From 30b580dcad8052d8e101c8622583ebb2dd9202ea Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 3 Nov 2020 07:01:38 -0500
Subject: [PATCH] import libvirt-6.0.0-28.module+el8.3.0+7827+5e65edd7

---
 .gitignore                                    |     2 +-
 .libvirt.metadata                             |     2 +-
 ...pying-bitmaps-to-larger-data-buffers.patch |    56 -
 ...IA-V100-GPU-with-NVLink2-passthrough.patch |   183 -
 ...e-types-to-qemuDomainMachineNeedsFDC.patch |    31 +-
 ...HEL-Fix-virConnectGetMaxVcpus-output.patch |    10 +-
 ...round-changed-Broadwell-Haswell-CPUs.patch |   129 +-
 ...y-after-firewalld-switch-to-nftables.patch |   146 -
 ...ility-to-set-sgio-values-for-hostdev.patch |    36 +-
 ...iv-sgio-for-SCSI-generic-host-device.patch |    35 +-
 ...tUnprivSGIO-hostdev-shareable-logic.patch} |    16 +-
 ...lter-val-usage-in-qemuSetUnprivSGIO.patch} |    22 +-
 ...ix-crash-trying-to-use-iSCSI-hostdev.patch |    12 +-
 ...ix-logic-error-in-qemuSetUnprivSGIO.patch} |    14 +-
 ...IO-use-sysfs_path-to-get-unpriv_sgio.patch |    20 +-
 ...ulated-sysfs_path-to-set-unpriv_sgio.patch |    52 +-
 ...pe-before-getting-it-s-dev-node-name.patch |    50 +-
 ...-virSCSIDeviceGetUnprivSGIOSysfsPath.patch |    61 +-
 ...ort-TAPEs-in-virSCSIDeviceGetDevName.patch |    73 +-
 ...-non-block-devices-in-virGetDeviceID.patch |    14 +-
 ...ecking-of-return-value-of-virHashNew.patch |    62 +
 ...bvirt-Remove-qemuDomainSecretInfoNew.patch |   109 +
 ...y-after-firewalld-switch-to-nftables.patch |    84 -
 ...-StateAutoStart-from-StateInitialize.patch |    93 -
 ..._ACCESS_DENIED-to-include-driverName.patch |   163 -
 ...up-into-virCgroupDetectControllersCB.patch |   108 -
 ...r-Separate-AutoStart-from-Initialize.patch |   295 -
 ...lers-not-managed-by-systemd-on-error.patch |    83 -
 ...nding-ACL-access-API-name-generation.patch |    60 -
 ..._ACCESS_DENIED-to-include-driverName.patch |   173 -
 ...CCESS_DENIED-to-include-driverName_1.patch |   159 -
 ...ss-their-UID-matches-the-current-UID.patch |    61 -
 ...pervisorCPU-on-read-only-connections.patch |    46 -
 ...apabilities-on-read-only-connections.patch |    38 -
 ...onseTimeout-on-read-only-connections.patch |    45 +
 ...veDefineXML-on-read-only-connections.patch |    40 -
 ...eGetXMLDesc-on-read-only-connections.patch |    98 -
 ...of-domains-into-bhyveStateInitialize.patch |    65 -
 ...r-uid-and-fid-PCI-address-attributes.patch |    67 -
 ...ort-for-cookies-for-HTTP-based-disks.patch |   449 +
 ...Add-support-for-http-s-query-strings.patch |   160 +
 ...-ssl-validation-for-https-ftps-disks.patch |   242 +
 ...and-readahead-size-for-network-disks.patch |   205 +
 ...conf-Add-validation-of-input-devices.patch |    76 -
 ...e-release-uid-and-fid-in-PCI-address.patch |   527 -
 ...VIR_DOMAIN_DEF_FORMAT_SECURE-is-used.patch |    58 +
 ...-t-generate-machine-names-with-a-dot.patch |    97 +
 ...pose-virDomainSCSIDriveAddressIsUsed.patch |    69 -
 ...sg-typo-in-virDomainVideoDefValidate.patch |    35 -
 ...nf-Fix-check-for-chardev-source-path.patch |   113 -
 ...nt-support-for-slices-of-disk-source.patch |   143 +
 ...duce-VIR_DOMAIN_TIMER_NAME_ARMVTIMER.patch |   129 +
 ...e-address-caching-for-PCI-extensions.patch |   241 -
 ...flag-and-zPCI-member-for-PCI-address.patch |   283 -
 ...roduce-new-hostdev-attribute-display.patch |   416 -
 ...t-conf-Introduce-new-video-type-none.patch |   504 -
 ...uce-parser-formatter-for-uid-and-fid.patch |   574 -
 ...onf-Introduce-virCPUDefCheckFeatures.patch |   103 -
 ...troduce-virDomainDefPostParseMemtune.patch |   210 -
 ...ce-virDomainDefPostParseVideo-helper.patch |    89 -
 ...virDomainGraphicsDefHasOpenGL-helper.patch |   105 -
 ...roduce-virDomainVideoDefClear-helper.patch |    84 -
 ...m-post-parse-to-QEMU-validation-code.patch |   122 -
 ...validation-check-out-of-qemu_command.patch |   247 -
 ...gepages-validation-out-of-XML-parser.patch |   126 -
 ...f-Parse-and-format-nested-hv-feature.patch |   152 -
 ...e-and-format-the-HTM-pSeries-feature.patch |   194 -
 ...e-guestfwd-channel-device-info-again.patch |    48 -
 ...in-virDomainHostdevDefParseXMLSubsys.patch |   175 -
 ...-add-new-PCI_CONNECT-flag-AUTOASSIGN.patch |    87 +
 ...rt-for-specifying-CPU-dies-parameter.patch |  1510 +
 ...iofs-related-elements-and-attributes.patch |   395 +
 ...figuration-of-names-exported-via-NBD.patch |   146 +
 ...ntal-backup-checkpoint-name-per-disk.patch |    67 +
 ...t-flag-when-validating-a-PCI-address.patch |    51 +
 ...boot-order-error-during-domain-parse.patch |   214 -
 ...ate-machine-names-ending-with-a-dash.patch |    70 +
 ...of-return-value-of-virHashCreateFull.patch |    73 +
 ...-that-the-controller-support-hotplug.patch |    47 +
 ...ttribute-hotplug-for-pci-controllers.patch |   290 +
 ...rmat-teaming-subelement-of-interface.patch |   468 +
 ...add-support-for-Hyper-V-PV-TLB-flush.patch |   262 -
 ...d-support-for-Hyper-V-frequency-MSRs.patch |   262 -
 ...yper-V-reenlightenment-notifications.patch |   264 -
 ...conf-qemu-add-virtiofs-fsdriver-type.patch |   327 +
 ...UGGABLE-VIR_PCI_CONNECT_AUTOASSIGN-g.patch |   161 +
 ...sed-virCapabilitiesSetHostCPU-method.patch |    88 +
 ...y-of-struct-_virStorageSourceNVMeDef.patch |   144 +
 ...hecking-for-AUTOASSIGN-PCI-addresses.patch |    83 +
 ...Element-in-virDomainDeviceInfoFormat.patch |   154 -
 ...ormatElement-in-virDomainFSDefFormat.patch |    70 +
 ...nge-HAVE_FIREWALLD-to-WITH_FIREWALLD.patch |   110 -
 ...ely-install-a-firewalld-libvirt-zone.patch |   280 -
 ...Add-support-for-stibp-x86_64-feature.patch |   202 -
 ...nge-control-flow-in-virCPUUpdateLive.patch |    53 +
 ...invalid-memory-in-virCPUx86Translate.patch |    59 -
 ...op-CPUID-definition-for-hv-spinlocks.patch |    82 -
 ...Drop-KVM_-from-hyperv-feature-macros.patch |   156 -
 ...libvirt-cpu-Drop-unused-KVM-features.patch |   102 -
 ...check-full-for-host-passthrough-CPUs.patch |   100 +
 ...t-cpu-Introduce-virCPUDataAddFeature.patch |   176 -
 ...low-include-files-for-CPU-definition.patch |   159 -
 ...cleanup-when-signature-parsing-fails.patch |    51 -
 ...-more-parsing-logic-into-common-code.patch |   782 -
 ...t-cpu-simplify-failure-cleanup-paths.patch |   397 -
 ...or-virCapabilitiesGetNodeInfo-retval.patch |    41 +
 ...Format-vendor_id-for-host-model-CPUs.patch |    80 +
 ...nf-Introduce-virCPUDefFilterFeatures.patch |    91 -
 ...y-to-CPU-feature-filtering-callbacks.patch |   165 -
 ...map-Add-Cascadelake-Server-CPU-model.patch |   211 -
 ...cpu_map-Add-Cooperlake-x86-CPU-model.patch |   289 +
 ...bvirt-cpu_map-Add-Icelake-CPU-models.patch |   219 -
 ...O-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch |    47 -
 ...L-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch |    46 -
 ...element-to-x86-CPU-model-definitions.patch |   749 +
 ...pu_map-Add-features-for-Icelake-CPUs.patch |   379 -
 ...Add-hex-representation-of-signatures.patch |   318 -
 ...pu_map-Add-more-noTSX-x86-CPU-models.patch |   831 +
 ...-signatures-for-Broadwell-CPU-models.patch |   254 -
 ...more-signatures-for-Conroe-CPU-model.patch |    41 -
 ...re-signatures-for-Haswell-CPU-models.patch |    76 -
 ...-signatures-for-IvyBridge-CPU-models.patch |    50 -
 ...re-signatures-for-Nehalem-CPU-models.patch |    54 -
 ...more-signatures-for-Penryn-CPU-model.patch |    41 -
 ...ignatures-for-SandyBridge-CPU-models.patch |    50 -
 ...atures-for-Skylake-Client-CPU-models.patch |    58 -
 ...re-signatures-for-Westmere-CPU-model.patch |   184 -
 ...no-bit-in-IA32_ARCH_CAPABILITIES-MSR.patch |   212 +
 ...upport-for-arch-capabilities-feature.patch |   110 -
 ...Add-support-for-cldemote-CPU-feature.patch |    46 -
 ...rt-cpu_map-Define-md-clear-CPUID-bit.patch |   102 -
 ...scadelake-Server-from-Skylake-Server.patch |   154 +
 ...pu_map-Distribute-x86_Cooperlake.xml.patch |    37 +
 ...new-noTSX-models-for-host-model-CPUs.patch |   137 +
 ...config-from-Icelake-Server-CPU-model.patch |   190 -
 ...-IA32_ARCH_CAPABILITIES-MSR-features.patch |   155 -
 ...6-Add-support-for-BFLOAT16-data-type.patch |    46 -
 ...t-for-stepping-part-of-CPU-signature.patch |   183 +
 ...-for-storing-MSR-features-in-CPU-map.patch |   328 -
 ...-virCPUx86DataGetSignature-for-tests.patch |    81 -
 ...86-Add-x86ModelCopySignatures-helper.patch |    77 -
 ...-multiple-signatures-for-a-CPU-model.patch |   114 -
 ...u_x86-Do-not-cache-microcode-version.patch |    60 -
 ...t-check-return-value-of-x86ModelCopy.patch |    74 +
 ...rop-noTSX-hint-for-incompatible-CPUs.patch |   102 +
 ...x86-Fix-memory-leak-virCPUx86GetHost.patch |    43 -
 ...-placement-of-CheckFeature-functions.patch |   119 -
 ..._x86-Honor-CPU-models-decode-element.patch |    67 +
 ...t-cpu_x86-Introduce-virCPUx86DataCmp.patch |    60 -
 ...e-virCPUx86DataItem-container-struct.patch |   850 -
 ...Introduce-virCPUx86FeatureFilter-MSR.patch |   133 -
 ...ntroduce-virCPUx86SignatureFromCPUID.patch |    71 +
 ...86-Introduce-virCPUx86SignaturesFree.patch |    64 +
 ...Log-decoded-CPU-model-and-signatures.patch |    79 -
 ...PU-model-names-are-unique-in-cpu_map.patch |    49 -
 ...86-Make-x86cpuidAndBits-more-general.patch |    64 -
 ...-Make-x86cpuidClearBits-more-general.patch |    84 -
 ..._x86-Make-x86cpuidMatch-more-general.patch |    96 -
 ...ake-x86cpuidMatchMasked-more-general.patch |    88 -
 ...86-Make-x86cpuidSetBits-more-general.patch |    64 -
 ...-cpu_x86-Move-CheckFeature-functions.patch |   115 -
 ...-Move-and-rename-x86FormatSignatures.patch |    97 +
 ...ve-and-rename-x86ModelCopySignatures.patch |   100 +
 ...Move-and-rename-x86ModelHasSignature.patch |   101 +
 ...PUx86UpdateLive-for-easier-extension.patch |    59 +
 ...ures-from-IA32_ARCH_CAPABILITIES-MSR.patch |    61 -
 ...-cpu_x86-Rename-virCPUx86CPUIDSorter.patch |    50 -
 ...cpu_x86-Rename-virCPUx86DataAddCPUID.patch |   274 -
 ..._x86-Rename-virCPUx86DataAddCPUIDInt.patch |   107 -
 ...6-Rename-virCPUx86DataItem-variables.patch |   328 -
 ...cpu_x86-Rename-virCPUx86Vendor.cpuid.patch |    99 -
 ...pu_x86-Rename-virCPUx86VendorToCPUID.patch |    60 -
 .../libvirt-cpu_x86-Rename-x86DataCpuid.patch |   141 -
 ...x86-Rename-x86DataCpuidNext-function.patch |   113 -
 ...ures-in-virCPUx86Model-with-a-struct.patch |   325 +
 ...uire-cpuid-within-feature-in-CPU-map.patch |    46 -
 ...tor-model-parsing-from-x86ModelParse.patch |   110 -
 ...ture-list-parsing-from-x86ModelParse.patch |   129 -
 ...signature-parsing-from-x86ModelParse.patch |   103 -
 ...te-vendor-parsing-from-x86ModelParse.patch |   109 -
 .../libvirt-cpu_x86-Simplify-x86DataAdd.patch |    54 -
 ..._x86-Store-CPU-signature-in-an-array.patch |   161 -
 ...e-virCPUx86DataItem-content-in-union.patch |   487 -
 ...Ux86DataIteratorInit-into-a-function.patch |   147 -
 ..._x86-Use-g_auto-in-virCPUx86Baseline.patch |   160 +
 ...-Use-g_auto-in-virCPUx86CheckFeature.patch |    54 +
 ...u_x86-Use-g_auto-in-virCPUx86Compare.patch |    69 +
 ...se-g_auto-in-virCPUx86CopyMigratable.patch |    54 +
 ...x86-Use-g_auto-in-virCPUx86DataParse.patch |    87 +
 ...se-g_auto-in-virCPUx86ExpandFeatures.patch |    86 +
 ...u_x86-Use-g_auto-in-virCPUx86GetHost.patch |    71 +
 ...u_x86-Use-g_auto-in-virCPUx86LoadMap.patch |    51 +
 ...x86-Use-g_auto-in-virCPUx86Translate.patch |    85 +
 ...pu_x86-Use-g_auto-in-virCPUx86Update.patch |    73 +
 ...86-Use-g_auto-in-virCPUx86UpdateLive.patch |   116 +
 ...irt-cpu_x86-Use-g_auto-in-x86Compute.patch |   181 +
 ...t-cpu_x86-Use-g_auto-in-x86DataToCPU.patch |    71 +
 ...virt-cpu_x86-Use-g_auto-in-x86Decode.patch |    99 +
 ...virt-cpu_x86-Use-g_auto-in-x86Encode.patch |   141 +
 ...pu_x86-Use-g_auto-in-x86EncodePolicy.patch |    46 +
 ...pu_x86-Use-g_auto-in-x86FeatureParse.patch |   115 +
 ...pu_x86-Use-g_auto-in-x86ModelFromCPU.patch |    74 +
 ...-cpu_x86-Use-g_auto-in-x86ModelParse.patch |    80 +
 ...x86-Use-g_auto-in-x86UpdateHostModel.patch |    71 +
 ...cpu_x86-Use-g_auto-in-x86VendorParse.patch |    76 +
 ...-glib-allocation-for-virCPU-x86-Data.patch |   149 +
 ...glib-allocation-for-virCPUx86Feature.patch |    74 +
 ...Use-glib-allocation-for-virCPUx86Map.patch |    69 +
 ...e-glib-allocation-for-virCPUx86Model.patch |   103 +
 ...-glib-allocation-for-virCPUx86Vendor.patch |    53 +
 ...lib-allocation-in-virCPUx86GetModels.patch |    52 +
 ...-cputest-Add-data-for-Cooperlake-CPU.patch |  1869 +
 ...dd-data-for-Intel-R-Core-TM-i7-7600U.patch |   979 -
 ...l-R-Core-TM-i7-8550U-CPU-without-TSX.patch |  2028 +
 ...Add-data-for-Intel-R-Core-TM-i7-8700.patch |   873 -
 ...ta-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch |   885 -
 ...ta-for-Intel-R-Xeon-R-CPU-E5-2630-v4.patch |   824 -
 ...-data-for-Intel-R-Xeon-R-CPU-E5-2650.patch |  1144 -
 ...dd-data-for-Intel-R-Xeon-R-CPU-E7540.patch |  1317 -
 ...ta-for-Intel-R-Xeon-R-Gold-6130-CPU.patch} |   380 +-
 ...or-Intel-R-Xeon-R-Platinum-9242-CPU.patch} |   973 +-
 ...ort-for-MSR-features-to-cpu-parse.sh.patch |    41 -
 .../libvirt-cputest-Test-CPU-signatures.patch |   755 -
 ...-secret-driver-before-storage-driver.patch |    59 -
 ...protected-virtualization-guest-setup.patch |   245 +
 ...-slices-sub-element-of-disk-s-source.patch |   100 +
 ...-tun-from-the-list-of-shared-devices.patch |    39 -
 ...ion-to-describe-secondary-connection.patch |   173 -
 ...the-armvtimer-timer-among-all-others.patch |    42 +
 ...diated-devices-hostdev-section-a-bit.patch |    44 -
 ...Update-AMD-launch-secure-description.patch |    56 +
 SOURCES/libvirt-docs-add-virtiofs-kbase.patch |   198 +
 ...ocument-interface-subelement-teaming.patch |   180 +
 ...DOMAIN_UNDEFINE_CHECKPOINTS_METADATA.patch |    43 +
 SOURCES/libvirt-docs-fix-a-typo.patch         |    38 +
 ...Close-source-on-one-of-disk-examples.patch |    35 +
 ...rmatdomain-Mention-missing-protocols.patch |    45 +
 ...docs-mention-hotplug-off-in-news.xml.patch |    48 +
 ...cessive-spacing-in-ToC-for-RST-files.patch |    39 +
 ...er-class-literal-with-monospace-font.patch |    41 +
 ...ma-Add-missing-alias-to-vsock-device.patch |    39 -
 ...e-the-virtio-options-from-each-other.patch |    44 -
 ...in-virDomainConfNWFilterTeardownImpl.patch |    46 -
 ...x-storage-Fix-typo-lsilogic-lsiLogic.patch |    42 -
 ...clean-traffic-gateway-into-nwfilters.patch |    77 -
 ...or-reporting-die_id-in-NUMA-topology.patch |   519 +
 ...introduce-a-family-of-NULLSTR-macros.patch |    55 -
 ...ernals-of-incremental-backup-in-qemu.patch |   267 +
 ...s-how-to-securely-probe-image-format.patch |    54 +
 ...larify-some-aspects-of-image-probing.patch |    70 +
 SOURCES/libvirt-lib-Drop-UDEVSETTLE.patch     |    73 -
 ...ocking-restrict-sockets-to-mode-0600.patch |    54 -
 ...ogging-restrict-sockets-to-mode-0600.patch |    54 -
 ...bvirt-lxc-Use-virCgroupGetMemoryStat.patch |   100 -
 ...bvirt-m4-Drop-needless-string-checks.patch |    51 -
 ...4-Provide-default-value-fore-UDEVADM.patch |   100 -
 ...ne-for-virtual-network-bridge-device.patch |   332 -
 ...llow-icmp-icmpv6-in-libvirt-zonefile.patch |    61 -
 ...ges-to-libvirt-zone-when-appropriate.patch |   174 -
 ...-error-if-unable-to-read-leases-file.patch |    59 -
 ...-usage-vs-initial-device-enumeration.patch |   256 +
 ...e-SEGV-for-NWFilter-Snoop-processing.patch |    79 -
 ...-MAC-and-IP-values-to-filter-binding.patch |   164 -
 ...s-wait-longer-5-30s-on-hard-shutdown.patch |    56 -
 ...-longer-on-kill-per-assigned-Hostdev.patch |   138 -
 ...dd-APIs-for-translating-CPU-features.patch |   124 -
 ...pability-for-the-HTM-pSeries-feature.patch |    80 -
 ...qemu-Add-ccw-support-for-vhost-vsock.patch |   343 -
 ...k-for-whether-KVM-nesting-is-enabled.patch |   162 -
 ...pport-for-PCI-devices-on-S390-guests.patch |   316 -
 ...d-support-for-slices-of-type-storage.patch |   231 +
 ..._CAPS_CPU_KVM_NO_ADJVTIME-capability.patch |    82 +
 ...ter-to-qemuMonitorJSONParsePropsList.patch |    89 -
 ...mu-Add-zPCI-address-definition-check.patch |   156 -
 ...uests-with-graphics-and-no-USB-mouse.patch |    76 -
 ...o-add-pci-root-for-s390-s390x-guests.patch |    46 -
 ...cate-resume-events-and-state-changes.patch |   243 -
 ...ing-non-native-binaries-all-the-time.patch |    45 -
 ...-AMD-secure-guest-support-is-enabled.patch |    80 +
 ...s390-secure-guest-support-is-enabled.patch |   166 +
 .../libvirt-qemu-Clarify-QEMU_CAPS_KVM.patch  |    88 -
 ...emu-Create-multipath-targets-for-PRs.patch |   399 +
 ...t-qemu-Don-t-cache-microcode-version.patch |   154 -
 ...emu-Don-t-check-for-dev-kvm-presence.patch |    45 -
 ...when-getting-targets-for-a-multipath.patch |    84 +
 ...PENDED_POSTCOPY-event-on-destination.patch |    53 +
 ...virt-qemu-Don-t-ignore-resume-events.patch |    68 -
 ...tore-disk-alias-in-qemuAgentDiskInfo.patch |   192 +
 ...-pointer-in-qemuDomainSecretInfoFree.patch |   161 +
 ...u-Don-t-use-full-CPU-model-expansion.patch |  2643 --
 ...em-prealloc-among-with-.prealloc-yes.patch |   200 -
 ...atures-from-host-model-with-old-QEMU.patch |    65 -
 ...bvirt-qemu-Drop-QEMU_CAPS_ENABLE_KVM.patch |   108 -
 ...abel-from-qemuProcessInitCpuAffinity.patch |    74 -
 ...isabled-CPU-features-unknown-to-QEMU.patch |    99 -
 ...e-from-qemuDomainDefValidateFeatures.patch |    60 -
 ...Drop-user-prefix-for-guestfwd-netdev.patch |    65 -
 ...Enable-PCI-multi-bus-for-S390-guests.patch |    54 -
 ...ne-from-getting-a-PCI-address-on-Q35.patch |    45 -
 ...lidation-code-into-a-separate-helper.patch |    93 -
 ...-pr-helper-process-info-on-reconnect.patch |   104 -
 ...evs-in-qemuHostdevPrepareSCSIDevices.patch |    41 -
 ...UTE_NONNULL-for-qemuMonitorAddObject.patch |    41 -
 ...-qemu-Fix-KVM-features-with-QEMU-4.1.patch |    67 -
 ...access-in-qemuProcessInitCpuAffinity.patch |    47 -
 ...ed-by-qemuDomainDefFormatBufInternal.patch |    51 -
 ...mu-Fix-hyperv-features-with-QEMU-4.1.patch |   100 -
 ...x-leak-in-qemuProcessInitCpuAffinity.patch |    65 -
 ...ix-post-copy-migration-on-the-source.patch |   110 -
 ...-qemu-Fix-probing-of-AMD-SEV-support.patch |   143 -
 ...-qemu-Fix-qemuProcessInitCpuAffinity.patch |    76 -
 ...etting-global_period-cputune-element.patch |    40 -
 ...-of-device-argument-for-block-commit.patch |    43 +
 ...-device-argument-for-blockdev-mirror.patch |    58 +
 ...mu-Forbid-MSR-features-with-old-QEMU.patch |    80 -
 ...ested-hv-feature-on-the-command-line.patch |    68 -
 ...-qemu-Format-the-HTM-pSeries-feature.patch |   102 -
 ...-armvtimer-timer-on-the-command-line.patch |    52 +
 ...use-zPCI-device-in-QEMU-command-line.patch |   834 -
 ...-for-secret-objects-for-http-cookies.patch |   117 +
 ...nstantiation-issues-during-reconnect.patch |    88 -
 ...U_CAPS_MACHINE_PSERIES_CAP_NESTED_HV.patch |   109 -
 ...a-new-graphics-display-type-headless.patch |   908 -
 ...r-creating-alias-for-a-secret-object.patch |    70 +
 ...oduce-generic-qemuMonitorGetGuestCPU.patch |   323 -
 ...bvirt-qemu-Introduce-zPCI-capability.patch |   156 -
 ...onitorGetGuestCPU-usable-on-x86-only.patch |   228 -
 ...unning-reason-to-resume-event-detail.patch |   121 -
 ...nning-reason-to-RESUME-event-handler.patch |   123 -
 ...-ssh-block-driver-used-by-libguestfs.patch |   169 +
 ...mu-Prefer-dashes-for-hyperv-features.patch |   160 -
 ...t-qemu-Probe-for-max-x86_64-cpu-type.patch |   155 -
 ...or-unavailable-features-CPU-property.patch |  3972 --
 ...mu-Probe-host-CPU-after-capabilities.patch |   403 -
 ...R_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT.patch |    42 -
 ...n-machines-that-do-not-have-this-bus.patch |   605 +
 ...emove-duplicated-qemuAgentCheckError.patch |    48 -
 ...ssSecurityDriver-from-qemuOpenFileAs.patch |   157 -
 ...ort-more-appropriate-running-reasons.patch |    61 -
 ...qemu-Rework-setting-process-affinity.patch |   265 -
 ...ite-bitmap-handling-for-block-commit.patch |   518 +
 ...write-bitmap-handling-for-block-copy.patch |   281 +
 ...dentity-for-the-reconnect-all-thread.patch |    94 -
 ...and-cpuset.mems-before-exec-ing-qemu.patch |    70 -
 ...zation-of-secrets-for-iscsi-hostdevs.patch |    80 +
 ...t-qemu-Stop-domain-on-failed-restore.patch |   107 +
 ...cdrivers-which-images-are-top-parent.patch |   312 +
 ...names-from-query-cpu-model-expansion.patch |   133 -
 ...eatures-in-virQEMUCapsGetCPUFeatures.patch |    69 -
 ...e-g_autoptr-for-qemuDomainSaveCookie.patch |   146 +
 ...statement-in-qemuBuildCpuCommandLine.patch |    74 +
 ...tachChrDevice-to-build-device-string.patch |    43 -
 ...onfiguration-for-the-armvtimer-timer.patch |    78 +
 ...e-up-PR_MANAGER_STATUS_CHANGED-event.patch |   275 -
 ...u-add-QEMU_CAPS_DEVICE_VHOST_USER_FS.patch |   122 +
 ...rt-qemu-add-QEMU_CAPS_STORAGE_WERROR.patch |   407 +
 ...pabilities-flag-for-failover-feature.patch |   123 +
 ...qemu-add-code-for-handling-virtiofsd.patch |   528 +
 ...ecifying-CPU-dies-topology-parameter.patch |   382 +
 .../libvirt-qemu-add-vfio-ap-capability.patch |    58 -
 ...emu-add-virtiofsd_debug-to-qemu.conf.patch |    99 +
 ...unplug-to-qemu-migration-status-enum.patch |    82 +
 ...e-video-devices-within-a-single-loop.patch |    52 -
 ...signed-PCI-hostdev-if-teaming-is-set.patch |    96 +
 ...non-x86-guests-with-APIC-EOI-setting.patch |    80 +
 ...kipped-in-an-intermediate-checkpoint.patch |    81 +
 ...cking-store-for-backup-target-images.patch |   125 +
 ...ackup-disk-bitmap-name-configuration.patch |    56 +
 ...ackup-disk-export-name-configuration.patch |    46 +
 ...-store-source-properly-and-just-once.patch |    49 +
 ...eckpoint-list-for-incremental-backup.patch |   213 +
 ...handling-to-the-new-bitmap-semantics.patch |   457 +
 ...-checkpoint-list-looking-for-bitmaps.patch |   165 +
 ...u-block-Add-support-for-HTTP-cookies.patch |   122 +
 ...ging-dirty-bitmaps-for-all-scenarios.patch |   238 +
 ...bitmap-chains-accross-backing-chains.patch |   196 +
 ...ip-creation-of-luks-formatted-images.patch |    59 +
 ...NamedNodeData-into-a-helper-function.patch |   122 +
 ...-Extract-formatting-of-cookie-string.patch |   108 +
 ...ing-with-bitmaps-during-block-commit.patch |   287 +
 ...d-timeout-properties-for-curl-driver.patch |    82 +
 ...ement-ssl-verification-configuration.patch |    65 +
 ...ulate-bitmap-handling-for-block-copy.patch |   189 +
 ...age-slice-into-backing-store-strings.patch |   138 +
 ...ven-if-there-are-no-bitmaps-to-merge.patch |   105 +
 ...T-PULL-REBASE_RELATIVE-with-blockdev.patch |   127 +
 ...eation-of-storage-sources-with-slice.patch |    43 +
 ...mplement-helpers-for-blockdev-reopen.patch |   155 +
 ...mages-when-mirror-job-fails-to-start.patch |    43 +
 ...opy-of-read-only-disks-with-blockdev.patch |    71 +
 ...-the-backing-chain-of-a-shallow-copy.patch |   137 +
 ...orary-bitmap-on-failed-active-commit.patch |    65 +
 ...-commit-on-QEMU_CAPS_BLOCKDEV_REOPEN.patch |    59 +
 ...-after-finish-of-normal-block-commit.patch |    95 +
 ...le-bitmaps-after-failed-block-commit.patch |    90 +
 ...e-field-from-commit-job-private-data.patch |   219 +
 ...re-flags-for-all-the-block-job-types.patch |   154 +
 ...b-Store-jobflags-with-block-job-data.patch |   125 +
 ...-of-bitmaps-disabled-prior-to-commit.patch |   117 +
 ...ld-vhost-user-fs-device-command-line.patch |   222 +
 ...lities-Add-QEMU_CAPS_BLOCKDEV_REOPEN.patch |    53 +
 ...error-rerror-for-usb-device-frontend.patch |    73 -
 ...S_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY.patch |    71 +
 ...caps-Add-vfio-pci.display-capability.patch |   142 -
 ...ask-for-CAP_DAC_OVERRIDE-if-non-root.patch |    39 -
 ...EV-platform-data-into-qemuCaps-cache.patch |   238 -
 ...roduce-a-capability-for-egl-headless.patch |   223 -
 ...r-probing-to-avoid-permission-issues.patch |   127 -
 ...sev-only-to-domains-that-require-SEV.patch |    65 -
 ...-checkpoint-redefine-for-offline-VMs.patch |    59 +
 ...-Don-t-chain-bitmaps-for-checkpoints.patch |    97 +
 ...-t-merge-checkpoints-during-deletion.patch |   312 +
 ...tmap-merging-for-checkpoint-deletion.patch |   140 +
 ...heckpoint-disk-definition-in-parents.patch |   215 +
 ...leting-checkpoints-accross-snapshots.patch |   298 +
 ...-checkpoint-is-current-in-a-variable.patch |    56 +
 ...nd-relabel-images-for-bitmap-merging.patch |   257 +
 ...on-directly-when-creating-checkpoint.patch |    62 +
 ...-chkdisk-in-qemuCheckpointAddActions.patch |    58 +
 ...disk-in-qemuCheckpointDiscardBitmaps.patch |    75 +
 ...plit-out-checkpoint-deletion-bitmaps.patch |   192 +
 ...missing-disks-on-checkpoint-deletion.patch |    85 +
 ...mat-image-properties-for-empty-drive.patch |   143 -
 ...-and-throttling-info-for-empty-drive.patch |   108 -
 ...vfio-pci.display-option-onto-cmdline.patch |   479 -
 ...aphics-iteration-to-its-own-function.patch |   105 -
 ...m-the-default-cgroup-device-acl-list.patch |    81 -
 ...ect-flag-during-PCI-address-set-init.patch |   199 +
 ...of-qemuBuildChrChardevStr-into-flags.patch |   313 -
 ...qemu-do-not-revert-to-NULL-bandwidth.patch |    45 +
 ...e-domain-mount-namespace-selectively.patch |    75 -
 ...t-detected-iso-image-format-into-raw.patch |    43 +
 ...name-to-qemuDomainDiskGetTopNodename.patch |   106 +
 ...commit-blockjob-data-into-a-function.patch |    72 +
 ...commit-blockjob-data-into-a-function.patch |   104 +
 ...atting-of-node-names-into-status-XML.patch |    51 +
 ...nused-qemuDomainDiskNodeFormatLookup.patch |    66 +
 ...O-memLockLimit-calculation-for-PPC64.patch |    66 -
 ...ret-object-representing-http-cookies.patch |   105 +
 ...ore-nodenames-of-slice-in-status-XML.patch |    74 +
 ...n-t-access-vmdef-within-qemu_agent.c.patch |   947 +
 ...dev-FD-passing-for-vhostuser-backend.patch |   171 -
 ...rdev-FD-passing-with-standalone-args.patch |    63 -
 ...eliminate-ret-in-qemuExtDevicesStart.patch |    68 +
 ...-agent-job-in-qemuDomainSetTimeAgent.patch |    41 +
 ...et-chardevs-operating-in-client-mode.patch |   132 -
 ...-pids-when-multiple-dies-are-present.patch |   136 +
 ...issions-for-pre-created-UNIX-sockets.patch |    50 -
 ...ecting-binary-in-domain-capabilities.patch |   118 +
 ...-migration-with-vhost-user-fs-device.patch |    52 +
 ...up-pcie-root-port-hotplug-off-option.patch |   174 +
 ...-object-for-TLS-if-it-does-not-exist.patch |    40 -
 ...cess-srcPriv-when-it-s-not-allocated.patch |    42 -
 ...lug-Fix-asynchronous-unplug-of-shmem.patch |    47 -
 ...the-copy-on-read-layer-with-blockdev.patch |    94 +
 ...message-in-qemuDomainAttachNetDevice.patch |    51 -
 ...nging-rom-enabled-attr-for-net-iface.patch |    40 -
 ...ay-property-only-with-vfio-pci-mdevs.patch |    43 -
 ...itor-Add-handler-for-blockdev-reopen.patch |   113 +
 ...message-when-QEMU-reply-is-too-large.patch |    51 +
 ...re-robust-against-programming-errors.patch |    91 -
 ...onitorJSONExtractCPUArchInfo-wrapper.patch |    88 -
 ...-of-arch-in-reply-of-query-cpus-fast.patch |    52 -
 ...ilities-flag-pcie-root-port.hotplug.patch} | 31850 +++++++++++-----
 ...op-external-devices-after-the-domain.patch |    49 +
 ...nObjPtr-to-qemuExtDevicesSetupCgroup.patch |    66 +
 ...preserve-error-on-bandwidth-rollback.patch |    59 +
 ...ice-on-a-controller-with-hotplug-off.patch |    79 +
 ...-be-the-directory-to-create-files-in.patch |    66 -
 ...ner-s-SEV-files-created-before-start.patch |    51 -
 ...put-virtiofsd-in-the-emulator-cgroup.patch |   108 +
 ...ndLine-Use-a-helper-variable-mdevsrc.patch |    49 -
 ...oLogd-param-from-vhostuser-code-path.patch |    98 -
 ...e-qemuDomainObjBegin-EndJobWithAgent.patch |   228 +
 ...ename-qemuAgentGetFSInfoInternalDisk.patch |    53 +
 ...uest-agent-in-qemuAgentGetInterfaces.patch |    50 -
 ...d-only-disks-when-we-can-create-them.patch |    43 +
 ...re-data-when-reusing-existing-images.patch |    46 +
 ...ain-XML-when-doing-inactive-snapshot.patch |    48 +
 ...snapshot-go-through-cleanup-on-error.patch |    41 +
 ...omplete-agent-filesystem-information.patch |   116 +
 ...port-interface-teaming-functionality.patch |   222 +
 ...AGE_WERROR-for-disk-error-attributes.patch |   114 +
 ...ead-of-vm-def-in-qemuExtDevicesStart.patch |    54 +
 ...he-vhost-user-schemas-to-find-binary.patch |   150 +
 ...time-switch-type-checking-for-videos.patch |    59 -
 ...t-qemu-validate-virtiofs-filesystems.patch |   137 +
 .../libvirt-qemu-vfio-ap-device-support.patch |   166 -
 ...t-qemu-virtiofs-shorten-pid-filename.patch |    49 +
 ...emu-virtiofs-shorten-socket-filename.patch |    39 +
 ...rt-qemu-vnc-switch-to-tls-creds-x509.patch |    87 -
 ...rams-Remove-pointless-returned-value.patch |   137 +
 ...gin-Don-t-leak-def-on-early-failures.patch |    39 +
 ...ess-when-rolling-back-due-to-failure.patch |    43 +
 ...-exit-early-when-the-job-has-started.patch |    75 +
 ...ataCleanupOne-Free-incrementalBitmap.patch |    37 +
 ...ed-Fix-improper-dereference-of-array.patch |    38 +
 ...d-Adjust-to-new-semantics-of-bitmaps.patch |    95 +
 ...inish-Use-proper-variable-to-iterate.patch |    42 +
 ...tStart-Fix-allocation-of-string-list.patch |    41 +
 ...xtra-wrapping-object-to-JSON-strings.patch |   129 +
 ...ckingStoreString-Add-pretty-argument.patch |   103 +
 ...andle-http-s-with-cookies-and-others.patch |   226 +
 ...ckingStoreString-Remove-ret-variable.patch |    67 +
 ...Commit-Propagate-disabledBitmapsBase.patch |    72 +
 ...-write-access-when-formatting-images.patch |    59 +
 ...chPrepare-Get-rid-of-cleanup-section.patch |    55 +
 ...ps-Report-errors-on-all-switch-cases.patch |    65 +
 ...ops-format-offset-and-size-for-slice.patch |    58 +
 ...eGetURI-Pass-through-query-component.patch |   136 +
 ...iv-instead-of-its-individual-members.patch |   172 -
 ...intCreateXML-Check-VM-liveness-first.patch |    57 +
 ...open-images-for-bitmap-modifications.patch |    54 +
 ...ect-field-for-checkpoint-bitmap-name.patch |    40 +
 ...it-Handle-bitmaps-on-start-of-commit.patch |    96 +
 ...on-capabilities-after-liveness-check.patch |    70 +
 ...on-Record-updated-flags-to-block-job.patch |    49 +
 ...g-checkpoints-for-virDomainBlockCopy.patch |    84 +
 ...when-pivoting-an-active-block-commit.patch |    61 +
 ...ures-of-creating-active-layer-bitmap.patch |    42 +
 ...k-prior-to-executing-the-pivot-steps.patch |    60 +
 ...ivot-Rename-actions-to-bitmapactions.patch |    73 +
 ...heck-for-range-only-if-IP-prefix-set.patch |    41 -
 ...reSecAlias-Hardcode-restored-aliases.patch |    58 +
 ...to-free-a-negative-number-of-entries.patch |    77 +
 ...GuestInfo-don-t-assign-NULL-hostname.patch |    49 +
 ...tanding-uses-with-qemuAliasForSecret.patch |   110 +
 ...ad-Don-t-leak-array-with-0-iothreads.patch |    48 +
 ...NestedJobAllowed-Allow-QEMU_JOB_NONE.patch |    47 -
 ...Device-Remove-associated-chardev-too.patch |    76 -
 ...Use-VIR_AUTOCLOSE-for-intermediatefd.patch |    56 +
 ...StartVM-Use-g_autoptr-for-virCommand.patch |    46 +
 ...emory-Don-t-enforce-dynamicOwnership.patch |    90 -
 ...tup-Allocate-and-return-secinfo-here.patch |   146 +
 ...Automatically-free-non-secret-locals.patch |    88 +
 ...etup-Split-out-lookup-of-secret-data.patch |   174 +
 ...tupFromSecret-Use-qemuAliasForSecret.patch |   123 +
 ...fo-Register-autoptr-cleanup-function.patch |    36 +
 ...pare-Change-aliases-for-disk-secrets.patch |   640 +
 ...repare-Fix-naming-of-alias-variables.patch |    60 +
 ...repare-Setup-secret-for-http-cookies.patch |    90 +
 ...load-the-relative-path-with-blockdev.patch |    42 +
 ...gic-of-relative-backing-store-update.patch |    78 +
 ...rageSource-Reject-unsupported-slices.patch |    52 +
 ...ateStorageSource-Relax-PR-validation.patch |    64 -
 ...idate-new-network-storage-parameters.patch |   113 +
 ...-qemuExtDevicesStart-pass-logManager.patch |    67 +
 ...NBD-Exit-early-if-there-are-no-disks.patch |    56 +
 ...ng-of-capacity-when-blockdev-is-used.patch |    74 +
 ...BD-Move-monitor-call-out-of-the-loop.patch |    65 +
 ...emove-ret-variable-and-cleanup-label.patch |    61 +
 ...kieAddNBD-Use-glib-memory-allocators.patch |    47 +
 ...automatic-freeing-of-virHashTablePtr.patch |    57 +
 ...ionCookieNBD-Extract-embedded-struct.patch |    52 +
 ...LS-Adapt-to-modern-memory-management.patch |    59 +
 ...uMigrationParamsResetTLS-Fix-comment.patch |    39 +
 ...kdevAdd-Take-double-pointer-argument.patch |   146 +
 ...itorJSONBlockdevAdd-Refactor-cleanup.patch |    61 +
 ...itorJSONBlockdevDel-Refactor-cleanup.patch |    63 +
 ...te-Output-validator-output-to-stderr.patch |    80 +
 ...emoryPathsImpl-Don-t-overwrite-error.patch |    45 -
 ...t-NS-iff-domain-was-started-with-one.patch |    52 -
 ...roduce-virQEMUCapsGetCPUModelX86Data.patch |   120 -
 ...Introduce-virQEMUCapsGetCPUModelInfo.patch |    65 -
 ...apabilities-Rework-domain-caps-cache.patch |   328 +
 ...ities-Use-virQEMUCapsGetCPUModelInfo.patch |   132 -
 ...-Use-canonical-names-of-CPU-features.patch |   137 -
 ...e-consistent-syntax-for-CPU-features.patch |   121 -
 ...in-virQEMUDriverGetHost-NUMACaps-CPU.patch |    85 +
 ...ify-access-to-a-NVMe-disk-iff-needed.patch |    52 +
 ...-bridge-detection-function-for-PPC64.patch |    85 -
 ...main-add-a-PPC64-memLockLimit-helper.patch |   219 -
 ...lug-Attach-guestfwd-using-netdev_add.patch |    65 -
 ...-Check-for-duplicate-drive-addresses.patch |    43 -
 ...lug-Detach-guestfwd-using-netdev_del.patch |   137 -
 ...qemuDomainDetachExtensionDevice-call.patch |    52 -
 ...l-to-qemuDomainDetachExtensionDevice.patch |    99 -
 ...ration-Avoid-writing-to-freed-memory.patch |    48 -
 ...duce-qemuMonitorJSONGetPRManagerInfo.patch |   180 -
 ...refer-generic-qemuMonitorGetGuestCPU.patch |    81 -
 ...ement-qemuSecurityDomainSetPathLabel.patch |   166 -
 ...test-cases-for-block-device-backends.patch |   149 +
 ...sic-tests-for-backup-bitmap-handling.patch |   139 +
 ...sic-tests-for-commit-bitmap-handling.patch |   355 +
 ...e-for-blockcopy-bitmap-handling-test.patch |    47 +
 ...-case-for-checkpoint-bitmap-handling.patch |    46 +
 ...d-empty-case-for-checkpoint-deletion.patch |    68 +
 ...pty-case-for-incremental-backup-test.patch |    74 +
 ...test-Add-empty-test-case-for-bitmaps.patch |   133 +
 ...ommit-bitmap-handling-with-snapshots.patch |   945 +
 ...p-detection-and-validation-test-case.patch |   593 +
 ...ots-tests-for-backup-bitmap-handling.patch |   161 +
 ...sts-for-block-commit-bitmap-handling.patch |  1105 +
 ...r-handling-bitmaps-during-block-copy.patch |   685 +
 ...dling-of-bitmaps-during-block-commit.patch |   418 +
 ...-re-enabling-of-bitmaps-after-commit.patch |   460 +
 ...p-chain-handling-during-block-commit.patch |   585 +
 ...tQemuDiskXMLToProps-from-dd94f36ffbe.patch |    60 +
 ...t-Delete-synthetic-bitmap-test-cases.patch |  1903 +
 ...le-testcases-for-all-bitmap-handling.patch |  3366 ++
 ...st-Extract-printing-of-nodename-list.patch |    78 +
 ...ema-root-for-blockdev-add-validation.patch |    71 +
 ...st-Fix-and-optimize-fake-image-chain.patch |    47 +
 ...emublocktest-Load-QMP-schema-earlier.patch |    85 +
 ...dation-for-basic-and-snapshots-cases.patch |    49 +
 ...oduce-testing-of-checkpoint-deletion.patch |   401 +
 ...LETE_MERGE-to-TEST_CHECKPOINT_DELETE.patch |    81 +
 ...asic-bitmap-detection-test-case-data.patch |   282 +
 ...hots-bitmap-detection-test-case-data.patch |  1476 +
 ...blocktest-Test-backing-store-strings.patch |  1587 +
 ...st-formatting-parsing-of-modern-JSON.patch |   103 +
 ...blocktest-xml-json-Add-test-for-NVMe.patch |    94 +
 ...actor-cleanup-in-test-case-functions.patch |   208 +
 ...est-Don-t-plug-a-SCSI-disk-at-unit-7.patch |    71 -
 ...test-Test-guestfwd-attach-and-detach.patch |   117 -
 ...rjsontest-AddNetdev-Use-real-variant.patch |    43 +
 ...Add-tests-for-Icelake-Server-pconfig.patch |   128 -
 ...st-case-for-disks-with-http-s-source.patch |   166 +
 ...dd-test-for-CPU-features-translation.patch |   134 -
 ...st-Add-case-for-host-model-vendor_id.patch |    79 +
 ...ltest-Wire-up-disk-network-http-case.patch |   115 +
 ...xml2xmltest-set-driver-as-privileged.patch |    38 +
 ...el-Enable-usage-of-x-blockdev-reopen.patch |   186 +
 ...hsession-update-deprecated-functions.patch |    63 -
 ...hema-wrap-fsDriver-in-a-choice-group.patch |    89 +
 ...nterleave-in-the-disk-source-element.patch |   497 +
 ...-for-correct-usage-when-LookupByUUID.patch |    78 -
 ...if-locking-a-file-on-NFS-mount-fails.patch |    45 +
 ...paths-we-haven-t-locked-successfully.patch |   117 +
 ...Y_DOMAIN_IMAGE_PARENT_CHAIN_TOP-flag.patch |   182 +
 ...dac-Relabel-dev-sev-in-the-namespace.patch |   122 -
 ...y-dac-also-label-listen-UNIX-sockets.patch |    64 -
 ...report-an-error-when-not-returning-1.patch |    55 -
 ...ry-leak-in-virNWFilterBindingDispose.patch |    69 -
 ...t-in-virDomainDetachDeviceAlias-docs.patch |    40 -
 ...s-sysmacros.h-always-exists-on-Linux.patch |   168 +
 ...-qemu-img-command-when-shrinking-vol.patch |    47 -
 ...ol-to-have-any-format-for-encryption.patch |   137 -
 ...orage-Allow-inputvol-to-be-encrypted.patch |   347 -
 ...backing-store-support-for-fat-prefix.patch |   123 +
 ...urce-properties-from-json-pseudo-uri.patch |   115 +
 ...h-from-_virStorageBackendQemuImgInfo.patch |    61 -
 ...new-images-with-write-permission-bit.patch |    69 +
 ...t-Introduce-virnetdevopenvswitchtest.patch |   356 -
 ...-all-per-image-data-in-one-structure.patch |   205 +
 ...-together-with-rest-of-xml-json-code.patch |   106 +
 ...pabilities-data-for-QEMU-2.11-x86_64.patch | 20429 ----------
 ...abilities-for-QEMU-5.0.0-on-aarch64.patch} | 22934 ++++++-----
 ...ain-capabilities-case-for-QEMU-4.1.0.patch |   203 -
 ...ibvirt-tests-Add-linux-high-ids-test.patch |  1112 -
 ...d-missing-thread_siblings_list-files.patch |   654 -
 ...tests-Add-more-tests-to-qemucaps2xml.patch |  1089 -
 ...dd-test-case-for-the-armvtimer-timer.patch |   136 +
 ...uptest-to-add-virCgroupGetMemoryStat.patch |   112 -
 ...Follow-up-on-qemucaps2xmldata-rename.patch |    37 -
 ...bvirt-tests-Resolve-possible-overrun.patch |    84 -
 ...mucapabilities-data-for-qemucaps2xml.patch |   478 -
 ...abilities-data-for-QEMU-3.0.0-x86_64.patch |   837 -
 ...-correct-function-name-in-error-path.patch |    40 -
 ...CPU-data-files-for-validating-die_id.patch |  2131 ++
 ...a-default-dimm-out-of-hugepages-numa.patch |   207 -
 ...rd-hugepages-out-of-hugepages-pages3.patch |   203 -
 ...pages-discard-out-of-hugepages-pages.patch |   234 -
 ...x-TLS-handshake-failure-with-TLS-1.3.patch |    42 -
 ...case-for-adding-duplicate-hash-entry.patch |    68 +
 ...duce-hugepages-default-1G-nodeset-2M.patch |   144 -
 ...rt-tests-introduce-hugepages-nodeset.patch |   106 -
 ...-test-data-for-the-new-slice-element.patch |   232 +
 ...mu-Remove-disk-from-graphics-vnc-tls.patch |    72 -
 ...dd-disk-error-policy-tests-for-s390x.patch |   185 +
 ...t-more-versions-for-graphics-vnc-tls.patch |   116 -
 ...-overlays-on-top-of-disks-with-slice.patch |   151 +
 ...deletion-test-for-deep-backing-chain.patch |   276 +
 ...eletion-tests-for-some-special-cases.patch |   257 +
 ...e-test-cases-for-checkpoint-deletion.patch |   169 +
 ...thetic-snapshot-checkpoint-test-data.patch |   896 +
 ...for-checkpoint-deletion-bitmap-merge.patch |   134 +
 ...-for-qemuBlockBitmapsHandleBlockcopy.patch |   577 +
 ...nthetic-test-case-for-broken-bitmaps.patch |   900 +
 ...dd-test-data-for-upcoming-qemu-3.0.0.patch | 23984 ------------
 ...case-for-empty-CDROM-with-cache-mode.patch |    85 -
 ...uxml2argv-add-CAPS_ARCH_LATEST-macro.patch |    99 -
 ...elements-from-hugepages-numa-default.patch |   208 -
 ...ges-numa-into-hugepages-numa-default.patch |    48 -
 ...es-pages-into-hugepages-numa-nodeset.patch |   184 -
 ...ages2-into-hugepages-numa-default-2M.patch |   146 -
 ...es3-into-hugepages-numa-nodeset-part.patch |   137 -
 ...into-hugepages-numa-nodeset-nonexist.patch |   125 -
 ...ges-pages5-into-hugepages-default-2M.patch |   140 -
 ...6-into-hugepages-default-system-size.patch |   141 -
 ...pages-pages7-into-pages-dimm-discard.patch |   189 -
 ...ges8-into-hugepages-nodeset-nonexist.patch |    85 -
 ...ename-hugepages-to-hugepages-default.patch |   115 -
 ...-security-with-specific-QEMU-version.patch |   101 -
 ...json-pseudo-URI-without-file-wrapper.patch |    54 +
 ...specified-raw-image-with-offset-size.patch |    49 +
 ...s-for-NBD-URI-style-syntax-over-UNIX.patch |    61 +
 ...backing-file-format-of-created-image.patch |    39 +
 ...x-typo-generating-adapter_wwpn-field.patch |    35 -
 ...-check-for-AMD-in-virt-host-validate.patch |   107 +
 ...-check-on-s390-in-virt-host-validate.patch |   158 +
 ...ossible-error-in-virCommandMassClose.patch |    47 -
 ...util-Don-t-overflow-in-virRandomBits.patch |    44 -
 ...virt-util-Fix-virCgroupGetMemoryStat.patch |    89 -
 ...-parser-for-kernel-cmdline-arguments.patch |   446 +
 ...ibvirt-util-Introduce-virBitmapUnion.patch |   149 -
 ...til-Introduce-virNumaNodesetToCPUset.patch |   128 -
 ...rIsDevMapperDevice-to-virdevmapper.c.patch |   186 +
 ...l-Propagate-numad-failures-correctly.patch |    63 -
 ...libvirt-util-Rework-virStringListAdd.patch |   145 -
 ...ewrite-virHostCPUCountThreadSiblings.patch |    91 -
 ...terfaces-to-IPv6CheckForwarding-list.patch |    82 -
 .../libvirt-util-add-virBufferTrimChars.patch |   151 +
 ...ting-automatic-cleanup-functionality.patch |    78 -
 ...nction-using-VIR_DEFINE_AUTOPTR_FUNC.patch |    66 -
 ...instead-of-VIR_FREE-for-scalar-types.patch |  1528 -
 ...xthop-interfaces-of-multipath-routes.patch |    81 -
 ...numerating-file-descriptors-to-close.patch |    62 -
 ...nction-using-VIR_DEFINE_AUTOPTR_FUNC.patch |    69 -
 ...instead-of-VIR_FREE-for-scalar-types.patch |   194 -
 ...ups-v2-cpuset-controller-for-threads.patch |    44 -
 ...o-close-fd-of-the-file-automatically.patch |    68 -
 ...leak-in-virFirewallDInterfaceSetZone.patch |    45 -
 ...ility-of-Duplicate-key-error-message.patch |   209 +
 ...g_new0-for-allocating-hash-internals.patch |    79 +
 ...ement-virCgroupV2-Set-Get-CpusetCpus.patch |    66 -
 ...CgroupV2-Set-Get-CpusetMemoryMigrate.patch |    64 -
 ...ement-virCgroupV2-Set-Get-CpusetMems.patch |    67 -
 ...bvirt-util-introduce-cgroup-v2-files.patch |   256 -
 ...til-introduce-vircgroupbackend-files.patch |   197 -
 ...on-Introduce-virJSONValueArrayConcat.patch |    94 +
 ...nction-using-VIR_DEFINE_AUTOPTR_FUNC.patch |    69 -
 ...ted-during-review-of-commit-d40b820c.patch |    66 -
 ...ld-specific-stuff-into-its-own-files.patch |   480 -
 ...t-to-avoid-issues-with-mount-syscall.patch |    43 -
 ...instead-of-VIR_FREE-for-scalar-types.patch |    98 -
 ...-use-VIR_AUTOPTR-for-aggregate-types.patch |   277 -
 ...virt-util-new-virFirewallD-APIs-docs.patch |   343 -
 ...msghdr-arg-to-virNetlinkDumpCallback.patch |    51 -
 ...-committed-to-virFirewallDZoneExists.patch |    46 -
 ...etection-for-non-PCI-network-devices.patch |    51 -
 ...ing-store-format-in-virStorageSource.patch |   155 +
 ...-image-format-probing-by-file-suffix.patch |   191 +
 ...nsport-type-when-parsing-NBD-strings.patch |    69 +
 ...uce-macro-for-automatic-string-lists.patch |    94 -
 ...-errors-when-getting-interface-stats.patch |    55 -
 ...d_attr-instead-of-an-open-coded-loop.patch |   106 -
 ...rcgroup-improve-controller-detection.patch |   117 -
 ...introduce-virCgroup-Get-Set-ValueRaw.patch |   161 -
 ...tr-out-of-virCgroupGetValueForBlkDev.patch |   323 -
 ...up-into-virCgroupDetectControllersCB.patch |   105 -
 ...upv1-add-support-for-BFQ-blkio-files.patch |   202 -
 ...ircgroupv2-add-support-for-BFQ-files.patch |   211 -
 ...ror-out-if-enabling-controller-fails.patch |    64 -
 ...PU-controller-only-if-it-s-available.patch |    44 -
 ...y-requested-controllers-as-available.patch |    53 -
 ...alues-of-virCgroupV2EnableController.patch |   104 -
 ...ing-missing-controllers-with-systemd.patch |    80 -
 ...ontroller-to-create-thread-directory.patch |    42 -
 ...-Drop-an-unused-variable-ovs_timeout.patch |    42 -
 ...re-for-storing-storage-source-slices.patch |   113 +
 ...arbitrary-limit-on-socket_id-core_id.patch |    93 -
 ...mmand-use-procfs-to-learn-opened-FDs.patch |   145 -
 ...vMapperGetTargets-Don-t-ignore-EBADF.patch |    61 +
 ...getsImpl-Check-for-dm-major-properly.patch |    69 +
 ...etTargetsImpl-Use-VIR_AUTOSTRINGLIST.patch |    73 +
 ...-if-device-is-not-a-devmapper-target.patch |    68 +
 ...urrent-checkpoint-if-there-isn-t-any.patch |    50 +
 ...initialize-xml-to-avoid-random-crash.patch |    52 -
 ...tibleDevice-Relax-alias-change-check.patch |    55 -
 ...DeviceFlags-Clarify-update-semantics.patch |    50 -
 ...IPoolSourceHost-Remove-cleanup-label.patch |    72 +
 ...olSourceHost-Remove-ternary-operator.patch |    40 +
 ...ost-Sanitize-handling-of-string-list.patch |    63 +
 ...cePtr-instead-of-virDomainDiskDefPtr.patch |    99 +
 ...st-use-g_new0-instead-of-VIR_ALLOC_N.patch |    39 +
 ...mat-Format-only-valid-managed-values.patch |    43 +
 ...cePtr-instead-of-virDomainDiskDefPtr.patch |    88 +
 ...cePool-Check-for-disk-type-correctly.patch |    44 +
 ...-volume-disks-in-whole-backing-chain.patch |    64 +
 ...lit-code-to-setup-one-storage-source.patch |   228 +
 ...cePtr-instead-of-virDomainDiskDefPtr.patch |    62 +
 ...irDomainFSDefFree-Unref-private-data.patch |    53 +
 ...BIStability-Check-for-MTU-change-too.patch |    47 -
 ...mainNetDefClear-Free-persistent-name.patch |    53 +
 ...ter-error-message-than-Duplicate-key.patch |   123 -
 ...mainObjListAddLocked-fix-double-free.patch |    64 -
 ...dFSType-Check-for-fuse.glusterfs-too.patch |   128 -
 ...redFSType-Detect-direct-mount-points.patch |    80 -
 ...try-Simplify-allocation-of-new-entry.patch |    53 +
 ...-and-remove-NULL-checks-from-callers.patch |   472 +
 ...tchInterfaceStats-Optimize-for-speed.patch |   175 -
 ...retLookupDefCopy-Remove-return-value.patch |    79 +
 ...nagerMetadataLock-Store-locked-paths.patch |   115 +
 ...l-Refactor-handling-of-backing-store.patch |    65 +
 ...onSecretCopy-Properly-copy-internals.patch |    50 +
 ...romBuf-Remove-backingFormat-argument.patch |   111 +
 ...Remove-unused-backingFormat-argument.patch |    91 +
 ...-probing-under-special-circumstances.patch |   148 +
 ...MetadataRecurse-Expect-NULL-src-path.patch |    48 +
 ...tadataRecurse-Extract-storage-access.patch |   128 +
 ...MetadataRecurse-Remove-cleanup-label.patch |   124 +
 ...curse-Remove-impossible-error-report.patch |    49 +
 ...nd-assignment-of-backing-chain-depth.patch |    59 +
 ...ashHasEntry-instead-of-fake-pointers.patch |    49 +
 ...s-path-formatting-for-migratable-XML.patch |    80 -
 ...DriverParser-annotate-format-drivers.patch |    79 +
 ...eValidate-Accept-quoted-cookie-value.patch |   148 +
 ...FromBacking-Also-transfer-the-format.patch |    81 +
 ...son-pseudo-URIs-without-file-wrapper.patch |   115 +
 ...tening-of-json-URIs-out-of-recursion.patch |    69 +
 ...-around-original-backing-file-string.patch |   186 +
 ...rbitrary-nesting-with-format-drivers.patch |    93 +
 ...Raw-Parse-offset-and-size-attributes.patch |    78 +
 ...undocumented-value-off-for-sslverify.patch |    92 +
 ...serve-query-string-of-URI-for-http-s.patch |    73 +
 ...ceUpdateCapacity-Drop-probe-argument.patch |   117 +
 ...vices-Drop-confusing-part-of-comment.patch |    41 -
 ...st-declare-testBufAddStrData-earlier.patch |    55 +
 ...t-remove-extra-G_GNUC_UNUSED-markers.patch |    49 +
 ...virbuftest-remove-unnecessary-labels.patch |   152 +
 ...eld-names-when-initalizing-test-info.patch |    74 +
 .../libvirt-virbuftest-use-g_autofree.patch   |   148 +
 ...roupRemove-inside-virCgroupMakeGroup.patch |   106 -
 ...up-Duplicate-string-before-modifying.patch |    75 -
 ...t-controller-detection-into-function.patch |    95 -
 ...ink-resolving-into-separate-function.patch |   137 -
 ...mount-options-matching-into-function.patch |   127 -
 ...t-placement-validation-into-function.patch |   102 -
 ...tandard-set-of-typedefs-and-use-them.patch |    72 -
 ...ce-virCgroupEnableMissingControllers.patch |   185 -
 ...oup-Introduce-virCgroupGetMemoryStat.patch |   155 -
 ...n-used-in-tests-into-vircgrouppriv.h.patch |    74 -
 ...-vircgroup-Remove-obsolete-sa_assert.patch |    40 -
 ...roup-Remove-pointless-bool-parameter.patch |    60 -
 ...Remove-unused-function-virCgroupKill.patch |   105 -
 ...up-Remove-virCgroupAddTaskController.patch |    76 -
 ...ame-structs-to-start-with-underscore.patch |    80 -
 ...-if-conditions-in-virCgroupMakeGroup.patch |    62 -
 ...pPathOfController-into-two-functions.patch |   138 -
 ...-function-virCgroupAddTaskController.patch |   148 -
 ...-function-virCgroupRemoveRecursively.patch |    80 -
 ...ntroller-in-virCgroupDetectPlacement.patch |    86 -
 ...add-support-for-hybrid-configuration.patch |   985 -
 ...lers-not-managed-by-systemd-on-error.patch |    77 -
 ...-detect-available-backend-for-cgroup.patch |   151 -
 ...ircgroup-extract-v1-detect-functions.patch |   426 -
 ...ct-virCgroupV1-Allow-Deny-AllDevices.patch |   140 -
 ...xtract-virCgroupV1-Allow-Deny-Device.patch |   250 -
 ...rCgroupV1-Set-Get-BlkioDeviceReadBps.patch |   181 -
 ...CgroupV1-Set-Get-BlkioDeviceReadIops.patch |   181 -
 ...irCgroupV1-Set-Get-BlkioDeviceWeight.patch |   208 -
 ...CgroupV1-Set-Get-BlkioDeviceWriteBps.patch |   181 -
 ...groupV1-Set-Get-BlkioDeviceWriteIops.patch |   181 -
 ...ract-virCgroupV1-Set-Get-BlkioWeight.patch |   150 -
 ...act-virCgroupV1-Set-Get-CpuCfsPeriod.patch |   142 -
 ...ract-virCgroupV1-Set-Get-CpuCfsQuota.patch |   168 -
 ...xtract-virCgroupV1-Set-Get-CpuShares.patch |   123 -
 ...tract-virCgroupV1-Set-Get-CpusetCpus.patch |   126 -
 ...CgroupV1-Set-Get-CpusetMemoryMigrate.patch |   132 -
 ...tract-virCgroupV1-Set-Get-CpusetMems.patch |   128 -
 ...act-virCgroupV1-Set-Get-FreezerState.patch |   123 -
 ...act-virCgroupV1-Set-Get-Memory-Limit.patch |   478 -
 ...vircgroup-extract-virCgroupV1AddTask.patch |   234 -
 ...rcgroup-extract-virCgroupV1Available.patch |   173 -
 ...rcgroup-extract-virCgroupV1BindMount.patch |   310 -
 ...cgroup-extract-virCgroupV1CopyMounts.patch |   129 -
 ...oup-extract-virCgroupV1CopyPlacement.patch |   163 -
 ...extract-virCgroupV1DetectControllers.patch |   218 -
 ...-extract-virCgroupV1GetAnyController.patch |   118 -
 ...-virCgroupV1GetBlkioIoDeviceServiced.patch |   278 -
 ...xtract-virCgroupV1GetBlkioIoServiced.patch |   265 -
 ...-extract-virCgroupV1GetCpuacct-Usage.patch |   122 -
 ...up-extract-virCgroupV1GetCpuacctStat.patch |   167 -
 ...p-extract-virCgroupV1GetMemSwapUsage.patch |   105 -
 ...oup-extract-virCgroupV1GetMemoryStat.patch |   228 -
 ...up-extract-virCgroupV1GetMemoryUsage.patch |   105 -
 ...oup-extract-virCgroupV1HasController.patch |    92 -
 ...oup-extract-virCgroupV1HasEmptyTasks.patch |   113 -
 ...rcgroup-extract-virCgroupV1MakeGroup.patch |   446 -
 ...-extract-virCgroupV1PathOfController.patch |   135 -
 ...-vircgroup-extract-virCgroupV1Remove.patch |   172 -
 ...rcgroup-extract-virCgroupV1SetMemory.patch |   129 -
 ...ircgroup-extract-virCgroupV1SetOwner.patch |   198 -
 ...up-extract-virCgroupV1StealPlacement.patch |    94 -
 ...oup-extract-virCgroupV1SupportsCpuBW.patch |   111 -
 ...ract-virCgroupV1ValidateMachineGroup.patch |   290 -
 ...extract-virCgroupV1ValidatePlacement.patch |   150 -
 .../libvirt-vircgroup-fix-MinGW-build.patch   |    52 -
 ...in-virCgroupEnableMissingControllers.patch |    50 -
 ...fix-cgroups-v2-controllers-detection.patch |   128 -
 ...include-system-headers-only-on-linux.patch |    83 -
 ...up-introduce-cgroup-v1-backend-files.patch |   186 -
 ...rcgroup-introduce-virCgroupAddThread.patch |   126 -
 ...p-introduce-virCgroupKillRecursiveCB.patch |   286 -
 ...rcgroup-introduce-virCgroupTaskFlags.patch |    86 -
 ...rCgroupV2-Set-Get-BlkioDeviceReadBps.patch |   112 -
 ...CgroupV2-Set-Get-BlkioDeviceReadIops.patch |   112 -
 ...irCgroupV2-Set-Get-BlkioDeviceWeight.patch |    93 -
 ...CgroupV2-Set-Get-BlkioDeviceWriteBps.patch |   112 -
 ...groupV2-Set-Get-BlkioDeviceWriteIops.patch |   112 -
 ...duce-virCgroupV2-Set-Get-BlkioWeight.patch |    91 -
 ...uce-virCgroupV2-Set-Get-CpuCfsPeriod.patch |   116 -
 ...duce-virCgroupV2-Set-Get-CpuCfsQuota.patch |    94 -
 ...roduce-virCgroupV2-Set-Get-CpuShares.patch |    65 -
 ...virCgroupV2-Set-Get-MemSwapHardLimit.patch |   104 -
 ...-virCgroupV2-Set-Get-MemoryHardLimit.patch |    85 -
 ...-virCgroupV2-Set-Get-MemorySoftLimit.patch |   103 -
 ...rcgroup-introduce-virCgroupV2AddTask.patch |    67 -
 ...group-introduce-virCgroupV2Available.patch |   116 -
 ...group-introduce-virCgroupV2BindMount.patch |    83 -
 ...roup-introduce-virCgroupV2CopyMounts.patch |    49 -
 ...p-introduce-virCgroupV2CopyPlacement.patch |    68 -
 ...troduce-virCgroupV2DetectControllers.patch |   125 -
 ...up-introduce-virCgroupV2DetectMounts.patch |    58 -
 ...introduce-virCgroupV2DetectPlacement.patch |    72 -
 ...ntroduce-virCgroupV2GetAnyController.patch |    51 -
 ...-virCgroupV2GetBlkioIoDeviceServiced.patch |   106 -
 ...roduce-virCgroupV2GetBlkioIoServiced.patch |   107 -
 ...-introduce-virCgroupV2GetCpuacctStat.patch |    91 -
 ...introduce-virCgroupV2GetCpuacctUsage.patch |    75 -
 ...introduce-virCgroupV2GetMemSwapUsage.patch |    58 -
 ...p-introduce-virCgroupV2GetMemoryStat.patch |   117 -
 ...-introduce-virCgroupV2GetMemoryUsage.patch |    57 -
 ...p-introduce-virCgroupV2HasController.patch |    51 -
 ...p-introduce-virCgroupV2HasEmptyTasks.patch |    59 -
 ...group-introduce-virCgroupV2MakeGroup.patch |   174 -
 ...ntroduce-virCgroupV2PathOfController.patch |    66 -
 ...ircgroup-introduce-virCgroupV2Remove.patch |    62 -
 ...group-introduce-virCgroupV2SetMemory.patch |    71 -
 ...cgroup-introduce-virCgroupV2SetOwner.patch |    69 -
 ...-introduce-virCgroupV2StealPlacement.patch |    54 -
 ...p-introduce-virCgroupV2SupportsCpuBW.patch |    58 -
 ...duce-virCgroupV2ValidateMachineGroup.patch |    94 -
 ...troduce-virCgroupV2ValidatePlacement.patch |    57 -
 ...group-machinename-will-never-be-NULL.patch |    87 -
 ...vircgroup-register-cgroup-v2-backend.patch |    39 -
 ...ircgroup-remove-VIR_CGROUP_SUPPORTED.patch |    72 -
 ...rcgroup-rename-controllers-to-legacy.patch |   524 -
 ...upAdd.-Task-to-virCgroupAdd.-Process.patch |   222 -
 ...ontroller-into-virCgroupV1Controller.patch |    82 -
 ...upmock-add-support-to-test-cgroup-v2.patch |   253 -
 ...t-vircgroupmock-change-cgroup-prefix.patch |   104 -
 ...roupmock-cleanup-unused-cgroup-files.patch |   150 -
 ...oupmock-rewrite-cgroup-fopen-mocking.patch |   390 -
 ...rt-vircgrouptest-add-cgroup-v2-tests.patch |    83 -
 ...add-detect-mounts-test-for-cgroup-v2.patch |   115 -
 ...etect-mounts-test-for-hybrid-cgroups.patch |   125 -
 ...bvirt-vircgrouptest-add-hybrid-tests.patch |    90 -
 ...-call-virCgroupDetectMounts-directly.patch |   163 -
 ...ewSelf-instead-virCgroupDetectMounts.patch |   544 -
 ...initFakeFS-and-cleanupFakeFS-helpers.patch |   120 -
 ...testCgroupDetectMounts-for-cgroup-v2.patch |   137 -
 ...-prepare-validateCgroup-for-cgroupv2.patch |   150 -
 ...cgroupv1-fix-build-on-non-linux-OSes.patch |    94 -
 ...ircgroupv2-fix-abort-in-VIR_AUTOFREE.patch |    65 -
 ...rsing-multiple-values-in-single-file.patch |   105 -
 ...rcgroupv2-fix-setting-cpu.max-period.patch |    42 -
 ...CgroupV2GetCpuCfsQuota-for-max-value.patch |    39 -
 ...-fix-virCgroupV2ValidateMachineGroup.patch |    47 -
 ...ircgroupv2-store-enabled-controllers.patch |    79 -
 ...rate-mass-FD-closing-into-a-function.patch |   111 -
 ...cpuhost-Add-support-for-reading-MSRs.patch |   155 -
 ...s-long-as-the-while-loop-is-executed.patch |    49 -
 ...pper-Don-t-cache-device-mapper-major.patch |    99 +
 ...-libdevmapper-to-obtain-dependencies.patch |   467 +
 ...kernel-without-device-mapper-support.patch |    87 +
 ...rors-when-opening-dev-mapper-control.patch |    88 +
 ...two-WITH_DEVMAPPER-sections-together.patch |    69 +
 ...irt-virfile-Detect-ceph-as-shared-FS.patch |   139 -
 ...irfile-Rework-virFileIsSharedFixFUSE.patch |   151 -
 ...to-account-in-virFileIsSharedFixFUSE.patch |   187 -
 ...virt-virfile-added-GPFS-as-shared-fs.patch |   124 -
 ...libvirt-virfile-fix-cast-align-error.patch |    95 -
 ...t-name-prefix-for-virFileInData-test.patch |    37 -
 ...rt-virfiletst-Test-virFileIsSharedFS.patch |   358 -
 ...s-of-virHashKeyEqual-implementations.patch |    74 +
 ...ke-virHostCPUGetMSR-work-only-on-x86.patch |    89 -
 ...ifname-in-virNetDevTapInterfaceStats.patch |    60 -
 ...undefined-behaviour-in-virRandomBits.patch |    40 -
 ...explicit-domain-for-domxml-to-native.patch |    90 -
 ...declaration-when-extracting-CPU-XMLs.patch |    63 -
 ...p-persistent-for-detach-device-alias.patch |    35 -
 ...me-typo-in-nwfilter-binding-undefine.patch |    39 -
 ...verify-readahead-cookies-and-timeout.patch |   183 +
 ...host-validate-Fix-build-on-non-Linux.patch |    45 -
 ...ost-validate-require-freezer-for-LXC.patch |    38 -
 ...roup-detection-to-use-util-vircgroup.patch |   371 -
 ...idate-Add-schema-for-nwfilterbinding.patch |    53 -
 ...x-make-fileName-optional-for-CD-ROMs.patch |   196 +
 ...-few-ignore-cases-in-virVMXParseDisk.patch |   109 +
 SOURCES/symlinks                              |    99 +-
 SPECS/libvirt.spec                            |  1829 +-
 993 files changed, 108657 insertions(+), 156032 deletions(-)
 delete mode 100644 SOURCES/libvirt-Handle-copying-bitmaps-to-larger-data-buffers.patch
 delete mode 100644 SOURCES/libvirt-PPC64-support-for-NVIDIA-V100-GPU-with-NVLink2-passthrough.patch
 delete mode 100644 SOURCES/libvirt-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
 rename SOURCES/{libvirt-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch => libvirt-RHEL-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch} (78%)
 rename SOURCES/{libvirt-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch => libvirt-RHEL-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch} (76%)
 rename SOURCES/{libvirt-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch => libvirt-RHEL-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch} (84%)
 create mode 100644 SOURCES/libvirt-Remove-checking-of-return-value-of-virHashNew.patch
 create mode 100644 SOURCES/libvirt-Remove-qemuDomainSecretInfoNew.patch
 delete mode 100644 SOURCES/libvirt-Revert-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
 delete mode 100644 SOURCES/libvirt-Revert-Separate-out-StateAutoStart-from-StateInitialize.patch
 delete mode 100644 SOURCES/libvirt-Revert-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
 delete mode 100644 SOURCES/libvirt-Revert-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
 delete mode 100644 SOURCES/libvirt-Revert-virStateDriver-Separate-AutoStart-from-Initialize.patch
 delete mode 100644 SOURCES/libvirt-Revert-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
 delete mode 100644 SOURCES/libvirt-access-Fix-nwfilter-binding-ACL-access-API-name-generation.patch
 delete mode 100644 SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
 delete mode 100644 SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName_1.patch
 delete mode 100644 SOURCES/libvirt-admin-reject-clients-unless-their-UID-matches-the-current-UID.patch
 delete mode 100644 SOURCES/libvirt-api-disallow-virConnect-HypervisorCPU-on-read-only-connections.patch
 delete mode 100644 SOURCES/libvirt-api-disallow-virConnectGetDomainCapabilities-on-read-only-connections.patch
 create mode 100644 SOURCES/libvirt-api-disallow-virDomainAgentSetResponseTimeout-on-read-only-connections.patch
 delete mode 100644 SOURCES/libvirt-api-disallow-virDomainManagedSaveDefineXML-on-read-only-connections.patch
 delete mode 100644 SOURCES/libvirt-api-disallow-virDomainSaveImageGetXMLDesc-on-read-only-connections.patch
 delete mode 100644 SOURCES/libvirt-bhyve-Move-autostarting-of-domains-into-bhyveStateInitialize.patch
 delete mode 100644 SOURCES/libvirt-conf-Add-definitions-for-uid-and-fid-PCI-address-attributes.patch
 create mode 100644 SOURCES/libvirt-conf-Add-support-for-cookies-for-HTTP-based-disks.patch
 create mode 100644 SOURCES/libvirt-conf-Add-support-for-http-s-query-strings.patch
 create mode 100644 SOURCES/libvirt-conf-Add-support-for-modifying-ssl-validation-for-https-ftps-disks.patch
 create mode 100644 SOURCES/libvirt-conf-Add-support-for-setting-timeout-and-readahead-size-for-network-disks.patch
 delete mode 100644 SOURCES/libvirt-conf-Add-validation-of-input-devices.patch
 delete mode 100644 SOURCES/libvirt-conf-Allocate-release-uid-and-fid-in-PCI-address.patch
 create mode 100644 SOURCES/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF_FORMAT_SECURE-is-used.patch
 create mode 100644 SOURCES/libvirt-conf-Don-t-generate-machine-names-with-a-dot.patch
 delete mode 100644 SOURCES/libvirt-conf-Expose-virDomainSCSIDriveAddressIsUsed.patch
 delete mode 100644 SOURCES/libvirt-conf-Fix-a-error-msg-typo-in-virDomainVideoDefValidate.patch
 delete mode 100644 SOURCES/libvirt-conf-Fix-check-for-chardev-source-path.patch
 create mode 100644 SOURCES/libvirt-conf-Implement-support-for-slices-of-disk-source.patch
 create mode 100644 SOURCES/libvirt-conf-Introduce-VIR_DOMAIN_TIMER_NAME_ARMVTIMER.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-address-caching-for-PCI-extensions.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-extension-flag-and-zPCI-member-for-PCI-address.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-new-hostdev-attribute-display.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-new-video-type-none.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-parser-formatter-for-uid-and-fid.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-virCPUDefCheckFeatures.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-virDomainDefPostParseMemtune.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-virDomainDefPostParseVideo-helper.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-virDomainGraphicsDefHasOpenGL-helper.patch
 delete mode 100644 SOURCES/libvirt-conf-Introduce-virDomainVideoDefClear-helper.patch
 delete mode 100644 SOURCES/libvirt-conf-Move-VFIO-AP-validation-from-post-parse-to-QEMU-validation-code.patch
 delete mode 100644 SOURCES/libvirt-conf-Move-hugepage-XML-validation-check-out-of-qemu_command.patch
 delete mode 100644 SOURCES/libvirt-conf-Move-hugepages-validation-out-of-XML-parser.patch
 delete mode 100644 SOURCES/libvirt-conf-Parse-and-format-nested-hv-feature.patch
 delete mode 100644 SOURCES/libvirt-conf-Parse-and-format-the-HTM-pSeries-feature.patch
 delete mode 100644 SOURCES/libvirt-conf-Parse-guestfwd-channel-device-info-again.patch
 delete mode 100644 SOURCES/libvirt-conf-Replace-error-with-cleanup-in-virDomainHostdevDefParseXMLSubsys.patch
 create mode 100644 SOURCES/libvirt-conf-add-new-PCI_CONNECT-flag-AUTOASSIGN.patch
 create mode 100644 SOURCES/libvirt-conf-add-support-for-specifying-CPU-dies-parameter.patch
 create mode 100644 SOURCES/libvirt-conf-add-virtiofs-related-elements-and-attributes.patch
 create mode 100644 SOURCES/libvirt-conf-backup-Allow-configuration-of-names-exported-via-NBD.patch
 create mode 100644 SOURCES/libvirt-conf-backup-Store-incremental-backup-checkpoint-name-per-disk.patch
 create mode 100644 SOURCES/libvirt-conf-check-HOTPLUGGABLE-connect-flag-when-validating-a-PCI-address.patch
 delete mode 100644 SOURCES/libvirt-conf-correct-false-boot-order-error-during-domain-parse.patch
 create mode 100644 SOURCES/libvirt-conf-do-not-generate-machine-names-ending-with-a-dash.patch
 create mode 100644 SOURCES/libvirt-conf-domain-Remove-checking-of-return-value-of-virHashCreateFull.patch
 create mode 100644 SOURCES/libvirt-conf-during-PCI-hotplug-require-that-the-controller-support-hotplug.patch
 create mode 100644 SOURCES/libvirt-conf-new-attribute-hotplug-for-pci-controllers.patch
 create mode 100644 SOURCES/libvirt-conf-parse-format-teaming-subelement-of-interface.patch
 delete mode 100644 SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-PV-TLB-flush.patch
 delete mode 100644 SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-frequency-MSRs.patch
 delete mode 100644 SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-reenlightenment-notifications.patch
 create mode 100644 SOURCES/libvirt-conf-qemu-add-virtiofs-fsdriver-type.patch
 create mode 100644 SOURCES/libvirt-conf-qemu-s-VIR_PCI_CONNECT_HOTPLUGGABLE-VIR_PCI_CONNECT_AUTOASSIGN-g.patch
 create mode 100644 SOURCES/libvirt-conf-remove-unused-virCapabilitiesSetHostCPU-method.patch
 create mode 100644 SOURCES/libvirt-conf-rename-namespace-property-of-struct-_virStorageSourceNVMeDef.patch
 create mode 100644 SOURCES/libvirt-conf-simplify-logic-when-checking-for-AUTOASSIGN-PCI-addresses.patch
 delete mode 100644 SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainDeviceInfoFormat.patch
 create mode 100644 SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainFSDefFormat.patch
 delete mode 100644 SOURCES/libvirt-configure-change-HAVE_FIREWALLD-to-WITH_FIREWALLD.patch
 delete mode 100644 SOURCES/libvirt-configure-selectively-install-a-firewalld-libvirt-zone.patch
 delete mode 100644 SOURCES/libvirt-cpu-Add-support-for-stibp-x86_64-feature.patch
 create mode 100644 SOURCES/libvirt-cpu-Change-control-flow-in-virCPUUpdateLive.patch
 delete mode 100644 SOURCES/libvirt-cpu-Don-t-access-invalid-memory-in-virCPUx86Translate.patch
 delete mode 100644 SOURCES/libvirt-cpu-Drop-CPUID-definition-for-hv-spinlocks.patch
 delete mode 100644 SOURCES/libvirt-cpu-Drop-KVM_-from-hyperv-feature-macros.patch
 delete mode 100644 SOURCES/libvirt-cpu-Drop-unused-KVM-features.patch
 create mode 100644 SOURCES/libvirt-cpu-Honor-check-full-for-host-passthrough-CPUs.patch
 delete mode 100644 SOURCES/libvirt-cpu-Introduce-virCPUDataAddFeature.patch
 delete mode 100644 SOURCES/libvirt-cpu-allow-include-files-for-CPU-definition.patch
 delete mode 100644 SOURCES/libvirt-cpu-fix-cleanup-when-signature-parsing-fails.patch
 delete mode 100644 SOURCES/libvirt-cpu-push-more-parsing-logic-into-common-code.patch
 delete mode 100644 SOURCES/libvirt-cpu-simplify-failure-cleanup-paths.patch
 create mode 100644 SOURCES/libvirt-cpu.c-Check-properly-for-virCapabilitiesGetNodeInfo-retval.patch
 create mode 100644 SOURCES/libvirt-cpu_conf-Format-vendor_id-for-host-model-CPUs.patch
 delete mode 100644 SOURCES/libvirt-cpu_conf-Introduce-virCPUDefFilterFeatures.patch
 delete mode 100644 SOURCES/libvirt-cpu_conf-Pass-policy-to-CPU-feature-filtering-callbacks.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Cascadelake-Server-CPU-model.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Add-Cooperlake-x86-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-Icelake-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-TAA_NO-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-TSX_CTRL-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Add-decode-element-to-x86-CPU-model-definitions.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-features-for-Icelake-CPUs.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-hex-representation-of-signatures.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Add-more-noTSX-x86-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Broadwell-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Conroe-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Haswell-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-IvyBridge-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Nehalem-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Penryn-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-SandyBridge-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Skylake-Client-CPU-models.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-more-signatures-for-Westmere-CPU-model.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILITIES-MSR.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-support-for-arch-capabilities-feature.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Add-support-for-cldemote-CPU-feature.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Define-md-clear-CPUID-bit.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-Server.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Distribute-x86_Cooperlake.xml.patch
 create mode 100644 SOURCES/libvirt-cpu_map-Don-t-use-new-noTSX-models-for-host-model-CPUs.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Drop-pconfig-from-Icelake-Server-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-Introduce-IA32_ARCH_CAPABILITIES-MSR-features.patch
 delete mode 100644 SOURCES/libvirt-cpu_map-x86-Add-support-for-BFLOAT16-data-type.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Add-support-for-stepping-part-of-CPU-signature.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Add-support-for-storing-MSR-features-in-CPU-map.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Add-virCPUx86DataGetSignature-for-tests.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Add-x86ModelCopySignatures-helper.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Allow-multiple-signatures-for-a-CPU-model.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Do-not-cache-microcode-version.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Fix-memory-leak-virCPUx86GetHost.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Fix-placement-of-CheckFeature-functions.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Honor-CPU-models-decode-element.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataCmp.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataItem-container-struct.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Introduce-virCPUx86FeatureFilter-MSR.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Log-decoded-CPU-model-and-signatures.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Make-sure-CPU-model-names-are-unique-in-cpu_map.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Make-x86cpuidAndBits-more-general.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Make-x86cpuidClearBits-more-general.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Make-x86cpuidMatch-more-general.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Make-x86cpuidMatchMasked-more-general.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Make-x86cpuidSetBits-more-general.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Move-CheckFeature-functions.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Move-and-rename-x86FormatSignatures.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Prepare-virCPUx86UpdateLive-for-easier-extension.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Read-CPU-features-from-IA32_ARCH_CAPABILITIES-MSR.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-virCPUx86CPUIDSorter.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUID.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUIDInt.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataItem-variables.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-virCPUx86Vendor.cpuid.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-virCPUx86VendorToCPUID.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-x86DataCpuid.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Rename-x86DataCpuidNext-function.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-with-a-struct.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Require-cpuid-within-feature-in-CPU-map.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Separate-ancestor-model-parsing-from-x86ModelParse.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Separate-feature-list-parsing-from-x86ModelParse.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Separate-signature-parsing-from-x86ModelParse.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Separate-vendor-parsing-from-x86ModelParse.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Simplify-x86DataAdd.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Store-CPU-signature-in-an-array.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Store-virCPUx86DataItem-content-in-union.patch
 delete mode 100644 SOURCES/libvirt-cpu_x86-Turn-virCPUx86DataIteratorInit-into-a-function.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Compute.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Decode.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Encode.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelParse.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86VendorParse.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
 create mode 100644 SOURCES/libvirt-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
 create mode 100644 SOURCES/libvirt-cputest-Add-data-for-Cooperlake-CPU.patch
 delete mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-7600U.patch
 create mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8550U-CPU-without-TSX.patch
 delete mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8700.patch
 delete mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch
 delete mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2630-v4.patch
 delete mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2650.patch
 delete mode 100644 SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E7540.patch
 rename SOURCES/{libvirt-cputest-Add-data-for-Ice-Lake-Server-CPU.patch => libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch} (78%)
 rename SOURCES/{libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-8268-CPU.patch => libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-9242-CPU.patch} (51%)
 delete mode 100644 SOURCES/libvirt-cputest-Add-support-for-MSR-features-to-cpu-parse.sh.patch
 delete mode 100644 SOURCES/libvirt-cputest-Test-CPU-signatures.patch
 delete mode 100644 SOURCES/libvirt-daemon-Register-secret-driver-before-storage-driver.patch
 create mode 100644 SOURCES/libvirt-docs-Describe-protected-virtualization-guest-setup.patch
 create mode 100644 SOURCES/libvirt-docs-Document-the-new-slices-sub-element-of-disk-s-source.patch
 delete mode 100644 SOURCES/libvirt-docs-Drop-dev-net-tun-from-the-list-of-shared-devices.patch
 delete mode 100644 SOURCES/libvirt-docs-Enhance-polkit-documentation-to-describe-secondary-connection.patch
 create mode 100644 SOURCES/libvirt-docs-List-the-armvtimer-timer-among-all-others.patch
 delete mode 100644 SOURCES/libvirt-docs-Rephrase-the-mediated-devices-hostdev-section-a-bit.patch
 create mode 100644 SOURCES/libvirt-docs-Update-AMD-launch-secure-description.patch
 create mode 100644 SOURCES/libvirt-docs-add-virtiofs-kbase.patch
 create mode 100644 SOURCES/libvirt-docs-document-interface-subelement-teaming.patch
 create mode 100644 SOURCES/libvirt-docs-domaincaps-Mention-VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA.patch
 create mode 100644 SOURCES/libvirt-docs-fix-a-typo.patch
 create mode 100644 SOURCES/libvirt-docs-formatdomain-Close-source-on-one-of-disk-examples.patch
 create mode 100644 SOURCES/libvirt-docs-formatdomain-Mention-missing-protocols.patch
 create mode 100644 SOURCES/libvirt-docs-mention-hotplug-off-in-news.xml.patch
 create mode 100644 SOURCES/libvirt-docs-reduce-excessive-spacing-in-ToC-for-RST-files.patch
 create mode 100644 SOURCES/libvirt-docs-render-class-literal-with-monospace-font.patch
 delete mode 100644 SOURCES/libvirt-docs-schema-Add-missing-alias-to-vsock-device.patch
 delete mode 100644 SOURCES/libvirt-docs-schemas-Decouple-the-virtio-options-from-each-other.patch
 delete mode 100644 SOURCES/libvirt-domain_nwfilter-Return-early-if-net-has-no-name-in-virDomainConfNWFilterTeardownImpl.patch
 delete mode 100644 SOURCES/libvirt-esx-storage-Fix-typo-lsilogic-lsiLogic.patch
 delete mode 100644 SOURCES/libvirt-examples-Add-clean-traffic-gateway-into-nwfilters.patch
 create mode 100644 SOURCES/libvirt-hostcpu-add-support-for-reporting-die_id-in-NUMA-topology.patch
 delete mode 100644 SOURCES/libvirt-internal-introduce-a-family-of-NULLSTR-macros.patch
 create mode 100644 SOURCES/libvirt-kbase-Add-document-outlining-internals-of-incremental-backup-in-qemu.patch
 create mode 100644 SOURCES/libvirt-kbase-backing_chains-Add-steps-how-to-securely-probe-image-format.patch
 create mode 100644 SOURCES/libvirt-kbase-backing_chains-Clarify-some-aspects-of-image-probing.patch
 delete mode 100644 SOURCES/libvirt-lib-Drop-UDEVSETTLE.patch
 delete mode 100644 SOURCES/libvirt-locking-restrict-sockets-to-mode-0600.patch
 delete mode 100644 SOURCES/libvirt-logging-restrict-sockets-to-mode-0600.patch
 delete mode 100644 SOURCES/libvirt-lxc-Use-virCgroupGetMemoryStat.patch
 delete mode 100644 SOURCES/libvirt-m4-Drop-needless-string-checks.patch
 delete mode 100644 SOURCES/libvirt-m4-Provide-default-value-fore-UDEVADM.patch
 delete mode 100644 SOURCES/libvirt-network-allow-configuring-firewalld-zone-for-virtual-network-bridge-device.patch
 delete mode 100644 SOURCES/libvirt-network-explicitly-allow-icmp-icmpv6-in-libvirt-zonefile.patch
 delete mode 100644 SOURCES/libvirt-network-set-firewalld-zone-of-bridges-to-libvirt-zone-when-appropriate.patch
 delete mode 100644 SOURCES/libvirt-networkGetDHCPLeases-Don-t-always-report-error-if-unable-to-read-leases-file.patch
 create mode 100644 SOURCES/libvirt-nodedev-fix-race-in-API-usage-vs-initial-device-enumeration.patch
 delete mode 100644 SOURCES/libvirt-nwfilter-Resolve-SEGV-for-NWFilter-Snoop-processing.patch
 delete mode 100644 SOURCES/libvirt-nwfilter-fix-adding-std-MAC-and-IP-values-to-filter-binding.patch
 delete mode 100644 SOURCES/libvirt-process-wait-longer-5-30s-on-hard-shutdown.patch
 delete mode 100644 SOURCES/libvirt-process-wait-longer-on-kill-per-assigned-Hostdev.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-APIs-for-translating-CPU-features.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-capability-for-the-HTM-pSeries-feature.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-ccw-support-for-vhost-vsock.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-check-for-whether-KVM-nesting-is-enabled.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-hotpluging-support-for-PCI-devices-on-S390-guests.patch
 create mode 100644 SOURCES/libvirt-qemu-Add-support-for-slices-of-type-storage.patch
 create mode 100644 SOURCES/libvirt-qemu-Add-the-QEMU_CAPS_CPU_KVM_NO_ADJVTIME-capability.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-type-filter-to-qemuMonitorJSONParsePropsList.patch
 delete mode 100644 SOURCES/libvirt-qemu-Add-zPCI-address-definition-check.patch
 delete mode 100644 SOURCES/libvirt-qemu-Allow-creating-ppc64-guests-with-graphics-and-no-USB-mouse.patch
 delete mode 100644 SOURCES/libvirt-qemu-Auto-add-pci-root-for-s390-s390x-guests.patch
 delete mode 100644 SOURCES/libvirt-qemu-Avoid-duplicate-resume-events-and-state-changes.patch
 delete mode 100644 SOURCES/libvirt-qemu-Avoid-probing-non-native-binaries-all-the-time.patch
 create mode 100644 SOURCES/libvirt-qemu-Check-if-AMD-secure-guest-support-is-enabled.patch
 create mode 100644 SOURCES/libvirt-qemu-Check-if-s390-secure-guest-support-is-enabled.patch
 delete mode 100644 SOURCES/libvirt-qemu-Clarify-QEMU_CAPS_KVM.patch
 create mode 100644 SOURCES/libvirt-qemu-Create-multipath-targets-for-PRs.patch
 delete mode 100644 SOURCES/libvirt-qemu-Don-t-cache-microcode-version.patch
 delete mode 100644 SOURCES/libvirt-qemu-Don-t-check-for-dev-kvm-presence.patch
 create mode 100644 SOURCES/libvirt-qemu-Don-t-crash-when-getting-targets-for-a-multipath.patch
 create mode 100644 SOURCES/libvirt-qemu-Don-t-emit-SUSPENDED_POSTCOPY-event-on-destination.patch
 delete mode 100644 SOURCES/libvirt-qemu-Don-t-ignore-resume-events.patch
 create mode 100644 SOURCES/libvirt-qemu-Don-t-store-disk-alias-in-qemuAgentDiskInfo.patch
 create mode 100644 SOURCES/libvirt-qemu-Don-t-take-double-pointer-in-qemuDomainSecretInfoFree.patch
 delete mode 100644 SOURCES/libvirt-qemu-Don-t-use-full-CPU-model-expansion.patch
 delete mode 100644 SOURCES/libvirt-qemu-Don-t-use-mem-prealloc-among-with-.prealloc-yes.patch
 delete mode 100644 SOURCES/libvirt-qemu-Drop-MSR-features-from-host-model-with-old-QEMU.patch
 delete mode 100644 SOURCES/libvirt-qemu-Drop-QEMU_CAPS_ENABLE_KVM.patch
 delete mode 100644 SOURCES/libvirt-qemu-Drop-cleanup-label-from-qemuProcessInitCpuAffinity.patch
 delete mode 100644 SOURCES/libvirt-qemu-Drop-disabled-CPU-features-unknown-to-QEMU.patch
 delete mode 100644 SOURCES/libvirt-qemu-Drop-duplicated-code-from-qemuDomainDefValidateFeatures.patch
 delete mode 100644 SOURCES/libvirt-qemu-Drop-user-prefix-for-guestfwd-netdev.patch
 delete mode 100644 SOURCES/libvirt-qemu-Enable-PCI-multi-bus-for-S390-guests.patch
 delete mode 100644 SOURCES/libvirt-qemu-Exempt-video-model-none-from-getting-a-PCI-address-on-Q35.patch
 delete mode 100644 SOURCES/libvirt-qemu-Extract-MDEV-VFIO-PCI-validation-code-into-a-separate-helper.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fetch-pr-helper-process-info-on-reconnect.patch
 delete mode 100644 SOURCES/libvirt-qemu-Filter-non-SCSI-hostdevs-in-qemuHostdevPrepareSCSIDevices.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-ATTRIBUTE_NONNULL-for-qemuMonitorAddObject.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-KVM-features-with-QEMU-4.1.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-NULL-pointer-access-in-qemuProcessInitCpuAffinity.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-NULL-ptr-dereference-caused-by-qemuDomainDefFormatBufInternal.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-hyperv-features-with-QEMU-4.1.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-leak-in-qemuProcessInitCpuAffinity.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-post-copy-migration-on-the-source.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-probing-of-AMD-SEV-support.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-qemuProcessInitCpuAffinity.patch
 delete mode 100644 SOURCES/libvirt-qemu-Fix-setting-global_period-cputune-element.patch
 create mode 100644 SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-blockdev-mirror.patch
 delete mode 100644 SOURCES/libvirt-qemu-Forbid-MSR-features-with-old-QEMU.patch
 delete mode 100644 SOURCES/libvirt-qemu-Format-nested-hv-feature-on-the-command-line.patch
 delete mode 100644 SOURCES/libvirt-qemu-Format-the-HTM-pSeries-feature.patch
 create mode 100644 SOURCES/libvirt-qemu-Format-the-armvtimer-timer-on-the-command-line.patch
 delete mode 100644 SOURCES/libvirt-qemu-Generate-and-use-zPCI-device-in-QEMU-command-line.patch
 create mode 100644 SOURCES/libvirt-qemu-Handle-hotplug-and-commandline-for-secret-objects-for-http-cookies.patch
 delete mode 100644 SOURCES/libvirt-qemu-Ignore-nwfilter-binding-instantiation-issues-during-reconnect.patch
 delete mode 100644 SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV.patch
 delete mode 100644 SOURCES/libvirt-qemu-Introduce-a-new-graphics-display-type-headless.patch
 create mode 100644 SOURCES/libvirt-qemu-Introduce-another-helper-for-creating-alias-for-a-secret-object.patch
 delete mode 100644 SOURCES/libvirt-qemu-Introduce-generic-qemuMonitorGetGuestCPU.patch
 delete mode 100644 SOURCES/libvirt-qemu-Introduce-zPCI-capability.patch
 delete mode 100644 SOURCES/libvirt-qemu-Make-qemuMonitorGetGuestCPU-usable-on-x86-only.patch
 delete mode 100644 SOURCES/libvirt-qemu-Map-running-reason-to-resume-event-detail.patch
 delete mode 100644 SOURCES/libvirt-qemu-Pass-running-reason-to-RESUME-event-handler.patch
 create mode 100644 SOURCES/libvirt-qemu-Pass-through-arguments-of-ssh-block-driver-used-by-libguestfs.patch
 delete mode 100644 SOURCES/libvirt-qemu-Prefer-dashes-for-hyperv-features.patch
 delete mode 100644 SOURCES/libvirt-qemu-Probe-for-max-x86_64-cpu-type.patch
 delete mode 100644 SOURCES/libvirt-qemu-Probe-for-unavailable-features-CPU-property.patch
 delete mode 100644 SOURCES/libvirt-qemu-Probe-host-CPU-after-capabilities.patch
 delete mode 100644 SOURCES/libvirt-qemu-Properly-report-VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT.patch
 create mode 100644 SOURCES/libvirt-qemu-Refuse-to-use-ps2-on-machines-that-do-not-have-this-bus.patch
 delete mode 100644 SOURCES/libvirt-qemu-Remove-duplicated-qemuAgentCheckError.patch
 delete mode 100644 SOURCES/libvirt-qemu-Remove-unused-bypassSecurityDriver-from-qemuOpenFileAs.patch
 delete mode 100644 SOURCES/libvirt-qemu-Report-more-appropriate-running-reasons.patch
 delete mode 100644 SOURCES/libvirt-qemu-Rework-setting-process-affinity.patch
 create mode 100644 SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-copy.patch
 delete mode 100644 SOURCES/libvirt-qemu-Set-identity-for-the-reconnect-all-thread.patch
 delete mode 100644 SOURCES/libvirt-qemu-Set-up-EMULATOR-thread-and-cpuset.mems-before-exec-ing-qemu.patch
 create mode 100644 SOURCES/libvirt-qemu-Split-out-initialization-of-secrets-for-iscsi-hostdevs.patch
 create mode 100644 SOURCES/libvirt-qemu-Stop-domain-on-failed-restore.patch
 create mode 100644 SOURCES/libvirt-qemu-Tell-secdrivers-which-images-are-top-parent.patch
 delete mode 100644 SOURCES/libvirt-qemu-Translate-feature-names-from-query-cpu-model-expansion.patch
 delete mode 100644 SOURCES/libvirt-qemu-Translate-features-in-virQEMUCapsGetCPUFeatures.patch
 create mode 100644 SOURCES/libvirt-qemu-Use-g_autoptr-for-qemuDomainSaveCookie.patch
 create mode 100644 SOURCES/libvirt-qemu-Use-switch-statement-in-qemuBuildCpuCommandLine.patch
 delete mode 100644 SOURCES/libvirt-qemu-Use-tmpChr-in-qemuDomainDetachChrDevice-to-build-device-string.patch
 create mode 100644 SOURCES/libvirt-qemu-Validate-configuration-for-the-armvtimer-timer.patch
 delete mode 100644 SOURCES/libvirt-qemu-Wire-up-PR_MANAGER_STATUS_CHANGED-event.patch
 create mode 100644 SOURCES/libvirt-qemu-add-QEMU_CAPS_DEVICE_VHOST_USER_FS.patch
 create mode 100644 SOURCES/libvirt-qemu-add-QEMU_CAPS_STORAGE_WERROR.patch
 create mode 100644 SOURCES/libvirt-qemu-add-capabilities-flag-for-failover-feature.patch
 create mode 100644 SOURCES/libvirt-qemu-add-code-for-handling-virtiofsd.patch
 create mode 100644 SOURCES/libvirt-qemu-add-support-for-specifying-CPU-dies-topology-parameter.patch
 delete mode 100644 SOURCES/libvirt-qemu-add-vfio-ap-capability.patch
 create mode 100644 SOURCES/libvirt-qemu-add-virtiofsd_debug-to-qemu.conf.patch
 create mode 100644 SOURCES/libvirt-qemu-add-wait-unplug-to-qemu-migration-status-enum.patch
 delete mode 100644 SOURCES/libvirt-qemu-address-Handle-all-the-video-devices-within-a-single-loop.patch
 create mode 100644 SOURCES/libvirt-qemu-allow-migration-with-assigned-PCI-hostdev-if-teaming-is-set.patch
 create mode 100644 SOURCES/libvirt-qemu-avoid-launching-non-x86-guests-with-APIC-EOI-setting.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Fix-backup-of-disk-skipped-in-an-intermediate-checkpoint.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Fix-handling-of-backing-store-for-backup-target-images.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-bitmap-name-configuration.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-export-name-configuration.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Initialize-store-source-properly-and-just-once.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Move-fetching-of-checkpoint-list-for-incremental-backup.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Rewrite-backup-bitmap-handling-to-the-new-bitmap-semantics.patch
 create mode 100644 SOURCES/libvirt-qemu-backup-Split-up-code-traversing-checkpoint-list-looking-for-bitmaps.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Add-support-for-HTTP-cookies.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Add-universal-helper-for-merging-dirty-bitmaps-for-all-scenarios.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Add-validator-for-bitmap-chains-accross-backing-chains.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Don-t-skip-creation-of-luks-formatted-images.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Extract-calls-of-qemuBlockGetNamedNodeData-into-a-helper-function.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Extract-formatting-of-cookie-string.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Implement-helpers-for-dealing-with-bitmaps-during-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Implement-readahead-and-timeout-properties-for-curl-driver.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Implement-ssl-verification-configuration.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Introduce-function-to-calculate-bitmap-handling-for-block-copy.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Properly-format-storage-slice-into-backing-store-strings.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Remove-active-write-bitmap-even-if-there-are-no-bitmaps-to-merge.patch
 create mode 100644 SOURCES/libvirt-qemu-block-Support-VIR_DOMAIN_BLOCK_COMMIT-PULL-REBASE_RELATIVE-with-blockdev.patch
 create mode 100644 SOURCES/libvirt-qemu-block-forbid-creation-of-storage-sources-with-slice.patch
 create mode 100644 SOURCES/libvirt-qemu-block-implement-helpers-for-blockdev-reopen.patch
 create mode 100644 SOURCES/libvirt-qemu-blockcopy-Actually-unplug-unused-images-when-mirror-job-fails-to-start.patch
 create mode 100644 SOURCES/libvirt-qemu-blockcopy-Allow-copy-of-read-only-disks-with-blockdev.patch
 create mode 100644 SOURCES/libvirt-qemu-blockcopy-Allow-late-opening-of-the-backing-chain-of-a-shallow-copy.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Actually-delete-temporary-bitmap-on-failed-active-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Don-t-base-bitmap-handling-of-active-layer-block-commit-on-QEMU_CAPS_BLOCKDEV_REOPEN.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Handle-bitmaps-after-finish-of-normal-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Re-enable-bitmaps-after-failed-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Remove-disabledBitmapsBase-field-from-commit-job-private-data.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Store-flags-for-all-the-block-job-types.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Store-jobflags-with-block-job-data.patch
 create mode 100644 SOURCES/libvirt-qemu-blockjob-Store-list-of-bitmaps-disabled-prior-to-commit.patch
 create mode 100644 SOURCES/libvirt-qemu-build-vhost-user-fs-device-command-line.patch
 create mode 100644 SOURCES/libvirt-qemu-capabilities-Add-QEMU_CAPS_BLOCKDEV_REOPEN.patch
 delete mode 100644 SOURCES/libvirt-qemu-capabilities-Add-capability-for-werror-rerror-for-usb-device-frontend.patch
 create mode 100644 SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY.patch
 delete mode 100644 SOURCES/libvirt-qemu-caps-Add-vfio-pci.display-capability.patch
 delete mode 100644 SOURCES/libvirt-qemu-caps-Don-t-try-to-ask-for-CAP_DAC_OVERRIDE-if-non-root.patch
 delete mode 100644 SOURCES/libvirt-qemu-caps-Format-SEV-platform-data-into-qemuCaps-cache.patch
 delete mode 100644 SOURCES/libvirt-qemu-caps-Introduce-a-capability-for-egl-headless.patch
 delete mode 100644 SOURCES/libvirt-qemu-caps-Use-CAP_DAC_OVERRIDE-for-probing-to-avoid-permission-issues.patch
 delete mode 100644 SOURCES/libvirt-qemu-cgroup-Expose-dev-sev-only-to-domains-that-require-SEV.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Allow-checkpoint-redefine-for-offline-VMs.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Don-t-chain-bitmaps-for-checkpoints.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Don-t-merge-checkpoints-during-deletion.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Extract-calculation-of-bitmap-merging-for-checkpoint-deletion.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Introduce-helper-to-find-checkpoint-disk-definition-in-parents.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Introduce-support-for-deleting-checkpoints-accross-snapshots.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Store-whether-deleted-checkpoint-is-current-in-a-variable.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Track-and-relabel-images-for-bitmap-merging.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-Use-disk-definition-directly-when-creating-checkpoint.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointAddActions.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointDiscardBitmaps.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-split-out-checkpoint-deletion-bitmaps.patch
 create mode 100644 SOURCES/libvirt-qemu-checkpoint-tolerate-missing-disks-on-checkpoint-deletion.patch
 delete mode 100644 SOURCES/libvirt-qemu-command-Don-t-format-image-properties-for-empty-drive.patch
 delete mode 100644 SOURCES/libvirt-qemu-command-Don-t-skip-readonly-and-throttling-info-for-empty-drive.patch
 delete mode 100644 SOURCES/libvirt-qemu-command-Enable-formatting-vfio-pci.display-option-onto-cmdline.patch
 delete mode 100644 SOURCES/libvirt-qemu-command-Move-graphics-iteration-to-its-own-function.patch
 delete mode 100644 SOURCES/libvirt-qemu-conf-Remove-dev-sev-from-the-default-cgroup-device-acl-list.patch
 create mode 100644 SOURCES/libvirt-qemu-conf-set-HOTPLUGGABLE-connect-flag-during-PCI-address-set-init.patch
 delete mode 100644 SOURCES/libvirt-qemu-consolidate-parameters-of-qemuBuildChrChardevStr-into-flags.patch
 create mode 100644 SOURCES/libvirt-qemu-do-not-revert-to-NULL-bandwidth.patch
 delete mode 100644 SOURCES/libvirt-qemu-domain-Add-dev-sev-into-the-domain-mount-namespace-selectively.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Convert-detected-iso-image-format-into-raw.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Extract-code-to-determine-topmost-nodename-to-qemuDomainDiskGetTopNodename.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Extract-formatting-of-commit-blockjob-data-into-a-function.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Extract-parsing-of-commit-blockjob-data-into-a-function.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Refactor-formatting-of-node-names-into-status-XML.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Remove-unused-qemuDomainDiskNodeFormatLookup.patch
 delete mode 100644 SOURCES/libvirt-qemu-domain-Simplify-non-VFIO-memLockLimit-calculation-for-PPC64.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Store-data-for-secret-object-representing-http-cookies.patch
 create mode 100644 SOURCES/libvirt-qemu-domain-Store-nodenames-of-slice-in-status-XML.patch
 create mode 100644 SOURCES/libvirt-qemu-don-t-access-vmdef-within-qemu_agent.c.patch
 delete mode 100644 SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-for-vhostuser-backend.patch
 delete mode 100644 SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-with-standalone-args.patch
 create mode 100644 SOURCES/libvirt-qemu-eliminate-ret-in-qemuExtDevicesStart.patch
 create mode 100644 SOURCES/libvirt-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch
 delete mode 100644 SOURCES/libvirt-qemu-fix-UNIX-socket-chardevs-operating-in-client-mode.patch
 create mode 100644 SOURCES/libvirt-qemu-fix-detection-of-vCPU-pids-when-multiple-dies-are-present.patch
 delete mode 100644 SOURCES/libvirt-qemu-fix-up-permissions-for-pre-created-UNIX-sockets.patch
 create mode 100644 SOURCES/libvirt-qemu-fixing-auto-detecting-binary-in-domain-capabilities.patch
 create mode 100644 SOURCES/libvirt-qemu-forbid-migration-with-vhost-user-fs-device.patch
 create mode 100644 SOURCES/libvirt-qemu-hook-up-pcie-root-port-hotplug-off-option.patch
 delete mode 100644 SOURCES/libvirt-qemu-hotplug-Do-not-try-to-add-secret-object-for-TLS-if-it-does-not-exist.patch
 delete mode 100644 SOURCES/libvirt-qemu-hotplug-Don-t-access-srcPriv-when-it-s-not-allocated.patch
 delete mode 100644 SOURCES/libvirt-qemu-hotplug-Fix-asynchronous-unplug-of-shmem.patch
 create mode 100644 SOURCES/libvirt-qemu-hotplug-Fix-handling-of-the-copy-on-read-layer-with-blockdev.patch
 delete mode 100644 SOURCES/libvirt-qemu-hotplug-don-t-overwrite-error-message-in-qemuDomainAttachNetDevice.patch
 delete mode 100644 SOURCES/libvirt-qemu-hotplug-report-error-when-changing-rom-enabled-attr-for-net-iface.patch
 delete mode 100644 SOURCES/libvirt-qemu-mdev-Use-vfio-pci-display-property-only-with-vfio-pci-mdevs.patch
 create mode 100644 SOURCES/libvirt-qemu-monitor-Add-handler-for-blockdev-reopen.patch
 create mode 100644 SOURCES/libvirt-qemu-monitor-Improve-error-message-when-QEMU-reply-is-too-large.patch
 delete mode 100644 SOURCES/libvirt-qemu-monitor-Make-qemuMonitorAddObject-more-robust-against-programming-errors.patch
 delete mode 100644 SOURCES/libvirt-qemu-monitor-Remove-qemuMonitorJSONExtractCPUArchInfo-wrapper.patch
 delete mode 100644 SOURCES/libvirt-qemu-monitor-Use-target-instead-of-arch-in-reply-of-query-cpus-fast.patch
 rename SOURCES/{libvirt-tests-Add-QEMU-caps-data-for-future-4.1.0.patch => libvirt-qemu-new-capabilities-flag-pcie-root-port.hotplug.patch} (55%)
 create mode 100644 SOURCES/libvirt-qemu-only-stop-external-devices-after-the-domain.patch
 create mode 100644 SOURCES/libvirt-qemu-pass-virDomainObjPtr-to-qemuExtDevicesSetupCgroup.patch
 create mode 100644 SOURCES/libvirt-qemu-preserve-error-on-bandwidth-rollback.patch
 create mode 100644 SOURCES/libvirt-qemu-prevent-attempts-to-detach-a-device-on-a-controller-with-hotplug-off.patch
 delete mode 100644 SOURCES/libvirt-qemu-process-SEV-Assume-libDir-to-be-the-directory-to-create-files-in.patch
 delete mode 100644 SOURCES/libvirt-qemu-process-SEV-Relabel-guest-owner-s-SEV-files-created-before-start.patch
 create mode 100644 SOURCES/libvirt-qemu-put-virtiofsd-in-the-emulator-cgroup.patch
 delete mode 100644 SOURCES/libvirt-qemu-qemuBuildHostdevCommandLine-Use-a-helper-variable-mdevsrc.patch
 delete mode 100644 SOURCES/libvirt-qemu-remove-chardevStdioLogd-param-from-vhostuser-code-path.patch
 create mode 100644 SOURCES/libvirt-qemu-remove-qemuDomainObjBegin-EndJobWithAgent.patch
 create mode 100644 SOURCES/libvirt-qemu-rename-qemuAgentGetFSInfoInternalDisk.patch
 delete mode 100644 SOURCES/libvirt-qemu-require-reply-from-guest-agent-in-qemuAgentGetInterfaces.patch
 create mode 100644 SOURCES/libvirt-qemu-snapshot-Allow-snapshots-of-read-only-disks-when-we-can-create-them.patch
 create mode 100644 SOURCES/libvirt-qemu-snapshot-Always-rewrite-backingStore-data-when-reusing-existing-images.patch
 create mode 100644 SOURCES/libvirt-qemu-snapshot-Prevent-too-nested-domain-XML-when-doing-inactive-snapshot.patch
 create mode 100644 SOURCES/libvirt-qemu-snapshot-go-through-cleanup-on-error.patch
 create mode 100644 SOURCES/libvirt-qemu-store-complete-agent-filesystem-information.patch
 create mode 100644 SOURCES/libvirt-qemu-support-interface-teaming-functionality.patch
 create mode 100644 SOURCES/libvirt-qemu-use-QEMU_CAPS_STORAGE_WERROR-for-disk-error-attributes.patch
 create mode 100644 SOURCES/libvirt-qemu-use-def-instead-of-vm-def-in-qemuExtDevicesStart.patch
 create mode 100644 SOURCES/libvirt-qemu-use-the-vhost-user-schemas-to-find-binary.patch
 delete mode 100644 SOURCES/libvirt-qemu-validate-Enforce-compile-time-switch-type-checking-for-videos.patch
 create mode 100644 SOURCES/libvirt-qemu-validate-virtiofs-filesystems.patch
 delete mode 100644 SOURCES/libvirt-qemu-vfio-ap-device-support.patch
 create mode 100644 SOURCES/libvirt-qemu-virtiofs-shorten-pid-filename.patch
 create mode 100644 SOURCES/libvirt-qemu-virtiofs-shorten-socket-filename.patch
 delete mode 100644 SOURCES/libvirt-qemu-vnc-switch-to-tls-creds-x509.patch
 create mode 100644 SOURCES/libvirt-qemuAgentFSInfoFormatParams-Remove-pointless-returned-value.patch
 create mode 100644 SOURCES/libvirt-qemuBackupBegin-Don-t-leak-def-on-early-failures.patch
 create mode 100644 SOURCES/libvirt-qemuBackupBegin-Fix-monitor-access-when-rolling-back-due-to-failure.patch
 create mode 100644 SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Don-t-exit-early-when-the-job-has-started.patch
 create mode 100644 SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Free-incrementalBitmap.patch
 create mode 100644 SOURCES/libvirt-qemuBackupDiskStarted-Fix-improper-dereference-of-array.patch
 create mode 100644 SOURCES/libvirt-qemuBlockBitmapChainIsValid-Adjust-to-new-semantics-of-bitmaps.patch
 create mode 100644 SOURCES/libvirt-qemuBlockBitmapsHandleCommitFinish-Use-proper-variable-to-iterate.patch
 create mode 100644 SOURCES/libvirt-qemuBlockBitmapsHandleCommitStart-Fix-allocation-of-string-list.patch
 create mode 100644 SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-extra-wrapping-object-to-JSON-strings.patch
 create mode 100644 SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-pretty-argument.patch
 create mode 100644 SOURCES/libvirt-qemuBlockGetBackingStoreString-Properly-handle-http-s-with-cookies-and-others.patch
 create mode 100644 SOURCES/libvirt-qemuBlockGetBackingStoreString-Remove-ret-variable.patch
 create mode 100644 SOURCES/libvirt-qemuBlockJobDiskNewCommit-Propagate-disabledBitmapsBase.patch
 create mode 100644 SOURCES/libvirt-qemuBlockStorageSourceCreateFormat-Force-write-access-when-formatting-images.patch
 create mode 100644 SOURCES/libvirt-qemuBlockStorageSourceDetachPrepare-Get-rid-of-cleanup-section.patch
 create mode 100644 SOURCES/libvirt-qemuBlockStorageSourceGetBackendProps-Report-errors-on-all-switch-cases.patch
 create mode 100644 SOURCES/libvirt-qemuBlockStorageSourceGetFormatRawProps-format-offset-and-size-for-slice.patch
 create mode 100644 SOURCES/libvirt-qemuBlockStorageSourceGetURI-Pass-through-query-component.patch
 delete mode 100644 SOURCES/libvirt-qemuBuildMemoryBackendProps-Pass-priv-instead-of-its-individual-members.patch
 create mode 100644 SOURCES/libvirt-qemuCheckpointCreateXML-Check-VM-liveness-first.patch
 create mode 100644 SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Reopen-images-for-bitmap-modifications.patch
 create mode 100644 SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Use-correct-field-for-checkpoint-bitmap-name.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockCommit-Handle-bitmaps-on-start-of-commit.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockCommit-Move-checks-depending-on-capabilities-after-liveness-check.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockCopyCommon-Record-updated-flags-to-block-job.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockPivot-Copy-bitmaps-backing-checkpoints-for-virDomainBlockCopy.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockPivot-Handle-merging-of-bitmaps-when-pivoting-an-active-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockPivot-Ignore-failures-of-creating-active-layer-bitmap.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockPivot-Move-check-prior-to-executing-the-pivot-steps.patch
 create mode 100644 SOURCES/libvirt-qemuDomainBlockPivot-Rename-actions-to-bitmapactions.patch
 delete mode 100644 SOURCES/libvirt-qemuDomainDeviceDefValidateNetwork-Check-for-range-only-if-IP-prefix-set.patch
 create mode 100644 SOURCES/libvirt-qemuDomainDeviceDiskDefPostParseRestoreSecAlias-Hardcode-restored-aliases.patch
 create mode 100644 SOURCES/libvirt-qemuDomainGetGuestInfo-Don-t-try-to-free-a-negative-number-of-entries.patch
 create mode 100644 SOURCES/libvirt-qemuDomainGetGuestInfo-don-t-assign-NULL-hostname.patch
 create mode 100644 SOURCES/libvirt-qemuDomainGetSecretAESAlias-Replace-outstanding-uses-with-qemuAliasForSecret.patch
 create mode 100644 SOURCES/libvirt-qemuDomainGetStatsIOThread-Don-t-leak-array-with-0-iothreads.patch
 delete mode 100644 SOURCES/libvirt-qemuDomainNestedJobAllowed-Allow-QEMU_JOB_NONE.patch
 delete mode 100644 SOURCES/libvirt-qemuDomainRemoveRNGDevice-Remove-associated-chardev-too.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-VIR_AUTOCLOSE-for-intermediatefd.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-g_autoptr-for-virCommand.patch
 delete mode 100644 SOURCES/libvirt-qemuDomainSaveMemory-Don-t-enforce-dynamicOwnership.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretAESSetup-Allocate-and-return-secinfo-here.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretAESSetup-Automatically-free-non-secret-locals.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretAESSetup-Split-out-lookup-of-secret-data.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretAESSetupFromSecret-Use-qemuAliasForSecret.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretInfo-Register-autoptr-cleanup-function.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Change-aliases-for-disk-secrets.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Fix-naming-of-alias-variables.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Setup-secret-for-http-cookies.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Don-t-load-the-relative-path-with-blockdev.patch
 create mode 100644 SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Fix-logic-of-relative-backing-store-update.patch
 create mode 100644 SOURCES/libvirt-qemuDomainValidateStorageSource-Reject-unsupported-slices.patch
 delete mode 100644 SOURCES/libvirt-qemuDomainValidateStorageSource-Relax-PR-validation.patch
 create mode 100644 SOURCES/libvirt-qemuDomainValidateStorageSource-Validate-new-network-storage-parameters.patch
 create mode 100644 SOURCES/libvirt-qemuExtDevicesStart-pass-logManager.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieAddNBD-Exit-early-if-there-are-no-disks.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieAddNBD-Fix-filling-of-capacity-when-blockdev-is-used.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieAddNBD-Move-monitor-call-out-of-the-loop.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieAddNBD-Remove-ret-variable-and-cleanup-label.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-glib-memory-allocators.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-virHashNew-and-automatic-freeing-of-virHashTablePtr.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationCookieNBD-Extract-embedded-struct.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationParamsResetTLS-Adapt-to-modern-memory-management.patch
 create mode 100644 SOURCES/libvirt-qemuMigrationParamsResetTLS-Fix-comment.patch
 create mode 100644 SOURCES/libvirt-qemuMonitorBlockdevAdd-Take-double-pointer-argument.patch
 create mode 100644 SOURCES/libvirt-qemuMonitorJSONBlockdevAdd-Refactor-cleanup.patch
 create mode 100644 SOURCES/libvirt-qemuMonitorJSONBlockdevDel-Refactor-cleanup.patch
 create mode 100644 SOURCES/libvirt-qemuMonitorTestProcessCommandDefaultValidate-Output-validator-output-to-stderr.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessBuildDestroyMemoryPathsImpl-Don-t-overwrite-error.patch
 delete mode 100644 SOURCES/libvirt-qemuProcessStartPRDaemonHook-Try-to-set-NS-iff-domain-was-started-with-one.patch
 delete mode 100644 SOURCES/libvirt-qemu_capabilities-Inroduce-virQEMUCapsGetCPUModelX86Data.patch
 delete mode 100644 SOURCES/libvirt-qemu_capabilities-Introduce-virQEMUCapsGetCPUModelInfo.patch
 create mode 100644 SOURCES/libvirt-qemu_capabilities-Rework-domain-caps-cache.patch
 delete mode 100644 SOURCES/libvirt-qemu_capabilities-Use-virQEMUCapsGetCPUModelInfo.patch
 delete mode 100644 SOURCES/libvirt-qemu_command-Use-canonical-names-of-CPU-features.patch
 delete mode 100644 SOURCES/libvirt-qemu_command-Use-consistent-syntax-for-CPU-features.patch
 create mode 100644 SOURCES/libvirt-qemu_conf-Avoid-dereferencing-NULL-in-virQEMUDriverGetHost-NUMACaps-CPU.patch
 create mode 100644 SOURCES/libvirt-qemu_domain-Modify-access-to-a-NVMe-disk-iff-needed.patch
 delete mode 100644 SOURCES/libvirt-qemu_domain-NVLink2-bridge-detection-function-for-PPC64.patch
 delete mode 100644 SOURCES/libvirt-qemu_domain-add-a-PPC64-memLockLimit-helper.patch
 delete mode 100644 SOURCES/libvirt-qemu_hotplug-Attach-guestfwd-using-netdev_add.patch
 delete mode 100644 SOURCES/libvirt-qemu_hotplug-Check-for-duplicate-drive-addresses.patch
 delete mode 100644 SOURCES/libvirt-qemu_hotplug-Detach-guestfwd-using-netdev_del.patch
 delete mode 100644 SOURCES/libvirt-qemu_hotplug-remove-another-erroneous-qemuDomainDetachExtensionDevice-call.patch
 delete mode 100644 SOURCES/libvirt-qemu_hotplug-remove-erroneous-call-to-qemuDomainDetachExtensionDevice.patch
 delete mode 100644 SOURCES/libvirt-qemu_migration-Avoid-writing-to-freed-memory.patch
 delete mode 100644 SOURCES/libvirt-qemu_monitor-Introduce-qemuMonitorJSONGetPRManagerInfo.patch
 delete mode 100644 SOURCES/libvirt-qemu_process-Prefer-generic-qemuMonitorGetGuestCPU.patch
 delete mode 100644 SOURCES/libvirt-qemu_security-Fully-implement-qemuSecurityDomainSetPathLabel.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-JSON-JSON-test-cases-for-block-device-backends.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-basic-tests-for-backup-bitmap-handling.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-basic-tests-for-commit-bitmap-handling.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-empty-case-for-blockcopy-bitmap-handling-test.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-bitmap-handling.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-deletion.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-empty-case-for-incremental-backup-test.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-empty-test-case-for-bitmaps.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-more-tests-for-block-commit-bitmap-handling-with-snapshots.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-new-synthetic-bitmap-detection-and-validation-test-case.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-backup-bitmap-handling.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-block-commit-bitmap-handling.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-test-cases-for-handling-bitmaps-during-block-copy.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-tests-for-handling-of-bitmaps-during-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-tests-for-re-enabling-of-bitmaps-after-commit.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Add-tests-of-broken-bitmap-chain-handling-during-block-commit.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Backport-cleanups-for-testQemuDiskXMLToProps-from-dd94f36ffbe.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Delete-synthetic-bitmap-test-cases.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Disable-testcases-for-all-bitmap-handling.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Extract-printing-of-nodename-list.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Extract-schema-root-for-blockdev-add-validation.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Fix-and-optimize-fake-image-chain.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Load-QMP-schema-earlier.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Re-add-bitmap-validation-for-basic-and-snapshots-cases.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Re-introduce-testing-of-checkpoint-deletion.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Rename-TEST_CHECKPOINT_DELETE_MERGE-to-TEST_CHECKPOINT_DELETE.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Replace-basic-bitmap-detection-test-case-data.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Replace-snapshots-bitmap-detection-test-case-data.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-Test-backing-store-strings.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-XMLjsonXML-Test-formatting-parsing-of-modern-JSON.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-xml-json-Add-test-for-NVMe.patch
 create mode 100644 SOURCES/libvirt-qemublocktest-xml-json-Refactor-cleanup-in-test-case-functions.patch
 delete mode 100644 SOURCES/libvirt-qemuhotplugtest-Don-t-plug-a-SCSI-disk-at-unit-7.patch
 delete mode 100644 SOURCES/libvirt-qemuhotplugtest-Test-guestfwd-attach-and-detach.patch
 create mode 100644 SOURCES/libvirt-qemumonitorjsontest-AddNetdev-Use-real-variant.patch
 delete mode 100644 SOURCES/libvirt-qemuxml2-test-Add-tests-for-Icelake-Server-pconfig.patch
 create mode 100644 SOURCES/libvirt-qemuxml2argvtest-Add-test-case-for-disks-with-http-s-source.patch
 delete mode 100644 SOURCES/libvirt-qemuxml2argvtest-Add-test-for-CPU-features-translation.patch
 create mode 100644 SOURCES/libvirt-qemuxml2xmltest-Add-case-for-host-model-vendor_id.patch
 create mode 100644 SOURCES/libvirt-qemuxml2xmltest-Wire-up-disk-network-http-case.patch
 create mode 100644 SOURCES/libvirt-qemuxml2xmltest-set-driver-as-privileged.patch
 create mode 100644 SOURCES/libvirt-rhel-Enable-usage-of-x-blockdev-reopen.patch
 delete mode 100644 SOURCES/libvirt-rpc-virnetlibsshsession-update-deprecated-functions.patch
 create mode 100644 SOURCES/libvirt-schema-wrap-fsDriver-in-a-choice-group.patch
 create mode 100644 SOURCES/libvirt-schemas-rng-Use-interleave-in-the-disk-source-element.patch
 delete mode 100644 SOURCES/libvirt-secret-Add-check-validation-for-correct-usage-when-LookupByUUID.patch
 create mode 100644 SOURCES/libvirt-security-Don-t-fail-if-locking-a-file-on-NFS-mount-fails.patch
 create mode 100644 SOURCES/libvirt-security-Don-t-remember-seclabel-for-paths-we-haven-t-locked-successfully.patch
 create mode 100644 SOURCES/libvirt-security-Introduce-VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP-flag.patch
 delete mode 100644 SOURCES/libvirt-security-dac-Relabel-dev-sev-in-the-namespace.patch
 delete mode 100644 SOURCES/libvirt-security-dac-also-label-listen-UNIX-sockets.patch
 delete mode 100644 SOURCES/libvirt-selinux-Do-not-report-an-error-when-not-returning-1.patch
 delete mode 100644 SOURCES/libvirt-src-Fix-memory-leak-in-virNWFilterBindingDispose.patch
 delete mode 100644 SOURCES/libvirt-src-Mention-DEVICE_REMOVAL_FAILED-event-in-virDomainDetachDeviceAlias-docs.patch
 create mode 100644 SOURCES/libvirt-src-assume-sys-sysmacros.h-always-exists-on-Linux.patch
 delete mode 100644 SOURCES/libvirt-storage-Add-shrink-to-qemu-img-command-when-shrinking-vol.patch
 delete mode 100644 SOURCES/libvirt-storage-Allow-for-inputvol-to-have-any-format-for-encryption.patch
 delete mode 100644 SOURCES/libvirt-storage-Allow-inputvol-to-be-encrypted.patch
 create mode 100644 SOURCES/libvirt-storage-Implement-backing-store-support-for-fat-prefix.patch
 create mode 100644 SOURCES/libvirt-storage-Parse-nvme-disk-source-properties-from-json-pseudo-uri.patch
 delete mode 100644 SOURCES/libvirt-storage-Remove-secretPath-from-_virStorageBackendQemuImgInfo.patch
 create mode 100644 SOURCES/libvirt-storage_file-create-Create-new-images-with-write-permission-bit.patch
 delete mode 100644 SOURCES/libvirt-test-Introduce-virnetdevopenvswitchtest.patch
 create mode 100644 SOURCES/libvirt-testQemuDiskXMLToProps-Store-all-per-image-data-in-one-structure.patch
 create mode 100644 SOURCES/libvirt-testQemuDiskXMLToPropsValidateFileSrcOnly-Move-together-with-rest-of-xml-json-code.patch
 delete mode 100644 SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-2.11-x86_64.patch
 rename SOURCES/{libvirt-tests-Add-capabilities-data-for-QEMU-3.1.0-on-ppc64.patch => libvirt-tests-Add-capabilities-for-QEMU-5.0.0-on-aarch64.patch} (66%)
 delete mode 100644 SOURCES/libvirt-tests-Add-domain-capabilities-case-for-QEMU-4.1.0.patch
 delete mode 100644 SOURCES/libvirt-tests-Add-linux-high-ids-test.patch
 delete mode 100644 SOURCES/libvirt-tests-Add-missing-thread_siblings_list-files.patch
 delete mode 100644 SOURCES/libvirt-tests-Add-more-tests-to-qemucaps2xml.patch
 create mode 100644 SOURCES/libvirt-tests-Add-test-case-for-the-armvtimer-timer.patch
 delete mode 100644 SOURCES/libvirt-tests-Augment-vcgrouptest-to-add-virCgroupGetMemoryStat.patch
 delete mode 100644 SOURCES/libvirt-tests-Follow-up-on-qemucaps2xmldata-rename.patch
 delete mode 100644 SOURCES/libvirt-tests-Resolve-possible-overrun.patch
 delete mode 100644 SOURCES/libvirt-tests-Reuse-qemucapabilities-data-for-qemucaps2xml.patch
 delete mode 100644 SOURCES/libvirt-tests-Update-capabilities-data-for-QEMU-3.0.0-x86_64.patch
 delete mode 100644 SOURCES/libvirt-tests-Use-correct-function-name-in-error-path.patch
 create mode 100644 SOURCES/libvirt-tests-add-host-CPU-data-files-for-validating-die_id.patch
 delete mode 100644 SOURCES/libvirt-tests-extract-hugepages-numa-default-dimm-out-of-hugepages-numa.patch
 delete mode 100644 SOURCES/libvirt-tests-extract-pages-discard-hugepages-out-of-hugepages-pages3.patch
 delete mode 100644 SOURCES/libvirt-tests-extract-pages-discard-out-of-hugepages-pages.patch
 delete mode 100644 SOURCES/libvirt-tests-fix-TLS-handshake-failure-with-TLS-1.3.patch
 create mode 100644 SOURCES/libvirt-tests-hash-Test-case-for-adding-duplicate-hash-entry.patch
 delete mode 100644 SOURCES/libvirt-tests-introduce-hugepages-default-1G-nodeset-2M.patch
 delete mode 100644 SOURCES/libvirt-tests-introduce-hugepages-nodeset.patch
 create mode 100644 SOURCES/libvirt-tests-qemu-Add-test-data-for-the-new-slice-element.patch
 delete mode 100644 SOURCES/libvirt-tests-qemu-Remove-disk-from-graphics-vnc-tls.patch
 create mode 100644 SOURCES/libvirt-tests-qemu-add-disk-error-policy-tests-for-s390x.patch
 delete mode 100644 SOURCES/libvirt-tests-qemu-test-more-versions-for-graphics-vnc-tls.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-cases-for-creating-image-overlays-on-top-of-disks-with-slice.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-test-for-deep-backing-chain.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-tests-for-some-special-cases.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-few-more-test-cases-for-checkpoint-deletion.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-synthetic-snapshot-checkpoint-test-data.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-test-for-checkpoint-deletion-bitmap-merge.patch
 create mode 100644 SOURCES/libvirt-tests-qemublock-Add-tests-for-qemuBlockBitmapsHandleBlockcopy.patch
 create mode 100644 SOURCES/libvirt-tests-qemublocktest-Add-another-synthetic-test-case-for-broken-bitmaps.patch
 delete mode 100644 SOURCES/libvirt-tests-qemucaps-Add-test-data-for-upcoming-qemu-3.0.0.patch
 delete mode 100644 SOURCES/libvirt-tests-qemuxml2argv-Add-test-case-for-empty-CDROM-with-cache-mode.patch
 delete mode 100644 SOURCES/libvirt-tests-qemuxml2argv-add-CAPS_ARCH_LATEST-macro.patch
 delete mode 100644 SOURCES/libvirt-tests-remove-unnecessary-XML-elements-from-hugepages-numa-default.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-numa-into-hugepages-numa-default.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages-into-hugepages-numa-nodeset.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages2-into-hugepages-numa-default-2M.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages3-into-hugepages-numa-nodeset-part.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages4-into-hugepages-numa-nodeset-nonexist.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages5-into-hugepages-default-2M.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages6-into-hugepages-default-system-size.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages7-into-pages-dimm-discard.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-pages8-into-hugepages-nodeset-nonexist.patch
 delete mode 100644 SOURCES/libvirt-tests-rename-hugepages-to-hugepages-default.patch
 delete mode 100644 SOURCES/libvirt-tests-sev-Test-launch-security-with-specific-QEMU-version.patch
 create mode 100644 SOURCES/libvirt-tests-virstorage-Add-test-cases-for-json-pseudo-URI-without-file-wrapper.patch
 create mode 100644 SOURCES/libvirt-tests-virstorage-Add-test-data-for-json-specified-raw-image-with-offset-size.patch
 create mode 100644 SOURCES/libvirt-tests-virstorage-Add-tests-for-NBD-URI-style-syntax-over-UNIX.patch
 create mode 100644 SOURCES/libvirt-tests-virstorage-Fix-backing-file-format-of-created-image.patch
 delete mode 100644 SOURCES/libvirt-tools-Fix-typo-generating-adapter_wwpn-field.patch
 create mode 100644 SOURCES/libvirt-tools-Secure-guest-check-for-AMD-in-virt-host-validate.patch
 create mode 100644 SOURCES/libvirt-tools-Secure-guest-check-on-s390-in-virt-host-validate.patch
 delete mode 100644 SOURCES/libvirt-util-Avoid-possible-error-in-virCommandMassClose.patch
 delete mode 100644 SOURCES/libvirt-util-Don-t-overflow-in-virRandomBits.patch
 delete mode 100644 SOURCES/libvirt-util-Fix-virCgroupGetMemoryStat.patch
 create mode 100644 SOURCES/libvirt-util-Introduce-a-parser-for-kernel-cmdline-arguments.patch
 delete mode 100644 SOURCES/libvirt-util-Introduce-virBitmapUnion.patch
 delete mode 100644 SOURCES/libvirt-util-Introduce-virNumaNodesetToCPUset.patch
 create mode 100644 SOURCES/libvirt-util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
 delete mode 100644 SOURCES/libvirt-util-Propagate-numad-failures-correctly.patch
 delete mode 100644 SOURCES/libvirt-util-Rework-virStringListAdd.patch
 delete mode 100644 SOURCES/libvirt-util-Rewrite-virHostCPUCountThreadSiblings.patch
 delete mode 100644 SOURCES/libvirt-util-add-a-function-to-insert-new-interfaces-to-IPv6CheckForwarding-list.patch
 create mode 100644 SOURCES/libvirt-util-add-virBufferTrimChars.patch
 delete mode 100644 SOURCES/libvirt-util-alloc-add-macros-for-implementing-automatic-cleanup-functionality.patch
 delete mode 100644 SOURCES/libvirt-util-bitmap-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
 delete mode 100644 SOURCES/libvirt-util-cgroup-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
 delete mode 100644 SOURCES/libvirt-util-check-accept_ra-for-all-nexthop-interfaces-of-multipath-routes.patch
 delete mode 100644 SOURCES/libvirt-util-command-Ignore-bitmap-errors-when-enumerating-file-descriptors-to-close.patch
 delete mode 100644 SOURCES/libvirt-util-command-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
 delete mode 100644 SOURCES/libvirt-util-command-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
 delete mode 100644 SOURCES/libvirt-util-enable-cgroups-v2-cpuset-controller-for-threads.patch
 delete mode 100644 SOURCES/libvirt-util-file-introduce-VIR_AUTOCLOSE-macro-to-close-fd-of-the-file-automatically.patch
 delete mode 100644 SOURCES/libvirt-util-fix-memory-leak-in-virFirewallDInterfaceSetZone.patch
 create mode 100644 SOURCES/libvirt-util-hash-Improve-debugability-of-Duplicate-key-error-message.patch
 create mode 100644 SOURCES/libvirt-util-hash-Use-g_new0-for-allocating-hash-internals.patch
 delete mode 100644 SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetCpus.patch
 delete mode 100644 SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMemoryMigrate.patch
 delete mode 100644 SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMems.patch
 delete mode 100644 SOURCES/libvirt-util-introduce-cgroup-v2-files.patch
 delete mode 100644 SOURCES/libvirt-util-introduce-vircgroupbackend-files.patch
 create mode 100644 SOURCES/libvirt-util-json-Introduce-virJSONValueArrayConcat.patch
 delete mode 100644 SOURCES/libvirt-util-json-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
 delete mode 100644 SOURCES/libvirt-util-make-forgotten-changes-suggested-during-review-of-commit-d40b820c.patch
 delete mode 100644 SOURCES/libvirt-util-move-all-firewalld-specific-stuff-into-its-own-files.patch
 delete mode 100644 SOURCES/libvirt-util-moving-type-argument-to-avoid-issues-with-mount-syscall.patch
 delete mode 100644 SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
 delete mode 100644 SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOPTR-for-aggregate-types.patch
 delete mode 100644 SOURCES/libvirt-util-new-virFirewallD-APIs-docs.patch
 delete mode 100644 SOURCES/libvirt-util-remove-const-specifier-from-nlmsghdr-arg-to-virNetlinkDumpCallback.patch
 delete mode 100644 SOURCES/libvirt-util-remove-test-code-accidentally-committed-to-virFirewallDZoneExists.patch
 delete mode 100644 SOURCES/libvirt-util-skip-RDMA-detection-for-non-PCI-network-devices.patch
 create mode 100644 SOURCES/libvirt-util-storage-Store-backing-store-format-in-virStorageSource.patch
 create mode 100644 SOURCES/libvirt-util-storagefile-Drop-image-format-probing-by-file-suffix.patch
 create mode 100644 SOURCES/libvirt-util-storagefile-Properly-set-transport-type-when-parsing-NBD-strings.patch
 delete mode 100644 SOURCES/libvirt-util-string-Introduce-macro-for-automatic-string-lists.patch
 delete mode 100644 SOURCES/libvirt-util-suppress-unimportant-ovs-vsctl-errors-when-getting-interface-stats.patch
 delete mode 100644 SOURCES/libvirt-util-use-nlmsg_find_attr-instead-of-an-open-coded-loop.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroup-improve-controller-detection.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroup-introduce-virCgroup-Get-Set-ValueRaw.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroup-move-virCgroupGetValueStr-out-of-virCgroupGetValueForBlkDev.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv1-add-support-for-BFQ-blkio-files.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-add-support-for-BFQ-files.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-don-t-error-out-if-enabling-controller-fails.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-enable-CPU-controller-only-if-it-s-available.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-mark-only-requested-controllers-as-available.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-separate-return-values-of-virCgroupV2EnableController.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-stop-enabling-missing-controllers-with-systemd.patch
 delete mode 100644 SOURCES/libvirt-util-vircgroupv2-use-any-controller-to-create-thread-directory.patch
 delete mode 100644 SOURCES/libvirt-util-virnetdevopenvswitch-Drop-an-unused-variable-ovs_timeout.patch
 create mode 100644 SOURCES/libvirt-util-virstoragefile-Add-data-structure-for-storing-storage-source-slices.patch
 delete mode 100644 SOURCES/libvirt-utils-Remove-arbitrary-limit-on-socket_id-core_id.patch
 delete mode 100644 SOURCES/libvirt-virCommand-use-procfs-to-learn-opened-FDs.patch
 create mode 100644 SOURCES/libvirt-virDevMapperGetTargets-Don-t-ignore-EBADF.patch
 create mode 100644 SOURCES/libvirt-virDevMapperGetTargetsImpl-Check-for-dm-major-properly.patch
 create mode 100644 SOURCES/libvirt-virDevMapperGetTargetsImpl-Use-VIR_AUTOSTRINGLIST.patch
 create mode 100644 SOURCES/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-not-a-devmapper-target.patch
 create mode 100644 SOURCES/libvirt-virDomainCheckpointRedefinePrep-Set-current-checkpoint-if-there-isn-t-any.patch
 delete mode 100644 SOURCES/libvirt-virDomainConfNWFilterInstantiate-initialize-xml-to-avoid-random-crash.patch
 delete mode 100644 SOURCES/libvirt-virDomainDefCompatibleDevice-Relax-alias-change-check.patch
 delete mode 100644 SOURCES/libvirt-virDomainDetachDeviceFlags-Clarify-update-semantics.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-cleanup-label.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-ternary-operator.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Sanitize-handling-of-string-list.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-use-g_new0-instead-of-VIR_ALLOC_N.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskSourceNVMeFormat-Format-only-valid-managed-values.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskTranslateISCSIDirect-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskTranslateSourcePool-Check-for-disk-type-correctly.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskTranslateSourcePool-Translate-volume-disks-in-whole-backing-chain.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskTranslateSourcePool-split-code-to-setup-one-storage-source.patch
 create mode 100644 SOURCES/libvirt-virDomainDiskTranslateSourcePoolAuth-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
 create mode 100644 SOURCES/libvirt-virDomainFSDefFree-Unref-private-data.patch
 delete mode 100644 SOURCES/libvirt-virDomainNetDefCheckABIStability-Check-for-MTU-change-too.patch
 create mode 100644 SOURCES/libvirt-virDomainNetDefClear-Free-persistent-name.patch
 delete mode 100644 SOURCES/libvirt-virDomainObjListAddLocked-Produce-better-error-message-than-Duplicate-key.patch
 delete mode 100644 SOURCES/libvirt-virDomainObjListAddLocked-fix-double-free.patch
 delete mode 100644 SOURCES/libvirt-virFileIsSharedFSType-Check-for-fuse.glusterfs-too.patch
 delete mode 100644 SOURCES/libvirt-virFileIsSharedFSType-Detect-direct-mount-points.patch
 create mode 100644 SOURCES/libvirt-virHashAddOrUpdateEntry-Simplify-allocation-of-new-entry.patch
 create mode 100644 SOURCES/libvirt-virJSONValueNewArray-Use-g_new0-to-allocate-and-remove-NULL-checks-from-callers.patch
 delete mode 100644 SOURCES/libvirt-virNetDevOpenvswitchInterfaceStats-Optimize-for-speed.patch
 create mode 100644 SOURCES/libvirt-virSecretLookupDefCopy-Remove-return-value.patch
 create mode 100644 SOURCES/libvirt-virSecurityManagerMetadataLock-Store-locked-paths.patch
 create mode 100644 SOURCES/libvirt-virStorageBackendGlusterRefreshVol-Refactor-handling-of-backing-store.patch
 create mode 100644 SOURCES/libvirt-virStorageEncryptionSecretCopy-Properly-copy-internals.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataFromBuf-Remove-backingFormat-argument.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataFromFD-Remove-unused-backingFormat-argument.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Allow-format-probing-under-special-circumstances.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Expect-NULL-src-path.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Extract-storage-access.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-cleanup-label.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-impossible-error-report.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Shuffle-around-assignment-of-backing-chain-depth.patch
 create mode 100644 SOURCES/libvirt-virStorageFileGetMetadataRecurse-Use-virHashHasEntry-instead-of-fake-pointers.patch
 delete mode 100644 SOURCES/libvirt-virStoragePRDefFormat-Suppress-path-formatting-for-migratable-XML.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceJSONDriverParser-annotate-format-drivers.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceNetCookieValidate-Accept-quoted-cookie-value.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceNewFromBacking-Also-transfer-the-format.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingJSON-Allow-json-pseudo-URIs-without-file-wrapper.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingJSON-Move-deflattening-of-json-URIs-out-of-recursion.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingJSON-Pass-around-original-backing-file-string.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingJSON-Prevent-arbitrary-nesting-with-format-drivers.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingJSONRaw-Parse-offset-and-size-attributes.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingJSONUri-Handle-undocumented-value-off-for-sslverify.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceParseBackingURI-Preserve-query-string-of-URI-for-http-s.patch
 create mode 100644 SOURCES/libvirt-virStorageSourceUpdateCapacity-Drop-probe-argument.patch
 delete mode 100644 SOURCES/libvirt-virWaitForDevices-Drop-confusing-part-of-comment.patch
 create mode 100644 SOURCES/libvirt-virbuftest-declare-testBufAddStrData-earlier.patch
 create mode 100644 SOURCES/libvirt-virbuftest-remove-extra-G_GNUC_UNUSED-markers.patch
 create mode 100644 SOURCES/libvirt-virbuftest-remove-unnecessary-labels.patch
 create mode 100644 SOURCES/libvirt-virbuftest-use-field-names-when-initalizing-test-info.patch
 create mode 100644 SOURCES/libvirt-virbuftest-use-g_autofree.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Call-virCgroupRemove-inside-virCgroupMakeGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Duplicate-string-before-modifying.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Extract-controller-detection-into-function.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Extract-file-link-resolving-into-separate-function.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Extract-mount-options-matching-into-function.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Extract-placement-validation-into-function.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Introduce-standard-set-of-typedefs-and-use-them.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Introduce-virCgroupEnableMissingControllers.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Introduce-virCgroupGetMemoryStat.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Move-function-used-in-tests-into-vircgrouppriv.h.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Remove-obsolete-sa_assert.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Remove-pointless-bool-parameter.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Remove-unused-function-virCgroupKill.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Remove-virCgroupAddTaskController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Rename-structs-to-start-with-underscore.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Simplify-if-conditions-in-virCgroupMakeGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Split-virCgroupPathOfController-into-two-functions.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupAddTaskController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupRemoveRecursively.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-Use-virCgroupMountOptsMatchController-in-virCgroupDetectPlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-add-support-for-hybrid-configuration.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-detect-available-backend-for-cgroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-v1-detect-functions.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-AllDevices.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-Device.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadBps.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadIops.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWeight.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteBps.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteIops.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioWeight.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsPeriod.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsQuota.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuShares.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetCpus.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMemoryMigrate.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMems.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-FreezerState.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-Memory-Limit.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1AddTask.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1Available.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1BindMount.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyMounts.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyPlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1DetectControllers.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetAnyController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoDeviceServiced.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoServiced.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacct-Usage.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacctStat.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemSwapUsage.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryStat.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryUsage.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1HasController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1HasEmptyTasks.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1MakeGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1PathOfController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1Remove.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1SetMemory.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1SetOwner.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1StealPlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1SupportsCpuBW.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidateMachineGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidatePlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-fix-MinGW-build.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-fix-bug-in-virCgroupEnableMissingControllers.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-fix-cgroups-v2-controllers-detection.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-include-system-headers-only-on-linux.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-cgroup-v1-backend-files.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupAddThread.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupKillRecursiveCB.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupTaskFlags.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadBps.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadIops.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWeight.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteBps.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteIops.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioWeight.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsPeriod.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsQuota.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuShares.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemSwapHardLimit.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemoryHardLimit.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemorySoftLimit.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2AddTask.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2Available.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2BindMount.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyMounts.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyPlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectControllers.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectMounts.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectPlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetAnyController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoDeviceServiced.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoServiced.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctStat.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctUsage.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemSwapUsage.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryStat.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryUsage.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasEmptyTasks.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2MakeGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2PathOfController.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2Remove.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetMemory.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetOwner.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2StealPlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2SupportsCpuBW.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidateMachineGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidatePlacement.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-machinename-will-never-be-NULL.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-register-cgroup-v2-backend.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-remove-VIR_CGROUP_SUPPORTED.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-rename-controllers-to-legacy.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-rename-virCgroupAdd.-Task-to-virCgroupAdd.-Process.patch
 delete mode 100644 SOURCES/libvirt-vircgroup-rename-virCgroupController-into-virCgroupV1Controller.patch
 delete mode 100644 SOURCES/libvirt-vircgroupmock-add-support-to-test-cgroup-v2.patch
 delete mode 100644 SOURCES/libvirt-vircgroupmock-change-cgroup-prefix.patch
 delete mode 100644 SOURCES/libvirt-vircgroupmock-cleanup-unused-cgroup-files.patch
 delete mode 100644 SOURCES/libvirt-vircgroupmock-rewrite-cgroup-fopen-mocking.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-add-cgroup-v2-tests.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-cgroup-v2.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-hybrid-cgroups.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-add-hybrid-tests.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-call-virCgroupDetectMounts-directly.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-call-virCgroupNewSelf-instead-virCgroupDetectMounts.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-introduce-initFakeFS-and-cleanupFakeFS-helpers.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-prepare-testCgroupDetectMounts-for-cgroup-v2.patch
 delete mode 100644 SOURCES/libvirt-vircgrouptest-prepare-validateCgroup-for-cgroupv2.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv1-fix-build-on-non-linux-OSes.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv2-fix-abort-in-VIR_AUTOFREE.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv2-fix-parsing-multiple-values-in-single-file.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv2-fix-setting-cpu.max-period.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv2-fix-virCgroupV2GetCpuCfsQuota-for-max-value.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv2-fix-virCgroupV2ValidateMachineGroup.patch
 delete mode 100644 SOURCES/libvirt-vircgroupv2-store-enabled-controllers.patch
 delete mode 100644 SOURCES/libvirt-vircommand-Separate-mass-FD-closing-into-a-function.patch
 delete mode 100644 SOURCES/libvirt-vircpuhost-Add-support-for-reading-MSRs.patch
 delete mode 100644 SOURCES/libvirt-virdbus-Grab-a-ref-as-long-as-the-while-loop-is-executed.patch
 create mode 100644 SOURCES/libvirt-virdevmapper-Don-t-cache-device-mapper-major.patch
 create mode 100644 SOURCES/libvirt-virdevmapper-Don-t-use-libdevmapper-to-obtain-dependencies.patch
 create mode 100644 SOURCES/libvirt-virdevmapper-Handle-kernel-without-device-mapper-support.patch
 create mode 100644 SOURCES/libvirt-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-control.patch
 create mode 100644 SOURCES/libvirt-virdevmapper.c-Join-two-WITH_DEVMAPPER-sections-together.patch
 delete mode 100644 SOURCES/libvirt-virfile-Detect-ceph-as-shared-FS.patch
 delete mode 100644 SOURCES/libvirt-virfile-Rework-virFileIsSharedFixFUSE.patch
 delete mode 100644 SOURCES/libvirt-virfile-Take-symlink-into-account-in-virFileIsSharedFixFUSE.patch
 delete mode 100644 SOURCES/libvirt-virfile-added-GPFS-as-shared-fs.patch
 delete mode 100644 SOURCES/libvirt-virfile-fix-cast-align-error.patch
 delete mode 100644 SOURCES/libvirt-virfiletest-Fix-test-name-prefix-for-virFileInData-test.patch
 delete mode 100644 SOURCES/libvirt-virfiletst-Test-virFileIsSharedFS.patch
 create mode 100644 SOURCES/libvirt-virhash-Fix-the-expectations-of-virHashKeyEqual-implementations.patch
 delete mode 100644 SOURCES/libvirt-virhostcpu-Make-virHostCPUGetMSR-work-only-on-x86.patch
 delete mode 100644 SOURCES/libvirt-virnetdevtap-Don-t-crash-on-ifname-in-virNetDevTapInterfaceStats.patch
 delete mode 100644 SOURCES/libvirt-virrandom-Avoid-undefined-behaviour-in-virRandomBits.patch
 delete mode 100644 SOURCES/libvirt-virsh-Require-explicit-domain-for-domxml-to-native.patch
 delete mode 100644 SOURCES/libvirt-virsh-Strip-XML-declaration-when-extracting-CPU-XMLs.patch
 delete mode 100644 SOURCES/libvirt-virsh.pod-Drop-persistent-for-detach-device-alias.patch
 delete mode 100644 SOURCES/libvirt-virsh.pod-Fix-a-command-name-typo-in-nwfilter-binding-undefine.patch
 create mode 100644 SOURCES/libvirt-virstoragefile-Add-JSON-parser-for-sslverify-readahead-cookies-and-timeout.patch
 delete mode 100644 SOURCES/libvirt-virt-host-validate-Fix-build-on-non-Linux.patch
 delete mode 100644 SOURCES/libvirt-virt-host-validate-require-freezer-for-LXC.patch
 delete mode 100644 SOURCES/libvirt-virt-host-validate-rewrite-cgroup-detection-to-use-util-vircgroup.patch
 delete mode 100644 SOURCES/libvirt-virt-xml-validate-Add-schema-for-nwfilterbinding.patch
 create mode 100644 SOURCES/libvirt-vmx-make-fileName-optional-for-CD-ROMs.patch
 create mode 100644 SOURCES/libvirt-vmx-shortcut-earlier-few-ignore-cases-in-virVMXParseDisk.patch

diff --git a/.gitignore b/.gitignore
index 95d8dbd..7677d22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libvirt-4.5.0.tar.xz
+SOURCES/libvirt-6.0.0.tar.xz
diff --git a/.libvirt.metadata b/.libvirt.metadata
index 3fedbbb..4a2f940 100644
--- a/.libvirt.metadata
+++ b/.libvirt.metadata
@@ -1 +1 @@
-5f097d246c0fba04d18ac7ec951ad56ffa1a8958 SOURCES/libvirt-4.5.0.tar.xz
+9939a559e652d44b27e3404a26bcabe58988e4b4 SOURCES/libvirt-6.0.0.tar.xz
diff --git a/SOURCES/libvirt-Handle-copying-bitmaps-to-larger-data-buffers.patch b/SOURCES/libvirt-Handle-copying-bitmaps-to-larger-data-buffers.patch
deleted file mode 100644
index 4f8ba04..0000000
--- a/SOURCES/libvirt-Handle-copying-bitmaps-to-larger-data-buffers.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e75abae126f9fcaf1e8478f0780ecae736f7d3e1 Mon Sep 17 00:00:00 2001
-Message-Id: <e75abae126f9fcaf1e8478f0780ecae736f7d3e1@dist-git>
-From: "Allen, John" <John.Allen@amd.com>
-Date: Tue, 2 Jul 2019 17:05:34 +0200
-Subject: [PATCH] Handle copying bitmaps to larger data buffers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If a bitmap of a shorter length than the data buffer is passed to
-virBitmapToDataBuf, it will read off the end of the bitmap and copy junk
-into the returned buffer. Add a check to only copy the length of the
-bitmap to the buffer.
-
-The problem can be observed after setting a vcpu affinity using the vcpupin
-command on a system with a large number of cores:
-  # virsh vcpupin example_domain 0 0
-  # virsh vcpupin example_domain 0
-     VCPU   CPU Affinity
-    ---------------------------
-     0      0,192,197-198,202
-
-Signed-off-by: John Allen <john.allen@amd.com>
-(cherry picked from commit 51f9f80d350e633adf479c6a9b3c55f82ca9cbd4)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1703160
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <1a487c4f1ba9725eb7325debeeff2861d7047890.1562079635.git.eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virbitmap.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
-index 49e542a4e6..7df0a2d4f3 100644
---- a/src/util/virbitmap.c
-+++ b/src/util/virbitmap.c
-@@ -831,11 +831,15 @@ virBitmapToDataBuf(virBitmapPtr bitmap,
-                    unsigned char *bytes,
-                    size_t len)
- {
-+    size_t nbytes = bitmap->map_len * (VIR_BITMAP_BITS_PER_UNIT / CHAR_BIT);
-     unsigned long *l;
-     size_t i, j;
- 
-     memset(bytes, 0, len);
- 
-+    /* If bitmap and buffer differ in size, only fill to the smaller length */
-+    len = MIN(len, nbytes);
-+
-     /* htole64 is not provided by gnulib, so we do the conversion by hand */
-     l = bitmap->map;
-     for (i = j = 0; i < len; i++, j++) {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-PPC64-support-for-NVIDIA-V100-GPU-with-NVLink2-passthrough.patch b/SOURCES/libvirt-PPC64-support-for-NVIDIA-V100-GPU-with-NVLink2-passthrough.patch
deleted file mode 100644
index d29a9cf..0000000
--- a/SOURCES/libvirt-PPC64-support-for-NVIDIA-V100-GPU-with-NVLink2-passthrough.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 5347b12008842b5c86f766e391c6f3756afbff7d Mon Sep 17 00:00:00 2001
-Message-Id: <5347b12008842b5c86f766e391c6f3756afbff7d@dist-git>
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Fri, 3 May 2019 13:54:53 +0200
-Subject: [PATCH] PPC64 support for NVIDIA V100 GPU with NVLink2 passthrough
-
-The NVIDIA V100 GPU has an onboard RAM that is mapped into the
-host memory and accessible as normal RAM via an NVLink2 bridge. When
-passed through in a guest, QEMU puts the NVIDIA RAM window in a
-non-contiguous area, above the PCI MMIO area that starts at 32TiB.
-This means that the NVIDIA RAM window starts at 64TiB and go all the
-way to 128TiB.
-
-This means that the guest might request a 64-bit window, for each PCI
-Host Bridge, that goes all the way to 128TiB. However, the NVIDIA RAM
-window isn't counted as regular RAM, thus this window is considered
-only for the allocation of the Translation and Control Entry (TCE).
-For more information about how NVLink2 support works in QEMU,
-refer to the accepted implementation [1].
-
-This memory layout differs from the existing VFIO case, requiring its
-own formula. This patch changes the PPC64 code of
-@qemuDomainGetMemLockLimitBytes to:
-
-- detect if we have a NVLink2 bridge being passed through to the
-guest. This is done by using the @ppc64VFIODeviceIsNV2Bridge function
-added in the previous patch. The existence of the NVLink2 bridge in
-the guest means that we are dealing with the NVLink2 memory layout;
-
-- if an IBM NVLink2 bridge exists, passthroughLimit is calculated in a
-different way to account for the extra memory the TCE table can alloc.
-The 64TiB..128TiB window is more than enough to fit all possible
-GPUs, thus the memLimit is the same regardless of passing through 1 or
-multiple V100 GPUs.
-
-Further reading explaining the background
-[1] https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg03700.html
-[2] https://www.redhat.com/archives/libvir-list/2019-March/msg00660.html
-[3] https://www.redhat.com/archives/libvir-list/2019-April/msg00527.html
-
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 1a922648f67f56c4374d647feebf2adb9a642f96)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1505998
-
-Conflicts:
-    The upstream commit relied on:
-        - v4.7.0-37-gb72183223f
-        - v4.7.0-38-ga14f597266
-    which were not backported so virPCIDeviceAddressAsString had to
-    swapped for the former virDomainPCIAddressAsString in order to
-    compile.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <03c00ebf46d85b0615134ef8655e67a4c909b7da.1556884443.git.eskultet@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_domain.c | 80 ++++++++++++++++++++++++++++++++----------
- 1 file changed, 61 insertions(+), 19 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index a8bc618389..21f0722495 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9813,7 +9813,7 @@ qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver,
-  * such as '0004:04:00.0', and tells if the device is a NVLink2
-  * bridge.
-  */
--static ATTRIBUTE_UNUSED bool
-+static bool
- ppc64VFIODeviceIsNV2Bridge(const char *device)
- {
-     const char *nvlink2Files[] = {"ibm,gpu", "ibm,nvlink",
-@@ -9851,7 +9851,9 @@ getPPC64MemLockLimitBytes(virDomainDefPtr def)
-     unsigned long long maxMemory = 0;
-     unsigned long long passthroughLimit = 0;
-     size_t i, nPCIHostBridges = 0;
-+    virPCIDeviceAddressPtr pciAddr;
-     bool usesVFIO = false;
-+    bool nvlink2Capable = false;
- 
-     for (i = 0; i < def->ncontrollers; i++) {
-         virDomainControllerDefPtr cont = def->controllers[i];
-@@ -9869,7 +9871,17 @@ getPPC64MemLockLimitBytes(virDomainDefPtr def)
-             dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-             dev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
-             usesVFIO = true;
--            break;
-+
-+            pciAddr = &dev->source.subsys.u.pci.addr;
-+            if (virPCIDeviceAddressIsValid(pciAddr, false)) {
-+                VIR_AUTOFREE(char *) pciAddrStr = NULL;
-+
-+                pciAddrStr = virDomainPCIAddressAsString(pciAddr);
-+                if (ppc64VFIODeviceIsNV2Bridge(pciAddrStr)) {
-+                    nvlink2Capable = true;
-+                    break;
-+                }
-+            }
-         }
-     }
- 
-@@ -9896,29 +9908,59 @@ getPPC64MemLockLimitBytes(virDomainDefPtr def)
-                 4096 * nPCIHostBridges +
-                 8192;
- 
--    /* passthroughLimit := max( 2 GiB * #PHBs,                       (c)
--     *                          memory                               (d)
--     *                          + memory * 1/512 * #PHBs + 8 MiB )   (e)
-+    /* NVLink2 support in QEMU is a special case of the passthrough
-+     * mechanics explained in the usesVFIO case below. The GPU RAM
-+     * is placed with a gap after maxMemory. The current QEMU
-+     * implementation puts the NVIDIA RAM above the PCI MMIO, which
-+     * starts at 32TiB and is the MMIO reserved for the guest main RAM.
-      *
--     * (c) is the pre-DDW VFIO DMA window accounting. We're allowing 2 GiB
--     * rather than 1 GiB
-+     * This window ends at 64TiB, and this is where the GPUs are being
-+     * placed. The next available window size is at 128TiB, and
-+     * 64TiB..128TiB will fit all possible NVIDIA GPUs.
-      *
--     * (d) is the with-DDW (and memory pre-registration and related
--     * features) DMA window accounting - assuming that we only account RAM
--     * once, even if mapped to multiple PHBs
-+     * The same assumption as the most common case applies here:
-+     * the guest will request a 64-bit DMA window, per PHB, that is
-+     * big enough to map all its RAM, which is now at 128TiB due
-+     * to the GPUs.
-      *
--     * (e) is the with-DDW userspace view and overhead for the 64-bit DMA
--     * window. This is based a bit on expected guest behaviour, but there
--     * really isn't a way to completely avoid that. We assume the guest
--     * requests a 64-bit DMA window (per PHB) just big enough to map all
--     * its RAM. 4 kiB page size gives the 1/512; it will be less with 64
--     * kiB pages, less still if the guest is mapped with hugepages (unlike
--     * the default 32-bit DMA window, DDW windows can use large IOMMU
--     * pages). 8 MiB is for second and further level overheads, like (b) */
--    if (usesVFIO)
-+     * Note that the NVIDIA RAM window must be accounted for the TCE
-+     * table size, but *not* for the main RAM (maxMemory). This gives
-+     * us the following passthroughLimit for the NVLink2 case:
-+     *
-+     * passthroughLimit = maxMemory +
-+     *                    128TiB/512KiB * #PHBs + 8 MiB */
-+    if (nvlink2Capable) {
-+        passthroughLimit = maxMemory +
-+                           128 * (1ULL<<30) / 512 * nPCIHostBridges +
-+                           8192;
-+    } else if (usesVFIO) {
-+        /* For regular (non-NVLink2 present) VFIO passthrough, the value
-+         * of passthroughLimit is:
-+         *
-+         * passthroughLimit := max( 2 GiB * #PHBs,                       (c)
-+         *                          memory                               (d)
-+         *                          + memory * 1/512 * #PHBs + 8 MiB )   (e)
-+         *
-+         * (c) is the pre-DDW VFIO DMA window accounting. We're allowing 2
-+         * GiB rather than 1 GiB
-+         *
-+         * (d) is the with-DDW (and memory pre-registration and related
-+         * features) DMA window accounting - assuming that we only account
-+         * RAM once, even if mapped to multiple PHBs
-+         *
-+         * (e) is the with-DDW userspace view and overhead for the 64-bit
-+         * DMA window. This is based a bit on expected guest behaviour, but
-+         * there really isn't a way to completely avoid that. We assume the
-+         * guest requests a 64-bit DMA window (per PHB) just big enough to
-+         * map all its RAM. 4 kiB page size gives the 1/512; it will be
-+         * less with 64 kiB pages, less still if the guest is mapped with
-+         * hugepages (unlike the default 32-bit DMA window, DDW windows
-+         * can use large IOMMU pages). 8 MiB is for second and further level
-+         * overheads, like (b) */
-         passthroughLimit = MAX(2 * 1024 * 1024 * nPCIHostBridges,
-                                memory +
-                                memory / 512 * nPCIHostBridges + 8192);
-+    }
- 
-     memKB = baseLimit + passthroughLimit;
- 
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch b/SOURCES/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch
index a32bf30..763b437 100644
--- a/SOURCES/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch
+++ b/SOURCES/libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch
@@ -1,5 +1,5 @@
-From 74b69d4a7240c601fcd12c18d5e8d95d641ae922 Mon Sep 17 00:00:00 2001
-Message-Id: <74b69d4a7240c601fcd12c18d5e8d95d641ae922@dist-git>
+From a04fcb5b463c90c47705ca0f28e40b73c00b6b72 Mon Sep 17 00:00:00 2001
+Message-Id: <a04fcb5b463c90c47705ca0f28e40b73c00b6b72@dist-git>
 From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
 Date: Mon, 22 Feb 2016 12:51:51 +0100
 Subject: [PATCH] RHEL: Add rhel machine types to qemuDomainMachineNeedsFDC
@@ -13,23 +13,24 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1227880
 
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 ---
- src/qemu/qemu_domain.c | 3 +++
- 1 file changed, 3 insertions(+)
+ src/qemu/qemu_domain.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 4c15d5a36a..4c2a162b85 100644
+index a6dde15bad..0edf316fff 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -9239,6 +9239,9 @@ qemuDomainMachineNeedsFDC(const char *machine)
-             STRPREFIX(p, "2.2") ||
-             STRPREFIX(p, "2.3"))
-             return false;
-+        if (STRPREFIX(p, "rhel7.0.0") ||
-+            STRPREFIX(p, "rhel7.1.0"))
-+            return false;
-         return true;
+@@ -12631,6 +12631,10 @@ qemuDomainMachineNeedsFDC(const char *machine,
+         return false;
      }
-     return false;
+ 
++    if (STRPREFIX(p, "rhel7.0.0") ||
++        STRPREFIX(p, "rhel7.1.0"))
++        return false;
++
+     return true;
+ }
+ 
 -- 
-2.18.0
+2.25.0
 
diff --git a/SOURCES/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch b/SOURCES/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
index 449b106..345c0b2 100644
--- a/SOURCES/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
+++ b/SOURCES/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
@@ -1,5 +1,5 @@
-From 72c5455c00fcec50bae3e71a6fbd6330e524be0a Mon Sep 17 00:00:00 2001
-Message-Id: <72c5455c00fcec50bae3e71a6fbd6330e524be0a@dist-git>
+From 3e50b013277c7fa05987ceba440f8c4583b6c634 Mon Sep 17 00:00:00 2001
+Message-Id: <3e50b013277c7fa05987ceba440f8c4583b6c634@dist-git>
 From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
 Date: Mon, 27 Aug 2018 13:09:38 +0200
 Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output
@@ -26,10 +26,10 @@ Reviewed-by: Andrea Bolognani <abologna@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index 1e31be5900..effe04ca3a 100644
+index 7f14340f49..256976cce1 100644
 --- a/src/util/virhostcpu.c
 +++ b/src/util/virhostcpu.c
-@@ -1186,6 +1186,11 @@ virHostCPUGetKVMMaxVCPUs(void)
+@@ -1169,6 +1169,11 @@ virHostCPUGetKVMMaxVCPUs(void)
          return -1;
      }
  
@@ -42,5 +42,5 @@ index 1e31be5900..effe04ca3a 100644
      /* at first try KVM_CAP_MAX_VCPUS to determine the maximum count */
      if ((ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS)) > 0)
 -- 
-2.18.0
+2.25.0
 
diff --git a/SOURCES/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch b/SOURCES/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch
index 69fece3..12d8958 100644
--- a/SOURCES/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch
+++ b/SOURCES/libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch
@@ -1,5 +1,5 @@
-From 498389f6b88547c352add4b209d61896a5143c00 Mon Sep 17 00:00:00 2001
-Message-Id: <498389f6b88547c352add4b209d61896a5143c00@dist-git>
+From 0dd015e1aff1a56a4584824d1a97c9eacabf7f03 Mon Sep 17 00:00:00 2001
+Message-Id: <0dd015e1aff1a56a4584824d1a97c9eacabf7f03@dist-git>
 From: Jiri Denemark <jdenemar@redhat.com>
 Date: Fri, 27 Mar 2015 12:48:40 +0100
 Subject: [PATCH] RHEL: Hack around changed Broadwell/Haswell CPUs
@@ -18,29 +18,31 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1199446
 
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 ---
- src/qemu/qemu_command.c                       | 29 +++++++++++++++++++
+ src/qemu/qemu_command.c                       | 21 +++++++++++++++++++
  tests/qemuxml2argvdata/cpu-Haswell.args       |  2 +-
- .../qemuxml2argvdata/cpu-host-model-cmt.args  |  3 +-
- tests/qemuxml2argvdata/cpu-tsc-frequency.args |  2 +-
+ .../qemuxml2argvdata/cpu-host-model-cmt.args  |  2 +-
+ .../cpu-translation.x86_64-4.0.0.args         |  4 ++--
+ .../cpu-translation.x86_64-latest.args        |  4 ++--
+ tests/qemuxml2argvdata/cpu-tsc-frequency.args |  4 ++--
  tests/qemuxml2argvdata/q35-acpi-nouefi.args   |  2 +-
  tests/qemuxml2argvdata/q35-acpi-uefi.args     |  2 +-
  tests/qemuxml2argvdata/q35-noacpi-nouefi.args |  2 +-
- 7 files changed, 36 insertions(+), 6 deletions(-)
+ 9 files changed, 32 insertions(+), 11 deletions(-)
 
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 4fc3176ad3..c1eefca639 100644
+index 904d2beab5..e10cc7fc74 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
-@@ -6677,6 +6677,8 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+@@ -6469,6 +6469,8 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+ {
      size_t i;
-     virCapsPtr caps = NULL;
      virCPUDefPtr cpu = def->cpu;
 +    bool hle = false;
 +    bool rtm = false;
  
-     if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-         goto cleanup;
-@@ -6734,6 +6736,11 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+     switch ((virCPUMode) cpu->mode) {
+     case VIR_CPU_MODE_HOST_PASSTHROUGH:
+@@ -6524,6 +6526,11 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
          virBufferAsprintf(buf, ",vendor=%s", cpu->vendor_id);
  
      for (i = 0; i < cpu->nfeatures; i++) {
@@ -52,7 +54,7 @@ index 4fc3176ad3..c1eefca639 100644
          switch ((virCPUFeaturePolicy) cpu->features[i].policy) {
          case VIR_CPU_FEATURE_FORCE:
          case VIR_CPU_FEATURE_REQUIRE:
-@@ -6757,6 +6764,28 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+@@ -6541,6 +6548,20 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
          }
      }
  
@@ -64,81 +66,104 @@ index 4fc3176ad3..c1eefca639 100644
 +     */
 +    if (STREQ_NULLABLE(cpu->model, "Broadwell") ||
 +        STREQ_NULLABLE(cpu->model, "Haswell")) {
-+        if (!rtm) {
-+            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
-+                virBufferAddLit(buf, ",rtm=on");
-+            else
-+                virBufferAddLit(buf, ",+rtm");
-+        }
-+        if (!hle) {
-+            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
-+                virBufferAddLit(buf, ",hle=on");
-+            else
-+                virBufferAddLit(buf, ",+hle");
-+        }
++        if (!rtm)
++            qemuBuildCpuFeature(qemuCaps, buf, "rtm", true);
++        if (!hle)
++            qemuBuildCpuFeature(qemuCaps, buf, "hle", true);
 +    }
 +
-     ret = 0;
-  cleanup:
-     virObjectUnref(caps);
+     return 0;
+ }
+ 
 diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
-index c7ce396d05..6f20359524 100644
+index a33b16f7ce..d35de5ea58 100644
 --- a/tests/qemuxml2argvdata/cpu-Haswell.args
 +++ b/tests/qemuxml2argvdata/cpu-Haswell.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
+@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
  -name QEMUGuest1 \
  -S \
  -machine pc,accel=kvm,usb=off,dump-guest-core=off \
 --cpu Haswell \
 +-cpu Haswell,+rtm,+hle \
  -m 214 \
+ -realtime mlock=off \
  -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
-index 8767278d11..d236aa9e09 100644
+index 42f969fd62..c8795acb3e 100644
 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
 +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
-@@ -9,7 +9,8 @@ QEMU_AUDIO_DRV=none \
+@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
  -S \
  -machine pc,accel=tcg,usb=off,dump-guest-core=off \
  -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\
--+smx,+est,+tm2,+xtpr,+pdcm,+osxsave,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm \
-++smx,+est,+tm2,+xtpr,+pdcm,+osxsave,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+rtm,\
-++hle \
+-+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm \
+++smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+rtm,+hle \
  -m 214 \
+ -realtime mlock=off \
  -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
+index f8e19fca24..08c672fd2c 100644
+--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
++++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
+@@ -14,8 +14,8 @@ QEMU_AUDIO_DRV=none \
+ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
+ -cpu Haswell,pclmuldq=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 \
++cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,rtm=on,hle=on,\
++kvm_pv_eoi=on,kvm_pv_unhalt=on \
+ -m 214 \
+ -overcommit mem-lock=off \
+ -smp 1,sockets=1,cores=1,threads=1 \
+diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
+index 9322b826f4..1dbfc9553b 100644
+--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
+@@ -14,8 +14,8 @@ QEMU_AUDIO_DRV=none \
+ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off \
+ -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 \
++cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,rtm=on,hle=on,\
++kvm-pv-eoi=on,kvm-pv-unhalt=on \
+ -m 214 \
+ -overcommit mem-lock=off \
+ -smp 1,sockets=1,cores=1,threads=1 \
 diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
-index 7824dea96f..216fd43014 100644
+index 55b72b4404..45a777d468 100644
 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
 +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
-@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
+@@ -12,8 +12,8 @@ QEMU_AUDIO_DRV=none \
+ -S \
  -machine pc,accel=kvm,usb=off,dump-guest-core=off \
  -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\
- +smx,+est,+tm2,+xtpr,+pdcm,+osxsave,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,\
--+invtsc,tsc-frequency=3504000000 \
-++invtsc,+rtm,+hle,tsc-frequency=3504000000 \
+-+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,\
+-tsc-frequency=3504000000 \
+++smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,+rtm,\
+++hle,tsc-frequency=3504000000 \
  -m 214 \
+ -realtime mlock=off \
  -smp 1,sockets=1,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
-index caef49ea16..a9375a35db 100644
+index 09e06c96ea..aed56fb1fc 100644
 --- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
 +++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
+@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
  -name guest \
  -S \
  -machine q35,accel=tcg,usb=off,dump-guest-core=off \
 --cpu Haswell \
 +-cpu Haswell,+rtm,+hle \
  -m 1024 \
+ -realtime mlock=off \
  -smp 1,sockets=1,cores=1,threads=1 \
- -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args
-index a3293aeb9d..8e3368b9e9 100644
+index d00fe5bc1d..1f4bfe7f87 100644
 --- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
 +++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
+@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
  -name guest \
  -S \
  -machine q35,accel=tcg,usb=off,dump-guest-core=off \
@@ -148,18 +173,18 @@ index a3293aeb9d..8e3368b9e9 100644
  readonly=on \
  -drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,\
 diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
-index fab2a6fcb0..0dd61840ef 100644
+index de34dff1cf..ccea7f91f9 100644
 --- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
 +++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
+@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
  -name guest \
  -S \
  -machine q35,accel=tcg,usb=off,dump-guest-core=off \
 --cpu Haswell \
 +-cpu Haswell,+rtm,+hle \
  -m 1024 \
+ -realtime mlock=off \
  -smp 1,sockets=1,cores=1,threads=1 \
- -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -- 
-2.18.0
+2.25.0
 
diff --git a/SOURCES/libvirt-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch b/SOURCES/libvirt-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
deleted file mode 100644
index 081d0e9..0000000
--- a/SOURCES/libvirt-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 54e270d7fb68b41002654374d395e4f260a24add Mon Sep 17 00:00:00 2001
-Message-Id: <54e270d7fb68b41002654374d395e4f260a24add@dist-git>
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 15 Oct 2018 20:31:02 -0400
-Subject: [PATCH] RHEL: network: regain guest network connectivity after
- firewalld switch to nftables
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a DOWNSTREAM ONLY patch to temporarily get back guest network
-connectivity while still allowing the firewalld backend to use
-nftables (which is the default with RHEL8).
-
-The circumstances that cause the problem:
-
-In the past (when both libvirt and firewalld used iptables), if either
-libvirt's rules *OR* firewalld's rules accepted a packet, it would be
-accepted.
-
-But now firewalld uses nftables for its backend, while libvirt's
-firewall rules are still using iptables; iptables rules are still
-processed, but at a different time during packet processing than the
-firewalld nftables hooks. The result is that a packet must be accepted
-by *BOTH* the libvirt iptables rules *AND* the firewalld nftable rules
-in order to be accepted.
-
-This causes pain for two types of traffic:
-
-1) libvirt always adds rules to permit DNS and DHCP (and sometimes
-TFTP) from guests to the host. But libvirt's bridges are in
-firewalld's "default" zone (which is usually the zone called
-"public"). The public zone allows ssh, but doesn't allow DNS, DHCP, or
-TFTP. So guests connected to libvirt's bridges can't acquire an IP
-address from DHCP, nor can they make DNS queries to the DNS server
-libvirt has setup on the host.
-
-2) firewalld's higher level "rich rules" don't yet have the ability to
-configure the acceptance of forwarded traffic (traffic that is going
-somewhere beyond the host), so any traffic that needs to be forwarded
-is rejected.
-
-libvirt can't send "direct" nftables rules (firewalld only supports
-that for iptables), so we can't solve this problem by just sending
-direct nftables rules instead of iptables rules.
-
-However, we can take advantage of a quirk in firewalld zones that have
-a default policy of accept (meaning any packet that doesn't match a
-specific rule in the zone will be accepted) - this default accept will
-also accept forwarded traffic (not just traffic destined for the host).
-
-So, as a temporary solution to get all network traffic flowing, this
-patch creates a new firewalld zone called "libvirt" which is setup to
-include interfaces named virbr0-virbr9, and has a default policy of
-accept. With this zone installed, libvirt networks that use the names
-virbr0-virbr9 will have *all* their traffic accepted, both to the host
-and to/from the rest of the network.
-
-firewalld zones can't normally be added to the runtime config of
-firewalld, so we have to reload all of the permanent config for it to
-be recognized. This is done with a call to "firewall-cmd --reload"
-during postinstall and postuninstall. In the case that firewalld is
-inactive, firewall-cmd exits without doing anything (i.e. it doesn't
-start up firewalld.service if it's not already started).
-
-This obviously can't be a permanent solution, since it allows guests
-to have access to *all* services on the host. However, it doesn't
-allow QE and beta testers to test firewalld with an nftables backend
-(which is important for firewalld and nftables devs) without breaking
-network connectivity for libvirt managed virtual machines (so testing
-of those can also take place.
-
-Resolves: https://bugzilla.redhat.com/1638864
-
-This problem is discussed in more detail in this message thread:
-
-https://post-office.corp.redhat.com/mailman/private/virt-devel/2018-September/msg00145.html
-https://post-office.corp.redhat.com/mailman/private/virt-devel/2018-October/msg00042.html
-
-and in the BZ assigned to firewalld: https://bugzilla.redhat.com/1623841
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- libvirt.spec.in             | 14 ++++++++++++++
- src/network/Makefile.inc.am | 10 +++++++++-
- src/network/libvirt.zone    | 15 +++++++++++++++
- 3 files changed, 38 insertions(+), 1 deletion(-)
- create mode 100644 src/network/libvirt.zone
-
-diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
-index 508c8c0422..20d899e699 100644
---- a/src/network/Makefile.inc.am
-+++ b/src/network/Makefile.inc.am
-@@ -87,6 +87,11 @@ install-data-network:
- 	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
- 	  rm -f default.xml && \
- 	  $(LN_S) ../default.xml default.xml )
-+if HAVE_FIREWALLD
-+	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
-+	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
-+	  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
-+endif HAVE_FIREWALLD
- 
- uninstall-data-network:
- 	rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
-@@ -95,10 +100,13 @@ uninstall-data-network:
- 	rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
- 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
- 	rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
-+if HAVE_FIREWALLD
-+	rm -f  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
-+endif HAVE_FIREWALLD
- 
- endif WITH_NETWORK
- 
--EXTRA_DIST += network/default.xml
-+EXTRA_DIST += network/default.xml network/libvirt.zone
- 
- .PHONY: \
- 	install-data-network \
-diff --git a/src/network/libvirt.zone b/src/network/libvirt.zone
-new file mode 100644
-index 0000000000..355a70b4da
---- /dev/null
-+++ b/src/network/libvirt.zone
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<zone target="ACCEPT">
-+  <short>libvirt</short>
-+  <description>All network connections are accepted. This also permits packets to/from interfaces in the zone to be forwarded. This zone is intended to be used only by libvirt virtual networks.</description>
-+  <interface name="virbr0"/>
-+  <interface name="virbr1"/>
-+  <interface name="virbr2"/>
-+  <interface name="virbr3"/>
-+  <interface name="virbr4"/>
-+  <interface name="virbr5"/>
-+  <interface name="virbr6"/>
-+  <interface name="virbr7"/>
-+  <interface name="virbr8"/>
-+  <interface name="virbr9"/>
-+</zone>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch b/SOURCES/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
index 537e868..95cd351 100644
--- a/SOURCES/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
+++ b/SOURCES/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
@@ -1,5 +1,5 @@
-From 2d4b19613c462e876ee1327d600f5cbbb998c540 Mon Sep 17 00:00:00 2001
-Message-Id: <2d4b19613c462e876ee1327d600f5cbbb998c540@dist-git>
+From fce502cf5233d800479c2efcf7721ab895db8998 Mon Sep 17 00:00:00 2001
+Message-Id: <fce502cf5233d800479c2efcf7721ab895db8998@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Mon, 17 Dec 2018 20:42:30 -0500
 Subject: [PATCH] RHEL: qemu: Add ability to set sgio values for hostdev
@@ -19,22 +19,22 @@ Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 (cherry picked from commit f2cf0ae7bc371c75f6c0e79192711f2b1d201b10)
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
 ---
- src/qemu/qemu_conf.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
+ src/qemu/qemu_conf.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index a4f545ef92..3ea9784854 100644
+index b62dd1df52..ce7869e6be 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1633,6 +1633,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1810,6 +1810,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
      virDomainDiskDefPtr disk = NULL;
      virDomainHostdevDefPtr hostdev = NULL;
-     char *sysfs_path = NULL;
-+    char *hostdev_path = NULL;
+     g_autofree char *sysfs_path = NULL;
++    g_autofree char *hostdev_path = NULL;
      const char *path = NULL;
      int val = -1;
-     int ret = -1;
-@@ -1654,14 +1655,10 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+ 
+@@ -1830,14 +1831,10 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
          if (!qemuIsSharedHostdev(hostdev))
              return 0;
  
@@ -43,7 +43,7 @@ index a4f545ef92..3ea9784854 100644
 -                           _("'sgio' is not supported for SCSI "
 -                             "generic device yet "));
 +        if (!(hostdev_path = qemuGetHostdevPath(hostdev)))
-             goto cleanup;
+             return -1;
 -        }
  
 -        return 0;
@@ -51,8 +51,8 @@ index a4f545ef92..3ea9784854 100644
      } else {
          return 0;
      }
-@@ -1670,7 +1667,11 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
-         goto cleanup;
+@@ -1846,7 +1843,11 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+         return -1;
  
      /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0.  */
 -    val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
@@ -64,14 +64,6 @@ index a4f545ef92..3ea9784854 100644
  
      /* Do not do anything if unpriv_sgio is not supported by the kernel and the
       * whitelist is enabled.  But if requesting unfiltered access, always call
-@@ -1683,6 +1684,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
-     ret = 0;
- 
-  cleanup:
-+    VIR_FREE(hostdev_path);
-     VIR_FREE(sysfs_path);
-     return ret;
- }
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch b/SOURCES/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
index 61a15f5..5f0af94 100644
--- a/SOURCES/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
+++ b/SOURCES/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
@@ -1,5 +1,5 @@
-From c39257f41ccb22272c6161777bf71390676bf7f0 Mon Sep 17 00:00:00 2001
-Message-Id: <c39257f41ccb22272c6161777bf71390676bf7f0@dist-git>
+From 5a192657ad4e08fc773fef90c6b07df3620fa1c2 Mon Sep 17 00:00:00 2001
+Message-Id: <5a192657ad4e08fc773fef90c6b07df3620fa1c2@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Mon, 17 Dec 2018 20:42:31 -0500
 Subject: [PATCH] RHEL: qemu: Add check for unpriv sgio for SCSI generic host
@@ -23,26 +23,29 @@ Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 (cherry picked from commit 712005bcf26190dc6fd1fe56283377987909cc4b)
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
 ---
- src/qemu/qemu_conf.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
+ src/qemu/qemu_conf.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 3ea9784854..7d15af9c0b 100644
+index ce7869e6be..2a84972fd9 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1473,6 +1473,8 @@ qemuAddSharedHostdev(virQEMUDriverPtr driver,
+@@ -1717,13 +1717,29 @@ qemuSharedHostdevAddRemoveInternal(virQEMUDriverPtr driver,
  {
-     char *dev_path = NULL;
-     char *key = NULL;
+     g_autofree char *dev_path = NULL;
+     g_autofree char *key = NULL;
 +    virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
 +    virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;
      int ret = -1;
  
      if (!qemuIsSharedHostdev(hostdev))
-@@ -1481,6 +1483,19 @@ qemuAddSharedHostdev(virQEMUDriverPtr driver,
-     if (!(dev_path = qemuGetHostdevPath(hostdev)))
-         goto cleanup;
+         return 0;
  
+-    if (!(dev_path = qemuGetHostdevPath(hostdev)) ||
+-        !(key = qemuGetSharedDeviceKey(dev_path)))
++    if (!(dev_path = qemuGetHostdevPath(hostdev)))
++        return -1;
++
 +    if ((ret = qemuCheckUnprivSGIO(driver->sharedDevices, dev_path,
 +                                   scsisrc->sgio)) < 0) {
 +        if (ret == -2) {
@@ -51,14 +54,14 @@ index 3ea9784854..7d15af9c0b 100644
 +                             "conflicts with other active domains"),
 +                           scsihostsrc->adapter, scsihostsrc->bus,
 +                           scsihostsrc->target, scsihostsrc->unit);
-+            ret = -1;
 +        }
-+        goto cleanup;
++        return -1;
 +    }
 +
-     if (!(key = qemuGetSharedDeviceKey(dev_path)))
-         goto cleanup;
++    if (!(key = qemuGetSharedDeviceKey(dev_path)))
+         return -1;
  
+     qemuDriverLock(driver);
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch b/SOURCES/libvirt-RHEL-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
similarity index 78%
rename from SOURCES/libvirt-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
rename to SOURCES/libvirt-RHEL-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
index 80f7399..2b30707 100644
--- a/SOURCES/libvirt-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
+++ b/SOURCES/libvirt-RHEL-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
@@ -1,8 +1,8 @@
-From 861a1a4d299c57f31fa091c6b74cddf80681bdf0 Mon Sep 17 00:00:00 2001
-Message-Id: <861a1a4d299c57f31fa091c6b74cddf80681bdf0@dist-git>
+From e79d54ff8e760ac1a200a37fb05cc9aa758c48d3 Mon Sep 17 00:00:00 2001
+Message-Id: <e79d54ff8e760ac1a200a37fb05cc9aa758c48d3@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Mon, 17 Dec 2018 20:42:33 -0500
-Subject: [PATCH] qemu: Alter qemuSetUnprivSGIO hostdev shareable logic
+Subject: [PATCH] RHEL: qemu: Alter qemuSetUnprivSGIO hostdev shareable logic
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -24,10 +24,10 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index de0cbca083..5971f3eb64 100644
+index faabc4d49f..590052b035 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1667,9 +1667,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1844,9 +1844,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
      } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
          hostdev = dev->data.hostdev;
  
@@ -35,9 +35,9 @@ index de0cbca083..5971f3eb64 100644
 -            return 0;
 -
          if (!(hostdev_path = qemuGetHostdevPath(hostdev)))
-             goto cleanup;
+             return -1;
  
-@@ -1686,7 +1683,9 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1863,7 +1860,9 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
          disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) {
          val = 1;
      } else {
@@ -49,5 +49,5 @@ index de0cbca083..5971f3eb64 100644
              val = 1;
      }
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch b/SOURCES/libvirt-RHEL-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
similarity index 76%
rename from SOURCES/libvirt-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
rename to SOURCES/libvirt-RHEL-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
index 87a119e..850b5ab 100644
--- a/SOURCES/libvirt-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
+++ b/SOURCES/libvirt-RHEL-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
@@ -1,8 +1,8 @@
-From c0f26a13c6ddd9aca729012d3a31347f77d52c68 Mon Sep 17 00:00:00 2001
-Message-Id: <c0f26a13c6ddd9aca729012d3a31347f77d52c68@dist-git>
+From fa46b5b4d5bb732462d0d5484cc010aa652d821b Mon Sep 17 00:00:00 2001
+Message-Id: <fa46b5b4d5bb732462d0d5484cc010aa652d821b@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Mon, 17 Dec 2018 20:42:32 -0500
-Subject: [PATCH] qemu: Alter @val usage in qemuSetUnprivSGIO
+Subject: [PATCH] RHEL: qemu: Alter @val usage in qemuSetUnprivSGIO
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -23,20 +23,20 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 7d15af9c0b..de0cbca083 100644
+index 2a84972fd9..faabc4d49f 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1650,7 +1650,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
-     char *sysfs_path = NULL;
-     char *hostdev_path = NULL;
+@@ -1828,7 +1828,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+     g_autofree char *sysfs_path = NULL;
+     g_autofree char *hostdev_path = NULL;
      const char *path = NULL;
 -    int val = -1;
 +    int val = 0;
-     int ret = -1;
  
      /* "sgio" is only valid for block disk; cdrom
-@@ -1682,11 +1682,14 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
-         goto cleanup;
+      * and floopy disk can have empty source.
+@@ -1859,11 +1859,14 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+         return -1;
  
      /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0.  */
 -    if (dev->type == VIR_DOMAIN_DEVICE_DISK)
@@ -56,5 +56,5 @@ index 7d15af9c0b..de0cbca083 100644
      /* Do not do anything if unpriv_sgio is not supported by the kernel and the
       * whitelist is enabled.  But if requesting unfiltered access, always call
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-RHEL-qemu-Fix-crash-trying-to-use-iSCSI-hostdev.patch b/SOURCES/libvirt-RHEL-qemu-Fix-crash-trying-to-use-iSCSI-hostdev.patch
index c86c563..e0bc6a1 100644
--- a/SOURCES/libvirt-RHEL-qemu-Fix-crash-trying-to-use-iSCSI-hostdev.patch
+++ b/SOURCES/libvirt-RHEL-qemu-Fix-crash-trying-to-use-iSCSI-hostdev.patch
@@ -1,5 +1,5 @@
-From 11bfd4f26c090b95a100aaf056ecfa799dfce979 Mon Sep 17 00:00:00 2001
-Message-Id: <11bfd4f26c090b95a100aaf056ecfa799dfce979@dist-git>
+From 163740bff28c6f1a82663bc652f2cd5df39e4276 Mon Sep 17 00:00:00 2001
+Message-Id: <163740bff28c6f1a82663bc652f2cd5df39e4276@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Fri, 25 Jan 2019 12:19:12 -0500
 Subject: [PATCH] RHEL: qemu: Fix crash trying to use iSCSI hostdev
@@ -26,10 +26,10 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 768e9d8308..a81298326f 100644
+index 0674292fab..3d2f0e7bbb 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1667,6 +1667,10 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1844,6 +1844,10 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
      } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
          hostdev = dev->data.hostdev;
  
@@ -38,8 +38,8 @@ index 768e9d8308..a81298326f 100644
 +            return 0;
 +
          if (!(hostdev_path = qemuGetHostdevPath(hostdev)))
-             goto cleanup;
+             return -1;
  
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch b/SOURCES/libvirt-RHEL-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
similarity index 84%
rename from SOURCES/libvirt-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
rename to SOURCES/libvirt-RHEL-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
index 8e8d799..b4d84ed 100644
--- a/SOURCES/libvirt-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
+++ b/SOURCES/libvirt-RHEL-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
@@ -1,8 +1,8 @@
-From d0f2fffa7c1a86f56f18143a1a14b9a32f8bcf16 Mon Sep 17 00:00:00 2001
-Message-Id: <d0f2fffa7c1a86f56f18143a1a14b9a32f8bcf16@dist-git>
+From f6a05ac3cb33c473de8ed49b53d22910fc0140df Mon Sep 17 00:00:00 2001
+Message-Id: <f6a05ac3cb33c473de8ed49b53d22910fc0140df@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Wed, 16 Jan 2019 15:54:31 -0500
-Subject: [PATCH] qemu: Fix logic error in qemuSetUnprivSGIO
+Subject: [PATCH] RHEL: qemu: Fix logic error in qemuSetUnprivSGIO
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -38,11 +38,11 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 5971f3eb64..768e9d8308 100644
+index 590052b035..0674292fab 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1679,9 +1679,9 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
-         goto cleanup;
+@@ -1856,9 +1856,9 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+         return -1;
  
      /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0.  */
 -    if (dev->type == VIR_DOMAIN_DEVICE_DISK &&
@@ -55,5 +55,5 @@ index 5971f3eb64..768e9d8308 100644
          /* Only settable if <shareable/> was present for hostdev */
          if (qemuIsSharedHostdev(hostdev) &&
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-RHEL-qemuCheckUnprivSGIO-use-sysfs_path-to-get-unpriv_sgio.patch b/SOURCES/libvirt-RHEL-qemuCheckUnprivSGIO-use-sysfs_path-to-get-unpriv_sgio.patch
index 47ae4bc..d9855b0 100644
--- a/SOURCES/libvirt-RHEL-qemuCheckUnprivSGIO-use-sysfs_path-to-get-unpriv_sgio.patch
+++ b/SOURCES/libvirt-RHEL-qemuCheckUnprivSGIO-use-sysfs_path-to-get-unpriv_sgio.patch
@@ -1,7 +1,7 @@
-From 825720316c0f63b029673f883c79a45e49e0f8ab Mon Sep 17 00:00:00 2001
-Message-Id: <825720316c0f63b029673f883c79a45e49e0f8ab@dist-git>
+From ef5a82d50464478a302cb59804d03e4a3dada83e Mon Sep 17 00:00:00 2001
+Message-Id: <ef5a82d50464478a302cb59804d03e4a3dada83e@dist-git>
 From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 6 Mar 2020 15:51:49 +0100
+Date: Fri, 6 Mar 2020 15:52:26 +0100
 Subject: [PATCH] RHEL: qemuCheckUnprivSGIO: use @sysfs_path to get unpriv_sgio
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -14,27 +14,27 @@ removed the device_path -> sysfs_path conversion from
 both virGetDeviceUnprivSGIO and virSetDeviceUnprivSGIO,
 but only adjusted one of the callers.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1808399
+https://bugzilla.redhat.com/show_bug.cgi?id=1808400
 
 Signed-off-by: Ján Tomko <jtomko@redhat.com>
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200306145149.1610286-7-abologna@redhat.com>
+Message-Id: <20200306145226.1610708-7-abologna@redhat.com>
 Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 ---
  src/qemu/qemu_conf.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 5788354444..a86e340013 100644
+index b61d7e59fa..6a22d78ac6 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1255,7 +1255,7 @@ qemuCheckUnprivSGIO(virHashTablePtr sharedDevices,
-         goto cleanup;
-     }
+@@ -1430,7 +1430,7 @@ qemuCheckUnprivSGIO(virHashTablePtr sharedDevices,
+     if (!(virHashLookup(sharedDevices, key)))
+         return 0;
  
 -    if (virGetDeviceUnprivSGIO(device_path, &val) < 0)
 +    if (virGetDeviceUnprivSGIO(sysfs_path, &val) < 0)
-         goto cleanup;
+         return -1;
  
      /* Error message on failure needs to be handled in caller
 -- 
diff --git a/SOURCES/libvirt-RHEL-qemuSetUnprivSGIO-Actually-use-calculated-sysfs_path-to-set-unpriv_sgio.patch b/SOURCES/libvirt-RHEL-qemuSetUnprivSGIO-Actually-use-calculated-sysfs_path-to-set-unpriv_sgio.patch
index ee1bd1a..b4ed1ae 100644
--- a/SOURCES/libvirt-RHEL-qemuSetUnprivSGIO-Actually-use-calculated-sysfs_path-to-set-unpriv_sgio.patch
+++ b/SOURCES/libvirt-RHEL-qemuSetUnprivSGIO-Actually-use-calculated-sysfs_path-to-set-unpriv_sgio.patch
@@ -1,7 +1,7 @@
-From 785d2dd780b472bf857dd962d910addd9ff7b07f Mon Sep 17 00:00:00 2001
-Message-Id: <785d2dd780b472bf857dd962d910addd9ff7b07f@dist-git>
+From 717423e7a452b0715e95b492b15dc08983677d12 Mon Sep 17 00:00:00 2001
+Message-Id: <717423e7a452b0715e95b492b15dc08983677d12@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 6 Mar 2020 15:51:48 +0100
+Date: Fri, 6 Mar 2020 15:52:25 +0100
 Subject: [PATCH] RHEL: qemuSetUnprivSGIO: Actually use calculated @sysfs_path
  to set unpriv_sgio
 
@@ -11,11 +11,11 @@ unpriv_sgio. However, virSetDeviceUnprivSGIO() does not care
 about that - it constructs the path on it's own again. This is
 suboptimal in either case - we already have the path constructed.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1808388
+https://bugzilla.redhat.com/show_bug.cgi?id=1808390
 
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200306145149.1610286-6-abologna@redhat.com>
+Message-Id: <20200306145226.1610708-6-abologna@redhat.com>
 Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 ---
  src/qemu/qemu_conf.c |  8 +++-----
@@ -24,27 +24,27 @@ Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
  3 files changed, 9 insertions(+), 25 deletions(-)
 
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 5636277888..5788354444 100644
+index 6d6feb97cd..b61d7e59fa 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1255,7 +1255,7 @@ qemuCheckUnprivSGIO(virHashTablePtr sharedDevices,
-         goto cleanup;
-     }
+@@ -1430,7 +1430,7 @@ qemuCheckUnprivSGIO(virHashTablePtr sharedDevices,
+     if (!(virHashLookup(sharedDevices, key)))
+         return 0;
  
 -    if (virGetDeviceUnprivSGIO(device_path, NULL, &val) < 0)
 +    if (virGetDeviceUnprivSGIO(device_path, &val) < 0)
-         goto cleanup;
+         return -1;
  
      /* Error message on failure needs to be handled in caller
-@@ -1648,7 +1648,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1789,7 +1789,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
      virDomainDiskDefPtr disk = NULL;
      virDomainHostdevDefPtr hostdev = NULL;
-     char *sysfs_path = NULL;
+     g_autofree char *sysfs_path = NULL;
 -    const char *path = NULL;
      int val = 0;
-     int ret = -1;
  
-@@ -1657,13 +1656,12 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+     /* "sgio" is only valid for block disk; cdrom
+@@ -1797,13 +1796,12 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
       */
      if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
          disk = dev->data.disk;
@@ -57,22 +57,22 @@ index 5636277888..5788354444 100644
 -        path = virDomainDiskGetSource(disk);
 -
          if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL)))
-             goto cleanup;
+             return -1;
  
-@@ -1703,7 +1701,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1843,7 +1841,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
       * virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio.
       */
      if ((virFileExists(sysfs_path) || val == 1) &&
 -        virSetDeviceUnprivSGIO(path, NULL, val) < 0)
 +        virSetDeviceUnprivSGIO(sysfs_path, val) < 0)
-         goto cleanup;
+         return -1;
  
-     ret = 0;
+     return 0;
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 2448eba073..ad2b8cb3a2 100644
+index f142951acf..4198473fce 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1736,18 +1736,13 @@ virGetUnprivSGIOSysfsPath(const char *path,
+@@ -1421,18 +1421,13 @@ virGetUnprivSGIOSysfsPath(const char *path,
  
  int
  virSetDeviceUnprivSGIO(const char *path,
@@ -92,9 +92,9 @@ index 2448eba073..ad2b8cb3a2 100644
          virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                         _("unpriv_sgio is not supported by this kernel"));
          goto cleanup;
-@@ -1756,38 +1751,32 @@ virSetDeviceUnprivSGIO(const char *path,
-     if (virAsprintf(&val, "%d", unpriv_sgio) < 0)
-         goto cleanup;
+@@ -1440,38 +1435,32 @@ virSetDeviceUnprivSGIO(const char *path,
+ 
+     val = g_strdup_printf("%d", unpriv_sgio);
  
 -    if ((rc = virFileWriteStr(sysfs_path, val, 0)) < 0) {
 -        virReportSystemError(-rc, _("failed to set %s"), sysfs_path);
@@ -135,7 +135,7 @@ index 2448eba073..ad2b8cb3a2 100644
          goto cleanup;
  
      if ((tmp = strchr(buf, '\n')))
-@@ -1795,13 +1784,12 @@ virGetDeviceUnprivSGIO(const char *path,
+@@ -1479,13 +1468,12 @@ virGetDeviceUnprivSGIO(const char *path,
  
      if (virStrToLong_i(buf, NULL, 10, unpriv_sgio) < 0) {
          virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -151,10 +151,10 @@ index 2448eba073..ad2b8cb3a2 100644
      return ret;
  }
 diff --git a/src/util/virutil.h b/src/util/virutil.h
-index 1ba9635bd9..1a1313cfa3 100644
+index 1a6ae1787a..a2530e21b5 100644
 --- a/src/util/virutil.h
 +++ b/src/util/virutil.h
-@@ -160,10 +160,8 @@ int virGetDeviceID(const char *path,
+@@ -124,10 +124,8 @@ int virGetDeviceID(const char *path,
                     int *maj,
                     int *min);
  int virSetDeviceUnprivSGIO(const char *path,
diff --git a/SOURCES/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch b/SOURCES/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
index af68a07..f371ff8 100644
--- a/SOURCES/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
+++ b/SOURCES/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
@@ -1,7 +1,7 @@
-From 521a2285cfee3d2fdd59cb7a3270e9ef91bcc14f Mon Sep 17 00:00:00 2001
-Message-Id: <521a2285cfee3d2fdd59cb7a3270e9ef91bcc14f@dist-git>
+From f66beef45382be2aed6d021a409e90f8114c8671 Mon Sep 17 00:00:00 2001
+Message-Id: <f66beef45382be2aed6d021a409e90f8114c8671@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 6 Mar 2020 15:51:44 +0100
+Date: Fri, 6 Mar 2020 15:52:21 +0100
 Subject: [PATCH] RHEL: virscsi: Check device type before getting it's /dev
  node name
 
@@ -9,27 +9,27 @@ Not all SCSI devices are block devices, therefore
 /sys/bus/scsi/devices/X:X:X:X/block/ directory does not always
 exist. Check if the SCSI device is a block device beforehand.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1808388
+https://bugzilla.redhat.com/show_bug.cgi?id=1808390
 
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200306145149.1610286-2-abologna@redhat.com>
+Message-Id: <20200306145226.1610708-2-abologna@redhat.com>
 Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 ---
- src/util/virscsi.c             | 149 ++++++++++++++++++++++++++++++---
+ src/util/virscsi.c             | 146 ++++++++++++++++++++++++++++++---
  tests/virscsidata/0-0-0-0/type |   1 +
  tests/virscsidata/1-0-0-0/type |   1 +
- 3 files changed, 138 insertions(+), 13 deletions(-)
+ 3 files changed, 137 insertions(+), 11 deletions(-)
  create mode 100644 tests/virscsidata/0-0-0-0/type
  create mode 100644 tests/virscsidata/1-0-0-0/type
 
 diff --git a/src/util/virscsi.c b/src/util/virscsi.c
-index b51103a86d..af908107d9 100644
+index 06659c45c7..c40857977f 100644
 --- a/src/util/virscsi.c
 +++ b/src/util/virscsi.c
-@@ -56,6 +56,32 @@ struct _virUsedByInfo {
- };
- typedef struct _virUsedByInfo *virUsedByInfoPtr;
+@@ -50,6 +50,32 @@ struct _virUsedByInfo {
+ typedef struct _virUsedByInfo virUsedByInfo;
+ typedef virUsedByInfo *virUsedByInfoPtr;
  
 +
 +/* Keep in sync with scsi/scsi_proto.h */
@@ -60,7 +60,7 @@ index b51103a86d..af908107d9 100644
  struct _virSCSIDevice {
      unsigned int adapter;
      unsigned int bus;
-@@ -143,6 +169,86 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix,
+@@ -134,6 +160,84 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix,
      return sg;
  }
  
@@ -121,25 +121,23 @@ index b51103a86d..af908107d9 100644
 +{
 +    DIR *dir = NULL;
 +    struct dirent *entry;
-+    char *path = NULL;
++    g_autofree char *path = NULL;
 +    char *name = NULL;
 +
-+    if (virAsprintf(&path,
-+                    "%s/%d:%u:%u:%llu/block",
-+                    prefix, adapter, bus, target, unit) < 0)
-+        return NULL;
++    path = g_strdup_printf("%s/%d:%u:%u:%llu/block",
++                           prefix, adapter, bus, target, unit);
 +
 +    if (virDirOpen(&dir, path) < 0)
 +        goto cleanup;
 +
 +    while (virDirRead(dir, &entry, path) > 0) {
-+        ignore_value(VIR_STRDUP(name, entry->d_name));
++        name = g_strdup(entry->d_name);
 +        break;
 +    }
 +
 + cleanup:
 +    VIR_DIR_CLOSE(dir);
-+    VIR_FREE(path);
++
 +    return name;
 +}
 +
@@ -147,13 +145,13 @@ index b51103a86d..af908107d9 100644
  /* Returns device name (e.g. "sdc") on success, or NULL
   * on failure.
   */
-@@ -153,35 +259,52 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
+@@ -144,32 +248,52 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
                          unsigned int target,
                          unsigned long long unit)
  {
 -    DIR *dir = NULL;
 -    struct dirent *entry;
--    char *path = NULL;
+-    g_autofree char *path = NULL;
      char *name = NULL;
      unsigned int adapter_id;
 +    virSCSIDeviceType type;
@@ -162,12 +160,11 @@ index b51103a86d..af908107d9 100644
      if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0)
          return NULL;
  
--    if (virAsprintf(&path,
--                    "%s/%d:%u:%u:%llu/block",
--                    prefix, adapter_id, bus, target, unit) < 0)
+-    path = g_strdup_printf("%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus,
+-                           target, unit);
 +    if (virSCSIDeviceGetType(prefix, adapter_id,
 +                             bus, target, unit, &type) < 0)
-         return NULL;
++        return NULL;
  
 -    if (virDirOpen(&dir, path) < 0)
 -        goto cleanup;
@@ -177,7 +174,7 @@ index b51103a86d..af908107d9 100644
 +        break;
  
 -    while (virDirRead(dir, &entry, path) > 0) {
--        ignore_value(VIR_STRDUP(name, entry->d_name));
+-        name = g_strdup(entry->d_name);
 +    case VIR_SCSI_DEVICE_TYPE_TAPE:
 +    case VIR_SCSI_DEVICE_TYPE_PRINTER:
 +    case VIR_SCSI_DEVICE_TYPE_PROCESSOR:
@@ -205,7 +202,6 @@ index b51103a86d..af908107d9 100644
  
 - cleanup:
 -    VIR_DIR_CLOSE(dir);
--    VIR_FREE(path);
      return name;
  }
  
diff --git a/SOURCES/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch b/SOURCES/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
index d2d3c65..5feb8f5 100644
--- a/SOURCES/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
+++ b/SOURCES/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
@@ -1,7 +1,7 @@
-From 6dfdc50564c3d2147f36c4cf6c252cad7a0e9381 Mon Sep 17 00:00:00 2001
-Message-Id: <6dfdc50564c3d2147f36c4cf6c252cad7a0e9381@dist-git>
+From c9fc757c867d197c17350b6a9cabc63cc08105d2 Mon Sep 17 00:00:00 2001
+Message-Id: <c9fc757c867d197c17350b6a9cabc63cc08105d2@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 6 Mar 2020 15:51:46 +0100
+Date: Fri, 6 Mar 2020 15:52:23 +0100
 Subject: [PATCH] RHEL: virscsi: Introduce and use
  virSCSIDeviceGetUnprivSGIOSysfsPath()
 
@@ -14,24 +14,24 @@ different path: /sys/bus/scsi/devices/X:X:X:X/unpriv_sgio where
 the file is directly accessible regardless of the SCSI device
 type.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1808388
+https://bugzilla.redhat.com/show_bug.cgi?id=1808390
 
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200306145149.1610286-4-abologna@redhat.com>
+Message-Id: <20200306145226.1610708-4-abologna@redhat.com>
 Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 ---
  src/libvirt_private.syms |  1 +
- src/qemu/qemu_conf.c     | 19 +++++++++++--------
- src/util/virscsi.c       | 21 +++++++++++++++++++++
+ src/qemu/qemu_conf.c     | 18 +++++++++++-------
+ src/util/virscsi.c       | 18 ++++++++++++++++++
  src/util/virscsi.h       |  5 +++++
- 4 files changed, 38 insertions(+), 8 deletions(-)
+ 4 files changed, 35 insertions(+), 7 deletions(-)
 
 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 2ad21a68bc..5e1d73c148 100644
+index 5dc99e03cf..1f97879faa 100644
 --- a/src/libvirt_private.syms
 +++ b/src/libvirt_private.syms
-@@ -2727,6 +2727,7 @@ virSCSIDeviceGetSgName;
+@@ -2959,6 +2959,7 @@ virSCSIDeviceGetSgName;
  virSCSIDeviceGetShareable;
  virSCSIDeviceGetTarget;
  virSCSIDeviceGetUnit;
@@ -40,24 +40,24 @@ index 2ad21a68bc..5e1d73c148 100644
  virSCSIDeviceListAdd;
  virSCSIDeviceListCount;
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index a81298326f..5636277888 100644
+index 7aaf2862a4..6d6feb97cd 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1648,7 +1648,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+@@ -1789,7 +1789,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
      virDomainDiskDefPtr disk = NULL;
      virDomainHostdevDefPtr hostdev = NULL;
-     char *sysfs_path = NULL;
--    char *hostdev_path = NULL;
+     g_autofree char *sysfs_path = NULL;
+-    g_autofree char *hostdev_path = NULL;
      const char *path = NULL;
      int val = 0;
-     int ret = -1;
-@@ -1664,24 +1663,29 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
+ 
+@@ -1804,24 +1803,29 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
              return 0;
  
          path = virDomainDiskGetSource(disk);
 +
 +        if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL)))
-+            goto cleanup;
++            return -1;
 +
      } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
          hostdev = dev->data.hostdev;
@@ -74,7 +74,7 @@ index a81298326f..5636277888 100644
 +                                                               scsihostsrc->bus,
 +                                                               scsihostsrc->target,
 +                                                               scsihostsrc->unit)))
-             goto cleanup;
+             return -1;
 -
 -        path = hostdev_path;
      } else {
@@ -82,24 +82,16 @@ index a81298326f..5636277888 100644
      }
  
 -    if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL)))
--        goto cleanup;
+-        return -1;
 -
      /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0.  */
      if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
          if (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED)
-@@ -1705,7 +1709,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
-     ret = 0;
- 
-  cleanup:
--    VIR_FREE(hostdev_path);
-     VIR_FREE(sysfs_path);
-     return ret;
- }
 diff --git a/src/util/virscsi.c b/src/util/virscsi.c
-index 6c3fd8a562..5aab43fc88 100644
+index 57958c06ea..1bba4051b6 100644
 --- a/src/util/virscsi.c
 +++ b/src/util/virscsi.c
-@@ -342,6 +342,27 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
+@@ -322,6 +322,24 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
  }
  
  
@@ -110,17 +102,14 @@ index 6c3fd8a562..5aab43fc88 100644
 +                                    unsigned int target,
 +                                    unsigned long long unit)
 +{
-+    char *path = NULL;
 +    unsigned int adapter_id;
 +    const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_DEVICES;
 +
 +    if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0)
 +        return NULL;
 +
-+    ignore_value(virAsprintf(&path,
-+                             "%s/%d:%u:%u:%llu/unpriv_sgio",
-+                             prefix, adapter_id, bus, target, unit));
-+    return path;
++    return g_strdup_printf("%s/%d:%u:%u:%llu/unpriv_sgio",
++                           prefix, adapter_id, bus, target, unit);
 +}
 +
 +
@@ -128,10 +117,10 @@ index 6c3fd8a562..5aab43fc88 100644
  virSCSIDeviceNew(const char *sysfs_prefix,
                   const char *adapter,
 diff --git a/src/util/virscsi.h b/src/util/virscsi.h
-index 9f8b3ecf1e..5dea2a9f5d 100644
+index 51627e0c05..c040d76716 100644
 --- a/src/util/virscsi.h
 +++ b/src/util/virscsi.h
-@@ -43,6 +43,11 @@ char *virSCSIDeviceGetDevName(const char *sysfs_prefix,
+@@ -42,6 +42,11 @@ char *virSCSIDeviceGetDevName(const char *sysfs_prefix,
                                unsigned int bus,
                                unsigned int target,
                                unsigned long long unit);
diff --git a/SOURCES/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch b/SOURCES/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
index f302043..7724e4d 100644
--- a/SOURCES/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
+++ b/SOURCES/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
@@ -1,21 +1,21 @@
-From 41480c7a787cc776e64d2ab7b737c3e8d6a84bd2 Mon Sep 17 00:00:00 2001
-Message-Id: <41480c7a787cc776e64d2ab7b737c3e8d6a84bd2@dist-git>
+From c481bcacd1f515d2e93036dc452a25e9ff06f7ae Mon Sep 17 00:00:00 2001
+Message-Id: <c481bcacd1f515d2e93036dc452a25e9ff06f7ae@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 6 Mar 2020 15:51:45 +0100
+Date: Fri, 6 Mar 2020 15:52:22 +0100
 Subject: [PATCH] RHEL: virscsi: Support TAPEs in virSCSIDeviceGetDevName()
 
 If the SCSI device we want to get /dev node name for is TAPE
 device we need to look at 'tape' symlink in the sysfs dir
 corresponding to the device.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1808388
+https://bugzilla.redhat.com/show_bug.cgi?id=1808390
 
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200306145149.1610286-3-abologna@redhat.com>
+Message-Id: <20200306145226.1610708-3-abologna@redhat.com>
 Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 ---
- src/util/virscsi.c                          | 37 ++++++++++++++++++++
+ src/util/virscsi.c                          | 28 +++++++++++++++
  tests/virscsidata/2-0-0-0/model             |  1 +
  tests/virscsidata/2-0-0-0/scsi_tape/st0/dev |  1 +
  tests/virscsidata/2-0-0-0/sg3/dev           |  1 +
@@ -24,7 +24,7 @@ Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
  tests/virscsidata/2-0-0-0/vendor            |  1 +
  tests/virscsidata/sg3                       |  0
  tests/virscsitest.c                         | 38 ++++++++++++++++++---
- 9 files changed, 76 insertions(+), 5 deletions(-)
+ 9 files changed, 67 insertions(+), 5 deletions(-)
  create mode 100644 tests/virscsidata/2-0-0-0/model
  create mode 100644 tests/virscsidata/2-0-0-0/scsi_tape/st0/dev
  create mode 100644 tests/virscsidata/2-0-0-0/sg3/dev
@@ -34,18 +34,10 @@ Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
  create mode 100644 tests/virscsidata/sg3
 
 diff --git a/src/util/virscsi.c b/src/util/virscsi.c
-index af908107d9..6c3fd8a562 100644
+index c40857977f..57958c06ea 100644
 --- a/src/util/virscsi.c
 +++ b/src/util/virscsi.c
-@@ -42,6 +42,7 @@
- #include "virutil.h"
- #include "virstring.h"
- #include "virerror.h"
-+#include "dirname.h"
- 
- #define SYSFS_SCSI_DEVICES "/sys/bus/scsi/devices"
- 
-@@ -249,6 +250,39 @@ virSCSIDeviceGetDevNameBlock(const char *prefix,
+@@ -238,6 +238,31 @@ virSCSIDeviceGetDevNameBlock(const char *prefix,
  }
  
  
@@ -56,36 +48,28 @@ index af908107d9..6c3fd8a562 100644
 +                            unsigned int target,
 +                            unsigned long long unit)
 +{
-+    char *path = NULL;
-+    char *resolvedPath = NULL;
-+    char *name = NULL;
++    g_autofree char *path = NULL;
++    g_autofree char *resolvedPath = NULL;
++    g_autoptr(GError) err = NULL;
 +
-+    if (virAsprintf(&path,
-+                    "%s/%d:%u:%u:%llu/tape",
-+                    prefix, adapter, bus, target, unit) < 0)
++    path = g_strdup_printf("%s/%d:%u:%u:%llu/tape",
++                           prefix, adapter, bus, target, unit);
++
++    if (!(resolvedPath = g_file_read_link(path, &err))) {
++        virReportError(VIR_ERR_SYSTEM_ERROR,
++                       _("Unable to read link: %s"),
++                       err->message);
 +        return NULL;
-+
-+    if (virFileReadLink(path, &resolvedPath) < 0) {
-+        virReportSystemError(errno,
-+                             _("Unable to read link: %s"),
-+                             path);
-+        goto cleanup;
 +    }
 +
-+    if (VIR_STRDUP(name, last_component(resolvedPath)) < 0)
-+        goto cleanup;
-+
-+ cleanup:
-+    VIR_FREE(resolvedPath);
-+    VIR_FREE(path);
-+    return name;
++    return g_path_get_basename(resolvedPath);
 +}
 +
 +
  /* Returns device name (e.g. "sdc") on success, or NULL
   * on failure.
   */
-@@ -277,6 +311,9 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
+@@ -266,6 +291,9 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix,
          break;
  
      case VIR_SCSI_DEVICE_TYPE_TAPE:
@@ -142,11 +126,11 @@ diff --git a/tests/virscsidata/sg3 b/tests/virscsidata/sg3
 new file mode 100644
 index 0000000000..e69de29bb2
 diff --git a/tests/virscsitest.c b/tests/virscsitest.c
-index 1215adbfab..880fa22ca8 100644
+index d5a0da4753..e501d6d041 100644
 --- a/tests/virscsitest.c
 +++ b/tests/virscsitest.c
-@@ -36,18 +36,34 @@ VIR_LOG_INIT("tests.scsitest");
- static const char *abs_top_srcdir;
+@@ -32,18 +32,34 @@ VIR_LOG_INIT("tests.scsitest");
+ 
  static char *virscsi_prefix;
  
 +typedef struct {
@@ -158,7 +142,7 @@ index 1215adbfab..880fa22ca8 100644
 +} testGetDevNameData;
 +
  static int
--test1(const void *data ATTRIBUTE_UNUSED)
+-test1(const void *data G_GNUC_UNUSED)
 +testGetDevName(const void *opaque)
  {
 +    const testGetDevNameData *data = opaque;
@@ -183,7 +167,7 @@ index 1215adbfab..880fa22ca8 100644
  
      ret = 0;
   cleanup:
-@@ -225,7 +241,9 @@ mymain(void)
+@@ -212,15 +228,27 @@ mymain(void)
  
      CREATE_SYMLINK("0-0-0-0", "0:0:0:0");
      CREATE_SYMLINK("1-0-0-0", "1:0:0:0");
@@ -193,9 +177,8 @@ index 1215adbfab..880fa22ca8 100644
      CREATE_SYMLINK("sg8", "sg8");
  
      VIR_FREE(virscsi_prefix);
-@@ -235,8 +253,18 @@ mymain(void)
-         goto cleanup;
-     }
+ 
+     virscsi_prefix = g_strdup(tmpdir);
  
 -    if (virTestRun("test1", test1, NULL) < 0)
 -        ret = -1;
diff --git a/SOURCES/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch b/SOURCES/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
index 6f59819..4568177 100644
--- a/SOURCES/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
+++ b/SOURCES/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
@@ -1,28 +1,28 @@
-From f4d9b6252bd2b2b5a3c70a3869ce49a3a9e1a9cc Mon Sep 17 00:00:00 2001
-Message-Id: <f4d9b6252bd2b2b5a3c70a3869ce49a3a9e1a9cc@dist-git>
+From cd2640c256389b4041e4cd38fd72f77184bb4414 Mon Sep 17 00:00:00 2001
+Message-Id: <cd2640c256389b4041e4cd38fd72f77184bb4414@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 6 Mar 2020 15:51:47 +0100
+Date: Fri, 6 Mar 2020 15:52:24 +0100
 Subject: [PATCH] RHEL: virutil: Accept non-block devices in virGetDeviceID()
 
 If a caller wants to learn major or minor number for a device,
 let them. There's no need to check if the device is a block
 device here.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1808388
+https://bugzilla.redhat.com/show_bug.cgi?id=1808390
 
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200306145149.1610286-5-abologna@redhat.com>
+Message-Id: <20200306145226.1610708-5-abologna@redhat.com>
 Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 ---
  src/util/virutil.c | 3 ---
  1 file changed, 3 deletions(-)
 
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index cd67f54bc2..2448eba073 100644
+index a0fd7618ee..f142951acf 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1693,9 +1693,6 @@ virGetDeviceID(const char *path, int *maj, int *min)
+@@ -1379,9 +1379,6 @@ virGetDeviceID(const char *path, int *maj, int *min)
      if (stat(path, &sb) < 0)
          return -errno;
  
diff --git a/SOURCES/libvirt-Remove-checking-of-return-value-of-virHashNew.patch b/SOURCES/libvirt-Remove-checking-of-return-value-of-virHashNew.patch
new file mode 100644
index 0000000..10e8801
--- /dev/null
+++ b/SOURCES/libvirt-Remove-checking-of-return-value-of-virHashNew.patch
@@ -0,0 +1,62 @@
+From ca7c7a8b07c31dc8bf96f7da6fb53af884e36ddb Mon Sep 17 00:00:00 2001
+Message-Id: <ca7c7a8b07c31dc8bf96f7da6fb53af884e36ddb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:01 +0100
+Subject: [PATCH] Remove checking of return value of virHashNew
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are two calls to virHashNew which check the return value. It's not
+necessary any more as virHashNew always returns a valid pointer.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 6eab924daa243afa67f2cc20dcbdf521904bb62b)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <08acb2e50b584a75c0131a628ee441f47e8fe823.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/backup_conf.c       | 6 +-----
+ src/qemu/qemu_monitor_json.c | 3 +--
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c
+index b370b686f1..64c8f6cc09 100644
+--- a/src/conf/backup_conf.c
++++ b/src/conf/backup_conf.c
+@@ -439,15 +439,11 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def,
+                           virDomainDefPtr dom,
+                           const char *suffix)
+ {
+-    g_autoptr(virHashTable) disks = NULL;
++    g_autoptr(virHashTable) disks = virHashNew(NULL);
+     size_t i;
+     int ndisks;
+     bool backup_all = false;
+ 
+-
+-    if (!(disks = virHashNew(NULL)))
+-        return -1;
+-
+     /* Unlikely to have a guest without disks but technically possible.  */
+     if (!dom->ndisks) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 5d8c7e9b5e..3fc0bcb80c 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -2992,8 +2992,7 @@ qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValuePtr nodes)
+ {
+     g_autoptr(virHashTable) ret = NULL;
+ 
+-    if (!(ret = virHashNew((virHashDataFree) qemuMonitorJSONBlockNamedNodeDataFree)))
+-        return NULL;
++    ret = virHashNew((virHashDataFree) qemuMonitorJSONBlockNamedNodeDataFree);
+ 
+     if (virJSONValueArrayForeachSteal(nodes,
+                                       qemuMonitorJSONBlockGetNamedNodeDataWorker,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-Remove-qemuDomainSecretInfoNew.patch b/SOURCES/libvirt-Remove-qemuDomainSecretInfoNew.patch
new file mode 100644
index 0000000..4534ae8
--- /dev/null
+++ b/SOURCES/libvirt-Remove-qemuDomainSecretInfoNew.patch
@@ -0,0 +1,109 @@
+From 160863c5cac5519c287462439b9ce8abc6a8237e Mon Sep 17 00:00:00 2001
+Message-Id: <160863c5cac5519c287462439b9ce8abc6a8237e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:48 +0100
+Subject: [PATCH] Remove qemuDomainSecretInfoNew
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace it by a direct call to qemuDomainSecretAESSetupFromSecret.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit f742461389c11a7d4cc8bda941814c4128eadf94)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <c14d98c90ae9d0e9c5e4fef6a8e5061411c43a78.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 53 +++++++++++-------------------------------
+ 1 file changed, 13 insertions(+), 40 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index c286f50650..af23079d5d 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1669,33 +1669,6 @@ qemuDomainSecretInfoNewPlain(virSecretUsageType usageType,
+ }
+ 
+ 
+-/* qemuDomainSecretInfoNew:
+- * @priv: pointer to domain private object
+- * @srcAlias: Alias base to use for TLS object
+- * @usageType: Secret usage type
+- * @username: username
+- * @looupDef: lookup def describing secret
+- * @isLuks: boolean for luks lookup
+- *
+- * Helper function to create a secinfo to be used for secinfo consumers. This
+- * sets up encrypted data to be used with qemu's 'secret' object.
+- *
+- * Returns @secinfo on success, NULL on failure. Caller is responsible
+- * to eventually free @secinfo.
+- */
+-static qemuDomainSecretInfoPtr
+-qemuDomainSecretInfoNew(qemuDomainObjPrivatePtr priv,
+-                        const char *srcAlias,
+-                        virSecretUsageType usageType,
+-                        const char *username,
+-                        virSecretLookupTypeDefPtr lookupDef,
+-                        bool isLuks)
+-{
+-    return qemuDomainSecretAESSetupFromSecret(priv, srcAlias, usageType, username,
+-                                              lookupDef, isLuks);
+-}
+-
+-
+ /**
+  * qemuDomainSecretInfoTLSNew:
+  * @priv: pointer to domain private object
+@@ -1722,9 +1695,9 @@ qemuDomainSecretInfoTLSNew(qemuDomainObjPrivatePtr priv,
+     }
+     seclookupdef.type = VIR_SECRET_LOOKUP_TYPE_UUID;
+ 
+-    return qemuDomainSecretInfoNew(priv, srcAlias,
+-                                   VIR_SECRET_USAGE_TYPE_TLS, NULL,
+-                                   &seclookupdef, false);
++    return qemuDomainSecretAESSetupFromSecret(priv, srcAlias,
++                                              VIR_SECRET_USAGE_TYPE_TLS,
++                                              NULL, &seclookupdef, false);
+ }
+ 
+ 
+@@ -1814,11 +1787,11 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+                                                             src->auth->username,
+                                                             &src->auth->seclookupdef);
+         } else {
+-            srcPriv->secinfo = qemuDomainSecretInfoNew(priv, authalias,
+-                                                       usageType,
+-                                                       src->auth->username,
+-                                                       &src->auth->seclookupdef,
+-                                                       false);
++            srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, authalias,
++                                                                  usageType,
++                                                                  src->auth->username,
++                                                                  &src->auth->seclookupdef,
++                                                                  false);
+         }
+ 
+         if (!srcPriv->secinfo)
+@@ -1826,11 +1799,11 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+     }
+ 
+     if (hasEnc) {
+-        if (!(srcPriv->encinfo =
+-              qemuDomainSecretInfoNew(priv, encalias,
+-                                      VIR_SECRET_USAGE_TYPE_VOLUME, NULL,
+-                                      &src->encryption->secrets[0]->seclookupdef,
+-                                      true)))
++        if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, encalias,
++                                                                    VIR_SECRET_USAGE_TYPE_VOLUME,
++                                                                    NULL,
++                                                                    &src->encryption->secrets[0]->seclookupdef,
++                                                                    true)))
+               return -1;
+     }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-Revert-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch b/SOURCES/libvirt-Revert-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
deleted file mode 100644
index 600d63a..0000000
--- a/SOURCES/libvirt-Revert-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 195908ad66fc52643d94eca0f45e5740f25e3e78 Mon Sep 17 00:00:00 2001
-Message-Id: <195908ad66fc52643d94eca0f45e5740f25e3e78@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Fri, 1 Feb 2019 20:29:26 -0500
-Subject: [PATCH] Revert "RHEL: network: regain guest network connectivity
- after firewalld switch to nftables"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 54e270d7fb68b41002654374d395e4f260a24add.
-
-This patch appeared in libvirt-4.5.0-11.el8 (RHEL git commit id
-2fb53957). It was a downstream-only temporary fix to the networking
-issues resulting from firewalld's switch to using nftables. Now that
-there is a permanent fix upstream we can revert this patch and use the
-upstream patches instead.
-
-https://bugzilla.redhat.com/1650320
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- libvirt.spec.in             | 14 --------------
- src/network/Makefile.inc.am | 10 +---------
- src/network/libvirt.zone    | 15 ---------------
- 3 files changed, 1 insertion(+), 38 deletions(-)
- delete mode 100644 src/network/libvirt.zone
-
-diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
-index 20d899e699..508c8c0422 100644
---- a/src/network/Makefile.inc.am
-+++ b/src/network/Makefile.inc.am
-@@ -87,11 +87,6 @@ install-data-network:
- 	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
- 	  rm -f default.xml && \
- 	  $(LN_S) ../default.xml default.xml )
--if HAVE_FIREWALLD
--	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
--	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
--	  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
--endif HAVE_FIREWALLD
- 
- uninstall-data-network:
- 	rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
-@@ -100,13 +95,10 @@ uninstall-data-network:
- 	rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
- 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
- 	rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
--if HAVE_FIREWALLD
--	rm -f  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
--endif HAVE_FIREWALLD
- 
- endif WITH_NETWORK
- 
--EXTRA_DIST += network/default.xml network/libvirt.zone
-+EXTRA_DIST += network/default.xml
- 
- .PHONY: \
- 	install-data-network \
-diff --git a/src/network/libvirt.zone b/src/network/libvirt.zone
-deleted file mode 100644
-index 355a70b4da..0000000000
---- a/src/network/libvirt.zone
-+++ /dev/null
-@@ -1,15 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--<zone target="ACCEPT">
--  <short>libvirt</short>
--  <description>All network connections are accepted. This also permits packets to/from interfaces in the zone to be forwarded. This zone is intended to be used only by libvirt virtual networks.</description>
--  <interface name="virbr0"/>
--  <interface name="virbr1"/>
--  <interface name="virbr2"/>
--  <interface name="virbr3"/>
--  <interface name="virbr4"/>
--  <interface name="virbr5"/>
--  <interface name="virbr6"/>
--  <interface name="virbr7"/>
--  <interface name="virbr8"/>
--  <interface name="virbr9"/>
--</zone>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-Revert-Separate-out-StateAutoStart-from-StateInitialize.patch b/SOURCES/libvirt-Revert-Separate-out-StateAutoStart-from-StateInitialize.patch
deleted file mode 100644
index abec5aa..0000000
--- a/SOURCES/libvirt-Revert-Separate-out-StateAutoStart-from-StateInitialize.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 8069bb50b2548acd3f2176499ede205e6099c067 Mon Sep 17 00:00:00 2001
-Message-Id: <8069bb50b2548acd3f2176499ede205e6099c067@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:18:17 +0200
-Subject: [PATCH] Revert "Separate out StateAutoStart from StateInitialize"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit e4a969092bda5b3b952963fdf6658895165040b7.
-
-Now that drivers may call virConnectOpen() on secondary drivers, it
-doesn't make much sense to have autostart separated from driver
-initialization callback. In fact, it creates a problem because one
-driver during its initialization might try to fetch an object from
-another driver but since the object is yet to be autostarted the fetch
-fails. This has been observed in reality: qemu driver performs
-qemuProcessReconnect() during qemu's stateInitialize phase which may
-call virDomainDiskTranslateSourcePool() which connects to the storage
-driver to look up the volume. But the storage driver did not autostart
-its pools yet therefore volume lookup fails and the domain is killed.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 07a9c8bae8b80ef1650e6d05869cbf55c6aea837)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1685151
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <4ed5f8f4edd0053cc14f4bb579a945b606b36f5a.1561641375.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/driver-state.h |  4 ----
- src/libvirt.c      | 14 +-------------
- 2 files changed, 1 insertion(+), 17 deletions(-)
-
-diff --git a/src/driver-state.h b/src/driver-state.h
-index 1cb3e4faf3..e1e060bcc5 100644
---- a/src/driver-state.h
-+++ b/src/driver-state.h
-@@ -30,9 +30,6 @@ typedef int
-                          virStateInhibitCallback callback,
-                          void *opaque);
- 
--typedef void
--(*virDrvStateAutoStart)(void);
--
- typedef int
- (*virDrvStateCleanup)(void);
- 
-@@ -48,7 +45,6 @@ typedef virStateDriver *virStateDriverPtr;
- struct _virStateDriver {
-     const char *name;
-     virDrvStateInitialize stateInitialize;
--    virDrvStateAutoStart stateAutoStart;
-     virDrvStateCleanup stateCleanup;
-     virDrvStateReload stateReload;
-     virDrvStateStop stateStop;
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 52f4dd2808..c9e5f47fd4 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -637,11 +637,7 @@ virRegisterStateDriver(virStateDriverPtr driver)
-  * @callback: callback to invoke to inhibit shutdown of the daemon
-  * @opaque: data to pass to @callback
-  *
-- * Initialize all virtualization drivers. Accomplished in two phases,
-- * the first being state and structure initialization followed by any
-- * auto start supported by the driver.  This is done to ensure dependencies
-- * that some drivers may have on another driver having been initialized
-- * will exist, such as the storage driver's need to use the secret driver.
-+ * Initialize all virtualization drivers.
-  *
-  * Returns 0 if all succeed, -1 upon any failure.
-  */
-@@ -669,14 +665,6 @@ virStateInitialize(bool privileged,
-             }
-         }
-     }
--
--    for (i = 0; i < virStateDriverTabCount; i++) {
--        if (virStateDriverTab[i]->stateAutoStart) {
--            VIR_DEBUG("Running global auto start for %s state driver",
--                      virStateDriverTab[i]->name);
--            virStateDriverTab[i]->stateAutoStart();
--        }
--    }
-     return 0;
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-Revert-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch b/SOURCES/libvirt-Revert-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
deleted file mode 100644
index 546facb..0000000
--- a/SOURCES/libvirt-Revert-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 6af885a53e425b88c7d9c123f64bbc4f8517b8a8 Mon Sep 17 00:00:00 2001
-Message-Id: <6af885a53e425b88c7d9c123f64bbc4f8517b8a8@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Thu, 15 Nov 2018 06:43:58 -0500
-Subject: [PATCH] Revert "access: Modify the VIR_ERR_ACCESS_DENIED to include
- driverName"
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1631608 (RHEL8)
-https://bugzilla.redhat.com/show_bug.cgi?id=1631606 (RHEL7)
-
-This reverts commit ccc72d5cbdd85f66cb737134b3be40aac1df03ef.
-
-Based on upstream comment to a follow-up patch, this didn't take the
-right approach and the right thing to do is revert and rework.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit b08396a5feab02fb3bb595603c888ee733aa178e)
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/access/viraccessmanager.c | 25 ++++++++++++-------------
- src/rpc/gendispatch.pl        |  2 +-
- src/util/virerror.c           |  4 ++--
- 3 files changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c
-index 1dfff32b9d..e7b5bf38da 100644
---- a/src/access/viraccessmanager.c
-+++ b/src/access/viraccessmanager.c
-@@ -196,12 +196,11 @@ static void virAccessManagerDispose(void *object)
-  * should the admin need to debug things
-  */
- static int
--virAccessManagerSanitizeError(int ret,
--                              const char *driverName)
-+virAccessManagerSanitizeError(int ret)
- {
-     if (ret < 0) {
-         virResetLastError();
--        virAccessError(VIR_ERR_ACCESS_DENIED, driverName, NULL);
-+        virAccessError(VIR_ERR_ACCESS_DENIED, NULL);
-     }
- 
-     return ret;
-@@ -218,7 +217,7 @@ int virAccessManagerCheckConnect(virAccessManagerPtr manager,
-     if (manager->drv->checkConnect)
-         ret = manager->drv->checkConnect(manager, driverName, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- 
-@@ -234,7 +233,7 @@ int virAccessManagerCheckDomain(virAccessManagerPtr manager,
-     if (manager->drv->checkDomain)
-         ret = manager->drv->checkDomain(manager, driverName, domain, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckInterface(virAccessManagerPtr manager,
-@@ -249,7 +248,7 @@ int virAccessManagerCheckInterface(virAccessManagerPtr manager,
-     if (manager->drv->checkInterface)
-         ret = manager->drv->checkInterface(manager, driverName, iface, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckNetwork(virAccessManagerPtr manager,
-@@ -264,7 +263,7 @@ int virAccessManagerCheckNetwork(virAccessManagerPtr manager,
-     if (manager->drv->checkNetwork)
-         ret = manager->drv->checkNetwork(manager, driverName, network, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager,
-@@ -279,7 +278,7 @@ int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager,
-     if (manager->drv->checkNodeDevice)
-         ret = manager->drv->checkNodeDevice(manager, driverName, nodedev, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckNWFilter(virAccessManagerPtr manager,
-@@ -294,7 +293,7 @@ int virAccessManagerCheckNWFilter(virAccessManagerPtr manager,
-     if (manager->drv->checkNWFilter)
-         ret = manager->drv->checkNWFilter(manager, driverName, nwfilter, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager,
-@@ -309,7 +308,7 @@ int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager,
-     if (manager->drv->checkNWFilterBinding)
-         ret = manager->drv->checkNWFilterBinding(manager, driverName, binding, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckSecret(virAccessManagerPtr manager,
-@@ -324,7 +323,7 @@ int virAccessManagerCheckSecret(virAccessManagerPtr manager,
-     if (manager->drv->checkSecret)
-         ret = manager->drv->checkSecret(manager, driverName, secret, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckStoragePool(virAccessManagerPtr manager,
-@@ -339,7 +338,7 @@ int virAccessManagerCheckStoragePool(virAccessManagerPtr manager,
-     if (manager->drv->checkStoragePool)
-         ret = manager->drv->checkStoragePool(manager, driverName, pool, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
- 
- int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
-@@ -355,5 +354,5 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
-     if (manager->drv->checkStorageVol)
-         ret = manager->drv->checkStorageVol(manager, driverName, pool, vol, perm);
- 
--    return virAccessManagerSanitizeError(ret, driverName);
-+    return virAccessManagerSanitizeError(ret);
- }
-diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
-index f599002056..0c4648c0fb 100755
---- a/src/rpc/gendispatch.pl
-+++ b/src/rpc/gendispatch.pl
-@@ -2199,7 +2199,7 @@ elsif ($mode eq "client") {
-                     print "        virObjectUnref(mgr);\n";
-                     if ($action eq "Ensure") {
-                         print "        if (rv == 0)\n";
--                        print "            virReportError(VIR_ERR_ACCESS_DENIED, conn->driver->name, NULL);\n";
-+                        print "            virReportError(VIR_ERR_ACCESS_DENIED, NULL);\n";
-                         print "        return $fail;\n";
-                     } else {
-                         print "        virResetLastError();\n";
-diff --git a/src/util/virerror.c b/src/util/virerror.c
-index 5f50fa0349..f198f27957 100644
---- a/src/util/virerror.c
-+++ b/src/util/virerror.c
-@@ -1439,9 +1439,9 @@ virErrorMsg(virErrorNumber error, const char *info)
-             break;
-         case VIR_ERR_ACCESS_DENIED:
-             if (info == NULL)
--                errmsg = _("access denied from '%s'");
-+                errmsg = _("access denied");
-             else
--                errmsg = _("access denied from '%s': %s");
-+                errmsg = _("access denied: %s");
-             break;
-         case VIR_ERR_DBUS_SERVICE:
-             if (info == NULL)
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-Revert-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch b/SOURCES/libvirt-Revert-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
deleted file mode 100644
index 796cc2e..0000000
--- a/SOURCES/libvirt-Revert-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 2395bf301cf76ffa863a3c2e125d52345cfbf6b5 Mon Sep 17 00:00:00 2001
-Message-Id: <2395bf301cf76ffa863a3c2e125d52345cfbf6b5@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:23 +0200
-Subject: [PATCH] Revert "util: vircgroup: pass parent cgroup into
- virCgroupDetectControllersCB"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 7bca1c9bdc85247446129f856e27c80a32819e17.
-
-As it turns out it's not a good idea on systemd hosts.  The root
-cgroup can have all controllers enabled but they don't have to be
-enabled for sub-cgroups.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit d117431143d5b6dcfc8fae4a6b3fae23881d0937)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <754b0ac5a0f1bd21e79eaeb71f6d2ab811446168.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  2 +-
- src/util/vircgroupbackend.h |  3 +--
- src/util/vircgroupv1.c      |  3 +--
- src/util/vircgroupv2.c      | 17 ++++++-----------
- 4 files changed, 9 insertions(+), 16 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index ff2a0b75b5..a7fb595bce 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -412,7 +412,7 @@ virCgroupDetect(virCgroupPtr group,
- 
-     for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-         if (group->backends[i]) {
--            int rc = group->backends[i]->detectControllers(group, controllers, parent);
-+            int rc = group->backends[i]->detectControllers(group, controllers);
-             if (rc < 0)
-                 return -1;
-             controllersAvailable |= rc;
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 05af118ec1..a825dc4be7 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -96,8 +96,7 @@ typedef char *
- 
- typedef int
- (*virCgroupDetectControllersCB)(virCgroupPtr group,
--                                int controllers,
--                                virCgroupPtr parent);
-+                                int controllers);
- 
- typedef bool
- (*virCgroupHasControllerCB)(virCgroupPtr cgroup,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 5b218c7f78..58bd20d636 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -419,8 +419,7 @@ virCgroupV1StealPlacement(virCgroupPtr group)
- 
- static int
- virCgroupV1DetectControllers(virCgroupPtr group,
--                             int controllers,
--                             virCgroupPtr parent ATTRIBUTE_UNUSED)
-+                             int controllers)
- {
-     size_t i;
-     size_t j;
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index bdeab397a3..b0ed889cc8 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -285,21 +285,16 @@ virCgroupV2ParseControllersFile(virCgroupPtr group)
- 
- static int
- virCgroupV2DetectControllers(virCgroupPtr group,
--                             int controllers,
--                             virCgroupPtr parent)
-+                             int controllers)
- {
-     size_t i;
- 
--    if (parent) {
--        group->unified.controllers = parent->unified.controllers;
--    } else {
--        if (virCgroupV2ParseControllersFile(group) < 0)
--            return -1;
-+    if (virCgroupV2ParseControllersFile(group) < 0)
-+        return -1;
- 
--        /* In cgroup v2 there is no cpuacct controller, the cpu.stat file always
--         * exists with usage stats. */
--        group->unified.controllers |= 1 << VIR_CGROUP_CONTROLLER_CPUACCT;
--    }
-+    /* In cgroup v2 there is no cpuacct controller, the cpu.stat file always
-+     * exists with usage stats. */
-+    group->unified.controllers |= 1 << VIR_CGROUP_CONTROLLER_CPUACCT;
- 
-     if (controllers >= 0)
-         group->unified.controllers &= controllers;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-Revert-virStateDriver-Separate-AutoStart-from-Initialize.patch b/SOURCES/libvirt-Revert-virStateDriver-Separate-AutoStart-from-Initialize.patch
deleted file mode 100644
index 45fdd94..0000000
--- a/SOURCES/libvirt-Revert-virStateDriver-Separate-AutoStart-from-Initialize.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 799c9dd37390878a54be303b3e3e27445049bf2b Mon Sep 17 00:00:00 2001
-Message-Id: <799c9dd37390878a54be303b3e3e27445049bf2b@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:18:16 +0200
-Subject: [PATCH] Revert "virStateDriver - Separate AutoStart from Initialize"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit cefb97fb815c81fc882da752f45effd23bcb9b4b.
-
-The stateAutoStart callback will be removed in the next commit.
-Therefore move autostarting of domains, networks and storage
-pools back into stateInitialize callbacks.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fc380c2e018ae15347d4c281a7e74896c48cac4a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1685151
-
-The difference to the upstream commit is uml driver change. In
-upstream, the uml driver was dropped, but it's still kept around
-in downstream.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <a8e69f65b397c81c2a68597cca6c8ac04df24153.1561641375.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/libxl/libxl_driver.c     | 14 +++-----------
- src/lxc/lxc_driver.c         | 16 ++--------------
- src/network/bridge_driver.c  | 22 ++++------------------
- src/qemu/qemu_driver.c       | 17 ++---------------
- src/storage/storage_driver.c | 19 ++-----------------
- src/uml/uml_driver.c         | 17 ++---------------
- 6 files changed, 15 insertions(+), 90 deletions(-)
-
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 5a5e792957..99bb010af4 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -773,6 +773,9 @@ libxlStateInitialize(bool privileged,
-                                        NULL, NULL) < 0)
-         goto error;
- 
-+    virDomainObjListForEach(libxl_driver->domains, libxlAutostartDomain,
-+                            libxl_driver);
-+
-     virDomainObjListForEach(libxl_driver->domains, libxlDomainManagedSaveLoad,
-                             libxl_driver);
- 
-@@ -784,16 +787,6 @@ libxlStateInitialize(bool privileged,
-     return -1;
- }
- 
--static void
--libxlStateAutoStart(void)
--{
--    if (!libxl_driver)
--        return;
--
--    virDomainObjListForEach(libxl_driver->domains, libxlAutostartDomain,
--                            libxl_driver);
--}
--
- static int
- libxlStateReload(void)
- {
-@@ -6479,7 +6472,6 @@ static virConnectDriver libxlConnectDriver = {
- static virStateDriver libxlStateDriver = {
-     .name = "LIBXL",
-     .stateInitialize = libxlStateInitialize,
--    .stateAutoStart = libxlStateAutoStart,
-     .stateCleanup = libxlStateCleanup,
-     .stateReload = libxlStateReload,
- };
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index f9794e0655..527fa72083 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -1646,6 +1646,8 @@ static int lxcStateInitialize(bool privileged,
-                                        NULL, NULL) < 0)
-         goto cleanup;
- 
-+    virLXCProcessAutostartAll(lxc_driver);
-+
-     virObjectUnref(caps);
-     return 0;
- 
-@@ -1655,19 +1657,6 @@ static int lxcStateInitialize(bool privileged,
-     return -1;
- }
- 
--/**
-- * lxcStateAutoStart:
-- *
-- * Function to autostart the LXC daemons
-- */
--static void lxcStateAutoStart(void)
--{
--    if (!lxc_driver)
--        return;
--
--    virLXCProcessAutostartAll(lxc_driver);
--}
--
- static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
- {
-     virLXCDriverPtr driver = opaque;
-@@ -5550,7 +5539,6 @@ static virConnectDriver lxcConnectDriver = {
- static virStateDriver lxcStateDriver = {
-     .name = LXC_DRIVER_NAME,
-     .stateInitialize = lxcStateInitialize,
--    .stateAutoStart = lxcStateAutoStart,
-     .stateCleanup = lxcStateCleanup,
-     .stateReload = lxcStateReload,
- };
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index d153a8cdb6..a60d7db685 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -755,6 +755,10 @@ networkStateInitialize(bool privileged,
-     networkReloadFirewallRules(network_driver);
-     networkRefreshDaemons(network_driver);
- 
-+    virNetworkObjListForEach(network_driver->networks,
-+                             networkAutostartConfig,
-+                             network_driver);
-+
-     network_driver->networkEventState = virObjectEventStateNew();
- 
- #ifdef WITH_FIREWALLD
-@@ -794,23 +798,6 @@ networkStateInitialize(bool privileged,
- }
- 
- 
--/**
-- * networkStateAutoStart:
-- *
-- * Function to AutoStart the bridge configs
-- */
--static void
--networkStateAutoStart(void)
--{
--    if (!network_driver)
--        return;
--
--    virNetworkObjListForEach(network_driver->networks,
--                             networkAutostartConfig,
--                             network_driver);
--}
--
--
- /**
-  * networkStateReload:
-  *
-@@ -5616,7 +5603,6 @@ static virConnectDriver networkConnectDriver = {
- static virStateDriver networkStateDriver = {
-     .name = "bridge",
-     .stateInitialize  = networkStateInitialize,
--    .stateAutoStart  = networkStateAutoStart,
-     .stateCleanup = networkStateCleanup,
-     .stateReload = networkStateReload,
- };
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 2da87992fd..056d324a62 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -911,6 +911,8 @@ qemuStateInitialize(bool privileged,
- 
-     qemuProcessReconnectAll(qemu_driver);
- 
-+    qemuAutostartDomains(qemu_driver);
-+
-     return 0;
- 
-  error:
-@@ -921,20 +923,6 @@ qemuStateInitialize(bool privileged,
-     return -1;
- }
- 
--/**
-- * qemuStateAutoStart:
-- *
-- * Function to auto start the QEMU daemons
-- */
--static void
--qemuStateAutoStart(void)
--{
--    if (!qemu_driver)
--        return;
--
--    qemuAutostartDomains(qemu_driver);
--}
--
- static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
- {
-     virQEMUDriverPtr driver = opaque;
-@@ -21846,7 +21834,6 @@ static virConnectDriver qemuConnectDriver = {
- static virStateDriver qemuStateDriver = {
-     .name = QEMU_DRIVER_NAME,
-     .stateInitialize = qemuStateInitialize,
--    .stateAutoStart = qemuStateAutoStart,
-     .stateCleanup = qemuStateCleanup,
-     .stateReload = qemuStateReload,
-     .stateStop = qemuStateStop,
-diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
-index 254818e308..f61fb074e6 100644
---- a/src/storage/storage_driver.c
-+++ b/src/storage/storage_driver.c
-@@ -291,6 +291,8 @@ storageStateInitialize(bool privileged,
- 
-     storagePoolUpdateAllState();
- 
-+    storageDriverAutostart();
-+
-     driver->storageEventState = virObjectEventStateNew();
- 
-     storageDriverUnlock();
-@@ -307,22 +309,6 @@ storageStateInitialize(bool privileged,
-     goto cleanup;
- }
- 
--/**
-- * storageStateAutoStart:
-- *
-- * Function to auto start the storage driver
-- */
--static void
--storageStateAutoStart(void)
--{
--    if (!driver)
--        return;
--
--    storageDriverLock();
--    storageDriverAutostart();
--    storageDriverUnlock();
--}
--
- /**
-  * storageStateReload:
-  *
-@@ -2843,7 +2829,6 @@ static virConnectDriver storageConnectDriver = {
- static virStateDriver stateDriver = {
-     .name = "storage",
-     .stateInitialize = storageStateInitialize,
--    .stateAutoStart = storageStateAutoStart,
-     .stateCleanup = storageStateCleanup,
-     .stateReload = storageStateReload,
- };
-diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
-index c77988f01e..296adf55d1 100644
---- a/src/uml/uml_driver.c
-+++ b/src/uml/uml_driver.c
-@@ -575,6 +575,8 @@ umlStateInitialize(bool privileged,
- 
-     umlDriverUnlock(uml_driver);
- 
-+    umlAutostartConfigs(uml_driver);
-+
-     VIR_FREE(userdir);
- 
-     return 0;
-@@ -590,20 +592,6 @@ umlStateInitialize(bool privileged,
-     return -1;
- }
- 
--/**
-- * umlStateAutoStart:
-- *
-- * Function to autostart the Uml daemons
-- */
--static void
--umlStateAutoStart(void)
--{
--    if (!uml_driver)
--        return;
--
--    umlAutostartConfigs(uml_driver);
--}
--
- static void umlNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
- {
-     struct uml_driver *driver = opaque;
-@@ -2826,7 +2814,6 @@ static virConnectDriver umlConnectDriver = {
- static virStateDriver umlStateDriver = {
-     .name = "UML",
-     .stateInitialize = umlStateInitialize,
--    .stateAutoStart = umlStateAutoStart,
-     .stateCleanup = umlStateCleanup,
-     .stateReload = umlStateReload,
- };
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-Revert-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch b/SOURCES/libvirt-Revert-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
deleted file mode 100644
index 44f72a9..0000000
--- a/SOURCES/libvirt-Revert-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From ddea95c1c2e32c6454c89aa83d78b26a83564cd4 Mon Sep 17 00:00:00 2001
-Message-Id: <ddea95c1c2e32c6454c89aa83d78b26a83564cd4@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:11 +0200
-Subject: [PATCH] Revert "vircgroup: cleanup controllers not managed by systemd
- on error"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 1602aa28f820ada66f707cef3e536e8572fbda1e.
-
-There is no need to call virCgroupRemove() nor virCgroupFree() if
-virCgroupEnableMissingControllers() fails because it will not modify
-'group' at all.
-
-The cleanup of directories is done in virCgroupMakeGroup().
-
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 199eee6aae7af3d813fbe98660c7e0fa1a8ae7b7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <53288dd310e0305ac3179693e64684eb8b3a31ab.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 25 ++++++++++---------------
- 1 file changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a376b9b89a..7ec1399bc6 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1059,7 +1059,6 @@ virCgroupNewMachineSystemd(const char *name,
-     int rv;
-     virCgroupPtr init;
-     VIR_AUTOFREE(char *) path = NULL;
--    virErrorPtr saved = NULL;
- 
-     VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
-     if ((rv = virSystemdCreateMachine(name,
-@@ -1092,24 +1091,20 @@ virCgroupNewMachineSystemd(const char *name,
- 
-     if (virCgroupEnableMissingControllers(path, pidleader,
-                                           controllers, group) < 0) {
--        goto error;
-+        return -1;
-     }
- 
--    if (virCgroupAddProcess(*group, pidleader) < 0)
--        goto error;
-+    if (virCgroupAddProcess(*group, pidleader) < 0) {
-+        virErrorPtr saved = virSaveLastError();
-+        virCgroupRemove(*group);
-+        virCgroupFree(group);
-+        if (saved) {
-+            virSetError(saved);
-+            virFreeError(saved);
-+        }
-+    }
- 
-     return 0;
--
-- error:
--    saved = virSaveLastError();
--    virCgroupRemove(*group);
--    virCgroupFree(group);
--    if (saved) {
--        virSetError(saved);
--        virFreeError(saved);
--    }
--
--    return -1;
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-access-Fix-nwfilter-binding-ACL-access-API-name-generation.patch b/SOURCES/libvirt-access-Fix-nwfilter-binding-ACL-access-API-name-generation.patch
deleted file mode 100644
index 4b53a50..0000000
--- a/SOURCES/libvirt-access-Fix-nwfilter-binding-ACL-access-API-name-generation.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 254da75ea1a9c2cade909534153f444bb8981c2a Mon Sep 17 00:00:00 2001
-Message-Id: <254da75ea1a9c2cade909534153f444bb8981c2a@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 27 Aug 2018 08:27:47 -0400
-Subject: [PATCH] access: Fix nwfilter-binding ACL access API name generation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1611320
-
-Generation of the ACL API policy is a "automated process"
-based on this perl script which "worked" with the changes to
-add nwfilter binding API's because they had the "nwfilter"
-prefix; however, the generated output name was incorrect
-based on the remote protocol algorithm which expected to
-generate names such as 'nwfilter-binding.action' instead
-of 'nwfilter.binding-action'.
-
-This effectively changes src/access/org.libvirt.api.policy entries:
-
-  org.libvirt.api.nwfilter.binding-create ==>
-      org.libvirt.api.nwfilter-binding.create
-
-  org.libvirt.api.nwfilter.binding-delete ==>
-      org.libvirt.api.nwfilter-binding.delete
-
-  org.libvirt.api.nwfilter.binding-getattr ==>
-      org.libvirt.api.nwfilter-binding.getattr
-
-  org.libvirt.api.nwfilter.binding-read ==>
-      org.libvirt.api.nwfilter-binding.read
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 6ef65e3c96d5d1f16a16daca83b81b818d461e64)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1622540
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/access/genpolkit.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/access/genpolkit.pl b/src/access/genpolkit.pl
-index 968cb8c55c..e074c90eb6 100755
---- a/src/access/genpolkit.pl
-+++ b/src/access/genpolkit.pl
-@@ -22,8 +22,8 @@ use warnings;
- 
- my @objects = (
-     "CONNECT", "DOMAIN", "INTERFACE",
--    "NETWORK","NODE_DEVICE", "NWFILTER",
--     "SECRET", "STORAGE_POOL", "STORAGE_VOL",
-+    "NETWORK","NODE_DEVICE", "NWFILTER_BINDING", "NWFILTER",
-+    "SECRET", "STORAGE_POOL", "STORAGE_VOL",
-     );
- 
- my $objects = join ("|", @objects);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch b/SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
deleted file mode 100644
index a47583c..0000000
--- a/SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 85750b0466aa3719d3d2447abaab2e87db92f552 Mon Sep 17 00:00:00 2001
-Message-Id: <85750b0466aa3719d3d2447abaab2e87db92f552@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 5 Nov 2018 07:48:37 -0500
-Subject: [PATCH] access: Modify the VIR_ERR_ACCESS_DENIED to include
- driverName
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1631608 (RHEL 8.0)
-https://bugzilla.redhat.com/show_bug.cgi?id=1631606 (RHEL 7.7)
-
-Changes made to manage and utilize a secondary connection
-driver to APIs outside the scope of the primary connection
-driver have resulted in some confusion processing polkit rules
-since the simple "access denied" error message doesn't provide
-enough of a clue when combined with the "authentication failed:
-access denied by policy" as to which connection driver refused
-or failed the ACL check.
-
-In order to provide some context, let's modify the existing
-"access denied" error returne from the various vir*EnsureACL
-API's to provide the connection driver name that is causing
-the failure. This should provide the context for writing the
-polkit rules that would allow access via the driver.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit ccc72d5cbdd85f66cb737134b3be40aac1df03ef)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/access/viraccessmanager.c | 25 +++++++++++++------------
- src/rpc/gendispatch.pl        |  2 +-
- src/util/virerror.c           |  4 ++--
- 3 files changed, 16 insertions(+), 15 deletions(-)
-
-diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c
-index e7b5bf38da..1dfff32b9d 100644
---- a/src/access/viraccessmanager.c
-+++ b/src/access/viraccessmanager.c
-@@ -196,11 +196,12 @@ static void virAccessManagerDispose(void *object)
-  * should the admin need to debug things
-  */
- static int
--virAccessManagerSanitizeError(int ret)
-+virAccessManagerSanitizeError(int ret,
-+                              const char *driverName)
- {
-     if (ret < 0) {
-         virResetLastError();
--        virAccessError(VIR_ERR_ACCESS_DENIED, NULL);
-+        virAccessError(VIR_ERR_ACCESS_DENIED, driverName, NULL);
-     }
- 
-     return ret;
-@@ -217,7 +218,7 @@ int virAccessManagerCheckConnect(virAccessManagerPtr manager,
-     if (manager->drv->checkConnect)
-         ret = manager->drv->checkConnect(manager, driverName, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- 
-@@ -233,7 +234,7 @@ int virAccessManagerCheckDomain(virAccessManagerPtr manager,
-     if (manager->drv->checkDomain)
-         ret = manager->drv->checkDomain(manager, driverName, domain, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckInterface(virAccessManagerPtr manager,
-@@ -248,7 +249,7 @@ int virAccessManagerCheckInterface(virAccessManagerPtr manager,
-     if (manager->drv->checkInterface)
-         ret = manager->drv->checkInterface(manager, driverName, iface, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNetwork(virAccessManagerPtr manager,
-@@ -263,7 +264,7 @@ int virAccessManagerCheckNetwork(virAccessManagerPtr manager,
-     if (manager->drv->checkNetwork)
-         ret = manager->drv->checkNetwork(manager, driverName, network, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager,
-@@ -278,7 +279,7 @@ int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager,
-     if (manager->drv->checkNodeDevice)
-         ret = manager->drv->checkNodeDevice(manager, driverName, nodedev, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNWFilter(virAccessManagerPtr manager,
-@@ -293,7 +294,7 @@ int virAccessManagerCheckNWFilter(virAccessManagerPtr manager,
-     if (manager->drv->checkNWFilter)
-         ret = manager->drv->checkNWFilter(manager, driverName, nwfilter, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager,
-@@ -308,7 +309,7 @@ int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager,
-     if (manager->drv->checkNWFilterBinding)
-         ret = manager->drv->checkNWFilterBinding(manager, driverName, binding, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckSecret(virAccessManagerPtr manager,
-@@ -323,7 +324,7 @@ int virAccessManagerCheckSecret(virAccessManagerPtr manager,
-     if (manager->drv->checkSecret)
-         ret = manager->drv->checkSecret(manager, driverName, secret, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckStoragePool(virAccessManagerPtr manager,
-@@ -338,7 +339,7 @@ int virAccessManagerCheckStoragePool(virAccessManagerPtr manager,
-     if (manager->drv->checkStoragePool)
-         ret = manager->drv->checkStoragePool(manager, driverName, pool, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
-@@ -354,5 +355,5 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
-     if (manager->drv->checkStorageVol)
-         ret = manager->drv->checkStorageVol(manager, driverName, pool, vol, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
-diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
-index 0c4648c0fb..f599002056 100755
---- a/src/rpc/gendispatch.pl
-+++ b/src/rpc/gendispatch.pl
-@@ -2199,7 +2199,7 @@ elsif ($mode eq "client") {
-                     print "        virObjectUnref(mgr);\n";
-                     if ($action eq "Ensure") {
-                         print "        if (rv == 0)\n";
--                        print "            virReportError(VIR_ERR_ACCESS_DENIED, NULL);\n";
-+                        print "            virReportError(VIR_ERR_ACCESS_DENIED, conn->driver->name, NULL);\n";
-                         print "        return $fail;\n";
-                     } else {
-                         print "        virResetLastError();\n";
-diff --git a/src/util/virerror.c b/src/util/virerror.c
-index f198f27957..5f50fa0349 100644
---- a/src/util/virerror.c
-+++ b/src/util/virerror.c
-@@ -1439,9 +1439,9 @@ virErrorMsg(virErrorNumber error, const char *info)
-             break;
-         case VIR_ERR_ACCESS_DENIED:
-             if (info == NULL)
--                errmsg = _("access denied");
-+                errmsg = _("access denied from '%s'");
-             else
--                errmsg = _("access denied: %s");
-+                errmsg = _("access denied from '%s': %s");
-             break;
-         case VIR_ERR_DBUS_SERVICE:
-             if (info == NULL)
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName_1.patch b/SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName_1.patch
deleted file mode 100644
index dc0cb0a..0000000
--- a/SOURCES/libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName_1.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 541a154e0f98604f63cb22356287dfa3858748c9 Mon Sep 17 00:00:00 2001
-Message-Id: <541a154e0f98604f63cb22356287dfa3858748c9@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Thu, 15 Nov 2018 06:43:59 -0500
-Subject: [PATCH] access: Modify the VIR_ERR_ACCESS_DENIED to include
- driverName
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1631608 (RHEL8)
-https://bugzilla.redhat.com/show_bug.cgi?id=1631606 (RHEL7)
-
-Changes made to manage and utilize a secondary connection
-driver to APIs outside the scope of the primary connection
-driver have resulted in some confusion processing polkit rules
-since the simple "access denied" error message doesn't provide
-enough of a clue when combined with the "authentication failed:
-access denied by policy" as to which connection driver refused
-or failed the ACL check.
-
-In order to provide some context, let's modify the existing
-"access denied" error returned from the various vir*EnsureACL
-API's to provide the connection driver name that is causing
-the failure. This should provide the context for writing the
-polkit rules that would allow access via the driver, but yet
-still adhere to the virAccessManagerSanitizeError commentary
-regarding not telling the user why access was denied.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 605496be609e153526fcdd3e98df8cf5244bc8fa)
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/access/viraccessmanager.c | 26 ++++++++++++++------------
- src/rpc/gendispatch.pl        |  3 ++-
- 2 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c
-index e7b5bf38da..f5d62604cf 100644
---- a/src/access/viraccessmanager.c
-+++ b/src/access/viraccessmanager.c
-@@ -196,11 +196,13 @@ static void virAccessManagerDispose(void *object)
-  * should the admin need to debug things
-  */
- static int
--virAccessManagerSanitizeError(int ret)
-+virAccessManagerSanitizeError(int ret,
-+                              const char *driverName)
- {
-     if (ret < 0) {
-         virResetLastError();
--        virAccessError(VIR_ERR_ACCESS_DENIED, NULL);
-+        virAccessError(VIR_ERR_ACCESS_DENIED,
-+                       _("'%s' denied access"), driverName);
-     }
- 
-     return ret;
-@@ -217,7 +219,7 @@ int virAccessManagerCheckConnect(virAccessManagerPtr manager,
-     if (manager->drv->checkConnect)
-         ret = manager->drv->checkConnect(manager, driverName, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- 
-@@ -233,7 +235,7 @@ int virAccessManagerCheckDomain(virAccessManagerPtr manager,
-     if (manager->drv->checkDomain)
-         ret = manager->drv->checkDomain(manager, driverName, domain, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckInterface(virAccessManagerPtr manager,
-@@ -248,7 +250,7 @@ int virAccessManagerCheckInterface(virAccessManagerPtr manager,
-     if (manager->drv->checkInterface)
-         ret = manager->drv->checkInterface(manager, driverName, iface, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNetwork(virAccessManagerPtr manager,
-@@ -263,7 +265,7 @@ int virAccessManagerCheckNetwork(virAccessManagerPtr manager,
-     if (manager->drv->checkNetwork)
-         ret = manager->drv->checkNetwork(manager, driverName, network, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager,
-@@ -278,7 +280,7 @@ int virAccessManagerCheckNodeDevice(virAccessManagerPtr manager,
-     if (manager->drv->checkNodeDevice)
-         ret = manager->drv->checkNodeDevice(manager, driverName, nodedev, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNWFilter(virAccessManagerPtr manager,
-@@ -293,7 +295,7 @@ int virAccessManagerCheckNWFilter(virAccessManagerPtr manager,
-     if (manager->drv->checkNWFilter)
-         ret = manager->drv->checkNWFilter(manager, driverName, nwfilter, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager,
-@@ -308,7 +310,7 @@ int virAccessManagerCheckNWFilterBinding(virAccessManagerPtr manager,
-     if (manager->drv->checkNWFilterBinding)
-         ret = manager->drv->checkNWFilterBinding(manager, driverName, binding, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckSecret(virAccessManagerPtr manager,
-@@ -323,7 +325,7 @@ int virAccessManagerCheckSecret(virAccessManagerPtr manager,
-     if (manager->drv->checkSecret)
-         ret = manager->drv->checkSecret(manager, driverName, secret, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckStoragePool(virAccessManagerPtr manager,
-@@ -338,7 +340,7 @@ int virAccessManagerCheckStoragePool(virAccessManagerPtr manager,
-     if (manager->drv->checkStoragePool)
-         ret = manager->drv->checkStoragePool(manager, driverName, pool, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
- 
- int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
-@@ -354,5 +356,5 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
-     if (manager->drv->checkStorageVol)
-         ret = manager->drv->checkStorageVol(manager, driverName, pool, vol, perm);
- 
--    return virAccessManagerSanitizeError(ret);
-+    return virAccessManagerSanitizeError(ret, driverName);
- }
-diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
-index 0c4648c0fb..a8b9f5aeca 100755
---- a/src/rpc/gendispatch.pl
-+++ b/src/rpc/gendispatch.pl
-@@ -2199,7 +2199,8 @@ elsif ($mode eq "client") {
-                     print "        virObjectUnref(mgr);\n";
-                     if ($action eq "Ensure") {
-                         print "        if (rv == 0)\n";
--                        print "            virReportError(VIR_ERR_ACCESS_DENIED, NULL);\n";
-+                        print "            virReportError(VIR_ERR_ACCESS_DENIED,\n";
-+                        print"                            _(\"'%s' denied access\"), conn->driver->name);\n";
-                         print "        return $fail;\n";
-                     } else {
-                         print "        virResetLastError();\n";
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-admin-reject-clients-unless-their-UID-matches-the-current-UID.patch b/SOURCES/libvirt-admin-reject-clients-unless-their-UID-matches-the-current-UID.patch
deleted file mode 100644
index a6c1113..0000000
--- a/SOURCES/libvirt-admin-reject-clients-unless-their-UID-matches-the-current-UID.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3eaa16967f0546c5d1596bb6c36767cbe01040b9 Mon Sep 17 00:00:00 2001
-Message-Id: <3eaa16967f0546c5d1596bb6c36767cbe01040b9@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 15 May 2019 21:40:56 +0100
-Subject: [PATCH] admin: reject clients unless their UID matches the current
- UID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The admin protocol RPC messages are only intended for use by the user
-running the daemon. As such they should not be allowed for any client
-UID that does not match the server UID.
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 96f41cd765c9e525fe28ee5abbfbf4a79b3720c7)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <20190515204058.28077-2-berrange@redhat.com>
----
- src/admin/admin_server_dispatch.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c
-index b78ff902c0..9f25813ae3 100644
---- a/src/admin/admin_server_dispatch.c
-+++ b/src/admin/admin_server_dispatch.c
-@@ -66,6 +66,28 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                    void *opaque)
- {
-     struct daemonAdmClientPrivate *priv;
-+    uid_t clientuid;
-+    gid_t clientgid;
-+    pid_t clientpid;
-+    unsigned long long timestamp;
-+
-+    if (virNetServerClientGetUNIXIdentity(client,
-+                                          &clientuid,
-+                                          &clientgid,
-+                                          &clientpid,
-+                                          &timestamp) < 0)
-+        return NULL;
-+
-+    VIR_DEBUG("New client pid %lld uid %lld",
-+              (long long)clientpid,
-+              (long long)clientuid);
-+
-+    if (geteuid() != clientuid) {
-+        virReportRestrictedError(_("Disallowing client %lld with uid %lld"),
-+                                 (long long)clientpid,
-+                                 (long long)clientuid);
-+        return NULL;
-+    }
- 
-     if (VIR_ALLOC(priv) < 0)
-         return NULL;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-api-disallow-virConnect-HypervisorCPU-on-read-only-connections.patch b/SOURCES/libvirt-api-disallow-virConnect-HypervisorCPU-on-read-only-connections.patch
deleted file mode 100644
index 70eecbc..0000000
--- a/SOURCES/libvirt-api-disallow-virConnect-HypervisorCPU-on-read-only-connections.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bab30af2d83e27d9141545cb9dcff51924e52b4d Mon Sep 17 00:00:00 2001
-Message-Id: <bab30af2d83e27d9141545cb9dcff51924e52b4d@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 18 Jun 2019 13:30:02 +0200
-Subject: [PATCH] api: disallow virConnect*HypervisorCPU on read-only
- connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These APIs can be used to execute arbitrary emulators.
-Forbid them on read-only connections.
-
-Fixes: CVE-2019-10168
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Message-Id: <470651092e7d6a4ba5875cf8885fd3714d5ea189.1560857354.git.jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/libvirt-host.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libvirt-host.c b/src/libvirt-host.c
-index e20d6ee250..2978825d22 100644
---- a/src/libvirt-host.c
-+++ b/src/libvirt-host.c
-@@ -1041,6 +1041,7 @@ virConnectCompareHypervisorCPU(virConnectPtr conn,
- 
-     virCheckConnectReturn(conn, VIR_CPU_COMPARE_ERROR);
-     virCheckNonNullArgGoto(xmlCPU, error);
-+    virCheckReadOnlyGoto(conn->flags, error);
- 
-     if (conn->driver->connectCompareHypervisorCPU) {
-         int ret;
-@@ -1234,6 +1235,7 @@ virConnectBaselineHypervisorCPU(virConnectPtr conn,
- 
-     virCheckConnectReturn(conn, NULL);
-     virCheckNonNullArgGoto(xmlCPUs, error);
-+    virCheckReadOnlyGoto(conn->flags, error);
- 
-     if (conn->driver->connectBaselineHypervisorCPU) {
-         char *cpu;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-api-disallow-virConnectGetDomainCapabilities-on-read-only-connections.patch b/SOURCES/libvirt-api-disallow-virConnectGetDomainCapabilities-on-read-only-connections.patch
deleted file mode 100644
index 6815a55..0000000
--- a/SOURCES/libvirt-api-disallow-virConnectGetDomainCapabilities-on-read-only-connections.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2b0e20b240848c84932aa549e8ec2b6e0a5646fa Mon Sep 17 00:00:00 2001
-Message-Id: <2b0e20b240848c84932aa549e8ec2b6e0a5646fa@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 18 Jun 2019 13:30:01 +0200
-Subject: [PATCH] api: disallow virConnectGetDomainCapabilities on read-only
- connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This API can be used to execute arbitrary emulators.
-Forbid it on read-only connections.
-
-Fixes: CVE-2019-10167
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Message-Id: <eeefd7cf2afba696bed78582e086bfbd3ed23e00.1560857354.git.jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/libvirt-domain.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 3855dfe0dd..a1c913bd86 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -11279,6 +11279,7 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
-     virResetLastError();
- 
-     virCheckConnectReturn(conn, NULL);
-+    virCheckReadOnlyGoto(conn->flags, error);
- 
-     if (conn->driver->connectGetDomainCapabilities) {
-         char *ret;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-api-disallow-virDomainAgentSetResponseTimeout-on-read-only-connections.patch b/SOURCES/libvirt-api-disallow-virDomainAgentSetResponseTimeout-on-read-only-connections.patch
new file mode 100644
index 0000000..5d9ae06
--- /dev/null
+++ b/SOURCES/libvirt-api-disallow-virDomainAgentSetResponseTimeout-on-read-only-connections.patch
@@ -0,0 +1,45 @@
+From 0c1bec6a89f97c77ba9e0ed4146deb8606ea6f16 Mon Sep 17 00:00:00 2001
+Message-Id: <0c1bec6a89f97c77ba9e0ed4146deb8606ea6f16@dist-git>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Wed, 25 Mar 2020 11:21:19 -0500
+Subject: [PATCH] api: disallow virDomainAgentSetResponseTimeout() on read-only
+ connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This function changes the amount of time that libvirt waits for a
+response from the guest agent for all guest agent commands. Since this
+is a configuration change, it should not be allowed on read-only
+connections.
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4cc90c2e62df653e909ad31fd810224bf8bcf913)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1814508
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Message-Id: <20200325162119.9047-2-jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/libvirt-domain.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index eb66999f07..3deee54e48 100644
+--- a/src/libvirt-domain.c
++++ b/src/libvirt-domain.c
+@@ -12554,6 +12554,8 @@ virDomainAgentSetResponseTimeout(virDomainPtr domain,
+     virCheckDomainReturn(domain, -1);
+     conn = domain->conn;
+ 
++    virCheckReadOnlyGoto(conn->flags, error);
++
+     if (conn->driver->domainAgentSetResponseTimeout) {
+         if (conn->driver->domainAgentSetResponseTimeout(domain, timeout, flags) < 0)
+             goto error;
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-api-disallow-virDomainManagedSaveDefineXML-on-read-only-connections.patch b/SOURCES/libvirt-api-disallow-virDomainManagedSaveDefineXML-on-read-only-connections.patch
deleted file mode 100644
index c02b5b9..0000000
--- a/SOURCES/libvirt-api-disallow-virDomainManagedSaveDefineXML-on-read-only-connections.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0673d5b707d68562732b78c89fe339e8558f8496 Mon Sep 17 00:00:00 2001
-Message-Id: <0673d5b707d68562732b78c89fe339e8558f8496@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 18 Jun 2019 13:30:00 +0200
-Subject: [PATCH] api: disallow virDomainManagedSaveDefineXML on read-only
- connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virDomainManagedSaveDefineXML can be used to alter the domain's
-config used for managedsave or even execute arbitrary emulator binaries.
-Forbid it on read-only connections.
-
-Fixes: CVE-2019-10166
-Reported-by: Matthias Gerstner <mgerstner@suse.de>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Message-Id: <352bf5e963a6482d426f97b0ef36ca019e69280b.1560857354.git.jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/libvirt-domain.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 0ba85b9360..3855dfe0dd 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -9487,6 +9487,7 @@ virDomainManagedSaveDefineXML(virDomainPtr domain, const char *dxml,
- 
-     virCheckDomainReturn(domain, -1);
-     conn = domain->conn;
-+    virCheckReadOnlyGoto(conn->flags, error);
- 
-     if (conn->driver->domainManagedSaveDefineXML) {
-         int ret;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-api-disallow-virDomainSaveImageGetXMLDesc-on-read-only-connections.patch b/SOURCES/libvirt-api-disallow-virDomainSaveImageGetXMLDesc-on-read-only-connections.patch
deleted file mode 100644
index f2ec040..0000000
--- a/SOURCES/libvirt-api-disallow-virDomainSaveImageGetXMLDesc-on-read-only-connections.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 8533d820c378ae31176922703b7368f586a59bc0 Mon Sep 17 00:00:00 2001
-Message-Id: <8533d820c378ae31176922703b7368f586a59bc0@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 18 Jun 2019 13:29:59 +0200
-Subject: [PATCH] api: disallow virDomainSaveImageGetXMLDesc on read-only
- connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virDomainSaveImageGetXMLDesc API is taking a path parameter,
-which can point to any path on the system. This file will then be
-read and parsed by libvirtd running with root privileges.
-
-Forbid it on read-only connections.
-
-Fixes: CVE-2019-10161
-Reported-by: Matthias Gerstner <mgerstner@suse.de>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-Conflicts:
-  src/libvirt-domain.c
-  src/remote/remote_protocol.x
-
-Upstream commit 12a51f372 which introduced the VIR_DOMAIN_SAVE_IMAGE_XML_SECURE
-alias for VIR_DOMAIN_XML_SECURE is not backported.
-Just skip the commit since we now disallow the whole API on read-only
-connections, regardless of the flag.
-Message-Id: <4c14d609cd7b548459b9ef2f59728fa5c5e38268.1560857354.git.jtomko@redhat.com>
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/libvirt-domain.c         | 11 ++---------
- src/qemu/qemu_driver.c       |  2 +-
- src/remote/remote_protocol.x |  3 +--
- 3 files changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index ad0ded9ee3..0ba85b9360 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -1073,9 +1073,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml,
-  * previously by virDomainSave() or virDomainSaveFlags().
-  *
-  * No security-sensitive data will be included unless @flags contains
-- * VIR_DOMAIN_XML_SECURE; this flag is rejected on read-only
-- * connections.  For this API, @flags should not contain either
-- * VIR_DOMAIN_XML_INACTIVE or VIR_DOMAIN_XML_UPDATE_CPU.
-+ * VIR_DOMAIN_XML_SECURE.
-  *
-  * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of
-  * error.  The caller must free() the returned value.
-@@ -1091,12 +1089,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file,
- 
-     virCheckConnectReturn(conn, NULL);
-     virCheckNonNullArgGoto(file, error);
--
--    if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) {
--        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
--                       _("virDomainSaveImageGetXMLDesc with secure flag"));
--        goto error;
--    }
-+    virCheckReadOnlyGoto(conn->flags, error);
- 
-     if (conn->driver->domainSaveImageGetXMLDesc) {
-         char *ret;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 88c08f88ee..2da87992fd 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6786,7 +6786,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path,
-     if (fd < 0)
-         goto cleanup;
- 
--    if (virDomainSaveImageGetXMLDescEnsureACL(conn, def, flags) < 0)
-+    if (virDomainSaveImageGetXMLDescEnsureACL(conn, def) < 0)
-         goto cleanup;
- 
-     ret = qemuDomainDefFormatXML(driver, def, flags);
-diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index 28c8febabd..52b92334fa 100644
---- a/src/remote/remote_protocol.x
-+++ b/src/remote/remote_protocol.x
-@@ -5226,8 +5226,7 @@ enum remote_procedure {
-     /**
-      * @generate: both
-      * @priority: high
--     * @acl: domain:read
--     * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE
-+     * @acl: domain:write
-      */
-     REMOTE_PROC_DOMAIN_SAVE_IMAGE_GET_XML_DESC = 235,
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-bhyve-Move-autostarting-of-domains-into-bhyveStateInitialize.patch b/SOURCES/libvirt-bhyve-Move-autostarting-of-domains-into-bhyveStateInitialize.patch
deleted file mode 100644
index 2f0f16b..0000000
--- a/SOURCES/libvirt-bhyve-Move-autostarting-of-domains-into-bhyveStateInitialize.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From a26ad1b57617abc4de8a0d13716b898d311ee01e Mon Sep 17 00:00:00 2001
-Message-Id: <a26ad1b57617abc4de8a0d13716b898d311ee01e@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:18:15 +0200
-Subject: [PATCH] bhyve: Move autostarting of domains into bhyveStateInitialize
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The stateAutoStart callback will go away shortly. Therefore, move
-the autostart call into state initialize callback.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 31c3c35c940010a793fea8351751bb04fab1a6d4)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1685151
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <1a93e2bef531c11190c652fcfb73b568ee73e487.1561641375.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/bhyve/bhyve_driver.c | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
-index 9284b51783..ec016ecc0c 100644
---- a/src/bhyve/bhyve_driver.c
-+++ b/src/bhyve/bhyve_driver.c
-@@ -1270,6 +1270,8 @@ bhyveStateInitialize(bool privileged,
- 
-     virBhyveProcessReconnectAll(bhyve_driver);
- 
-+    bhyveAutostartDomains(bhyve_driver);
-+
-     return 0;
- 
-  cleanup:
-@@ -1297,15 +1299,6 @@ bhyveDriverGetGrubCaps(virConnectPtr conn)
-     return 0;
- }
- 
--static void
--bhyveStateAutoStart(void)
--{
--    if (!bhyve_driver)
--        return;
--
--    bhyveAutostartDomains(bhyve_driver);
--}
--
- static int
- bhyveConnectGetMaxVcpus(virConnectPtr conn,
-                         const char *type)
-@@ -1713,7 +1706,6 @@ static virConnectDriver bhyveConnectDriver = {
- static virStateDriver bhyveStateDriver = {
-     .name = "bhyve",
-     .stateInitialize = bhyveStateInitialize,
--    .stateAutoStart = bhyveStateAutoStart,
-     .stateCleanup = bhyveStateCleanup,
- };
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Add-definitions-for-uid-and-fid-PCI-address-attributes.patch b/SOURCES/libvirt-conf-Add-definitions-for-uid-and-fid-PCI-address-attributes.patch
deleted file mode 100644
index 17eb235..0000000
--- a/SOURCES/libvirt-conf-Add-definitions-for-uid-and-fid-PCI-address-attributes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From dd083516c7057ee50e59290643634156daf0773b Mon Sep 17 00:00:00 2001
-Message-Id: <dd083516c7057ee50e59290643634156daf0773b@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:18 +0200
-Subject: [PATCH] conf: Add definitions for 'uid' and 'fid' PCI address
- attributes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add zPCI definitions in preparation of extending the PCI address
-with parameters uid (user-defined identifier) and fid (PCI function
-identifier).
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry-picked from commit 30522c78c11d9ff6c6c177dfca4a0da8057095fe)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-2-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- cfg.mk            | 1 +
- src/util/virpci.h | 7 +++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/cfg.mk b/cfg.mk
-index e3e94bf6f0..7fd2b1dcb6 100644
---- a/cfg.mk
-+++ b/cfg.mk
-@@ -472,6 +472,7 @@ sc_prohibit_canonicalize_file_name:
- # Insist on correct types for [pug]id.
- sc_correct_id_types:
- 	@prohibit='\<(int|long) *[pug]id\>' \
-+	exclude='exempt from syntax-check' \
- 	halt='use pid_t for pid, uid_t for uid, gid_t for gid' \
- 	  $(_sc_search_regexp)
- 
-diff --git a/src/util/virpci.h b/src/util/virpci.h
-index 794b7e59db..01df652b86 100644
---- a/src/util/virpci.h
-+++ b/src/util/virpci.h
-@@ -36,6 +36,13 @@ typedef virPCIDeviceAddress *virPCIDeviceAddressPtr;
- typedef struct _virPCIDeviceList virPCIDeviceList;
- typedef virPCIDeviceList *virPCIDeviceListPtr;
- 
-+typedef struct _virZPCIDeviceAddress virZPCIDeviceAddress;
-+typedef virZPCIDeviceAddress *virZPCIDeviceAddressPtr;
-+struct _virZPCIDeviceAddress {
-+    unsigned int uid; /* exempt from syntax-check */
-+    unsigned int fid;
-+};
-+
- struct _virPCIDeviceAddress {
-     unsigned int domain;
-     unsigned int bus;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Add-support-for-cookies-for-HTTP-based-disks.patch b/SOURCES/libvirt-conf-Add-support-for-cookies-for-HTTP-based-disks.patch
new file mode 100644
index 0000000..ed4e875
--- /dev/null
+++ b/SOURCES/libvirt-conf-Add-support-for-cookies-for-HTTP-based-disks.patch
@@ -0,0 +1,449 @@
+From 4abdfae3b67295a0143f650768630e009d1b2798 Mon Sep 17 00:00:00 2001
+Message-Id: <4abdfae3b67295a0143f650768630e009d1b2798@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:57 +0100
+Subject: [PATCH] conf: Add support for cookies for HTTP based disks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add possibility to specify one or more cookies for http based disks.
+This patch adds the config parser, storage and validation of the
+cookies.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3b076391befc3fe72deb0c244ac6c2b4c100b410)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <3135a30f0d0a1a4bb8da02c49f10a1bcf3a394f4.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomain.html.in                     |  10 ++
+ docs/schemas/domaincommon.rng                 |  24 ++++
+ src/conf/domain_conf.c                        |  82 +++++++++++++
+ src/libvirt_private.syms                      |   1 +
+ src/util/virstoragefile.c                     | 115 ++++++++++++++++++
+ src/util/virstoragefile.h                     |  15 +++
+ .../disk-network-http.xml                     |   8 ++
+ 7 files changed, 255 insertions(+)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 2cce247958..5a10d64e83 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2839,6 +2839,9 @@
+     &lt;driver name='qemu' type='raw'/&gt;
+     &lt;source protocol="http" name="url_path"&gt;
+       &lt;host name="hostname" port="80"/&gt;
++      &lt;cookies&gt;
++        &lt;cookie name="test"&gt;somevalue&lt;/cookie&gt;
++      &lt;/cookies&gt;
+     &lt;/source&gt;
+     &lt;target dev='hde' bus='ide' tray='open'/&gt;
+     &lt;readonly/&gt;
+@@ -3382,6 +3385,13 @@
+             certificate validation. Supported values are <code>yes</code> and
+             <code>no</code>. <span class="since">Since 6.2.0</span>
+           </dd>
++          <dt><code>cookies</code></dt>
++          <dd>
++            For <code>http</code> and <code>https</code> accessed storage it's
++            possible to pass one or more cookies. The cookie name and value
++            must conform to the HTTP specification.
++            <span class="since">Since 6.2.0</span>
++          </dd>
+         </dl>
+ 
+         <p>
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 548601b61c..bdf35e64f6 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1817,6 +1817,24 @@
+     </element>
+   </define>
+ 
++  <define name="diskSourceNetworkProtocolHTTPCookies">
++    <element name="cookies">
++      <oneOrMore>
++        <element name="cookie">
++          <attribute name="name">
++            <data type="string">
++              <param name="pattern">[!#$%&amp;'*+\-.0-9A-Z\^_`a-z|~]+</param>
++            </data>
++          </attribute>
++          <data type="string">
++            <param name="pattern">[!#$%&amp;'()*+\-./0-9:&gt;=&lt;?@A-Z\^_`\[\]a-z|~]+</param>
++          </data>
++        </element>
++      </oneOrMore>
++      <empty/>
++    </element>
++  </define>
++
+   <define name="diskSourceNetworkProtocolHTTPS">
+     <element name="source">
+       <attribute name="protocol">
+@@ -1833,6 +1851,9 @@
+       <optional>
+         <ref name="diskSourceNetworkProtocolSSLVerify"/>
+       </optional>
++      <optional>
++        <ref name="diskSourceNetworkProtocolHTTPCookies"/>
++      </optional>
+     </element>
+   </define>
+ 
+@@ -1849,6 +1870,9 @@
+       <optional>
+         <ref name="encryption"/>
+       </optional>
++      <optional>
++        <ref name="diskSourceNetworkProtocolHTTPCookies"/>
++      </optional>
+     </element>
+   </define>
+ 
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 70bbc35bb3..d066d3aac1 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -9249,6 +9249,62 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node,
+ }
+ 
+ 
++static virStorageNetCookieDefPtr
++virDomainStorageNetCookieParse(xmlNodePtr node,
++                               xmlXPathContextPtr ctxt)
++{
++    VIR_XPATH_NODE_AUTORESTORE(ctxt);
++    g_autoptr(virStorageNetCookieDef) cookie = NULL;
++
++    ctxt->node = node;
++
++    cookie = g_new0(virStorageNetCookieDef, 1);
++
++    if (!(cookie->name = virXPathString("string(./@name)", ctxt))) {
++        virReportError(VIR_ERR_XML_ERROR, "%s", _("missing cookie name"));
++        return NULL;
++    }
++
++    if (!(cookie->value = virXPathString("string(.)", ctxt))) {
++        virReportError(VIR_ERR_XML_ERROR, _("missing value for cookie '%s'"),
++                       cookie->name);
++        return NULL;
++    }
++
++    return g_steal_pointer(&cookie);
++}
++
++
++static int
++virDomainStorageNetCookiesParse(xmlNodePtr node,
++                                xmlXPathContextPtr ctxt,
++                                virStorageSourcePtr src)
++{
++    VIR_XPATH_NODE_AUTORESTORE(ctxt);
++    g_autofree xmlNodePtr *nodes = NULL;
++    ssize_t nnodes;
++    size_t i;
++
++    ctxt->node = node;
++
++    if ((nnodes = virXPathNodeSet("./cookie", ctxt, &nodes)) < 0)
++        return -1;
++
++    src->cookies = g_new0(virStorageNetCookieDefPtr, nnodes);
++    src->ncookies = nnodes;
++
++    for (i = 0; i < nnodes; i++) {
++        if (!(src->cookies[i] = virDomainStorageNetCookieParse(nodes[i], ctxt)))
++            return -1;
++    }
++
++    if (virStorageSourceNetCookiesValidate(src) < 0)
++        return -1;
++
++    return 0;
++}
++
++
+ static int
+ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+                                 xmlXPathContextPtr ctxt,
+@@ -9260,6 +9316,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+     g_autofree char *haveTLS = NULL;
+     g_autofree char *tlsCfg = NULL;
+     g_autofree char *sslverifystr = NULL;
++    xmlNodePtr tmpnode;
+ 
+     if (!(protocol = virXMLPropString(node, "protocol"))) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+@@ -9345,6 +9402,13 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+         src->sslverify = verify;
+     }
+ 
++    if ((src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
++         src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS) &&
++        (tmpnode = virXPathNode("./cookies", ctxt))) {
++        if (virDomainStorageNetCookiesParse(tmpnode, ctxt, src) < 0)
++            return -1;
++    }
++
+     return 0;
+ }
+ 
+@@ -24281,6 +24345,22 @@ virDomainSourceDefFormatSeclabel(virBufferPtr buf,
+ }
+ 
+ 
++static void
++virDomainDiskSourceFormatNetworkCookies(virBufferPtr buf,
++                                        virStorageSourcePtr src)
++{
++    g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
++    size_t i;
++
++    for (i = 0; i < src->ncookies; i++) {
++        virBufferEscapeString(&childBuf, "<cookie name='%s'>", src->cookies[i]->name);
++        virBufferEscapeString(&childBuf, "%s</cookie>\n", src->cookies[i]->value);
++    }
++
++    virXMLFormatElement(buf, "cookies", NULL, &childBuf);
++}
++
++
+ static int
+ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+                                  virBufferPtr childBuf,
+@@ -24331,6 +24411,8 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+                           virTristateBoolTypeToString(src->sslverify));
+     }
+ 
++    virDomainDiskSourceFormatNetworkCookies(childBuf, src);
++
+     return 0;
+ }
+ 
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index dbbec0d567..ac5527ef01 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -3123,6 +3123,7 @@ virStorageSourceIsEmpty;
+ virStorageSourceIsLocalStorage;
+ virStorageSourceIsRelative;
+ virStorageSourceIsSameLocation;
++virStorageSourceNetCookiesValidate;
+ virStorageSourceNetworkAssignDefaultPorts;
+ virStorageSourceNew;
+ virStorageSourceNewFromBacking;
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index cfa77fccf8..6350168d73 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2157,6 +2157,118 @@ virStorageSourceSeclabelsCopy(virStorageSourcePtr to,
+ }
+ 
+ 
++void
++virStorageNetCookieDefFree(virStorageNetCookieDefPtr def)
++{
++    if (!def)
++        return;
++
++    g_free(def->name);
++    g_free(def->value);
++
++    g_free(def);
++}
++
++
++static void
++virStorageSourceNetCookiesClear(virStorageSourcePtr src)
++{
++    size_t i;
++
++    if (!src || !src->cookies)
++        return;
++
++    for (i = 0; i < src->ncookies; i++)
++        virStorageNetCookieDefFree(src->cookies[i]);
++
++    g_clear_pointer(&src->cookies, g_free);
++    src->ncookies = 0;
++}
++
++
++static void
++virStorageSourceNetCookiesCopy(virStorageSourcePtr to,
++                               const virStorageSource *from)
++{
++    size_t i;
++
++    if (from->ncookies == 0)
++        return;
++
++    to->cookies = g_new0(virStorageNetCookieDefPtr, from->ncookies);
++    to->ncookies = from->ncookies;
++
++    for (i = 0; i < from->ncookies; i++) {
++        to->cookies[i]->name = g_strdup(from->cookies[i]->name);
++        to->cookies[i]->value = g_strdup(from->cookies[i]->value);
++    }
++}
++
++
++/* see https://tools.ietf.org/html/rfc6265#section-4.1.1 */
++static const char virStorageSourceCookieValueInvalidChars[] =
++ "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"
++ "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"
++ " \",;\\";
++
++/* in addition cookie name can't contain these */
++static const char virStorageSourceCookieNameInvalidChars[] =
++ "()<>@:/[]?={}";
++
++static int
++virStorageSourceNetCookieValidate(virStorageNetCookieDefPtr def)
++{
++    /* name must have at least 1 character */
++    if (*(def->name) == '\0') {
++        virReportError(VIR_ERR_XML_ERROR, "%s",
++                       _("cookie name must not be empty"));
++        return -1;
++    }
++
++    /* check invalid characters in name */
++    if (virStringHasChars(def->name, virStorageSourceCookieValueInvalidChars) ||
++        virStringHasChars(def->name, virStorageSourceCookieNameInvalidChars)) {
++        virReportError(VIR_ERR_XML_ERROR,
++                       _("cookie name '%s' contains invalid characters"),
++                       def->name);
++        return -1;
++    }
++
++    /* check invalid characters in value */
++    if (virStringHasChars(def->value, virStorageSourceCookieValueInvalidChars)) {
++        virReportError(VIR_ERR_XML_ERROR,
++                       _("value of cookie '%s' contains invalid characters"),
++                       def->name);
++        return -1;
++    }
++
++    return 0;
++}
++
++
++int
++virStorageSourceNetCookiesValidate(virStorageSourcePtr src)
++{
++    size_t i;
++    size_t j;
++
++    for (i = 0; i < src->ncookies; i++) {
++        if (virStorageSourceNetCookieValidate(src->cookies[i]) < 0)
++            return -1;
++
++        for (j = i + 1; j < src->ncookies; j++) {
++            if (STREQ(src->cookies[i]->name, src->cookies[j]->name)) {
++                virReportError(VIR_ERR_XML_ERROR, _("duplicate cookie '%s'"),
++                               src->cookies[i]->name);
++                return -1;
++            }
++        }
++    }
++
++    return 0;
++}
++
++
+ static virStorageTimestampsPtr
+ virStorageTimestampsCopy(const virStorageTimestamps *src)
+ {
+@@ -2299,6 +2411,8 @@ virStorageSourceCopy(const virStorageSource *src,
+         def->nhosts = src->nhosts;
+     }
+ 
++    virStorageSourceNetCookiesCopy(def, src);
++
+     if (src->srcpool &&
+         !(def->srcpool = virStorageSourcePoolDefCopy(src->srcpool)))
+         return NULL;
+@@ -2560,6 +2674,7 @@ virStorageSourceClear(virStorageSourcePtr def)
+     VIR_FREE(def->volume);
+     VIR_FREE(def->snapshot);
+     VIR_FREE(def->configFile);
++    virStorageSourceNetCookiesClear(def);
+     virStorageSourcePoolDefFree(def->srcpool);
+     virBitmapFree(def->features);
+     VIR_FREE(def->compat);
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index fab4248c3d..1c7c046ad6 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -162,6 +162,17 @@ struct _virStorageNetHostDef {
+     char *socket;  /* path to unix socket */
+ };
+ 
++typedef struct _virStorageNetCookieDef virStorageNetCookieDef;
++typedef virStorageNetCookieDef *virStorageNetCookieDefPtr;
++struct _virStorageNetCookieDef {
++    char *name;
++    char *value;
++};
++
++void virStorageNetCookieDefFree(virStorageNetCookieDefPtr def);
++
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageNetCookieDef, virStorageNetCookieDefFree);
++
+ /* Information for a storage volume from a virStoragePool */
+ 
+ /*
+@@ -276,6 +287,8 @@ struct _virStorageSource {
+                          the source definition */
+     size_t nhosts;
+     virStorageNetHostDefPtr hosts;
++    size_t ncookies;
++    virStorageNetCookieDefPtr *cookies;
+     virStorageSourcePoolDefPtr srcpool;
+     virStorageAuthDefPtr auth;
+     bool authInherited;
+@@ -477,6 +490,8 @@ int virStorageSourceUpdateCapacity(virStorageSourcePtr src,
+ int virStorageSourceNewFromBacking(virStorageSourcePtr parent,
+                                    virStorageSourcePtr *backing);
+ 
++int virStorageSourceNetCookiesValidate(virStorageSourcePtr src);
++
+ virStorageSourcePtr virStorageSourceCopy(const virStorageSource *src,
+                                          bool backingChain)
+     ATTRIBUTE_NONNULL(1);
+diff --git a/tests/genericxml2xmlindata/disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml
+index bdcc1977f2..bafb77c8ec 100644
+--- a/tests/genericxml2xmlindata/disk-network-http.xml
++++ b/tests/genericxml2xmlindata/disk-network-http.xml
+@@ -33,6 +33,10 @@
+       <driver name='qemu' type='raw'/>
+       <source protocol='http' name='test3.img'>
+         <host name='example.org' port='1234'/>
++        <cookies>
++          <cookie name='test'>testcookievalue</cookie>
++          <cookie name='test2'>blurb</cookie>
++        </cookies>
+       </source>
+       <target dev='vdc' bus='virtio'/>
+     </disk>
+@@ -41,6 +45,10 @@
+       <source protocol='https' name='test4.img'>
+         <host name='example.org' port='1234'/>
+         <ssl verify='yes'/>
++        <cookies>
++          <cookie name='test'>testcookievalue</cookie>
++          <cookie name='test2'>blurb</cookie>
++        </cookies>
+       </source>
+       <target dev='vdd' bus='virtio'/>
+     </disk>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-Add-support-for-http-s-query-strings.patch b/SOURCES/libvirt-conf-Add-support-for-http-s-query-strings.patch
new file mode 100644
index 0000000..32169e7
--- /dev/null
+++ b/SOURCES/libvirt-conf-Add-support-for-http-s-query-strings.patch
@@ -0,0 +1,160 @@
+From 45ecbd824c92bd05a46557bfcaff39196f701e6c Mon Sep 17 00:00:00 2001
+Message-Id: <45ecbd824c92bd05a46557bfcaff39196f701e6c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:45 +0200
+Subject: [PATCH] conf: Add support for http(s) query strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a new attribute for holding the query part for http(s) disks.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 56368124728f0d65dde07244c741b459fcd6b939)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <b60abcf1e7711e9e29175e1fdcfe2820d5694a17.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/formatdomain.html.in                                  | 7 ++++++-
+ docs/schemas/domaincommon.rng                              | 6 ++++++
+ src/conf/domain_conf.c                                     | 5 +++++
+ src/util/virstoragefile.c                                  | 2 ++
+ src/util/virstoragefile.h                                  | 1 +
+ tests/qemuxml2argvdata/disk-network-http.xml               | 2 +-
+ .../qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml | 2 +-
+ 7 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 143db21d4d..9c588185df 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2837,7 +2837,7 @@
+   &lt;/disk&gt;
+   &lt;disk type='network' device='cdrom'&gt;
+     &lt;driver name='qemu' type='raw'/&gt;
+-    &lt;source protocol="http" name="url_path"&gt;
++    &lt;source protocol="http" name="url_path" query="foo=bar&amp;amp;baz=flurb&gt;
+       &lt;host name="hostname" port="80"/&gt;
+       &lt;cookies&gt;
+         &lt;cookie name="test"&gt;somevalue&lt;/cookie&gt;
+@@ -3103,6 +3103,11 @@
+               ('tls' <span class="since">Since 4.5.0</span>)
+               </p>
+ 
++              <p>For protocols <code>http</code> and <code>https</code> an
++              optional attribute <code>query</code> specifies the query string.
++              (<span class="since">Since 6.2.0</span>)
++              </p>
++
+               <p>For "iscsi" (<span class="since">since 1.0.4</span>), the
+               <code>name</code> attribute may include a logical unit number,
+               separated from the target's name by a slash (e.g.,
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index e17f7ff8c0..dd8f27243a 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1869,6 +1869,9 @@
+           </choice>
+         </attribute>
+         <attribute name="name"/>
++        <optional>
++          <attribute name="query"/>
++        </optional>
+         <ref name="diskSourceCommon"/>
+         <ref name="diskSourceNetworkHost"/>
+         <optional>
+@@ -1894,6 +1897,9 @@
+           </choice>
+         </attribute>
+         <attribute name="name"/>
++        <optional>
++          <attribute name="query"/>
++        </optional>
+         <ref name="diskSourceCommon"/>
+         <ref name="diskSourceNetworkHost"/>
+         <optional>
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index e3755fa285..28160a2967 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -9382,6 +9382,10 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+     /* config file currently only works with remote disks */
+     src->configFile = virXPathString("string(./config/@file)", ctxt);
+ 
++    if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
++        src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS)
++        src->query = virXMLPropString(node, "query");
++
+     if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0)
+         return -1;
+ 
+@@ -24390,6 +24394,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+         path = g_strdup_printf("%s/%s", src->volume, src->path);
+ 
+     virBufferEscapeString(attrBuf, " name='%s'", path ? path : src->path);
++    virBufferEscapeString(attrBuf, " query='%s'", src->query);
+ 
+     if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT &&
+         !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index f8d741f040..4082e3f5f7 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2418,6 +2418,7 @@ virStorageSourceCopy(const virStorageSource *src,
+     def->compat = g_strdup(src->compat);
+     def->tlsAlias = g_strdup(src->tlsAlias);
+     def->tlsCertdir = g_strdup(src->tlsCertdir);
++    def->query = g_strdup(src->query);
+ 
+     if (src->sliceStorage)
+         def->sliceStorage = virStorageSourceSliceCopy(src->sliceStorage);
+@@ -2696,6 +2697,7 @@ virStorageSourceClear(virStorageSourcePtr def)
+     VIR_FREE(def->volume);
+     VIR_FREE(def->snapshot);
+     VIR_FREE(def->configFile);
++    VIR_FREE(def->query);
+     virStorageSourceNetCookiesClear(def);
+     virStorageSourcePoolDefFree(def->srcpool);
+     virBitmapFree(def->features);
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 0230f44652..8089d1e07f 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -285,6 +285,7 @@ struct _virStorageSource {
+     char *snapshot; /* for storage systems supporting internal snapshots */
+     char *configFile; /* some storage systems use config file as part of
+                          the source definition */
++    char *query; /* query string for HTTP based protocols */
+     size_t nhosts;
+     virStorageNetHostDefPtr hosts;
+     size_t ncookies;
+diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
+index 93e6617433..3abf499019 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.xml
++++ b/tests/qemuxml2argvdata/disk-network-http.xml
+@@ -42,7 +42,7 @@
+     </disk>
+     <disk type='network' device='disk'>
+       <driver name='qemu' type='raw'/>
+-      <source protocol='https' name='test4.img'>
++      <source protocol='https' name='test4.img' query='par=val&amp;other=ble'>
+         <host name='example.org' port='1234'/>
+         <ssl verify='no'/>
+         <cookies>
+diff --git a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+index 60073c227c..45b01841ec 100644
+--- a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+@@ -46,7 +46,7 @@
+     </disk>
+     <disk type='network' device='disk'>
+       <driver name='qemu' type='raw'/>
+-      <source protocol='https' name='test4.img'>
++      <source protocol='https' name='test4.img' query='par=val&amp;other=ble'>
+         <host name='example.org' port='1234'/>
+         <ssl verify='no'/>
+         <cookies>
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-conf-Add-support-for-modifying-ssl-validation-for-https-ftps-disks.patch b/SOURCES/libvirt-conf-Add-support-for-modifying-ssl-validation-for-https-ftps-disks.patch
new file mode 100644
index 0000000..995852c
--- /dev/null
+++ b/SOURCES/libvirt-conf-Add-support-for-modifying-ssl-validation-for-https-ftps-disks.patch
@@ -0,0 +1,242 @@
+From ffe8028ca07eb049b12d5c152b3d66489378d731 Mon Sep 17 00:00:00 2001
+Message-Id: <ffe8028ca07eb049b12d5c152b3d66489378d731@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:56 +0100
+Subject: [PATCH] conf: Add support for modifying ssl validation for https/ftps
+ disks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To allow turning off verification of SSL cerificates add a new element
+<ssl> to the disk source XML which will allow configuring the validation
+process using the 'verify' attribute.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 25481e25b14108373bf2e5e95c04fe30bff96bb4)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <ede13179128fc9ef05036a5408f4115132a2c12d.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomain.html.in                     |  9 ++++
+ docs/schemas/domaincommon.rng                 | 51 ++++++++++++++++++-
+ src/conf/domain_conf.c                        | 19 +++++++
+ src/util/virstoragefile.c                     |  1 +
+ src/util/virstoragefile.h                     |  1 +
+ .../disk-network-http.xml                     |  9 ++++
+ 6 files changed, 88 insertions(+), 2 deletions(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index e9830ab231..2cce247958 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2847,6 +2847,7 @@
+     &lt;driver name='qemu' type='raw'/&gt;
+     &lt;source protocol="https" name="url_path"&gt;
+       &lt;host name="hostname" port="443"/&gt;
++      &lt;ssl verify="no"/&gt;
+     &lt;/source&gt;
+     &lt;target dev='hdf' bus='ide' tray='open'/&gt;
+     &lt;readonly/&gt;
+@@ -3373,6 +3374,14 @@
+             The <code>offset</code> and <code>size</code> values are in bytes.
+             <span class="since">Since 6.1.0</span>
+           </dd>
++          <dt><code>ssl</code></dt>
++          <dd>
++            For <code>https</code> and <code>ftps</code> accessed storage it's
++            possible to tweak the SSL transport parameters with this element.
++            The <code>verify</code> attribute allows to turn on or off SSL
++            certificate validation. Supported values are <code>yes</code> and
++            <code>no</code>. <span class="since">Since 6.2.0</span>
++          </dd>
+         </dl>
+ 
+         <p>
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index aa70e340b9..548601b61c 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1808,12 +1808,39 @@
+     </element>
+   </define>
+ 
++  <define name="diskSourceNetworkProtocolSSLVerify">
++    <element name="ssl">
++      <attribute name="verify">
++        <ref name="virYesNo"/>
++      </attribute>
++      <empty/>
++    </element>
++  </define>
++
++  <define name="diskSourceNetworkProtocolHTTPS">
++    <element name="source">
++      <attribute name="protocol">
++        <choice>
++          <value>https</value>
++        </choice>
++      </attribute>
++      <attribute name="name"/>
++      <ref name="diskSourceCommon"/>
++      <ref name="diskSourceNetworkHost"/>
++      <optional>
++        <ref name="encryption"/>
++      </optional>
++      <optional>
++        <ref name="diskSourceNetworkProtocolSSLVerify"/>
++      </optional>
++    </element>
++  </define>
++
+   <define name="diskSourceNetworkProtocolHTTP">
+     <element name="source">
+       <attribute name="protocol">
+         <choice>
+           <value>http</value>
+-          <value>https</value>
+         </choice>
+       </attribute>
+       <attribute name="name"/>
+@@ -1825,13 +1852,31 @@
+     </element>
+   </define>
+ 
++  <define name="diskSourceNetworkProtocolFTPS">
++    <element name="source">
++      <attribute name="protocol">
++        <choice>
++          <value>ftps</value>
++        </choice>
++      </attribute>
++      <attribute name="name"/>
++      <ref name="diskSourceCommon"/>
++      <ref name="diskSourceNetworkHost"/>
++      <optional>
++        <ref name="encryption"/>
++      </optional>
++      <optional>
++        <ref name="diskSourceNetworkProtocolSSLVerify"/>
++      </optional>
++    </element>
++  </define>
++
+   <define name="diskSourceNetworkProtocolSimple">
+     <element name="source">
+       <attribute name="protocol">
+         <choice>
+           <value>sheepdog</value>
+           <value>ftp</value>
+-          <value>ftps</value>
+           <value>tftp</value>
+         </choice>
+       </attribute>
+@@ -1909,6 +1954,8 @@
+       <ref name="diskSourceNetworkProtocolRBD"/>
+       <ref name="diskSourceNetworkProtocolISCSI"/>
+       <ref name="diskSourceNetworkProtocolHTTP"/>
++      <ref name="diskSourceNetworkProtocolHTTPS"/>
++      <ref name="diskSourceNetworkProtocolFTPS"/>
+       <ref name="diskSourceNetworkProtocolSimple"/>
+       <ref name="diskSourceNetworkProtocolVxHS"/>
+     </choice>
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index b3c4084c38..70bbc35bb3 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -9259,6 +9259,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+     g_autofree char *protocol = NULL;
+     g_autofree char *haveTLS = NULL;
+     g_autofree char *tlsCfg = NULL;
++    g_autofree char *sslverifystr = NULL;
+ 
+     if (!(protocol = virXMLPropString(node, "protocol"))) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+@@ -9331,6 +9332,19 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+ 
+     virStorageSourceInitiatorParseXML(ctxt, &src->initiator);
+ 
++    if ((src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
++         src->protocol == VIR_STORAGE_NET_PROTOCOL_FTPS) &&
++        (sslverifystr = virXPathString("string(./ssl/@verify)", ctxt))) {
++        int verify;
++        if ((verify = virTristateBoolTypeFromString(sslverifystr)) < 0) {
++            virReportError(VIR_ERR_XML_ERROR,
++                           _("invalid ssl verify mode '%s'"), sslverifystr);
++            return -1;
++        }
++
++        src->sslverify = verify;
++    }
++
+     return 0;
+ }
+ 
+@@ -24312,6 +24326,11 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+ 
+     virStorageSourceInitiatorFormatXML(&src->initiator, childBuf);
+ 
++    if (src->sslverify != VIR_TRISTATE_BOOL_ABSENT) {
++        virBufferAsprintf(childBuf, "<ssl verify='%s'/>\n",
++                          virTristateBoolTypeToString(src->sslverify));
++    }
++
+     return 0;
+ }
+ 
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index b88763b267..cfa77fccf8 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2270,6 +2270,7 @@ virStorageSourceCopy(const virStorageSource *src,
+     def->cachemode = src->cachemode;
+     def->discard = src->discard;
+     def->detect_zeroes = src->detect_zeroes;
++    def->sslverify = src->sslverify;
+ 
+     /* storage driver metadata are not copied */
+     def->drv = NULL;
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 5b995d54ab..fab4248c3d 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -282,6 +282,7 @@ struct _virStorageSource {
+     virStorageEncryptionPtr encryption;
+     bool encryptionInherited;
+     virStoragePRDefPtr pr;
++    virTristateBool sslverify;
+ 
+     virStorageSourceNVMeDefPtr nvme; /* type == VIR_STORAGE_TYPE_NVME */
+ 
+diff --git a/tests/genericxml2xmlindata/disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml
+index fde1222fd0..bdcc1977f2 100644
+--- a/tests/genericxml2xmlindata/disk-network-http.xml
++++ b/tests/genericxml2xmlindata/disk-network-http.xml
+@@ -25,6 +25,7 @@
+       <driver name='qemu' type='raw'/>
+       <source protocol='https' name='test2.img'>
+         <host name='example.org' port='443'/>
++        <ssl verify='no'/>
+       </source>
+       <target dev='vdb' bus='virtio'/>
+     </disk>
+@@ -35,6 +36,14 @@
+       </source>
+       <target dev='vdc' bus='virtio'/>
+     </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='https' name='test4.img'>
++        <host name='example.org' port='1234'/>
++        <ssl verify='yes'/>
++      </source>
++      <target dev='vdd' bus='virtio'/>
++    </disk>
+     <controller type='usb' index='0'/>
+     <controller type='pci' index='0' model='pci-root'/>
+     <input type='mouse' bus='ps2'/>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-Add-support-for-setting-timeout-and-readahead-size-for-network-disks.patch b/SOURCES/libvirt-conf-Add-support-for-setting-timeout-and-readahead-size-for-network-disks.patch
new file mode 100644
index 0000000..5fe493e
--- /dev/null
+++ b/SOURCES/libvirt-conf-Add-support-for-setting-timeout-and-readahead-size-for-network-disks.patch
@@ -0,0 +1,205 @@
+From 3050ddce41896311b8c3ad06f148bea358e597b8 Mon Sep 17 00:00:00 2001
+Message-Id: <3050ddce41896311b8c3ad06f148bea358e597b8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:58 +0100
+Subject: [PATCH] conf: Add support for setting timeout and readahead size for
+ network disks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some disk backends support configuring the readahead buffer or timeout
+for requests. Add the knobs to the XML.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 63fd46177367c6653c4c986558f6d0e4a700cfcc)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <2694bc6f9a327f89d82da18320e7137152915ad3.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomain.html.in                     | 16 +++++++++++++
+ docs/schemas/domaincommon.rng                 | 23 +++++++++++++++++++
+ src/conf/domain_conf.c                        | 19 +++++++++++++++
+ src/util/virstoragefile.c                     |  2 ++
+ src/util/virstoragefile.h                     |  3 +++
+ .../disk-network-http.xml                     |  2 ++
+ 6 files changed, 65 insertions(+)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 5a10d64e83..2b8f9eabc2 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2842,6 +2842,8 @@
+       &lt;cookies&gt;
+         &lt;cookie name="test"&gt;somevalue&lt;/cookie&gt;
+       &lt;/cookies&gt;
++      &lt;readahead size='65536'/&gt;
++      &lt;timeout seconds='6'/&gt;
+     &lt;/source&gt;
+     &lt;target dev='hde' bus='ide' tray='open'/&gt;
+     &lt;readonly/&gt;
+@@ -3392,6 +3394,20 @@
+             must conform to the HTTP specification.
+             <span class="since">Since 6.2.0</span>
+           </dd>
++          <dt><code>readahead</code></dt>
++          <dd>
++            Specifies the size of the readahead buffer for protocols
++            which support it. (all 'curl' based drivers in qemu). The size
++            is in bytes. Note that '0' is considered as if the value is not
++            provided.
++            <span class="since">Since 6.2.0</span>
++          </dd>
++          <dt><code>timeout</code></dt>
++          <dd>
++            Specifies the connection timeout for protocols which support it.
++            Note that '0' is considered as if the value is not provided.
++            <span class="since">Since 6.2.0</span>
++          </dd>
+         </dl>
+ 
+         <p>
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index bdf35e64f6..3a0edbed97 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1808,6 +1808,25 @@
+     </element>
+   </define>
+ 
++  <define name="diskSourceNetworkProtocolPropsCommon">
++    <optional>
++      <element name="readahead">
++        <attribute name="size">
++          <ref name="positiveInteger"/>
++        </attribute>
++        <empty/>
++      </element>
++    </optional>
++    <optional>
++      <element name="timeout">
++        <attribute name="seconds">
++          <ref name="positiveInteger"/>
++        </attribute>
++        <empty/>
++      </element>
++    </optional>
++  </define>
++
+   <define name="diskSourceNetworkProtocolSSLVerify">
+     <element name="ssl">
+       <attribute name="verify">
+@@ -1854,6 +1873,7 @@
+       <optional>
+         <ref name="diskSourceNetworkProtocolHTTPCookies"/>
+       </optional>
++      <ref name="diskSourceNetworkProtocolPropsCommon"/>
+     </element>
+   </define>
+ 
+@@ -1873,6 +1893,7 @@
+       <optional>
+         <ref name="diskSourceNetworkProtocolHTTPCookies"/>
+       </optional>
++      <ref name="diskSourceNetworkProtocolPropsCommon"/>
+     </element>
+   </define>
+ 
+@@ -1892,6 +1913,7 @@
+       <optional>
+         <ref name="diskSourceNetworkProtocolSSLVerify"/>
+       </optional>
++      <ref name="diskSourceNetworkProtocolPropsCommon"/>
+     </element>
+   </define>
+ 
+@@ -1910,6 +1932,7 @@
+       <optional>
+         <ref name="encryption"/>
+       </optional>
++      <ref name="diskSourceNetworkProtocolPropsCommon"/>
+     </element>
+   </define>
+ 
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index d066d3aac1..8aec85e83c 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -9409,6 +9409,19 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+             return -1;
+     }
+ 
++    if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
++        src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
++        src->protocol == VIR_STORAGE_NET_PROTOCOL_FTP ||
++        src->protocol == VIR_STORAGE_NET_PROTOCOL_FTPS) {
++
++        if (virXPathULongLong("string(./readahead/@size)", ctxt, &src->readahead) == -2 ||
++            virXPathULongLong("string(./timeout/@seconds)", ctxt, &src->timeout) == -2) {
++            virReportError(VIR_ERR_XML_ERROR, "%s",
++                          _("invalid readahead size or timeout"));
++            return -1;
++        }
++    }
++
+     return 0;
+ }
+ 
+@@ -24413,6 +24426,12 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+ 
+     virDomainDiskSourceFormatNetworkCookies(childBuf, src);
+ 
++    if (src->readahead)
++        virBufferAsprintf(childBuf, "<readahead size='%llu'/>\n", src->readahead);
++
++    if (src->timeout)
++        virBufferAsprintf(childBuf, "<timeout seconds='%llu'/>\n", src->timeout);
++
+     return 0;
+ }
+ 
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 6350168d73..7893e054c3 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2383,6 +2383,8 @@ virStorageSourceCopy(const virStorageSource *src,
+     def->discard = src->discard;
+     def->detect_zeroes = src->detect_zeroes;
+     def->sslverify = src->sslverify;
++    def->readahead = src->readahead;
++    def->timeout = src->timeout;
+ 
+     /* storage driver metadata are not copied */
+     def->drv = NULL;
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 1c7c046ad6..1abdaf89ce 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -296,6 +296,9 @@ struct _virStorageSource {
+     bool encryptionInherited;
+     virStoragePRDefPtr pr;
+     virTristateBool sslverify;
++    /* both values below have 0 as default value */
++    unsigned long long readahead; /* size of the readahead buffer in bytes */
++    unsigned long long timeout; /* connection timeout in seconds */
+ 
+     virStorageSourceNVMeDefPtr nvme; /* type == VIR_STORAGE_TYPE_NVME */
+ 
+diff --git a/tests/genericxml2xmlindata/disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml
+index bafb77c8ec..a8430b8365 100644
+--- a/tests/genericxml2xmlindata/disk-network-http.xml
++++ b/tests/genericxml2xmlindata/disk-network-http.xml
+@@ -49,6 +49,8 @@
+           <cookie name='test'>testcookievalue</cookie>
+           <cookie name='test2'>blurb</cookie>
+         </cookies>
++        <readahead size='65536'/>
++        <timeout seconds='10'/>
+       </source>
+       <target dev='vdd' bus='virtio'/>
+     </disk>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-Add-validation-of-input-devices.patch b/SOURCES/libvirt-conf-Add-validation-of-input-devices.patch
deleted file mode 100644
index 5f9dbbb..0000000
--- a/SOURCES/libvirt-conf-Add-validation-of-input-devices.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c2afbedc310ac1a65a5ee96c8fa4103e926483c4 Mon Sep 17 00:00:00 2001
-Message-Id: <c2afbedc310ac1a65a5ee96c8fa4103e926483c4@dist-git>
-From: Han Han <hhan@redhat.com>
-Date: Tue, 28 Aug 2018 10:30:51 +0200
-Subject: [PATCH] conf: Add validation of input devices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1591151
-
-Add function virDomainInputDefValidate to validate input devices.
-Make sure evdev attribute of source element is not used by mouse,
-keyboard, and tablet input device.
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit deb057fd364cb57614c6dea7b05c247231f9ae4f)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1591240
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/conf/domain_conf.c | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 51a79ad8b1..16e52d149d 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -5760,6 +5760,29 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock)
-     return 0;
- }
- 
-+static int
-+virDomainInputDefValidate(const virDomainInputDef *input)
-+{
-+    switch ((virDomainInputType) input->type) {
-+        case VIR_DOMAIN_INPUT_TYPE_MOUSE:
-+        case VIR_DOMAIN_INPUT_TYPE_TABLET:
-+        case VIR_DOMAIN_INPUT_TYPE_KBD:
-+        case VIR_DOMAIN_INPUT_TYPE_LAST:
-+            if (input->source.evdev) {
-+                 virReportError(VIR_ERR_XML_ERROR, "%s",
-+                                _("setting source evdev path only supported for "
-+                                  "passthrough input devices"));
-+                 return -1;
-+            }
-+            break;
-+
-+        case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
-+            break;
-+    }
-+
-+    return 0;
-+}
-+
- 
- static int
- virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
-@@ -5799,9 +5822,11 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
-     case VIR_DOMAIN_DEVICE_VSOCK:
-         return virDomainVsockDefValidate(dev->data.vsock);
- 
-+    case VIR_DOMAIN_DEVICE_INPUT:
-+        return virDomainInputDefValidate(dev->data.input);
-+
-     case VIR_DOMAIN_DEVICE_LEASE:
-     case VIR_DOMAIN_DEVICE_FS:
--    case VIR_DOMAIN_DEVICE_INPUT:
-     case VIR_DOMAIN_DEVICE_SOUND:
-     case VIR_DOMAIN_DEVICE_WATCHDOG:
-     case VIR_DOMAIN_DEVICE_GRAPHICS:
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Allocate-release-uid-and-fid-in-PCI-address.patch b/SOURCES/libvirt-conf-Allocate-release-uid-and-fid-in-PCI-address.patch
deleted file mode 100644
index d99def9..0000000
--- a/SOURCES/libvirt-conf-Allocate-release-uid-and-fid-in-PCI-address.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-From 87e3a5f2f797c79516a560ddc224074c834ef528 Mon Sep 17 00:00:00 2001
-Message-Id: <87e3a5f2f797c79516a560ddc224074c834ef528@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:27 +0200
-Subject: [PATCH] conf: Allocate/release 'uid' and 'fid' in PCI address
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch adds new functions for reservation, assignment and release
-to handle the uid/fid. If the uid/fid is defined in the domain XML,
-they will be reserved directly in the collecting phase. If any of them
-is not defined, we will find out an available value for them from the
-zPCI address hashtable, and reserve them. For the hotplug case there
-might not be a zPCI definition. So allocate and reserve uid/fid the
-case. Assign if needed and reserve uid/fid for the defined case.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit f183b87fc1dbcc6446ac3c1cef9cdd345b9725fb)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/libvirt_private.syms
-    + several symbols are not present in the list
-      - missing 9ad119f4db5, ab3f781a10c, edeef779585, b899726faa5
-
-  * src/qemu/qemu_domain_address.c
-    + the old name for virDeviceInfoPCIAddressIsPresent() is used
-      - missing 76151a53a100
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-11-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/device_conf.c         |  16 +++
- src/conf/device_conf.h         |   3 +
- src/conf/domain_addr.c         | 244 +++++++++++++++++++++++++++++++++
- src/conf/domain_addr.h         |  12 ++
- src/libvirt_private.syms       |   5 +
- src/qemu/qemu_domain_address.c |  59 +++++++-
- 6 files changed, 338 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
-index cadac32603..76370d30a2 100644
---- a/src/conf/device_conf.c
-+++ b/src/conf/device_conf.c
-@@ -28,6 +28,7 @@
- #include "viruuid.h"
- #include "virbuffer.h"
- #include "device_conf.h"
-+#include "domain_addr.h"
- #include "virstring.h"
- 
- #define VIR_FROM_THIS VIR_FROM_DEVICE
-@@ -230,6 +231,21 @@ int virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr,
- }
- 
- 
-+bool
-+virDeviceInfoPCIAddressExtensionIsWanted(const virDomainDeviceInfo *info)
-+{
-+    return (info->addr.pci.extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) &&
-+           virZPCIDeviceAddressIsEmpty(&info->addr.pci.zpci);
-+}
-+
-+bool
-+virDeviceInfoPCIAddressExtensionIsPresent(const virDomainDeviceInfo *info)
-+{
-+    return (info->addr.pci.extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) &&
-+           !virZPCIDeviceAddressIsEmpty(&info->addr.pci.zpci);
-+}
-+
-+
- int
- virPCIDeviceAddressParseXML(xmlNodePtr node,
-                             virPCIDeviceAddressPtr addr)
-diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
-index c79066ec02..6bef2f093a 100644
---- a/src/conf/device_conf.h
-+++ b/src/conf/device_conf.h
-@@ -214,6 +214,9 @@ virDeviceInfoPCIAddressPresent(const virDomainDeviceInfo *info)
-        !virPCIDeviceAddressIsEmpty(&info->addr.pci);
- }
- 
-+bool virDeviceInfoPCIAddressExtensionIsWanted(const virDomainDeviceInfo *info);
-+bool virDeviceInfoPCIAddressExtensionIsPresent(const virDomainDeviceInfo *info);
-+
- int virPCIDeviceAddressParseXML(xmlNodePtr node,
-                                 virPCIDeviceAddressPtr addr);
- 
-diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
-index 9e0a0fdf95..a58910c394 100644
---- a/src/conf/domain_addr.c
-+++ b/src/conf/domain_addr.c
-@@ -33,6 +33,238 @@
- 
- VIR_LOG_INIT("conf.domain_addr");
- 
-+static int
-+virDomainZPCIAddressReserveId(virHashTablePtr set,
-+                              unsigned int id,
-+                              const char *name)
-+{
-+    if (virHashLookup(set, &id)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("zPCI %s %o is already reserved"),
-+                       name, id);
-+        return -1;
-+    }
-+
-+    if (virHashAddEntry(set, &id, (void*)1) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to reserve %s %o"),
-+                       name, id);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virDomainZPCIAddressReserveUid(virHashTablePtr set,
-+                               virZPCIDeviceAddressPtr addr)
-+{
-+    return virDomainZPCIAddressReserveId(set, addr->uid, "uid");
-+}
-+
-+
-+static int
-+virDomainZPCIAddressReserveFid(virHashTablePtr set,
-+                               virZPCIDeviceAddressPtr addr)
-+{
-+    return virDomainZPCIAddressReserveId(set, addr->fid, "fid");
-+}
-+
-+
-+static int
-+virDomainZPCIAddressAssignId(virHashTablePtr set,
-+                             unsigned int *id,
-+                             unsigned int min,
-+                             unsigned int max,
-+                             const char *name)
-+{
-+    while (virHashLookup(set, &min)) {
-+        if (min == max) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("There is no more free %s."),
-+                           name);
-+            return -1;
-+        }
-+        ++min;
-+    }
-+    *id = min;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virDomainZPCIAddressAssignUid(virHashTablePtr set,
-+                              virZPCIDeviceAddressPtr addr)
-+{
-+    return virDomainZPCIAddressAssignId(set, &addr->uid, 1,
-+                                        VIR_DOMAIN_DEVICE_ZPCI_MAX_UID, "uid");
-+}
-+
-+
-+static int
-+virDomainZPCIAddressAssignFid(virHashTablePtr set,
-+                              virZPCIDeviceAddressPtr addr)
-+{
-+    return virDomainZPCIAddressAssignId(set, &addr->fid, 0,
-+                                        VIR_DOMAIN_DEVICE_ZPCI_MAX_FID, "fid");
-+}
-+
-+
-+static void
-+virDomainZPCIAddressReleaseId(virHashTablePtr set,
-+                              unsigned int *id,
-+                              const char *name)
-+{
-+    if (virHashRemoveEntry(set, id) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Release %s %o failed"),
-+                       name, *id);
-+    }
-+
-+    *id = 0;
-+}
-+
-+
-+static void
-+virDomainZPCIAddressReleaseUid(virHashTablePtr set,
-+                               virZPCIDeviceAddressPtr addr)
-+{
-+    virDomainZPCIAddressReleaseId(set, &addr->uid, "uid");
-+}
-+
-+
-+static void
-+virDomainZPCIAddressReleaseFid(virHashTablePtr set,
-+                               virZPCIDeviceAddressPtr addr)
-+{
-+    virDomainZPCIAddressReleaseId(set, &addr->fid, "fid");
-+}
-+
-+
-+static void
-+virDomainZPCIAddressReleaseIds(virDomainZPCIAddressIdsPtr zpciIds,
-+                               virZPCIDeviceAddressPtr addr)
-+{
-+    if (!zpciIds || virZPCIDeviceAddressIsEmpty(addr))
-+        return;
-+
-+    virDomainZPCIAddressReleaseUid(zpciIds->uids, addr);
-+
-+    virDomainZPCIAddressReleaseFid(zpciIds->fids, addr);
-+}
-+
-+
-+static int
-+virDomainZPCIAddressReserveNextUid(virHashTablePtr uids,
-+                                   virZPCIDeviceAddressPtr zpci)
-+{
-+    if (virDomainZPCIAddressAssignUid(uids, zpci) < 0)
-+        return -1;
-+
-+    if (virDomainZPCIAddressReserveUid(uids, zpci) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virDomainZPCIAddressReserveNextFid(virHashTablePtr fids,
-+                                   virZPCIDeviceAddressPtr zpci)
-+{
-+    if (virDomainZPCIAddressAssignFid(fids, zpci) < 0)
-+        return -1;
-+
-+    if (virDomainZPCIAddressReserveFid(fids, zpci) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virDomainZPCIAddressReserveAddr(virDomainZPCIAddressIdsPtr zpciIds,
-+                                virZPCIDeviceAddressPtr addr)
-+{
-+    if (virDomainZPCIAddressReserveUid(zpciIds->uids, addr) < 0)
-+        return -1;
-+
-+    if (virDomainZPCIAddressReserveFid(zpciIds->fids, addr) < 0) {
-+        virDomainZPCIAddressReleaseUid(zpciIds->uids, addr);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virDomainZPCIAddressReserveNextAddr(virDomainZPCIAddressIdsPtr zpciIds,
-+                                    virZPCIDeviceAddressPtr addr)
-+{
-+    if (virDomainZPCIAddressReserveNextUid(zpciIds->uids, addr) < 0)
-+        return -1;
-+
-+    if (virDomainZPCIAddressReserveNextFid(zpciIds->fids, addr) < 0) {
-+        virDomainZPCIAddressReleaseUid(zpciIds->uids, addr);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+int
-+virDomainPCIAddressExtensionReserveAddr(virDomainPCIAddressSetPtr addrs,
-+                                        virPCIDeviceAddressPtr addr)
-+{
-+    if (addr->extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) {
-+        /* Reserve uid/fid to ZPCI device which has defined uid/fid
-+         * in the domain.
-+         */
-+        return virDomainZPCIAddressReserveAddr(addrs->zpciIds, &addr->zpci);
-+    }
-+
-+    return 0;
-+}
-+
-+
-+int
-+virDomainPCIAddressExtensionReserveNextAddr(virDomainPCIAddressSetPtr addrs,
-+                                            virPCIDeviceAddressPtr addr)
-+{
-+    if (addr->extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) {
-+        virZPCIDeviceAddress zpci = { 0 };
-+
-+        if (virDomainZPCIAddressReserveNextAddr(addrs->zpciIds, &zpci) < 0)
-+            return -1;
-+
-+        if (!addrs->dryRun)
-+            addr->zpci = zpci;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+virDomainPCIAddressExtensionEnsureAddr(virDomainPCIAddressSetPtr addrs,
-+                                       virPCIDeviceAddressPtr addr)
-+{
-+    if (addr->extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) {
-+        virZPCIDeviceAddressPtr zpci = &addr->zpci;
-+
-+        if (virZPCIDeviceAddressIsEmpty(zpci))
-+            return virDomainZPCIAddressReserveNextAddr(addrs->zpciIds, zpci);
-+        else
-+            return virDomainZPCIAddressReserveAddr(addrs->zpciIds, zpci);
-+    }
-+
-+    return 0;
-+}
-+
-+
- virDomainPCIConnectFlags
- virDomainPCIControllerModelToConnectType(virDomainControllerModelPCI model)
- {
-@@ -729,12 +961,24 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
-         ret = virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1);
-     }
- 
-+    dev->addr.pci.extFlags = dev->pciAddrExtFlags;
-+    ret = virDomainPCIAddressExtensionEnsureAddr(addrs, &dev->addr.pci);
-+
-  cleanup:
-     VIR_FREE(addrStr);
-     return ret;
- }
- 
- 
-+void
-+virDomainPCIAddressExtensionReleaseAddr(virDomainPCIAddressSetPtr addrs,
-+                                        virPCIDeviceAddressPtr addr)
-+{
-+    if (addr->extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI)
-+        virDomainZPCIAddressReleaseIds(addrs->zpciIds, &addr->zpci);
-+}
-+
-+
- void
- virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
-                                virPCIDeviceAddressPtr addr)
-diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
-index b01e6b9d20..e5ce4868d5 100644
---- a/src/conf/domain_addr.h
-+++ b/src/conf/domain_addr.h
-@@ -166,6 +166,14 @@ bool virDomainPCIAddressSlotInUse(virDomainPCIAddressSetPtr addrs,
-                                   virPCIDeviceAddressPtr addr)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
-+int virDomainPCIAddressExtensionReserveAddr(virDomainPCIAddressSetPtr addrs,
-+                                            virPCIDeviceAddressPtr addr)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-+
-+int virDomainPCIAddressExtensionReserveNextAddr(virDomainPCIAddressSetPtr addrs,
-+                                                virPCIDeviceAddressPtr addr)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-+
- int virDomainPCIAddressReserveAddr(virDomainPCIAddressSetPtr addrs,
-                                    virPCIDeviceAddressPtr addr,
-                                    virDomainPCIConnectFlags flags,
-@@ -187,6 +195,10 @@ void virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
-                                     virPCIDeviceAddressPtr addr)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
-+void virDomainPCIAddressExtensionReleaseAddr(virDomainPCIAddressSetPtr addrs,
-+                                             virPCIDeviceAddressPtr addr)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-+
- void virDomainPCIAddressSetAllMulti(virDomainDefPtr def)
-     ATTRIBUTE_NONNULL(1);
- 
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index b2a2a1f265..ee7625b0f3 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -93,6 +93,8 @@ virCPUModeTypeToString;
- 
- 
- # conf/device_conf.h
-+virDeviceInfoPCIAddressExtensionIsPresent;
-+virDeviceInfoPCIAddressExtensionIsWanted;
- virDomainDeviceInfoAddressIsEqual;
- virDomainDeviceInfoCopy;
- virInterfaceLinkFormat;
-@@ -114,6 +116,9 @@ virDomainPCIAddressAsString;
- virDomainPCIAddressBusIsFullyReserved;
- virDomainPCIAddressBusSetModel;
- virDomainPCIAddressEnsureAddr;
-+virDomainPCIAddressExtensionReleaseAddr;
-+virDomainPCIAddressExtensionReserveAddr;
-+virDomainPCIAddressExtensionReserveNextAddr;
- virDomainPCIAddressReleaseAddr;
- virDomainPCIAddressReserveAddr;
- virDomainPCIAddressReserveNextAddr;
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index ba870d56b1..8338241cba 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -1405,6 +1405,24 @@ qemuDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
- }
- 
- 
-+static int
-+qemuDomainAssignPCIAddressExtension(virDomainDefPtr def ATTRIBUTE_UNUSED,
-+                                    virDomainDeviceDefPtr device ATTRIBUTE_UNUSED,
-+                                    virDomainDeviceInfoPtr info,
-+                                    void *opaque)
-+{
-+    virDomainPCIAddressSetPtr addrs = opaque;
-+    virPCIDeviceAddressPtr addr = &info->addr.pci;
-+
-+    if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)
-+        addr->extFlags = info->pciAddrExtFlags;
-+
-+    if (virDeviceInfoPCIAddressExtensionIsWanted(info))
-+        return virDomainPCIAddressExtensionReserveNextAddr(addrs, addr);
-+
-+    return 0;
-+}
-+
- static int
- qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                             virDomainDeviceDefPtr device,
-@@ -1498,6 +1516,31 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
-     return ret;
- }
- 
-+static int
-+qemuDomainCollectPCIAddressExtension(virDomainDefPtr def ATTRIBUTE_UNUSED,
-+                                     virDomainDeviceDefPtr device,
-+                                     virDomainDeviceInfoPtr info,
-+                                     void *opaque)
-+{
-+    virDomainPCIAddressSetPtr addrs = opaque;
-+    virPCIDeviceAddressPtr addr = &info->addr.pci;
-+
-+    if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)
-+        addr->extFlags = info->pciAddrExtFlags;
-+
-+    if (!virDeviceInfoPCIAddressExtensionIsPresent(info) ||
-+        ((device->type == VIR_DOMAIN_DEVICE_HOSTDEV) &&
-+         (device->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE))) {
-+        /* If a hostdev has a parent, its info will be a part of the
-+         * parent, and will have its address collected during the scan
-+         * of the parent's device type.
-+        */
-+        return 0;
-+    }
-+
-+    return virDomainPCIAddressExtensionReserveAddr(addrs, addr);
-+}
-+
- static virDomainPCIAddressSetPtr
- qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
-                               virQEMUCapsPtr qemuCaps,
-@@ -1589,6 +1632,12 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
-     if (virDomainDeviceInfoIterate(def, qemuDomainCollectPCIAddress, addrs) < 0)
-         goto error;
- 
-+    if (virDomainDeviceInfoIterate(def,
-+                                   qemuDomainCollectPCIAddressExtension,
-+                                   addrs) < 0) {
-+        goto error;
-+    }
-+
-     return addrs;
- 
-  error:
-@@ -2590,6 +2639,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
-         if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
-             goto cleanup;
- 
-+        if (virDomainDeviceInfoIterate(def, qemuDomainAssignPCIAddressExtension, addrs) < 0)
-+            goto cleanup;
-+
-         /* Only for *new* domains with pcie-root (and no other
-          * manually specified PCI controllers in the definition): If,
-          * after assigning addresses/reserving slots for all devices,
-@@ -2684,6 +2736,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
-         if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
-             goto cleanup;
- 
-+        if (virDomainDeviceInfoIterate(def, qemuDomainAssignPCIAddressExtension, addrs) < 0)
-+            goto cleanup;
-+
-         /* set multi attribute for devices at function 0 of
-          * any slot that has multiple functions in use
-          */
-@@ -3143,8 +3198,10 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,
-     if (!devstr)
-         devstr = info->alias;
- 
--    if (virDeviceInfoPCIAddressPresent(info))
-+    if (virDeviceInfoPCIAddressPresent(info)) {
-         virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci);
-+        virDomainPCIAddressExtensionReleaseAddr(priv->pciaddrs, &info->addr.pci);
-+    }
- 
-     if (virDomainUSBAddressRelease(priv->usbaddrs, info) < 0)
-         VIR_WARN("Unable to release USB address on %s", NULLSTR(devstr));
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF_FORMAT_SECURE-is-used.patch b/SOURCES/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF_FORMAT_SECURE-is-used.patch
new file mode 100644
index 0000000..6c4c17c
--- /dev/null
+++ b/SOURCES/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF_FORMAT_SECURE-is-used.patch
@@ -0,0 +1,58 @@
+From 898e0003ae21e9fbe49995980c8746e9d2ac9b8b Mon Sep 17 00:00:00 2001
+Message-Id: <898e0003ae21e9fbe49995980c8746e9d2ac9b8b@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 14:23:06 +0200
+Subject: [PATCH] conf: Don't format http cookies unless
+ VIR_DOMAIN_DEF_FORMAT_SECURE is used
+
+Starting with 3b076391befc3fe72deb0c244ac6c2b4c100b410
+(v6.1.0-122-g3b076391be) we support http cookies. Since they may contain
+somewhat sensitive information we should not format them into the XML
+unless VIR_DOMAIN_DEF_FORMAT_SECURE is asserted.
+
+Reported-by: Han Han <hhan@redhat.com>
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit a5b064bf4b17a9884d7d361733737fb614ad8979)
+
+CVE-2020-14301
+Message-Id: <592a0b594666f580e743b6bd2b4ddccbd1e0cc7c.1592914898.git.pkrempa@redhat.com>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/conf/domain_conf.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index ed9ca0e9d8..60962ee7c1 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -24377,11 +24377,15 @@ virDomainSourceDefFormatSeclabel(virBufferPtr buf,
+ 
+ static void
+ virDomainDiskSourceFormatNetworkCookies(virBufferPtr buf,
+-                                        virStorageSourcePtr src)
++                                        virStorageSourcePtr src,
++                                        unsigned int flags)
+ {
+     g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
+     size_t i;
+ 
++    if (!(flags & VIR_DOMAIN_DEF_FORMAT_SECURE))
++        return;
++
+     for (i = 0; i < src->ncookies; i++) {
+         virBufferEscapeString(&childBuf, "<cookie name='%s'>", src->cookies[i]->name);
+         virBufferEscapeString(&childBuf, "%s</cookie>\n", src->cookies[i]->value);
+@@ -24442,7 +24446,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+                           virTristateBoolTypeToString(src->sslverify));
+     }
+ 
+-    virDomainDiskSourceFormatNetworkCookies(childBuf, src);
++    virDomainDiskSourceFormatNetworkCookies(childBuf, src, flags);
+ 
+     if (src->readahead)
+         virBufferAsprintf(childBuf, "<readahead size='%llu'/>\n", src->readahead);
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-conf-Don-t-generate-machine-names-with-a-dot.patch b/SOURCES/libvirt-conf-Don-t-generate-machine-names-with-a-dot.patch
new file mode 100644
index 0000000..1a24e0b
--- /dev/null
+++ b/SOURCES/libvirt-conf-Don-t-generate-machine-names-with-a-dot.patch
@@ -0,0 +1,97 @@
+From 3ff27fe469c36e5655231f6759150350b17de298 Mon Sep 17 00:00:00 2001
+Message-Id: <3ff27fe469c36e5655231f6759150350b17de298@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:09 +0100
+Subject: [PATCH] conf: Don't generate machine names with a dot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+According to the linked BZ, machined expects either valid
+hostname or valid FQDN (see systemd commit
+v239-3092-gd65652f1f2). While in case of multiple dots, a
+trailing one doesn't violate FQDN, it does violate the rule in
+case of something simple, like "domain.". But it's safe to remove
+it in both cases.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+Fixes: 45464db8ba502764cf37ec9335770248bdb3d9a8
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2695191a44eb7375225b4ad073825ed3563a172a)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <355e05e31ec98522fa0e03a0c2c7af8ca097070d.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 14 +++++++-------
+ tests/virsystemdtest.c |  5 +++--
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 4b297c96bc..b3c4084c38 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -30688,20 +30688,20 @@ static void
+ virDomainMachineNameAppendValid(virBufferPtr buf,
+                                 const char *name)
+ {
+-    bool skip_dot = false;
++    bool skip = true;
+ 
+     for (; *name; name++) {
+         if (strlen(virBufferCurrentContent(buf)) >= 64)
+             break;
+ 
+-        if (*name == '.') {
+-            if (!skip_dot)
++        if (*name == '.' || *name == '-') {
++            if (!skip)
+                 virBufferAddChar(buf, *name);
+-            skip_dot = true;
++            skip = true;
+             continue;
+         }
+ 
+-        skip_dot = false;
++        skip = false;
+ 
+         if (!strchr(HOSTNAME_CHARS, *name))
+             continue;
+@@ -30709,8 +30709,8 @@ virDomainMachineNameAppendValid(virBufferPtr buf,
+         virBufferAddChar(buf, *name);
+     }
+ 
+-    /* trailing dashes are not allowed */
+-    virBufferTrimChars(buf, "-");
++    /* trailing dashes or dots are not allowed */
++    virBufferTrimChars(buf, "-.");
+ }
+ 
+ #undef HOSTNAME_CHARS
+diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
+index 26876850b8..eb510b40e4 100644
+--- a/tests/virsystemdtest.c
++++ b/tests/virsystemdtest.c
+@@ -733,7 +733,7 @@ mymain(void)
+     TEST_MACHINE("demo", 1, "qemu-1-demo");
+     TEST_MACHINE("demo-name", 2, "qemu-2-demo-name");
+     TEST_MACHINE("demo!name", 3, "qemu-3-demoname");
+-    TEST_MACHINE(".demo", 4, "qemu-4-.demo");
++    TEST_MACHINE(".demo", 4, "qemu-4-demo");
+     TEST_MACHINE("bull\U0001f4a9", 5, "qemu-5-bull");
+     TEST_MACHINE("demo..name", 6, "qemu-6-demo.name");
+     TEST_MACHINE("12345678901234567890123456789012345678901234567890123456789", 7,
+@@ -743,7 +743,8 @@ mymain(void)
+     TEST_MACHINE("kstest-network-device-default-httpks_(c9eed63e-981e-48ec-acdc-56b3f8c5f678)", 100,
+                  "qemu-100-kstest-network-device-default-httpksc9eed63e-981e-48ec");
+     TEST_MACHINE("kstest-network-device-default-httpks_(c9eed63e-981e-48ec--cdc-56b3f8c5f678)", 10,
+-                 "qemu-10-kstest-network-device-default-httpksc9eed63e-981e-48ec");
++                 "qemu-10-kstest-network-device-default-httpksc9eed63e-981e-48ec-c");
++    TEST_MACHINE("demo.-.test.", 11, "qemu-11-demo.test");
+ 
+ # define TESTS_PM_SUPPORT_HELPER(name, function) \
+     do { \
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-Expose-virDomainSCSIDriveAddressIsUsed.patch b/SOURCES/libvirt-conf-Expose-virDomainSCSIDriveAddressIsUsed.patch
deleted file mode 100644
index 9d79b6a..0000000
--- a/SOURCES/libvirt-conf-Expose-virDomainSCSIDriveAddressIsUsed.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2e3774564235a185a2cc4b7a22c17de17498db68 Mon Sep 17 00:00:00 2001
-Message-Id: <2e3774564235a185a2cc4b7a22c17de17498db68@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 18 Apr 2019 19:36:31 +0200
-Subject: [PATCH] conf: Expose virDomainSCSIDriveAddressIsUsed
-
-RHEl-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1692296
-RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1692354
-
-This function checks if given drive address is already present in
-passed domain definition. Expose the function as it will be used
-shortly.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-(cherry picked from commit 89237d534f0fe950d06a2081089154160c6c2224)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <ef6c1d914a1f6bf0cdb44006b9adf6edf7bb4d41.1555608962.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/conf/domain_conf.c   | 2 +-
- src/conf/domain_conf.h   | 4 ++++
- src/libvirt_private.syms | 1 +
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d431441f62..e62f78471c 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4404,7 +4404,7 @@ virDomainDriveAddressIsUsedByHostdev(const virDomainDef *def,
-  * Return true if the SCSI drive address is already in use, false
-  * otherwise.
-  */
--static bool
-+bool
- virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
-                                 const virDomainDeviceDriveAddress *addr)
- {
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index f05fca284f..dbccf2cf24 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2789,6 +2789,10 @@ virDomainXMLNamespacePtr
- virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt)
-     ATTRIBUTE_NONNULL(1);
- 
-+bool
-+virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
-+                                const virDomainDeviceDriveAddress *addr);
-+
- int virDomainDefPostParse(virDomainDefPtr def,
-                           virCapsPtr caps,
-                           unsigned int parseFlags,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 624151056a..df27ac4b3a 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -520,6 +520,7 @@ virDomainRunningReasonTypeToString;
- virDomainSaveConfig;
- virDomainSaveStatus;
- virDomainSaveXML;
-+virDomainSCSIDriveAddressIsUsed;
- virDomainSeclabelTypeFromString;
- virDomainSeclabelTypeToString;
- virDomainShmemDefEquals;
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-conf-Fix-a-error-msg-typo-in-virDomainVideoDefValidate.patch b/SOURCES/libvirt-conf-Fix-a-error-msg-typo-in-virDomainVideoDefValidate.patch
deleted file mode 100644
index c848359..0000000
--- a/SOURCES/libvirt-conf-Fix-a-error-msg-typo-in-virDomainVideoDefValidate.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b1c91c78451c59b0ebe3aafa17eef764e69be28c Mon Sep 17 00:00:00 2001
-Message-Id: <b1c91c78451c59b0ebe3aafa17eef764e69be28c@dist-git>
-From: Han Han <hhan@redhat.com>
-Date: Tue, 31 Jul 2018 10:42:27 +0200
-Subject: [PATCH] conf: Fix a error msg typo in virDomainVideoDefValidate
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1607825
-
-Introduced by commit d48813e8.
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d1c4480390da7243e37daee37f8a40cb439a6a7c)
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/conf/domain_conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 23288aa01b..a05aad056d 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -5697,7 +5697,7 @@ virDomainVideoDefValidate(const virDomainVideoDef *video,
-         if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE &&
-             def->nvideos > 1) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("a '%s' video type must be the only video device "
-+                           _("a 'none' video type must be the only video device "
-                              "defined for the domain"));
-             return -1;
-         }
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Fix-check-for-chardev-source-path.patch b/SOURCES/libvirt-conf-Fix-check-for-chardev-source-path.patch
deleted file mode 100644
index 6aa4fef..0000000
--- a/SOURCES/libvirt-conf-Fix-check-for-chardev-source-path.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 27213f01f9320cf0fec49980f78a100e64025ba4 Mon Sep 17 00:00:00 2001
-Message-Id: <27213f01f9320cf0fec49980f78a100e64025ba4@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Fri, 7 Sep 2018 17:53:32 +0200
-Subject: [PATCH] conf: Fix check for chardev source path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Attempting to use a chardev definition like
-
-  <serial type='unix'>
-    <target type='isa-serial'/>
-  </serial>
-
-correctly results in an error being reported, since the source
-path - a required piece of information - is missing; however,
-the very similar
-
-  <serial type='unix'>
-    <target type='pci-serial'/>
-  </serial>
-
-was happily accepted by libvirt, only to result in libvirtd
-crashing as soon as the guest was started.
-
-The issue was caused by checking the chardev's targetType
-against whitelisted values from virDomainChrChannelTargetType
-without first checking the chardev's deviceType to make sure
-it is actually a channel, for which the check makes sense,
-rather than a different type of chardev.
-
-The only reason this wasn't spotted earlier is that the
-whitelisted values just so happen to correspond to USB and
-PCI serial devices and Xen and UML consoles respectively,
-all of which are fairly uncommon.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1609720
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 614193fac67445a7e92bf620ffef726ed1bd6f07)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1609723
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/conf/domain_conf.c                            | 11 +++++++----
- .../serial-unix-missing-source.xml                | 15 +++++++++++++++
- tests/qemuxml2argvtest.c                          |  1 +
- 3 files changed, 23 insertions(+), 4 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/serial-unix-missing-source.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index a881b43b51..240b33f28c 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -5523,11 +5523,14 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *def,
-         break;
- 
-     case VIR_DOMAIN_CHR_TYPE_UNIX:
--        /* path can be auto generated */
-+        /* The source path can be auto generated for certain specific
-+         * types of channels, but in most cases we should report an
-+         * error if the user didn't provide it */
-         if (!def->data.nix.path &&
--            (!chr_def ||
--             (chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN &&
--              chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO))) {
-+            !(chr_def &&
-+              chr_def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
-+              (chr_def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN ||
-+               chr_def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("Missing source path attribute for char device"));
-             return -1;
-diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.xml b/tests/qemuxml2argvdata/serial-unix-missing-source.xml
-new file mode 100644
-index 0000000000..1e1221f12d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/serial-unix-missing-source.xml
-@@ -0,0 +1,15 @@
-+<domain type='qemu'>
-+  <name>guest</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='aarch64' machine='virt'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <serial type='unix'>
-+      <target type='pci-serial'/>
-+    </serial>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 608a2b6ce3..ebe9c8a131 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1363,6 +1363,7 @@ mymain(void)
-     DO_TEST("serial-unix-chardev",
-             QEMU_CAPS_DEVICE_ISA_SERIAL);
-     DO_TEST_CAPS_LATEST("serial-unix-chardev");
-+    DO_TEST_PARSE_ERROR("serial-unix-missing-source", NONE);
-     DO_TEST("serial-tcp-chardev",
-             QEMU_CAPS_DEVICE_ISA_SERIAL);
-     DO_TEST("serial-udp-chardev",
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-conf-Implement-support-for-slices-of-disk-source.patch b/SOURCES/libvirt-conf-Implement-support-for-slices-of-disk-source.patch
new file mode 100644
index 0000000..3083b2c
--- /dev/null
+++ b/SOURCES/libvirt-conf-Implement-support-for-slices-of-disk-source.patch
@@ -0,0 +1,143 @@
+From 6d5174acd7530d554ac2651f3e6a5da9f69fe6e4 Mon Sep 17 00:00:00 2001
+Message-Id: <6d5174acd7530d554ac2651f3e6a5da9f69fe6e4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:20 +0100
+Subject: [PATCH] conf: Implement support for <slices> of disk source
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Implement parsing and formatting of the 'storage' slice.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bbf5d05cfd003e33600009cac7ea98ef1539dd7c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <d31bb27ae30140c9deb696972ee76a90d7bcc610.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 86 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 86 insertions(+)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index b46b92aecf..5c11f49463 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -9441,6 +9441,57 @@ virDomainStorageSourceParseBase(const char *type,
+ }
+ 
+ 
++static virStorageSourceSlicePtr
++virDomainStorageSourceParseSlice(xmlNodePtr node,
++                                 xmlXPathContextPtr ctxt)
++{
++    VIR_XPATH_NODE_AUTORESTORE(ctxt);
++    g_autofree char *offset = NULL;
++    g_autofree char *size = NULL;
++    g_autofree virStorageSourceSlicePtr ret = g_new0(virStorageSourceSlice, 1);
++
++    ctxt->node = node;
++
++    if (!(offset = virXPathString("string(./@offset)", ctxt)) ||
++        !(size = virXPathString("string(./@size)", ctxt))) {
++        virReportError(VIR_ERR_XML_ERROR, "%s",
++                       _("missing offset or size attribute of slice"));
++        return NULL;
++    }
++
++    if (virStrToLong_ullp(offset, NULL, 10, &ret->offset) < 0) {
++        virReportError(VIR_ERR_XML_ERROR,
++                       _("malformed value '%s' of 'offset' attribute of slice"),
++                       offset);
++        return NULL;
++    }
++
++    if (virStrToLong_ullp(size, NULL, 10, &ret->size) < 0) {
++        virReportError(VIR_ERR_XML_ERROR,
++                       _("malformed value '%s' of 'size' attribute of slice"),
++                       size);
++        return NULL;
++    }
++
++    return g_steal_pointer(&ret);
++}
++
++
++static int
++virDomainStorageSourceParseSlices(virStorageSourcePtr src,
++                                  xmlXPathContextPtr ctxt)
++{
++    xmlNodePtr node;
++
++    if ((node = virXPathNode("./slices/slice[@type='storage']", ctxt))) {
++        if (!(src->sliceStorage = virDomainStorageSourceParseSlice(node, ctxt)))
++            return -1;
++    }
++
++    return 0;
++}
++
++
+ /**
+  * virDomainStorageSourceParse:
+  * @node: XML node pointing to the source element to parse
+@@ -9506,6 +9557,9 @@ virDomainStorageSourceParse(xmlNodePtr node,
+     if (virDomainDiskSourcePRParse(node, ctxt, &src->pr) < 0)
+         return -1;
+ 
++    if (virDomainStorageSourceParseSlices(src, ctxt) < 0)
++        return -1;
++
+     if (virSecurityDeviceLabelDefParseXML(&src->seclabels, &src->nseclabels,
+                                           ctxt, flags) < 0)
+         return -1;
+@@ -24226,6 +24280,36 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr buf,
+ }
+ 
+ 
++static void
++virDomainDiskSourceFormatSlice(virBufferPtr buf,
++                               const char *slicetype,
++                               virStorageSourceSlicePtr slice)
++{
++    g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
++
++    if (!slice)
++        return;
++
++    virBufferAsprintf(&attrBuf, " type='%s'", slicetype);
++    virBufferAsprintf(&attrBuf, " offset='%llu'", slice->offset);
++    virBufferAsprintf(&attrBuf, " size='%llu'", slice->size);
++
++    virXMLFormatElement(buf, "slice", &attrBuf, NULL);
++}
++
++
++static void
++virDomainDiskSourceFormatSlices(virBufferPtr buf,
++                                virStorageSourcePtr src)
++{
++    g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
++
++    virDomainDiskSourceFormatSlice(&childBuf, "storage", src->sliceStorage);
++
++    virXMLFormatElement(buf, "slices", NULL, &childBuf);
++}
++
++
+ /**
+  * virDomainDiskSourceFormat:
+  * @buf: output buffer
+@@ -24296,6 +24380,8 @@ virDomainDiskSourceFormat(virBufferPtr buf,
+         return -1;
+     }
+ 
++    virDomainDiskSourceFormatSlices(&childBuf, src);
++
+     if (src->type != VIR_STORAGE_TYPE_NETWORK)
+         virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels,
+                                          src->seclabels, flags);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-Introduce-VIR_DOMAIN_TIMER_NAME_ARMVTIMER.patch b/SOURCES/libvirt-conf-Introduce-VIR_DOMAIN_TIMER_NAME_ARMVTIMER.patch
new file mode 100644
index 0000000..ba2679f
--- /dev/null
+++ b/SOURCES/libvirt-conf-Introduce-VIR_DOMAIN_TIMER_NAME_ARMVTIMER.patch
@@ -0,0 +1,129 @@
+From eb6bdf4798eea9bae5ddca1fdd13fb5ef6e99596 Mon Sep 17 00:00:00 2001
+Message-Id: <eb6bdf4798eea9bae5ddca1fdd13fb5ef6e99596@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 13:12:35 +0100
+Subject: [PATCH] conf: Introduce VIR_DOMAIN_TIMER_NAME_ARMVTIMER
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This new timer model will be used to control the behavior of the
+virtual timer for KVM ARM/virt guests.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3809e88a87e5898c9cf3a277cb32e20fca8fb2d0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214121237.623948-5-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/schemas/domaincommon.rng | 1 +
+ src/conf/domain_conf.c        | 1 +
+ src/conf/domain_conf.h        | 1 +
+ src/libxl/libxl_conf.c        | 1 +
+ src/libxl/xen_common.c        | 1 +
+ src/qemu/qemu_command.c       | 2 ++
+ src/qemu/qemu_domain.c        | 3 +++
+ 7 files changed, 10 insertions(+)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 026e753567..19476a2735 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1239,6 +1239,7 @@
+             <choice>
+               <value>hpet</value>
+               <value>pit</value>
++              <value>armvtimer</value>
+             </choice>
+           </attribute>
+           <optional>
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 58f72b3b0f..68d9ce9c4e 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -1062,6 +1062,7 @@ VIR_ENUM_IMPL(virDomainTimerName,
+               "tsc",
+               "kvmclock",
+               "hypervclock",
++              "armvtimer",
+ );
+ 
+ VIR_ENUM_IMPL(virDomainTimerTrack,
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index ee8eb3ddc0..ef2c1b80f7 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -1989,6 +1989,7 @@ typedef enum {
+     VIR_DOMAIN_TIMER_NAME_TSC,
+     VIR_DOMAIN_TIMER_NAME_KVMCLOCK,
+     VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK,
++    VIR_DOMAIN_TIMER_NAME_ARMVTIMER,
+ 
+     VIR_DOMAIN_TIMER_NAME_LAST
+ } virDomainTimerNameType;
+diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
+index 2488bb9d32..ffac890262 100644
+--- a/src/libxl/libxl_conf.c
++++ b/src/libxl/libxl_conf.c
+@@ -361,6 +361,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
+         case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK:
+         case VIR_DOMAIN_TIMER_NAME_RTC:
+         case VIR_DOMAIN_TIMER_NAME_PIT:
++        case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("unsupported timer type (name) '%s'"),
+                            virDomainTimerNameTypeToString(clock.timers[i]->name));
+diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
+index 415549a42c..9a385eba0d 100644
+--- a/src/libxl/xen_common.c
++++ b/src/libxl/xen_common.c
+@@ -2182,6 +2182,7 @@ xenFormatCPUFeatures(virConfPtr conf, virDomainDefPtr def)
+         case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK:
+         case VIR_DOMAIN_TIMER_NAME_RTC:
+         case VIR_DOMAIN_TIMER_NAME_PIT:
++        case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("unsupported timer type (name) '%s'"),
+                            virDomainTimerNameTypeToString(def->clock.timers[i]->name));
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 0ad09baa1d..e1e19e0fcc 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -6200,6 +6200,7 @@ qemuBuildClockCommandLine(virCommandPtr cmd,
+         case VIR_DOMAIN_TIMER_NAME_TSC:
+         case VIR_DOMAIN_TIMER_NAME_KVMCLOCK:
+         case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK:
++        case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
+             /* Timers above are handled when building -cpu.  */
+         case VIR_DOMAIN_TIMER_NAME_LAST:
+             break;
+@@ -6631,6 +6632,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
+             if (timer->frequency > 0)
+                 virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
+             break;
++        case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
+         case VIR_DOMAIN_TIMER_NAME_PLATFORM:
+         case VIR_DOMAIN_TIMER_NAME_PIT:
+         case VIR_DOMAIN_TIMER_NAME_RTC:
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 846d1ecb29..4de4f9da53 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -5504,6 +5504,9 @@ qemuDomainDefValidateClockTimers(const virDomainDef *def,
+                 return -1;
+             }
+             break;
++
++        case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
++            break;
+         }
+     }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-Introduce-address-caching-for-PCI-extensions.patch b/SOURCES/libvirt-conf-Introduce-address-caching-for-PCI-extensions.patch
deleted file mode 100644
index a186a21..0000000
--- a/SOURCES/libvirt-conf-Introduce-address-caching-for-PCI-extensions.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 7888472ef1d57d992995a16dc7c9ba0fe18562a8 Mon Sep 17 00:00:00 2001
-Message-Id: <7888472ef1d57d992995a16dc7c9ba0fe18562a8@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:22 +0200
-Subject: [PATCH] conf: Introduce address caching for PCI extensions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch provides a caching mechanism for the device address
-extensions uid and fid on S390. For efficient sparse address allocation,
-we introduce two hash tables for uid/fid which hold the address set
-information per domain. Also in order to improve performance of
-searching available value, we introduce our own callbacks for the two
-hashtables. In this way, uid/fid is saved in hash key and hash value
-could be any non-NULL pointer due to no operation on hash value. That is
-also the reason why we don't introduce hash value free callback.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit 28831e1f1ec001882e907f03f7618f7c00ebc98d)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/conf/domain_addr.h
-    + context
-      - missing b72183223f3b
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-6-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/bhyve/bhyve_device.c       |  3 +-
- src/conf/domain_addr.c         | 93 +++++++++++++++++++++++++++++++++-
- src/conf/domain_addr.h         | 10 +++-
- src/qemu/qemu_domain_address.c |  6 ++-
- 4 files changed, 108 insertions(+), 4 deletions(-)
-
-diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c
-index 03aa6c93bd..8f0862b0b6 100644
---- a/src/bhyve/bhyve_device.c
-+++ b/src/bhyve/bhyve_device.c
-@@ -71,7 +71,8 @@ bhyveDomainPCIAddressSetCreate(virDomainDefPtr def, unsigned int nbuses)
- {
-     virDomainPCIAddressSetPtr addrs;
- 
--    if ((addrs = virDomainPCIAddressSetAlloc(nbuses)) == NULL)
-+    if ((addrs = virDomainPCIAddressSetAlloc(nbuses,
-+                                             VIR_PCI_ADDRESS_EXTENSION_NONE)) == NULL)
-         return NULL;
- 
-     if (virDomainPCIAddressBusSetModel(&addrs->buses[0],
-diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
-index 39f22b82eb..3e33549c3d 100644
---- a/src/conf/domain_addr.c
-+++ b/src/conf/domain_addr.c
-@@ -27,6 +27,7 @@
- #include "virlog.h"
- #include "virstring.h"
- #include "domain_addr.h"
-+#include "virhashcode.h"
- 
- #define VIR_FROM_THIS VIR_FROM_DOMAIN
- 
-@@ -741,8 +742,93 @@ virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs,
-     addrs->buses[addr->bus].slot[addr->slot].functions &= ~(1 << addr->function);
- }
- 
-+
-+static uint32_t
-+virZPCIAddrKeyCode(const void *name,
-+                   uint32_t seed)
-+{
-+    unsigned int value = *((unsigned int *)name);
-+    return virHashCodeGen(&value, sizeof(value), seed);
-+}
-+
-+
-+static bool
-+virZPCIAddrKeyEqual(const void *namea,
-+                    const void *nameb)
-+{
-+    return *((unsigned int *)namea) == *((unsigned int *)nameb);
-+}
-+
-+
-+static void *
-+virZPCIAddrKeyCopy(const void *name)
-+{
-+    unsigned int *copy;
-+
-+    if (VIR_ALLOC(copy) < 0)
-+        return NULL;
-+
-+    *copy = *((unsigned int *)name);
-+    return (void *)copy;
-+}
-+
-+
-+static void
-+virZPCIAddrKeyFree(void *name)
-+{
-+    VIR_FREE(name);
-+}
-+
-+
-+static void
-+virDomainPCIAddressSetExtensionFree(virDomainPCIAddressSetPtr addrs)
-+{
-+    if (!addrs || !addrs->zpciIds)
-+        return;
-+
-+    virHashFree(addrs->zpciIds->uids);
-+    virHashFree(addrs->zpciIds->fids);
-+    VIR_FREE(addrs->zpciIds);
-+}
-+
-+
-+static int
-+virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSetPtr addrs,
-+                                     virPCIDeviceAddressExtensionFlags extFlags)
-+{
-+    if (extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) {
-+        if (addrs->zpciIds)
-+            return 0;
-+
-+        if (VIR_ALLOC(addrs->zpciIds) < 0)
-+            return -1;
-+
-+        if (!(addrs->zpciIds->uids = virHashCreateFull(10, NULL,
-+                                                       virZPCIAddrKeyCode,
-+                                                       virZPCIAddrKeyEqual,
-+                                                       virZPCIAddrKeyCopy,
-+                                                       virZPCIAddrKeyFree)))
-+            goto error;
-+
-+        if (!(addrs->zpciIds->fids = virHashCreateFull(10, NULL,
-+                                                       virZPCIAddrKeyCode,
-+                                                       virZPCIAddrKeyEqual,
-+                                                       virZPCIAddrKeyCopy,
-+                                                       virZPCIAddrKeyFree)))
-+            goto error;
-+    }
-+
-+    return 0;
-+
-+ error:
-+    virDomainPCIAddressSetExtensionFree(addrs);
-+    return -1;
-+}
-+
-+
- virDomainPCIAddressSetPtr
--virDomainPCIAddressSetAlloc(unsigned int nbuses)
-+virDomainPCIAddressSetAlloc(unsigned int nbuses,
-+                            virPCIDeviceAddressExtensionFlags extFlags)
- {
-     virDomainPCIAddressSetPtr addrs;
- 
-@@ -753,6 +839,10 @@ virDomainPCIAddressSetAlloc(unsigned int nbuses)
-         goto error;
- 
-     addrs->nbuses = nbuses;
-+
-+    if (virDomainPCIAddressSetExtensionAlloc(addrs, extFlags) < 0)
-+        goto error;
-+
-     return addrs;
- 
-  error:
-@@ -767,6 +857,7 @@ virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr addrs)
-     if (!addrs)
-         return;
- 
-+    virDomainPCIAddressSetExtensionFree(addrs);
-     VIR_FREE(addrs->buses);
-     VIR_FREE(addrs);
- }
-diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
-index fd06008e26..b01e6b9d20 100644
---- a/src/conf/domain_addr.h
-+++ b/src/conf/domain_addr.h
-@@ -116,6 +116,12 @@ typedef struct {
- } virDomainPCIAddressBus;
- typedef virDomainPCIAddressBus *virDomainPCIAddressBusPtr;
- 
-+typedef struct {
-+    virHashTablePtr uids;
-+    virHashTablePtr fids;
-+} virDomainZPCIAddressIds;
-+typedef virDomainZPCIAddressIds *virDomainZPCIAddressIdsPtr;
-+
- struct _virDomainPCIAddressSet {
-     virDomainPCIAddressBus *buses;
-     size_t nbuses;
-@@ -125,6 +131,7 @@ struct _virDomainPCIAddressSet {
-     bool areMultipleRootsSupported;
-     /* If true, the guest can use the pcie-to-pci-bridge controller */
-     bool isPCIeToPCIBridgeSupported;
-+    virDomainZPCIAddressIdsPtr zpciIds;
- };
- typedef struct _virDomainPCIAddressSet virDomainPCIAddressSet;
- typedef virDomainPCIAddressSet *virDomainPCIAddressSetPtr;
-@@ -132,7 +139,8 @@ typedef virDomainPCIAddressSet *virDomainPCIAddressSetPtr;
- char *virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
-       ATTRIBUTE_NONNULL(1);
- 
--virDomainPCIAddressSetPtr virDomainPCIAddressSetAlloc(unsigned int nbuses);
-+virDomainPCIAddressSetPtr virDomainPCIAddressSetAlloc(unsigned int nbuses,
-+                                                      virPCIDeviceAddressExtensionFlags extFlags);
- 
- void virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr addrs);
- 
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index 3d01d14b46..ba870d56b1 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -1508,8 +1508,12 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
-     size_t i;
-     bool hasPCIeRoot = false;
-     virDomainControllerModelPCI defaultModel;
-+    virPCIDeviceAddressExtensionFlags extFlags = VIR_PCI_ADDRESS_EXTENSION_NONE;
- 
--    if ((addrs = virDomainPCIAddressSetAlloc(nbuses)) == NULL)
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI))
-+        extFlags |= VIR_PCI_ADDRESS_EXTENSION_ZPCI;
-+
-+    if ((addrs = virDomainPCIAddressSetAlloc(nbuses, extFlags)) == NULL)
-         return NULL;
- 
-     addrs->dryRun = dryRun;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-extension-flag-and-zPCI-member-for-PCI-address.patch b/SOURCES/libvirt-conf-Introduce-extension-flag-and-zPCI-member-for-PCI-address.patch
deleted file mode 100644
index 3093f57..0000000
--- a/SOURCES/libvirt-conf-Introduce-extension-flag-and-zPCI-member-for-PCI-address.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 050eb598af9291f385998cb1127d5bdf83305501 Mon Sep 17 00:00:00 2001
-Message-Id: <050eb598af9291f385998cb1127d5bdf83305501@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:21 +0200
-Subject: [PATCH] conf: Introduce extension flag and zPCI member for PCI
- address
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch introduces PCI address extension flag for virDomainDeviceInfo
-and virPCIDeviceAddress. The extension flag in virDomainDeviceInfo is
-used internally during calculating PCI extension flag. The one in
-virPCIDeviceAddress is the duplicate to indicate extension address is
-being used. Currently only zPCI extension address is introduced to deal
-with 'uid' and 'fid' on the S390 platform.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit 478e5f90fd4c0c0a8c1b3a8e19b9cae93ed78a4e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_domain_address.c
-    + context
-      - missing db98a426a640
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-5-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/device_conf.h         |   4 +
- src/conf/domain_addr.h         |   5 ++
- src/qemu/qemu_domain_address.c | 140 ++++++++++++++++++++++++++++++++-
- src/util/virpci.h              |   2 +
- 4 files changed, 149 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
-index a31ce9c376..c79066ec02 100644
---- a/src/conf/device_conf.h
-+++ b/src/conf/device_conf.h
-@@ -164,6 +164,10 @@ struct _virDomainDeviceInfo {
-      * assignment, never saved and never reported.
-      */
-     int pciConnectFlags; /* enum virDomainPCIConnectFlags */
-+    /* pciAddrExtFlags is only used internally to calculate PCI
-+     * address extension flags during address assignment.
-+     */
-+    int pciAddrExtFlags; /* enum virDomainPCIAddressExtensionFlags */
-     char *loadparm;
- 
-     /* PCI devices will only be automatically placed on a PCI bus
-diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
-index 3236b7d6de..fd06008e26 100644
---- a/src/conf/domain_addr.h
-+++ b/src/conf/domain_addr.h
-@@ -29,6 +29,11 @@
- # define VIR_PCI_ADDRESS_SLOT_LAST 31
- # define VIR_PCI_ADDRESS_FUNCTION_LAST 7
- 
-+typedef enum {
-+    VIR_PCI_ADDRESS_EXTENSION_NONE = 0, /* no extension */
-+    VIR_PCI_ADDRESS_EXTENSION_ZPCI = 1 << 0, /* zPCI support */
-+} virPCIDeviceAddressExtensionFlags;
-+
- typedef enum {
-    VIR_PCI_CONNECT_HOTPLUGGABLE = 1 << 0, /* is hotplug needed/supported */
- 
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index 79d2b9f9c4..3d01d14b46 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -511,6 +511,64 @@ qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def,
- }
- 
- 
-+static bool
-+qemuDomainDeviceSupportZPCI(virDomainDeviceDefPtr device)
-+{
-+    switch ((virDomainDeviceType)device->type) {
-+    case VIR_DOMAIN_DEVICE_CHR:
-+        return false;
-+
-+    case VIR_DOMAIN_DEVICE_CONTROLLER:
-+    case VIR_DOMAIN_DEVICE_DISK:
-+    case VIR_DOMAIN_DEVICE_LEASE:
-+    case VIR_DOMAIN_DEVICE_FS:
-+    case VIR_DOMAIN_DEVICE_NET:
-+    case VIR_DOMAIN_DEVICE_INPUT:
-+    case VIR_DOMAIN_DEVICE_SOUND:
-+    case VIR_DOMAIN_DEVICE_VIDEO:
-+    case VIR_DOMAIN_DEVICE_HOSTDEV:
-+    case VIR_DOMAIN_DEVICE_WATCHDOG:
-+    case VIR_DOMAIN_DEVICE_GRAPHICS:
-+    case VIR_DOMAIN_DEVICE_HUB:
-+    case VIR_DOMAIN_DEVICE_REDIRDEV:
-+    case VIR_DOMAIN_DEVICE_SMARTCARD:
-+    case VIR_DOMAIN_DEVICE_MEMBALLOON:
-+    case VIR_DOMAIN_DEVICE_NVRAM:
-+    case VIR_DOMAIN_DEVICE_RNG:
-+    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_VSOCK:
-+        break;
-+
-+    case VIR_DOMAIN_DEVICE_NONE:
-+    case VIR_DOMAIN_DEVICE_LAST:
-+    default:
-+        virReportEnumRangeError(virDomainDeviceType, device->type);
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
-+
-+static virPCIDeviceAddressExtensionFlags
-+qemuDomainDeviceCalculatePCIAddressExtensionFlags(virQEMUCapsPtr qemuCaps,
-+                                                  virDomainDeviceDefPtr dev)
-+{
-+    virPCIDeviceAddressExtensionFlags extFlags = 0;
-+
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI) &&
-+        qemuDomainDeviceSupportZPCI(dev)) {
-+        extFlags |= VIR_PCI_ADDRESS_EXTENSION_ZPCI;
-+    }
-+
-+    return extFlags;
-+}
-+
-+
- /**
-  * qemuDomainDeviceCalculatePCIConnectFlags:
-  *
-@@ -993,6 +1051,56 @@ qemuDomainFillAllPCIConnectFlags(virDomainDefPtr def,
- }
- 
- 
-+/**
-+ * qemuDomainFillDevicePCIExtensionFlagsIter:
-+ *
-+ * @def: the entire DomainDef
-+ * @dev: The device to be checked
-+ * @info: virDomainDeviceInfo within the device
-+ * @opaque: qemu capabilities
-+ *
-+ * Sets the pciAddressExtFlags for a single device's info. Has properly
-+ * formatted arguments to be called by virDomainDeviceInfoIterate().
-+ *
-+ * Always returns 0 - there is no failure.
-+ */
-+static int
-+qemuDomainFillDevicePCIExtensionFlagsIter(virDomainDefPtr def ATTRIBUTE_UNUSED,
-+                                          virDomainDeviceDefPtr dev,
-+                                          virDomainDeviceInfoPtr info,
-+                                          void *opaque)
-+{
-+    virQEMUCapsPtr qemuCaps = opaque;
-+
-+    info->pciAddrExtFlags =
-+        qemuDomainDeviceCalculatePCIAddressExtensionFlags(qemuCaps, dev);
-+
-+    return 0;
-+}
-+
-+
-+/**
-+ * qemuDomainFillAllPCIExtensionFlags:
-+ *
-+ * @def: the entire DomainDef
-+ * @qemuCaps: as you'd expect
-+ *
-+ * Set the info->pciAddressExtFlags for all devices in the domain.
-+ *
-+ * Returns 0 on success or -1 on failure (the only possibility of
-+ * failure would be some internal problem with
-+ * virDomainDeviceInfoIterate())
-+ */
-+static int
-+qemuDomainFillAllPCIExtensionFlags(virDomainDefPtr def,
-+                                   virQEMUCapsPtr qemuCaps)
-+{
-+    return virDomainDeviceInfoIterate(def,
-+                                      qemuDomainFillDevicePCIExtensionFlagsIter,
-+                                      qemuCaps);
-+}
-+
-+
- /**
-  * qemuDomainFindUnusedIsolationGroupIter:
-  * @def: domain definition
-@@ -1267,6 +1375,27 @@ qemuDomainFillDevicePCIConnectFlags(virDomainDefPtr def,
- }
- 
- 
-+/**
-+ * qemuDomainFillDevicePCIExtensionFlags:
-+ *
-+ * @dev: The device to be checked
-+ * @info: virDomainDeviceInfo within the device
-+ * @qemuCaps: as you'd expect
-+ *
-+ * Set the info->pciAddressExtFlags for a single device.
-+ *
-+ * No return value.
-+ */
-+static void
-+qemuDomainFillDevicePCIExtensionFlags(virDomainDeviceDefPtr dev,
-+                                      virDomainDeviceInfoPtr info,
-+                                      virQEMUCapsPtr qemuCaps)
-+{
-+    info->pciAddrExtFlags =
-+        qemuDomainDeviceCalculatePCIAddressExtensionFlags(qemuCaps, dev);
-+}
-+
-+
- static int
- qemuDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
-                                     virDomainDeviceInfoPtr dev)
-@@ -2400,6 +2529,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
-     if (qemuDomainFillAllPCIConnectFlags(def, qemuCaps, driver) < 0)
-         goto cleanup;
- 
-+    if (qemuDomainFillAllPCIExtensionFlags(def, qemuCaps) < 0)
-+        goto cleanup;
-+
-     if (qemuDomainSetupIsolationGroups(def) < 0)
-         goto cleanup;
- 
-@@ -2435,7 +2567,8 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
-              */
-             virDomainDeviceInfo info = {
-                 .pciConnectFlags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
--                                    VIR_PCI_CONNECT_TYPE_PCI_DEVICE)
-+                                    VIR_PCI_CONNECT_TYPE_PCI_DEVICE),
-+                .pciAddrExtFlags = VIR_PCI_ADDRESS_EXTENSION_NONE
-             };
-             bool buses_reserved = true;
- 
-@@ -2472,7 +2605,8 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
-             qemuDomainHasPCIeRoot(def)) {
-             virDomainDeviceInfo info = {
-                 .pciConnectFlags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
--                                    VIR_PCI_CONNECT_TYPE_PCIE_DEVICE)
-+                                    VIR_PCI_CONNECT_TYPE_PCIE_DEVICE),
-+                .pciAddrExtFlags = VIR_PCI_ADDRESS_EXTENSION_NONE
-             };
- 
-             /* if there isn't an empty pcie-root-port, this will
-@@ -2989,6 +3123,8 @@ qemuDomainEnsurePCIAddress(virDomainObjPtr obj,
- 
-     qemuDomainFillDevicePCIConnectFlags(obj->def, dev, priv->qemuCaps, driver);
- 
-+    qemuDomainFillDevicePCIExtensionFlags(dev, info, priv->qemuCaps);
-+
-     return virDomainPCIAddressEnsureAddr(priv->pciaddrs, info,
-                                          info->pciConnectFlags);
- }
-diff --git a/src/util/virpci.h b/src/util/virpci.h
-index 01df652b86..b366d7d9c3 100644
---- a/src/util/virpci.h
-+++ b/src/util/virpci.h
-@@ -49,6 +49,8 @@ struct _virPCIDeviceAddress {
-     unsigned int slot;
-     unsigned int function;
-     int multi; /* virTristateSwitch */
-+    int extFlags; /* enum virPCIDeviceAddressExtensionFlags */
-+    virZPCIDeviceAddress zpci;
- };
- 
- typedef enum {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-new-hostdev-attribute-display.patch b/SOURCES/libvirt-conf-Introduce-new-hostdev-attribute-display.patch
deleted file mode 100644
index 2dc0045..0000000
--- a/SOURCES/libvirt-conf-Introduce-new-hostdev-attribute-display.patch
+++ /dev/null
@@ -1,416 +0,0 @@
-From 5ad0f7cc1b2444ee9355229316fb008919d22c71 Mon Sep 17 00:00:00 2001
-Message-Id: <5ad0f7cc1b2444ee9355229316fb008919d22c71@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:04:02 +0200
-Subject: [PATCH] conf: Introduce new <hostdev> attribute 'display'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU 2.12 introduced a new type of display for mediated devices using
-vfio-pci backend which allows a mediated device to be used as a VGA
-compatible device as an alternative to an emulated video device. QEMU
-exposes this feature via a vfio device property 'display' with supported
-values 'on/off/auto' (libvirt will default to 'off').
-
-This patch adds the necessary bits to domain config handling in order to
-expose this feature. Since there's no convenient way for libvirt to come
-up with usable defaults for the display setting, simply because libvirt
-is not able to figure out which of the display implementations - dma-buf
-which requires OpenGL support vs vfio regions which doesn't need OpenGL
-(works with OpenGL enabled too) - the underlying mdev uses.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d54e45b6edd7623e488a19e30bc4148a21fa8b03)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in                     | 20 +++-
- docs/schemas/domaincommon.rng                 |  5 +
- src/conf/domain_conf.c                        | 19 +++-
- src/conf/domain_conf.h                        |  1 +
- src/qemu/qemu_domain.c                        | 98 ++++++++++++++++++-
- .../qemuxml2argvdata/hostdev-mdev-display.xml | 39 ++++++++
- .../hostdev-mdev-display.xml                  | 47 +++++++++
- tests/qemuxml2xmltest.c                       |  1 +
- 8 files changed, 222 insertions(+), 8 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.xml
- create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 9dd22554ad..3554c3dc30 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -4510,9 +4510,23 @@
-           guest. Currently, <code>model='vfio-pci'</code> and
-           <code>model='vfio-ccw'</code> (<span class="since">Since 4.4.0</span>)
-           is supported. Refer <a href="drvnodedev.html#MDEV">MDEV</a> to create
--          a mediated device on the host. There are also some implications on the
--          usage of guest's address type depending on the <code>model</code>
--          attribute, see the <code>address</code> element below.
-+          a mediated device on the host.
-+          <span class="since">Since 4.6.0 (QEMU 2.12)</span> an optional
-+          <code>display</code> attribute may be used to enable or disable
-+          support for an accelerated remote desktop backed by a mediated
-+          device (such as NVIDIA vGPU or Intel GVT-g) as an alternative to
-+          emulated <a href="#elementsVideo">video devices</a>. This attribute
-+          is limited to <code>model='vfio-pci'</code> only. Supported values
-+          are either <code>on</code> or <code>off</code> (default is 'off').
-+          It is required to use a
-+          <a href="#elementsGraphics">graphical framebuffer</a> in order to
-+          use this attribute, currently only supported with VNC, Spice and
-+          egl-headless graphics devices.
-+          <p>
-+            Note: There are also some implications on the usage of guest's
-+            address type depending on the <code>model</code> attribute,
-+            see the <code>address</code> element below.
-+          </p>
-           </dd>
-         </dl>
-         <p>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 157726752c..be8430ab22 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -4579,6 +4579,11 @@
-         <value>vfio-ccw</value>
-       </choice>
-     </attribute>
-+    <optional>
-+      <attribute name="display">
-+        <ref name="virOnOff"/>
-+      </attribute>
-+    </optional>
-     <element name="source">
-       <ref name="mdevaddress"/>
-     </element>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 72086f9e86..830c298158 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -7656,6 +7656,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-     char *rawio = NULL;
-     char *backendStr = NULL;
-     char *model = NULL;
-+    char *display = NULL;
-     int backend;
-     int ret = -1;
-     virDomainHostdevSubsysPCIPtr pcisrc = &def->source.subsys.u.pci;
-@@ -7675,6 +7676,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-     sgio = virXMLPropString(node, "sgio");
-     rawio = virXMLPropString(node, "rawio");
-     model = virXMLPropString(node, "model");
-+    display = virXMLPropString(node, "display");
- 
-     /* @type is passed in from the caller rather than read from the
-      * xml document, because it is specified in different places for
-@@ -7762,6 +7764,15 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-                            model);
-             goto cleanup;
-         }
-+
-+        if (display &&
-+            (mdevsrc->display = virTristateSwitchTypeFromString(display)) <= 0) {
-+            virReportError(VIR_ERR_XML_ERROR,
-+                           _("unknown value '%s' for <hostdev> attribute "
-+                             "'display'"),
-+                           display);
-+            goto cleanup;
-+        }
-     }
- 
-     switch (def->source.subsys.type) {
-@@ -7815,6 +7826,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-     VIR_FREE(rawio);
-     VIR_FREE(backendStr);
-     VIR_FREE(model);
-+    VIR_FREE(display);
-     return ret;
- }
- 
-@@ -26568,9 +26580,14 @@ virDomainHostdevDefFormat(virBufferPtr buf,
-                               virTristateBoolTypeToString(scsisrc->rawio));
-         }
- 
--        if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV)
-+        if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV) {
-             virBufferAsprintf(buf, " model='%s'",
-                               virMediatedDeviceModelTypeToString(mdevsrc->model));
-+            if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT)
-+                virBufferAsprintf(buf, " display='%s'",
-+                                  virTristateSwitchTypeToString(mdevsrc->display));
-+        }
-+
-     }
-     virBufferAddLit(buf, ">\n");
-     virBufferAdjustIndent(buf, 2);
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 3deda1d978..8ca9558ceb 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -382,6 +382,7 @@ typedef struct _virDomainHostdevSubsysMediatedDev virDomainHostdevSubsysMediated
- typedef virDomainHostdevSubsysMediatedDev *virDomainHostdevSubsysMediatedDevPtr;
- struct _virDomainHostdevSubsysMediatedDev {
-     int model;                          /* enum virMediatedDeviceModelType */
-+    int display; /* virTristateSwitch */
-     char uuidstr[VIR_UUID_STRING_BUFLEN];   /* mediated device's uuid string */
- };
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 9498594857..5337f1ce55 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4451,9 +4451,48 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net)
- 
- 
- static int
--qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
--                                   const virDomainDef *def)
-+qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
-+                          const virDomainDef *def,
-+                          virQEMUCapsPtr qemuCaps)
- {
-+    if (mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
-+        return 0;
-+
-+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("display property of device vfio-pci is "
-+                         "not supported by this version of QEMU"));
-+        return -1;
-+    }
-+
-+    if (mdevsrc->model != VIR_MDEV_MODEL_TYPE_VFIO_PCI) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("<hostdev> attribute 'display' is only supported"
-+                         " with model='vfio-pci'"));
-+
-+        return -1;
-+    }
-+
-+    if (mdevsrc->display == VIR_TRISTATE_SWITCH_ON) {
-+        if (def->ngraphics == 0) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("graphics device is needed for attribute value "
-+                             "'display=on' in <hostdev>"));
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
-+                                   const virDomainDef *def,
-+                                   virQEMUCapsPtr qemuCaps)
-+{
-+    const virDomainHostdevSubsysMediatedDev *mdevsrc;
-+
-     /* forbid capabilities mode hostdev in this kind of hypervisor */
-     if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-@@ -4463,6 +4502,24 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
-         return -1;
-     }
- 
-+    if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
-+        switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) {
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
-+            break;
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-+            mdevsrc = &hostdev->source.subsys.u.mdev;
-+            return qemuDomainMdevDefValidate(mdevsrc, def, qemuCaps);
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-+        default:
-+            virReportEnumRangeError(virDomainHostdevSubsysType,
-+                                    hostdev->source.subsys.type);
-+            return -1;
-+        }
-+    }
-+
-     return 0;
- }
- 
-@@ -5595,7 +5652,8 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-         break;
- 
-     case VIR_DOMAIN_DEVICE_HOSTDEV:
--        ret = qemuDomainDeviceDefValidateHostdev(dev->data.hostdev, def);
-+        ret = qemuDomainDeviceDefValidateHostdev(dev->data.hostdev, def,
-+                                                 qemuCaps);
-         break;
- 
-     case VIR_DOMAIN_DEVICE_VIDEO:
-@@ -6205,6 +6263,35 @@ qemuDomainVsockDefPostParse(virDomainVsockDefPtr vsock)
- }
- 
- 
-+static int
-+qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDevPtr mdevsrc,
-+                                  virQEMUCapsPtr qemuCaps)
-+{
-+    /* QEMU 2.12 added support for vfio-pci display type, we default to
-+     * 'display=off' to stay safe from future changes */
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) &&
-+        mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
-+        mdevsrc->display = VIR_TRISTATE_SWITCH_OFF;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+qemuDomainHostdevDefPostParse(virDomainHostdevDefPtr hostdev,
-+                              virQEMUCapsPtr qemuCaps)
-+{
-+    virDomainHostdevSubsysPtr subsys = &hostdev->source.subsys;
-+
-+    if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
-+        hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV &&
-+        qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev, qemuCaps) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
-                              const virDomainDef *def,
-@@ -6255,11 +6342,14 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
-         ret = qemuDomainVsockDefPostParse(dev->data.vsock);
-         break;
- 
-+    case VIR_DOMAIN_DEVICE_HOSTDEV:
-+        ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, qemuCaps);
-+        break;
-+
-     case VIR_DOMAIN_DEVICE_LEASE:
-     case VIR_DOMAIN_DEVICE_FS:
-     case VIR_DOMAIN_DEVICE_INPUT:
-     case VIR_DOMAIN_DEVICE_SOUND:
--    case VIR_DOMAIN_DEVICE_HOSTDEV:
-     case VIR_DOMAIN_DEVICE_WATCHDOG:
-     case VIR_DOMAIN_DEVICE_GRAPHICS:
-     case VIR_DOMAIN_DEVICE_HUB:
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display.xml b/tests/qemuxml2argvdata/hostdev-mdev-display.xml
-new file mode 100644
-index 0000000000..f37e08e1b9
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display.xml
-@@ -0,0 +1,39 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <graphics type='vnc'/>
-+    <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+    </hostdev>
-+    <video>
-+      <model type='qxl' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
-new file mode 100644
-index 0000000000..94c11b1199
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
-@@ -0,0 +1,47 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+      <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'/>
-+    <graphics type='vnc' port='-1' autoport='yes'>
-+      <listen type='address'/>
-+    </graphics>
-+    <video>
-+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </video>
-+    <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </hostdev>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index fa57221d62..e418e67f6c 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -479,6 +479,7 @@ mymain(void)
-     DO_TEST("hostdev-pci-address", NONE);
-     DO_TEST("hostdev-vfio", NONE);
-     DO_TEST("hostdev-mdev-precreated", NONE);
-+    DO_TEST("hostdev-mdev-display", QEMU_CAPS_VFIO_PCI_DISPLAY);
-     DO_TEST("pci-rom", NONE);
-     DO_TEST("pci-rom-disabled", NONE);
-     DO_TEST("pci-rom-disabled-invalid", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-new-video-type-none.patch b/SOURCES/libvirt-conf-Introduce-new-video-type-none.patch
deleted file mode 100644
index e62369b..0000000
--- a/SOURCES/libvirt-conf-Introduce-new-video-type-none.patch
+++ /dev/null
@@ -1,504 +0,0 @@
-From 2010df9c6a8a4ff984e3f1b697398da648342953 Mon Sep 17 00:00:00 2001
-Message-Id: <2010df9c6a8a4ff984e3f1b697398da648342953@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:04:05 +0200
-Subject: [PATCH] conf: Introduce new video type 'none'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Historically, we've always enabled an emulated video device every time we
-see that graphics should be supported with a guest. With the appearance
-of mediated devices which can support QEMU's vfio-display capability,
-users might want to use such a device as the only video device.
-Therefore introduce a new, effectively a 'disable', type for video
-device.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d48813e81af798e3027edcc2f41be2630111ba65)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in                     | 13 +++-
- docs/schemas/domaincommon.rng                 |  1 +
- src/conf/domain_conf.c                        | 61 +++++++++++++------
- src/conf/domain_conf.h                        |  1 +
- src/qemu/qemu_command.c                       | 12 +++-
- src/qemu/qemu_domain.c                        |  2 +
- src/qemu/qemu_domain_address.c                |  7 ++-
- tests/domaincapsschemadata/full.xml           |  1 +
- .../video-invalid-multiple-devices.xml        | 33 ++++++++++
- tests/qemuxml2argvdata/video-none-device.args | 27 ++++++++
- tests/qemuxml2argvdata/video-none-device.xml  | 39 ++++++++++++
- tests/qemuxml2argvtest.c                      |  4 +-
- .../qemuxml2xmloutdata/video-none-device.xml  | 42 +++++++++++++
- tests/qemuxml2xmltest.c                       |  1 +
- 14 files changed, 220 insertions(+), 24 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
- create mode 100644 tests/qemuxml2argvdata/video-none-device.args
- create mode 100644 tests/qemuxml2argvdata/video-none-device.xml
- create mode 100644 tests/qemuxml2xmloutdata/video-none-device.xml
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 0e8f0a125f..42acf7a828 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -6666,9 +6666,18 @@ qemu-kvm -net nic,model=? /dev/null
-           The <code>model</code> element has a mandatory <code>type</code>
-           attribute which takes the value "vga", "cirrus", "vmvga", "xen",
-           "vbox", "qxl" (<span class="since">since 0.8.6</span>),
--          "virtio" (<span class="since">since 1.3.0</span>)
--          or "gop" (<span class="since">since 3.2.0</span>)
-+          "virtio" (<span class="since">since 1.3.0</span>),
-+          "gop" (<span class="since">since 3.2.0</span>), or
-+          "none" (<span class="since">since 4.6.0</span>)
-           depending on the hypervisor features available.
-+          The purpose of the type <code>none</code> is to instruct libvirt not
-+          to add a default video device in the guest (see the paragraph above).
-+          This legacy behaviour can be inconvenient in cases where GPU mediated
-+          devices are meant to be the only rendering device within a guest and
-+          so specifying another <code>video</code> device along with type
-+          <code>none</code>.
-+          Refer to <a id="elementsHostDev">Host device assignment</a> to see
-+          how to add a mediated device into a guest.
-         </p>
-         <p>
-           You can provide the amount of video memory in kibibytes (blocks of
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index be8430ab22..ac04af51a1 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -3454,6 +3454,7 @@
-                 <value>vbox</value>
-                 <value>virtio</value>
-                 <value>gop</value>
-+                <value>none</value>
-               </choice>
-             </attribute>
-             <group>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 830c298158..23288aa01b 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -590,7 +590,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
-               "qxl",
-               "parallels",
-               "virtio",
--              "gop")
-+              "gop",
-+              "none")
- 
- VIR_ENUM_IMPL(virDomainVideoVGAConf, VIR_DOMAIN_VIDEO_VGACONF_LAST,
-               "io",
-@@ -5106,22 +5107,30 @@ virDomainDefPostParseVideo(virDomainDefPtr def,
-     if (def->nvideos == 0)
-         return 0;
- 
--    virDomainDeviceDef device = {
--        .type = VIR_DOMAIN_DEVICE_VIDEO,
--        .data.video = def->videos[0],
--    };
-+    if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) {
-+        /* we don't want to format any values we automatically fill in for
-+         * videos into the XML, so clear them
-+         */
-+        virDomainVideoDefClear(def->videos[0]);
-+        def->videos[0]->type = VIR_DOMAIN_VIDEO_TYPE_NONE;
-+    } else {
-+        virDomainDeviceDef device = {
-+            .type = VIR_DOMAIN_DEVICE_VIDEO,
-+            .data.video = def->videos[0],
-+        };
- 
--    /* Mark the first video as primary. If the user specified
--     * primary="yes", the parser already inserted the device at
--     * def->videos[0]
--     */
--    def->videos[0]->primary = true;
-+        /* Mark the first video as primary. If the user specified
-+         * primary="yes", the parser already inserted the device at
-+         * def->videos[0]
-+         */
-+        def->videos[0]->primary = true;
- 
--    /* videos[0] might have been added in AddImplicitDevices, after we've
--     * done the per-device post-parse */
--    if (virDomainDefPostParseDeviceIterator(def, &device,
--                                            NULL, opaque) < 0)
--        return -1;
-+        /* videos[0] might have been added in AddImplicitDevices, after we've
-+         * done the per-device post-parse */
-+        if (virDomainDefPostParseDeviceIterator(def, &device,
-+                                                NULL, opaque) < 0)
-+            return -1;
-+    }
- 
-     return 0;
- }
-@@ -5670,13 +5679,30 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
- 
- 
- static int
--virDomainVideoDefValidate(const virDomainVideoDef *video)
-+virDomainVideoDefValidate(const virDomainVideoDef *video,
-+                          const virDomainDef *def)
- {
-+    size_t i;
-+
-     if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("missing video model and cannot determine default"));
-         return -1;
-     }
-+
-+    /* it doesn't make sense to pair video device type 'none' with any other
-+     * types, there can be only a single video device in such case
-+     */
-+    for (i = 0; i < def->nvideos; i++) {
-+        if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE &&
-+            def->nvideos > 1) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("a '%s' video type must be the only video device "
-+                             "defined for the domain"));
-+            return -1;
-+        }
-+    }
-+
-     return 0;
- }
- 
-@@ -5738,7 +5764,7 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
-         return virDomainHostdevDefValidate(dev->data.hostdev);
- 
-     case VIR_DOMAIN_DEVICE_VIDEO:
--        return virDomainVideoDefValidate(dev->data.video);
-+        return virDomainVideoDefValidate(dev->data.video, def);
- 
-     case VIR_DOMAIN_DEVICE_MEMORY:
-         return virDomainMemoryDefValidate(dev->data.memory);
-@@ -15048,6 +15074,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def,
-     case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
-     case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
-     case VIR_DOMAIN_VIDEO_TYPE_GOP:
-+    case VIR_DOMAIN_VIDEO_TYPE_NONE:
-     case VIR_DOMAIN_VIDEO_TYPE_LAST:
-     default:
-         return 0;
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 8ca9558ceb..5e2f21dea3 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1424,6 +1424,7 @@ typedef enum {
-     VIR_DOMAIN_VIDEO_TYPE_PARALLELS, /* pseudo device for VNC in containers */
-     VIR_DOMAIN_VIDEO_TYPE_VIRTIO,
-     VIR_DOMAIN_VIDEO_TYPE_GOP,
-+    VIR_DOMAIN_VIDEO_TYPE_NONE,
- 
-     VIR_DOMAIN_VIDEO_TYPE_LAST
- } virDomainVideoType;
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 1fce45134f..954265feb0 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -105,7 +105,8 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
-               "qxl",
-               "", /* don't support parallels */
-               "", /* no need for virtio */
--              "" /* don't support gop */);
-+              "" /* don't support gop */,
-+              "" /* 'none' doesn't make sense here */);
- 
- VIR_ENUM_DECL(qemuDeviceVideo)
- 
-@@ -119,7 +120,8 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
-               "qxl-vga",
-               "", /* don't support parallels */
-               "virtio-vga",
--              "" /* don't support gop */);
-+              "" /* don't support gop */,
-+              "" /* 'none' doesn't make sense here */);
- 
- VIR_ENUM_DECL(qemuDeviceVideoSecondary)
- 
-@@ -133,7 +135,8 @@ VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST,
-               "qxl",
-               "", /* don't support parallels */
-               "virtio-gpu",
--              "" /* don't support gop */);
-+              "" /* don't support gop */,
-+              "" /* 'none' doesn't make sense here */);
- 
- VIR_ENUM_DECL(qemuSoundCodec)
- 
-@@ -4421,6 +4424,9 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
-         char *str = NULL;
-         virDomainVideoDefPtr video = def->videos[i];
- 
-+        if (video->type == VIR_DOMAIN_VIDEO_TYPE_NONE)
-+            continue;
-+
-         if (video->primary) {
-             if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY)) {
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 5337f1ce55..508846116b 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4528,6 +4528,8 @@ static int
- qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video)
- {
-     switch ((virDomainVideoType) video->type) {
-+    case VIR_DOMAIN_VIDEO_TYPE_NONE:
-+        return 0;
-     case VIR_DOMAIN_VIDEO_TYPE_XEN:
-     case VIR_DOMAIN_VIDEO_TYPE_VBOX:
-     case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index ab2ac022f1..e6996934b8 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -821,6 +821,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
- 
-         case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
-         case VIR_DOMAIN_VIDEO_TYPE_GOP:
-+        case VIR_DOMAIN_VIDEO_TYPE_NONE:
-         case VIR_DOMAIN_VIDEO_TYPE_LAST:
-             return 0;
-         }
-@@ -1532,7 +1533,8 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
-             goto cleanup;
-     }
- 
--    if (def->nvideos > 0) {
-+    if (def->nvideos > 0 &&
-+        def->videos[0]->type != VIR_DOMAIN_VIDEO_TYPE_NONE) {
-         /* Because the PIIX3 integrated IDE/USB controllers are
-          * already at slot 1, when qemu looks for the first free slot
-          * to place the VGA controller (which is always the first
-@@ -1540,6 +1542,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
-          * at slot 2.
-          */
-         virDomainVideoDefPtr primaryVideo = def->videos[0];
-+
-         if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) {
-             memset(&tmp_addr, 0, sizeof(tmp_addr));
-             tmp_addr.slot = 2;
-@@ -2105,6 +2108,8 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
- 
-     /* Video devices */
-     for (i = 0; i < def->nvideos; i++) {
-+        if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE)
-+            continue;
- 
-         if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info))
-             continue;
-diff --git a/tests/domaincapsschemadata/full.xml b/tests/domaincapsschemadata/full.xml
-index 154c4a6fe9..eafba1ae5b 100644
---- a/tests/domaincapsschemadata/full.xml
-+++ b/tests/domaincapsschemadata/full.xml
-@@ -74,6 +74,7 @@
-         <value>parallels</value>
-         <value>virtio</value>
-         <value>gop</value>
-+        <value>none</value>
-       </enum>
-     </video>
-     <hostdev supported='yes'>
-diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
-new file mode 100644
-index 0000000000..3f105efaae
---- /dev/null
-+++ b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
-@@ -0,0 +1,33 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
-+  <os>
-+    <type arch='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <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'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <video>
-+      <model type='qxl'/>
-+    </video>
-+    <video>
-+      <model type='none'/>
-+    </video>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
-new file mode 100644
-index 0000000000..1b03c0cb97
---- /dev/null
-+++ b/tests/qemuxml2argvdata/video-none-device.args
-@@ -0,0 +1,27 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-+-vnc 127.0.0.1:0 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml
-new file mode 100644
-index 0000000000..4b591562b7
---- /dev/null
-+++ b/tests/qemuxml2argvdata/video-none-device.xml
-@@ -0,0 +1,39 @@
-+<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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <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'>
-+      <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'/>
-+    <graphics type='vnc'/>
-+    <video>
-+      <model type='none'/>
-+    </video>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </memballoon>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 9237a4fb89..3cff4ffb5e 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1998,7 +1998,9 @@ mymain(void)
-             QEMU_CAPS_DEVICE_VIRTIO_VGA,
-             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-             QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS);
--    DO_TEST_PARSE_ERROR("video-invalid", NONE);
-+    DO_TEST("video-none-device",
-+            QEMU_CAPS_VNC);
-+    DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE);
- 
-     DO_TEST("virtio-rng-default",
-             QEMU_CAPS_DEVICE_VIRTIO_RNG,
-diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml
-new file mode 100644
-index 0000000000..6e76b394fe
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/video-none-device.xml
-@@ -0,0 +1,42 @@
-+<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='i686' 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-i686</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'>
-+      <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'/>
-+    <graphics type='vnc' port='-1' autoport='yes'>
-+      <listen type='address'/>
-+    </graphics>
-+    <video>
-+      <model type='none'/>
-+    </video>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </memballoon>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index e418e67f6c..e35644d479 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -1145,6 +1145,7 @@ mymain(void)
-             QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
-             QEMU_CAPS_VNC,
-             QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
-+    DO_TEST("video-none-device", NONE);
- 
-     DO_TEST("intel-iommu",
-             QEMU_CAPS_DEVICE_INTEL_IOMMU);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-parser-formatter-for-uid-and-fid.patch b/SOURCES/libvirt-conf-Introduce-parser-formatter-for-uid-and-fid.patch
deleted file mode 100644
index 3bd46dd..0000000
--- a/SOURCES/libvirt-conf-Introduce-parser-formatter-for-uid-and-fid.patch
+++ /dev/null
@@ -1,574 +0,0 @@
-From fddd43e717869d56e481c3fde2d5ee6b5513a1f5 Mon Sep 17 00:00:00 2001
-Message-Id: <fddd43e717869d56e481c3fde2d5ee6b5513a1f5@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:25 +0200
-Subject: [PATCH] conf: Introduce parser, formatter for uid and fid
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch introduces new XML parser/formatter functions. Uid is
-16-bit and non-zero. Fid is 32-bit. They are the two attributes of zpci
-which is introduced as PCI address element. Zpci element is parsed and
-formatted along with PCI address. And add the related test cases.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit b4833b2c2f7be8a68eb6495ed57ed61918e3ecd8)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/conf/device_conf.c
-    + context
-      - missing edeef779585
-
-  * tests/qemuxml2argvtest.c
-    + context
-      - missing a0ff9fbe5cad, 0bdb704383f7
-
-Changed:
-
-  * tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-    tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-    + no -boot in output
-      - missing caccbba64aa9
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-9-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/schemas/basictypes.rng                   | 27 ++++++++++
- docs/schemas/domaincommon.rng                 |  1 +
- src/conf/device_conf.c                        | 53 +++++++++++++++++++
- src/conf/domain_addr.c                        |  3 ++
- src/conf/domain_conf.c                        | 12 ++++-
- src/libvirt_private.syms                      |  2 +
- src/util/virpci.c                             | 26 +++++++++
- src/util/virpci.h                             |  6 +++
- .../disk-virtio-s390-zpci.args                | 26 +++++++++
- .../disk-virtio-s390-zpci.xml                 | 19 +++++++
- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 24 +++++++++
- tests/qemuxml2argvdata/hostdev-vfio-zpci.xml  | 21 ++++++++
- tests/qemuxml2argvtest.c                      |  7 +++
- .../disk-virtio-s390-zpci.xml                 | 31 +++++++++++
- .../qemuxml2xmloutdata/hostdev-vfio-zpci.xml  | 32 +++++++++++
- tests/qemuxml2xmltest.c                       |  6 +++
- 16 files changed, 295 insertions(+), 1 deletion(-)
- create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
- create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml
- create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml
- create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml
-
-diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
-index b45a7fcdc8..97e14d7ca8 100644
---- a/docs/schemas/basictypes.rng
-+++ b/docs/schemas/basictypes.rng
-@@ -65,6 +65,17 @@
-       </data>
-     </choice>
-   </define>
-+  <define name="uint32">
-+    <choice>
-+      <data type="string">
-+        <param name="pattern">(0x)?[0-9a-fA-F]{1,8}</param>
-+      </data>
-+      <data type="unsignedInt">
-+        <param name="minInclusive">0</param>
-+        <param name="maxInclusive">4294967295</param>
-+      </data>
-+    </choice>
-+  </define>
- 
-   <define name="UUID">
-     <choice>
-@@ -111,6 +122,22 @@
-       </attribute>
-     </optional>
-   </define>
-+  <define name="zpciaddress">
-+    <optional>
-+      <element name="zpci">
-+        <optional>
-+          <attribute name="uid">
-+            <ref name="uint16"/>
-+          </attribute>
-+        </optional>
-+        <optional>
-+          <attribute name="fid">
-+            <ref name="uint32"/>
-+          </attribute>
-+        </optional>
-+      </element>
-+    </optional>
-+  </define>
- 
-   <!-- a 6 byte MAC address in ASCII-hex format, eg "12:34:56:78:9A:BC" -->
-   <!-- The lowest bit of the 1st byte is the "multicast" bit. a         -->
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 70a7767d9c..2b6d4dced6 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -5186,6 +5186,7 @@
-             <value>pci</value>
-           </attribute>
-           <ref name="pciaddress"/>
-+          <ref name="zpciaddress"/>
-         </group>
-         <group>
-           <attribute name="type">
-diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
-index d69f94fadf..cadac32603 100644
---- a/src/conf/device_conf.c
-+++ b/src/conf/device_conf.c
-@@ -32,6 +32,45 @@
- 
- #define VIR_FROM_THIS VIR_FROM_DEVICE
- 
-+static int
-+virZPCIDeviceAddressParseXML(xmlNodePtr node,
-+                             virPCIDeviceAddressPtr addr)
-+{
-+    virZPCIDeviceAddress def = { 0 };
-+    char *uid;
-+    char *fid;
-+    int ret = -1;
-+
-+    uid = virXMLPropString(node, "uid");
-+    fid = virXMLPropString(node, "fid");
-+
-+    if (uid &&
-+        virStrToLong_uip(uid, NULL, 0, &def.uid) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Cannot parse <address> 'uid' attribute"));
-+        goto cleanup;
-+    }
-+
-+    if (fid &&
-+        virStrToLong_uip(fid, NULL, 0, &def.fid) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Cannot parse <address> 'fid' attribute"));
-+        goto cleanup;
-+    }
-+
-+    if (!virZPCIDeviceAddressIsEmpty(&def) &&
-+        !virZPCIDeviceAddressIsValid(&def))
-+        goto cleanup;
-+
-+    addr->zpci = def;
-+    ret = 0;
-+
-+ cleanup:
-+    VIR_FREE(uid);
-+    VIR_FREE(fid);
-+    return ret;
-+}
-+
- int
- virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst,
-                         virDomainDeviceInfoPtr src)
-@@ -196,6 +235,8 @@ virPCIDeviceAddressParseXML(xmlNodePtr node,
-                             virPCIDeviceAddressPtr addr)
- {
-     char *domain, *slot, *bus, *function, *multi;
-+    xmlNodePtr cur;
-+    xmlNodePtr zpci = NULL;
-     int ret = -1;
- 
-     memset(addr, 0, sizeof(*addr));
-@@ -245,6 +286,18 @@ virPCIDeviceAddressParseXML(xmlNodePtr node,
-     if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(addr, true))
-         goto cleanup;
- 
-+    cur = node->children;
-+    while (cur) {
-+        if (cur->type == XML_ELEMENT_NODE &&
-+            virXMLNodeNameEqual(cur, "zpci")) {
-+            zpci = cur;
-+        }
-+        cur = cur->next;
-+    }
-+
-+    if (zpci && virZPCIDeviceAddressParseXML(zpci, addr) < 0)
-+        goto cleanup;
-+
-     ret = 0;
- 
-  cleanup:
-diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
-index 3e33549c3d..9e0a0fdf95 100644
---- a/src/conf/domain_addr.c
-+++ b/src/conf/domain_addr.c
-@@ -1054,6 +1054,9 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
-                                                dev->isolationGroup, false) < 0)
-         return -1;
- 
-+    addr.extFlags = dev->addr.pci.extFlags;
-+    addr.zpci = dev->addr.pci.zpci;
-+
-     if (!addrs->dryRun) {
-         dev->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
-         dev->addr.pci = addr;
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index bcb0558bc3..29ebf0a930 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -6448,6 +6448,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-                           unsigned int flags)
- {
-     virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
-+    virBuffer childBuf = VIR_BUFFER_INITIALIZER;
- 
-     if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) && info->bootIndex) {
-         virBufferAsprintf(buf, "<boot order='%u'", info->bootIndex);
-@@ -6510,6 +6511,14 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-             virBufferAsprintf(&attrBuf, " multifunction='%s'",
-                               virTristateSwitchTypeToString(info->addr.pci.multi));
-         }
-+
-+        if (!virZPCIDeviceAddressIsEmpty(&info->addr.pci.zpci)) {
-+            virBufferSetChildIndent(&childBuf, buf);
-+            virBufferAsprintf(&childBuf,
-+                              "<zpci uid='0x%.4x' fid='0x%.8x'/>\n",
-+                              info->addr.pci.zpci.uid,
-+                              info->addr.pci.zpci.fid);
-+        }
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE:
-@@ -6577,9 +6586,10 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-         break;
-     }
- 
--    virXMLFormatElement(buf, "address", &attrBuf, NULL);
-+    virXMLFormatElement(buf, "address", &attrBuf, &childBuf);
- 
-     virBufferFreeAndReset(&attrBuf);
-+    virBufferFreeAndReset(&childBuf);
- }
- 
- static int
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index df27ac4b3a..b2a2a1f265 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2569,6 +2569,8 @@ virPCIHeaderTypeToString;
- virPCIIsVirtualFunction;
- virPCIStubDriverTypeFromString;
- virPCIStubDriverTypeToString;
-+virZPCIDeviceAddressIsEmpty;
-+virZPCIDeviceAddressIsValid;
- 
- 
- # util/virperf.h
-diff --git a/src/util/virpci.c b/src/util/virpci.c
-index 8d02366664..3a1e49a7a7 100644
---- a/src/util/virpci.c
-+++ b/src/util/virpci.c
-@@ -2597,6 +2597,32 @@ virPCIDeviceAddressParse(char *address,
- 
- #ifdef __linux__
- 
-+bool
-+virZPCIDeviceAddressIsValid(virZPCIDeviceAddressPtr zpci)
-+{
-+    /* We don't need to check fid because fid covers
-+     * all range of uint32 type.
-+     */
-+    if (zpci->uid > VIR_DOMAIN_DEVICE_ZPCI_MAX_UID ||
-+        zpci->uid == 0) {
-+        virReportError(VIR_ERR_XML_ERROR,
-+                       _("Invalid PCI address uid='0x%.4x', "
-+                         "must be > 0x0000 and <= 0x%.4x"),
-+                       zpci->uid,
-+                       VIR_DOMAIN_DEVICE_ZPCI_MAX_UID);
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
-+bool
-+virZPCIDeviceAddressIsEmpty(const virZPCIDeviceAddress *addr)
-+{
-+    return !(addr->uid || addr->fid);
-+}
-+
-+
- /*
-  * returns true if equal
-  */
-diff --git a/src/util/virpci.h b/src/util/virpci.h
-index b366d7d9c3..1ed9e2381e 100644
---- a/src/util/virpci.h
-+++ b/src/util/virpci.h
-@@ -36,6 +36,9 @@ typedef virPCIDeviceAddress *virPCIDeviceAddressPtr;
- typedef struct _virPCIDeviceList virPCIDeviceList;
- typedef virPCIDeviceList *virPCIDeviceListPtr;
- 
-+# define VIR_DOMAIN_DEVICE_ZPCI_MAX_UID UINT16_MAX
-+# define VIR_DOMAIN_DEVICE_ZPCI_MAX_FID UINT32_MAX
-+
- typedef struct _virZPCIDeviceAddress virZPCIDeviceAddress;
- typedef virZPCIDeviceAddress *virZPCIDeviceAddressPtr;
- struct _virZPCIDeviceAddress {
-@@ -235,6 +238,9 @@ int virPCIGetAddrString(unsigned int domain,
- 
- int virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf);
- 
-+bool virZPCIDeviceAddressIsValid(virZPCIDeviceAddressPtr zpci);
-+bool virZPCIDeviceAddressIsEmpty(const virZPCIDeviceAddress *addr);
-+
- int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
-                                  int pfNetDevIdx,
-                                  char **pfname,
-diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-new file mode 100644
-index 0000000000..20e63a15b5
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-@@ -0,0 +1,26 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name QEMUGuest1 \
-+-S \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot c \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk0,\
-+id=virtio-disk0 \
-+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000
-diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml
-new file mode 100644
-index 0000000000..8bf4a23670
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml
-@@ -0,0 +1,19 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219136</memory>
-+  <vcpu>1</vcpu>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'>
-+        <zpci uid='0x0019' fid='0x0000001f'/>
-+      </address>
-+    </disk>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-new file mode 100644
-index 0000000000..622c504da0
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-@@ -0,0 +1,24 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name QEMUGuest1 \
-+-S \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot c \
-+-device vfio-pci,host=00:00.0,id=hostdev0,bus=pci.0,addr=0x8 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x1
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml
-new file mode 100644
-index 0000000000..002b99c52d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml
-@@ -0,0 +1,21 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219100</memory>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'>
-+        <zpci uid='0x0019' fid='0x0000001f'/>
-+      </address>
-+    </hostdev>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 7f25cccf9d..2eb2505971 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1038,6 +1038,10 @@ mymain(void)
-             QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
-     DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI,
-             QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
-+    DO_TEST("disk-virtio-s390-zpci",
-+            QEMU_CAPS_DEVICE_ZPCI,
-+            QEMU_CAPS_CCW,
-+            QEMU_CAPS_VIRTIO_S390);
-     DO_TEST("disk-order",
-             QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI);
-     DO_TEST("disk-virtio-drive-queues",
-@@ -1628,6 +1632,9 @@ mymain(void)
-     DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics",
-             QEMU_CAPS_DEVICE_VFIO_PCI,
-             QEMU_CAPS_VFIO_PCI_DISPLAY);
-+    DO_TEST("hostdev-vfio-zpci",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_ZPCI);
-     DO_TEST("pci-rom", NONE);
-     DO_TEST("pci-rom-disabled", NONE);
-     DO_TEST("pci-rom-disabled-invalid", NONE);
-diff --git a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml
-new file mode 100644
-index 0000000000..37684c82b1
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml
-@@ -0,0 +1,31 @@
-+<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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'>
-+        <zpci uid='0x0019' fid='0x0000001f'/>
-+      </address>
-+    </disk>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml
-new file mode 100644
-index 0000000000..fc8c38ab66
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml
-@@ -0,0 +1,32 @@
-+<domain type='qemu'>
-+  <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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'>
-+        <zpci uid='0x0019' fid='0x0000001f'/>
-+      </address>
-+    </hostdev>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 2a2bf01ffa..a787f4f4a3 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -400,6 +400,9 @@ mymain(void)
-             QEMU_CAPS_VIRTIO_SCSI);
-     DO_TEST("disk-virtio-scsi-ioeventfd",
-             QEMU_CAPS_VIRTIO_SCSI);
-+    DO_TEST("disk-virtio-s390-zpci",
-+            QEMU_CAPS_DEVICE_ZPCI,
-+            QEMU_CAPS_CCW);
-     DO_TEST("disk-scsi-megasas",
-             QEMU_CAPS_SCSI_MEGASAS);
-     DO_TEST("disk-scsi-mptsas1068",
-@@ -482,6 +485,9 @@ mymain(void)
-     DO_TEST("hostdev-usb-address", NONE);
-     DO_TEST("hostdev-pci-address", NONE);
-     DO_TEST("hostdev-vfio", NONE);
-+    DO_TEST("hostdev-vfio-zpci",
-+            QEMU_CAPS_DEVICE_ZPCI,
-+            QEMU_CAPS_CCW);
-     DO_TEST("hostdev-mdev-precreated", NONE);
-     DO_TEST("hostdev-mdev-display", QEMU_CAPS_VFIO_PCI_DISPLAY);
-     DO_TEST("pci-rom", NONE);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-virCPUDefCheckFeatures.patch b/SOURCES/libvirt-conf-Introduce-virCPUDefCheckFeatures.patch
deleted file mode 100644
index 509c5cf..0000000
--- a/SOURCES/libvirt-conf-Introduce-virCPUDefCheckFeatures.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 0bed2e17ea6469ccabb374c0520a97706b281911 Mon Sep 17 00:00:00 2001
-Message-Id: <0bed2e17ea6469ccabb374c0520a97706b281911@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:06 +0200
-Subject: [PATCH] conf: Introduce virCPUDefCheckFeatures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This API can be used to check whether a CPU definition contains features
-matching a given filter.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4e6f58b8d55d44fa9f80736b2745b44710f6e25a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <ea489f203e2d52250acb1b9656de6aba8355f3a6.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/cpu_conf.c      | 33 +++++++++++++++++++++++++++++++++
- src/conf/cpu_conf.h      |  6 ++++++
- src/libvirt_private.syms |  1 +
- 3 files changed, 40 insertions(+)
-
-diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index 51e2a83eae..4cccea9981 100644
---- a/src/conf/cpu_conf.c
-+++ b/src/conf/cpu_conf.c
-@@ -872,6 +872,39 @@ virCPUDefFilterFeatures(virCPUDefPtr cpu,
- }
- 
- 
-+/**
-+ * virCPUDefCheckFeatures:
-+ *
-+ * Check CPU features for which @filter reports true and store them in a NULL
-+ * terminated list returned via @features.
-+ *
-+ * Returns the number of features matching @filter or -1 on error.
-+ */
-+int
-+virCPUDefCheckFeatures(virCPUDefPtr cpu,
-+                       virCPUDefFeatureFilter filter,
-+                       void *opaque,
-+                       char ***features)
-+{
-+    VIR_AUTOSTRINGLIST list = NULL;
-+    size_t n = 0;
-+    size_t i;
-+
-+    *features = NULL;
-+
-+    for (i = 0; i < cpu->nfeatures; i++) {
-+        if (filter(cpu->features[i].name, opaque)) {
-+            if (virStringListAdd(&list, cpu->features[i].name) < 0)
-+                return -1;
-+            n++;
-+        }
-+    }
-+
-+    VIR_STEAL_PTR(*features, list);
-+    return n;
-+}
-+
-+
- bool
- virCPUDefIsEqual(virCPUDefPtr src,
-                  virCPUDefPtr dst,
-diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
-index ad25932b9b..cba0ec7c81 100644
---- a/src/conf/cpu_conf.h
-+++ b/src/conf/cpu_conf.h
-@@ -225,6 +225,12 @@ virCPUDefFilterFeatures(virCPUDefPtr cpu,
-                         virCPUDefFeatureFilter filter,
-                         void *opaque);
- 
-+int
-+virCPUDefCheckFeatures(virCPUDefPtr cpu,
-+                       virCPUDefFeatureFilter filter,
-+                       void *opaque,
-+                       char ***features);
-+
- virCPUDefPtr *
- virCPUDefListParse(const char **xmlCPUs,
-                    unsigned int ncpus,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 06374deaae..0290f960a0 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -72,6 +72,7 @@ virCapabilitiesSetNetPrefix;
- virCPUCacheModeTypeFromString;
- virCPUCacheModeTypeToString;
- virCPUDefAddFeature;
-+virCPUDefCheckFeatures;
- virCPUDefCopy;
- virCPUDefCopyModel;
- virCPUDefCopyModelFilter;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-virDomainDefPostParseMemtune.patch b/SOURCES/libvirt-conf-Introduce-virDomainDefPostParseMemtune.patch
deleted file mode 100644
index c1d3a64..0000000
--- a/SOURCES/libvirt-conf-Introduce-virDomainDefPostParseMemtune.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From cb0d627bf064a14c83f3d34e8b73d77ed1733843 Mon Sep 17 00:00:00 2001
-Message-Id: <cb0d627bf064a14c83f3d34e8b73d77ed1733843@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:54 +0200
-Subject: [PATCH] conf: Introduce virDomainDefPostParseMemtune
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Previously we were ignoring "nodeset" attribute for hugepage pages
-if there was no guest NUMA topology configured in the domain XML.
-Commit <fa6bdf6afa878b8d7c5ed71664ee72be8967cdc5> partially fixed
-that issue but it introduced a somehow valid regression.
-
-In case that there is no guest NUMA topology configured and the
-"nodeset" attribute is set to "0" it was accepted and was working
-properly even though it was not completely valid XML.
-
-This patch introduces a workaround that it will ignore the nodeset="0"
-only in case that there is no guest NUMA topology in order not to
-hit the validation error.
-
-After this commit the following XML configuration is valid:
-
-  <memoryBacking>
-    <hugepages>
-      <page size='2048' unit='KiB' nodeset='0'/>
-    </hugepages>
-  </memoryBacking>
-
-but this configuration remains invalid:
-
-  <memoryBacking>
-    <hugepages>
-      <page size='2048' unit='KiB' nodeset='0'/>
-      <page size='1048576' unit='KiB'/>
-    </hugepages>
-  </memoryBacking>
-
-The issue with the second configuration is that it was originally
-working, however changing the order of the <page> elements resolved
-into using different page size for the guest.  The code is written
-in a way that it expect only one page configured and always uses only
-the first page in case that there is no guest NUMA topology configured.
-See qemuBuildMemPathStr() function for details.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1591235
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0a476f152150f62306f9f8d124aa44e4adb9158c)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-nodeset.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c                        | 27 +++++++++++++++++
- tests/qemuxml2argvdata/hugepages-nodeset.args | 26 ++++++++++++++++
- tests/qemuxml2argvtest.c                      |  2 +-
- .../qemuxml2xmloutdata/hugepages-nodeset.xml  | 30 +++++++++++++++++++
- tests/qemuxml2xmltest.c                       |  1 +
- 5 files changed, 85 insertions(+), 1 deletion(-)
- create mode 100644 tests/qemuxml2argvdata/hugepages-nodeset.args
- create mode 100644 tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 98e833c5bb..8a43e607e9 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4088,6 +4088,31 @@ virDomainDefPostParseMemory(virDomainDefPtr def,
- }
- 
- 
-+static void
-+virDomainDefPostParseMemtune(virDomainDefPtr def)
-+{
-+    size_t i;
-+
-+    if (virDomainNumaGetNodeCount(def->numa) == 0) {
-+        /* If guest NUMA is not configured and any hugepage page has nodemask
-+         * set to "0" free and clear that nodemas, otherwise we would rise
-+         * an error that there is no guest NUMA node configured. */
-+        for (i = 0; i < def->mem.nhugepages; i++) {
-+            ssize_t nextBit;
-+
-+            if (!def->mem.hugepages[i].nodemask)
-+                continue;
-+
-+            nextBit = virBitmapNextSetBit(def->mem.hugepages[i].nodemask, 0);
-+            if (nextBit < 0) {
-+                virBitmapFree(def->mem.hugepages[i].nodemask);
-+                def->mem.hugepages[i].nodemask = NULL;
-+            }
-+        }
-+    }
-+}
-+
-+
- static int
- virDomainDefAddConsoleCompat(virDomainDefPtr def)
- {
-@@ -5155,6 +5180,8 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
-     if (virDomainDefPostParseMemory(def, data->parseFlags) < 0)
-         return -1;
- 
-+    virDomainDefPostParseMemtune(def);
-+
-     if (virDomainDefRejectDuplicateControllers(def) < 0)
-         return -1;
- 
-diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args
-new file mode 100644
-index 0000000000..d094be1252
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
-@@ -0,0 +1,26 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name SomeDummyHugepagesGuest \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 1024 \
-+-mem-prealloc \
-+-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
-+-smp 2,sockets=2,cores=1,threads=1 \
-+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,\
-+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index f82bca2637..e6c0120670 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -960,7 +960,7 @@ mymain(void)
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-     DO_TEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M", NONE);
--    DO_TEST_PARSE_ERROR("hugepages-nodeset", NONE);
-+    DO_TEST("hugepages-nodeset", NONE);
-     DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist",
-                         QEMU_CAPS_DEVICE_PC_DIMM,
-                         QEMU_CAPS_OBJECT_MEMORY_FILE,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-new file mode 100644
-index 0000000000..ac219a7800
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-@@ -0,0 +1,30 @@
-+<domain type='qemu'>
-+  <name>SomeDummyHugepagesGuest</name>
-+  <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <currentMemory unit='KiB'>1048576</currentMemory>
-+  <memoryBacking>
-+    <hugepages>
-+      <page size='2048' unit='KiB'/>
-+    </hugepages>
-+  </memoryBacking>
-+  <vcpu placement='static'>2</vcpu>
-+  <os>
-+    <type arch='i686' 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-i686</emulator>
-+    <controller type='usb' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <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/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index aa543e9e51..b76410b2c1 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -336,6 +336,7 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-+    DO_TEST("hugepages-nodeset", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-virDomainDefPostParseVideo-helper.patch b/SOURCES/libvirt-conf-Introduce-virDomainDefPostParseVideo-helper.patch
deleted file mode 100644
index 92dd24b..0000000
--- a/SOURCES/libvirt-conf-Introduce-virDomainDefPostParseVideo-helper.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 2f954b30573d57ab0b5d68364afa6168d00ca3e6 Mon Sep 17 00:00:00 2001
-Message-Id: <2f954b30573d57ab0b5d68364afa6168d00ca3e6@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:52 +0200
-Subject: [PATCH] conf: Introduce virDomainDefPostParseVideo helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Move the video post parse bits into a separate helper as the logic is
-going to be extended in the future.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 75aa179ad68f5845955128b9f047a43c8e5c9066)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c | 45 ++++++++++++++++++++++++++++--------------
- 1 file changed, 30 insertions(+), 15 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d23b2861ef..db8e17dac4 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -5097,6 +5097,34 @@ virDomainDefBootOrderPostParse(virDomainDefPtr def)
- }
- 
- 
-+static int
-+virDomainDefPostParseVideo(virDomainDefPtr def,
-+                           void *opaque)
-+{
-+    if (def->nvideos == 0)
-+        return 0;
-+
-+    virDomainDeviceDef device = {
-+        .type = VIR_DOMAIN_DEVICE_VIDEO,
-+        .data.video = def->videos[0],
-+    };
-+
-+    /* Mark the first video as primary. If the user specified
-+     * primary="yes", the parser already inserted the device at
-+     * def->videos[0]
-+     */
-+    def->videos[0]->primary = true;
-+
-+    /* videos[0] might have been added in AddImplicitDevices, after we've
-+     * done the per-device post-parse */
-+    if (virDomainDefPostParseDeviceIterator(def, &device,
-+                                            NULL, opaque) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- static int
- virDomainDefPostParseCommon(virDomainDefPtr def,
-                             struct virDomainDefPostParseDeviceIteratorData *data)
-@@ -5133,21 +5161,8 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
-     if (virDomainDefAddImplicitDevices(def) < 0)
-         return -1;
- 
--    if (def->nvideos != 0) {
--        virDomainDeviceDef device = {
--            .type = VIR_DOMAIN_DEVICE_VIDEO,
--            .data.video = def->videos[0],
--        };
--
--        /* Mark the first video as primary. If the user specified primary="yes",
--         * the parser already inserted the device at def->videos[0] */
--        def->videos[0]->primary = true;
--
--        /* videos[0] might have been added in AddImplicitDevices, after we've
--         * done the per-device post-parse */
--        if (virDomainDefPostParseDeviceIterator(def, &device, NULL, data) < 0)
--            return -1;
--    }
-+    if (virDomainDefPostParseVideo(def, data) < 0)
-+        return -1;
- 
-     if (def->nserials != 0) {
-         virDomainDeviceDef device = {
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-virDomainGraphicsDefHasOpenGL-helper.patch b/SOURCES/libvirt-conf-Introduce-virDomainGraphicsDefHasOpenGL-helper.patch
deleted file mode 100644
index 2a7b4f6..0000000
--- a/SOURCES/libvirt-conf-Introduce-virDomainGraphicsDefHasOpenGL-helper.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From e6b37b93dd6e7ec133378aec04dd9c96e0ab57cb Mon Sep 17 00:00:00 2001
-Message-Id: <e6b37b93dd6e7ec133378aec04dd9c96e0ab57cb@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:04:00 +0200
-Subject: [PATCH] conf: Introduce virDomainGraphicsDefHasOpenGL helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A simple helper which will loop through all the graphics elements and
-checks whether at least one of them enables OpenGL support, either by
-containing <gl enable='yes'/> or being of type 'egl-headless'.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Acked-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 425329181f1db19f34a8ffffc1da9afa7f323f13)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c   | 43 ++++++++++++++++++++++++++++++++++++++++
- src/conf/domain_conf.h   |  3 +++
- src/libvirt_private.syms |  1 +
- 3 files changed, 47 insertions(+)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index fa4dfafcff..08654ab41d 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -30284,3 +30284,46 @@ virDomainDefHasManagedPR(const virDomainDef *def)
- 
-     return false;
- }
-+
-+
-+/**
-+ * virDomainGraphicsDefHasOpenGL:
-+ * @def: domain definition
-+ *
-+ * Returns true if a domain config contains at least one <graphics> element
-+ * with OpenGL support enabled, false otherwise.
-+ */
-+bool
-+virDomainGraphicsDefHasOpenGL(const virDomainDef *def)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < def->ngraphics; i++) {
-+        virDomainGraphicsDefPtr graphics = def->graphics[i];
-+
-+        /* we only care about OpenGL support for a given type here */
-+        switch (graphics->type) {
-+        case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
-+        case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-+        case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+            continue;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-+            if (graphics->data.sdl.gl == VIR_TRISTATE_BOOL_YES)
-+                return true;
-+
-+            continue;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
-+            if (graphics->data.spice.gl == VIR_TRISTATE_BOOL_YES)
-+                return true;
-+
-+            continue;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-+            return true;
-+
-+        case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-+            break;
-+        }
-+    }
-+
-+    return false;
-+}
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 26f75b15d0..3deda1d978 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -3642,4 +3642,7 @@ virDomainDiskGetDetectZeroesMode(virDomainDiskDiscard discard,
- bool
- virDomainDefHasManagedPR(const virDomainDef *def);
- 
-+bool
-+virDomainGraphicsDefHasOpenGL(const virDomainDef *def);
-+
- #endif /* __DOMAIN_CONF_H */
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 5bd08d3f67..86846f3b08 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -368,6 +368,7 @@ virDomainGetFilesystemForTarget;
- virDomainGraphicsAuthConnectedTypeFromString;
- virDomainGraphicsAuthConnectedTypeToString;
- virDomainGraphicsDefFree;
-+virDomainGraphicsDefHasOpenGL;
- virDomainGraphicsGetListen;
- virDomainGraphicsListenAppendAddress;
- virDomainGraphicsListenAppendSocket;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Introduce-virDomainVideoDefClear-helper.patch b/SOURCES/libvirt-conf-Introduce-virDomainVideoDefClear-helper.patch
deleted file mode 100644
index cc24338..0000000
--- a/SOURCES/libvirt-conf-Introduce-virDomainVideoDefClear-helper.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From f60ad6c8636b58d8559963aaf2e445bb4dd3db63 Mon Sep 17 00:00:00 2001
-Message-Id: <f60ad6c8636b58d8559963aaf2e445bb4dd3db63@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:51 +0200
-Subject: [PATCH] conf: Introduce virDomainVideoDefClear helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Future patches rely on the ability to reset the contents of the
-virDomainVideoDef structure rather than re-allocating it.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit f317b1e5c57291644c841cb620eda86dac8642a1)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c   | 14 +++++++++++++-
- src/conf/domain_conf.h   |  1 +
- src/libvirt_private.syms |  1 +
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 70eb45f03a..d23b2861ef 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -2538,7 +2538,8 @@ virDomainVideoDefNew(void)
- }
- 
- 
--void virDomainVideoDefFree(virDomainVideoDefPtr def)
-+void
-+virDomainVideoDefClear(virDomainVideoDefPtr def)
- {
-     if (!def)
-         return;
-@@ -2548,6 +2549,17 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def)
-     VIR_FREE(def->accel);
-     VIR_FREE(def->virtio);
-     VIR_FREE(def->driver);
-+
-+    memset(def, 0, sizeof(*def));
-+}
-+
-+
-+void virDomainVideoDefFree(virDomainVideoDefPtr def)
-+{
-+    if (!def)
-+        return;
-+
-+    virDomainVideoDefClear(def);
-     VIR_FREE(def);
- }
- 
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 41d27482fb..1fc1734bcc 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2884,6 +2884,7 @@ void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def);
- void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
- virDomainVideoDefPtr virDomainVideoDefNew(void);
- void virDomainVideoDefFree(virDomainVideoDefPtr def);
-+void virDomainVideoDefClear(virDomainVideoDefPtr def);
- virDomainHostdevDefPtr virDomainHostdevDefNew(void);
- void virDomainHostdevDefClear(virDomainHostdevDefPtr def);
- void virDomainHostdevDefFree(virDomainHostdevDefPtr def);
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 5499a368c0..5bd08d3f67 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -567,6 +567,7 @@ virDomainTPMModelTypeToString;
- virDomainUSBDeviceDefForeach;
- virDomainVideoDefaultRAM;
- virDomainVideoDefaultType;
-+virDomainVideoDefClear;
- virDomainVideoDefFree;
- virDomainVideoDefNew;
- virDomainVideoTypeFromString;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Move-VFIO-AP-validation-from-post-parse-to-QEMU-validation-code.patch b/SOURCES/libvirt-conf-Move-VFIO-AP-validation-from-post-parse-to-QEMU-validation-code.patch
deleted file mode 100644
index c2d9bdb..0000000
--- a/SOURCES/libvirt-conf-Move-VFIO-AP-validation-from-post-parse-to-QEMU-validation-code.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 680d10a61dfab864b5e1bca9e1f197ae06e62d87 Mon Sep 17 00:00:00 2001
-Message-Id: <680d10a61dfab864b5e1bca9e1f197ae06e62d87@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 30 Nov 2018 15:49:26 +0100
-Subject: [PATCH] conf: Move VFIO AP validation from post parse to QEMU
- validation code
-
-VFIO AP has a limitation on a single device per domain, however, when
-commit 11708641 added the support for vfio-ap, check for this limitation
-was performed as part of the post parse code. Generally, checks like that
-should be performed within the driver's validation callback to eliminate
-any slight chance of failing in post parse, which could potentially
-result in the domain XML config vanishing.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 25dde373730545894f60ce5b1497f19d61714c69)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508146
-
-Signed-off-by: Pino Toscano <ptoscano@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/conf/domain_conf.c | 28 ----------------------------
- src/qemu/qemu_domain.c | 28 +++++++++++++++++++++++++++-
- 2 files changed, 27 insertions(+), 29 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index ea7152eb94..e013e9f0c5 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4325,31 +4325,6 @@ virDomainDefPostParseGraphics(virDomainDef *def)
- }
- 
- 
--static int
--virDomainDefPostParseHostdev(virDomainDefPtr def)
--{
--    size_t i;
--    bool vfioap_found = false;
--
--    /* verify settings of hostdevs vfio-ap */
--    for (i = 0; i < def->nhostdevs; i++) {
--        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
--
--        if (virHostdevIsMdevDevice(hostdev) &&
--            hostdev->source.subsys.u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_AP) {
--            if (vfioap_found) {
--                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                               _("Only one hostdev of model vfio-ap is "
--                                 "supported"));
--                return -1;
--            }
--            vfioap_found = true;
--        }
--    }
--    return 0;
--}
--
--
- /**
-  * virDomainDriveAddressIsUsedByDisk:
-  * @def: domain definition containing the disks to check
-@@ -5262,9 +5237,6 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
- 
-     virDomainDefPostParseGraphics(def);
- 
--    if (virDomainDefPostParseHostdev(def) < 0)
--        return -1;
--
-     if (virDomainDefPostParseCPU(def) < 0)
-         return -1;
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 4898d58733..08f479fa1d 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4486,6 +4486,32 @@ qemuDomainMdevDefVFIOPCIValidate(const virDomainHostdevSubsysMediatedDev *dev,
- }
- 
- 
-+static int
-+qemuDomainMdevDefVFIOAPValidate(const virDomainDef *def)
-+{
-+    size_t i;
-+    bool vfioap_found = false;
-+
-+    /* VFIO-AP is restricted to a single mediated device only */
-+    for (i = 0; i < def->nhostdevs; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+
-+        if (virHostdevIsMdevDevice(hostdev) &&
-+            hostdev->source.subsys.u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_AP) {
-+            if (vfioap_found) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                               _("Only one hostdev of model vfio-ap is "
-+                                 "supported"));
-+                return -1;
-+            }
-+            vfioap_found = true;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
-                           const virDomainDef *def,
-@@ -4495,7 +4521,7 @@ qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
-     case VIR_MDEV_MODEL_TYPE_VFIO_PCI:
-         return qemuDomainMdevDefVFIOPCIValidate(mdevsrc, def, qemuCaps);
-     case VIR_MDEV_MODEL_TYPE_VFIO_AP:
--        break;
-+        return qemuDomainMdevDefVFIOAPValidate(def);
-     case VIR_MDEV_MODEL_TYPE_VFIO_CCW:
-         break;
-     case VIR_MDEV_MODEL_TYPE_LAST:
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-conf-Move-hugepage-XML-validation-check-out-of-qemu_command.patch b/SOURCES/libvirt-conf-Move-hugepage-XML-validation-check-out-of-qemu_command.patch
deleted file mode 100644
index 6788a1e..0000000
--- a/SOURCES/libvirt-conf-Move-hugepage-XML-validation-check-out-of-qemu_command.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From d1a499f071b2a223641d2e4f0783eda1ad67d1ae Mon Sep 17 00:00:00 2001
-Message-Id: <d1a499f071b2a223641d2e4f0783eda1ad67d1ae@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:52 +0200
-Subject: [PATCH] conf: Move hugepage XML validation check out of qemu_command
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We can safely validate the hugepage nodeset attribute at a define time.
-This validation is not done for already existing domains when the daemon
-is restarted.
-
-All the changes to the tests are necessary because we move the error
-from domain start into XML parse.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 5c93dfb46d9dff623707994f115b6bd7ca4f0682)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c                        | 32 +++++++++++++++++
- src/qemu/qemu_command.c                       | 34 -------------------
- .../seclabel-dynamic-none-relabel.xml         |  2 +-
- tests/qemuxml2argvtest.c                      | 18 +++++-----
- .../hugepages-default-1G-nodeset-2M.xml       |  1 -
- .../qemuxml2xmloutdata/hugepages-nodeset.xml  |  1 -
- .../hugepages-numa-nodeset-nonexist.xml       |  1 -
- .../seclabel-dynamic-none-relabel.xml         |  2 +-
- tests/qemuxml2xmltest.c                       |  3 --
- 9 files changed, 43 insertions(+), 51 deletions(-)
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-nodeset.xml
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index a05aad056d..280bbdf35c 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -6142,6 +6142,35 @@ virDomainDefLifecycleActionValidate(const virDomainDef *def)
- }
- 
- 
-+static int
-+virDomainDefMemtuneValidate(const virDomainDef *def)
-+{
-+    const virDomainMemtune *mem = &(def->mem);
-+    size_t i;
-+    ssize_t pos = virDomainNumaGetNodeCount(def->numa) - 1;
-+
-+    for (i = 0; i < mem->nhugepages; i++) {
-+        ssize_t nextBit;
-+
-+        if (!mem->hugepages[i].nodemask) {
-+            /* This is the master hugepage to use. Skip it as it has no
-+             * nodemask anyway. */
-+            continue;
-+        }
-+
-+        nextBit = virBitmapNextSetBit(mem->hugepages[i].nodemask, pos);
-+        if (nextBit >= 0) {
-+            virReportError(VIR_ERR_XML_DETAIL,
-+                           _("hugepages: node %zd not found"),
-+                           nextBit);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- virDomainDefValidateInternal(const virDomainDef *def)
- {
-@@ -6177,6 +6206,9 @@ virDomainDefValidateInternal(const virDomainDef *def)
-     if (virDomainDefLifecycleActionValidate(def) < 0)
-         return -1;
- 
-+    if (virDomainDefMemtuneValidate(def) < 0)
-+        return -1;
-+
-     return 0;
- }
- 
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 954265feb0..f2b64ed720 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7482,16 +7482,6 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
-     if (!def->mem.nhugepages)
-         return 0;
- 
--    if (def->mem.hugepages[0].nodemask) {
--        ssize_t next_bit = virBitmapNextSetBit(def->mem.hugepages[0].nodemask, -1);
--        if (next_bit >= 0) {
--            virReportError(VIR_ERR_XML_DETAIL,
--                           _("hugepages: node %zd not found"),
--                           next_bit);
--            return -1;
--        }
--    }
--
-     /* There is one special case: if user specified "huge"
-      * pages of regular system pages size.
-      * And there is nothing to do in this case.
-@@ -7624,30 +7614,6 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
-     if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
-         goto cleanup;
- 
--    for (i = 0; i < def->mem.nhugepages; i++) {
--        ssize_t next_bit, pos = 0;
--
--        if (!def->mem.hugepages[i].nodemask) {
--            /* This is the master hugepage to use. Skip it as it has no
--             * nodemask anyway. */
--            continue;
--        }
--
--        if (ncells) {
--            /* Fortunately, we allow only guest NUMA nodes to be continuous
--             * starting from zero. */
--            pos = ncells - 1;
--        }
--
--        next_bit = virBitmapNextSetBit(def->mem.hugepages[i].nodemask, pos);
--        if (next_bit >= 0) {
--            virReportError(VIR_ERR_XML_DETAIL,
--                           _("hugepages: node %zd not found"),
--                           next_bit);
--            goto cleanup;
--        }
--    }
--
-     if (VIR_ALLOC_N(nodeBackends, ncells) < 0)
-         goto cleanup;
- 
-diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
-index 47f253b5f7..e954250009 100644
---- a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
-+++ b/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml
-@@ -5,7 +5,7 @@
-   <currentMemory unit='KiB'>262144</currentMemory>
-   <memoryBacking>
-     <hugepages>
--      <page size='2048' unit='KiB' nodeset='0'/>
-+      <page size='2048' unit='KiB'/>
-     </hugepages>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index bd5fdf9412..f82bca2637 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -959,12 +959,12 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
--    DO_TEST("hugepages-default-1G-nodeset-2M", NONE);
--    DO_TEST_FAILURE("hugepages-nodeset", NONE);
--    DO_TEST_FAILURE("hugepages-nodeset-nonexist",
--                    QEMU_CAPS_DEVICE_PC_DIMM,
--                    QEMU_CAPS_OBJECT_MEMORY_FILE,
--                    QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-+    DO_TEST_PARSE_ERROR("hugepages-default-1G-nodeset-2M", NONE);
-+    DO_TEST_PARSE_ERROR("hugepages-nodeset", NONE);
-+    DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist",
-+                        QEMU_CAPS_DEVICE_PC_DIMM,
-+                        QEMU_CAPS_OBJECT_MEMORY_FILE,
-+                        QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-default-2M",
-@@ -979,9 +979,9 @@ mymain(void)
-     DO_TEST("hugepages-numa-nodeset-part",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
--    DO_TEST_FAILURE("hugepages-numa-nodeset-nonexist",
--                    QEMU_CAPS_OBJECT_MEMORY_RAM,
--                    QEMU_CAPS_OBJECT_MEMORY_FILE);
-+    DO_TEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist",
-+                        QEMU_CAPS_OBJECT_MEMORY_RAM,
-+                        QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-shared",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-diff --git a/tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml
-deleted file mode 120000
-index 3d8eb7616e..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-deleted file mode 120000
-index b55838b780..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-nodeset.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
-deleted file mode 120000
-index d490edca69..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
-index 050967b4ee..bfa66b8deb 100644
---- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
-+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
-@@ -5,7 +5,7 @@
-   <currentMemory unit='KiB'>262144</currentMemory>
-   <memoryBacking>
-     <hugepages>
--      <page size='2048' unit='KiB' nodeset='0'/>
-+      <page size='2048' unit='KiB'/>
-     </hugepages>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index acbe2f7133..aa543e9e51 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -336,13 +336,10 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
--    DO_TEST("hugepages-default-1G-nodeset-2M", NONE);
--    DO_TEST("hugepages-nodeset", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
-     DO_TEST("hugepages-numa-nodeset-part", NONE);
--    DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
-     DO_TEST("hugepages-shared", NONE);
-     DO_TEST("hugepages-memaccess", NONE);
-     DO_TEST("hugepages-memaccess2", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Move-hugepages-validation-out-of-XML-parser.patch b/SOURCES/libvirt-conf-Move-hugepages-validation-out-of-XML-parser.patch
deleted file mode 100644
index 8e1c4e2..0000000
--- a/SOURCES/libvirt-conf-Move-hugepages-validation-out-of-XML-parser.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From a4ddc9b4213809cbab4abce609441975ae433dae Mon Sep 17 00:00:00 2001
-Message-Id: <a4ddc9b4213809cbab4abce609441975ae433dae@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:53 +0200
-Subject: [PATCH] conf: Move hugepages validation out of XML parser
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 82327038390bfae117dc6e1d9062e38901cd4c97)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c | 75 ++++++++++++++++++++++--------------------
- 1 file changed, 40 insertions(+), 35 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 280bbdf35c..98e833c5bb 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -6149,9 +6149,49 @@ virDomainDefMemtuneValidate(const virDomainDef *def)
-     size_t i;
-     ssize_t pos = virDomainNumaGetNodeCount(def->numa) - 1;
- 
-+    if (mem->nhugepages == 0)
-+        return 0;
-+
-+    if (mem->allocation == VIR_DOMAIN_MEMORY_ALLOCATION_ONDEMAND) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("hugepages are not allowed with memory "
-+                         "allocation ondemand"));
-+        return -1;
-+    }
-+
-+    if (mem->source == VIR_DOMAIN_MEMORY_SOURCE_ANONYMOUS) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("hugepages are not allowed with anonymous "
-+                         "memory source"));
-+        return -1;
-+    }
-+
-     for (i = 0; i < mem->nhugepages; i++) {
-+        size_t j;
-         ssize_t nextBit;
- 
-+        for (j = 0; j < i; j++) {
-+            if (mem->hugepages[i].nodemask &&
-+                mem->hugepages[j].nodemask &&
-+                virBitmapOverlaps(mem->hugepages[i].nodemask,
-+                                  mem->hugepages[j].nodemask)) {
-+                virReportError(VIR_ERR_XML_DETAIL,
-+                               _("nodeset attribute of hugepages "
-+                                 "of sizes %llu and %llu intersect"),
-+                               mem->hugepages[i].size,
-+                               mem->hugepages[j].size);
-+                return -1;
-+            } else if (!mem->hugepages[i].nodemask &&
-+                       !mem->hugepages[j].nodemask) {
-+                virReportError(VIR_ERR_XML_DETAIL,
-+                               _("two master hugepages detected: "
-+                                 "%llu and %llu"),
-+                               mem->hugepages[i].size,
-+                               mem->hugepages[j].size);
-+                return -1;
-+            }
-+        }
-+
-         if (!mem->hugepages[i].nodemask) {
-             /* This is the master hugepage to use. Skip it as it has no
-              * nodemask anyway. */
-@@ -19414,19 +19454,6 @@ virDomainDefParseXML(xmlDocPtr xml,
- 
-     if (virXPathNode("./memoryBacking/hugepages", ctxt)) {
-         /* hugepages will be used */
--
--        if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_ONDEMAND) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("hugepages are not allowed with memory allocation ondemand"));
--            goto error;
--        }
--
--        if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_ANONYMOUS) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("hugepages are not allowed with anonymous memory source"));
--            goto error;
--        }
--
-         if ((n = virXPathNodeSet("./memoryBacking/hugepages/page", ctxt, &nodes)) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("cannot extract hugepages nodes"));
-@@ -19442,28 +19469,6 @@ virDomainDefParseXML(xmlDocPtr xml,
-                                                &def->mem.hugepages[i]) < 0)
-                     goto error;
-                 def->mem.nhugepages++;
--
--                for (j = 0; j < i; j++) {
--                    if (def->mem.hugepages[i].nodemask &&
--                        def->mem.hugepages[j].nodemask &&
--                        virBitmapOverlaps(def->mem.hugepages[i].nodemask,
--                                          def->mem.hugepages[j].nodemask)) {
--                        virReportError(VIR_ERR_XML_DETAIL,
--                                       _("nodeset attribute of hugepages "
--                                         "of sizes %llu and %llu intersect"),
--                                       def->mem.hugepages[i].size,
--                                       def->mem.hugepages[j].size);
--                        goto error;
--                    } else if (!def->mem.hugepages[i].nodemask &&
--                               !def->mem.hugepages[j].nodemask) {
--                        virReportError(VIR_ERR_XML_DETAIL,
--                                       _("two master hugepages detected: "
--                                         "%llu and %llu"),
--                                       def->mem.hugepages[i].size,
--                                       def->mem.hugepages[j].size);
--                        goto error;
--                    }
--                }
-             }
- 
-             VIR_FREE(nodes);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Parse-and-format-nested-hv-feature.patch b/SOURCES/libvirt-conf-Parse-and-format-nested-hv-feature.patch
deleted file mode 100644
index ea80aab..0000000
--- a/SOURCES/libvirt-conf-Parse-and-format-nested-hv-feature.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 742667e7f0a55f3a8042840e2995982a003dc2fc Mon Sep 17 00:00:00 2001
-Message-Id: <742667e7f0a55f3a8042840e2995982a003dc2fc@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 4 Dec 2018 16:46:19 +0100
-Subject: [PATCH] conf: Parse and format nested-hv feature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit bfa2bd7e38f2777260b63200ef12804e13a7a5c2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1647822
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in                     | 12 ++++++++++++
- docs/schemas/domaincommon.rng                 |  5 +++++
- src/conf/domain_conf.c                        |  4 ++++
- src/conf/domain_conf.h                        |  1 +
- src/qemu/qemu_domain.c                        |  1 +
- tests/qemuxml2argvdata/pseries-features.xml   |  1 +
- tests/qemuxml2xmloutdata/pseries-features.xml |  1 +
- 7 files changed, 25 insertions(+)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 54eb298414..02d0ac4241 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -2191,6 +2191,18 @@
-           defined, the hypervisor default will be used.
-           <span class="since">Since 4.6.0</span> (QEMU/KVM only)
-       </dd>
-+      <dt><code>nested-hv</code></dt>
-+      <dd>Configure nested HV availability for pSeries guests. This needs to
-+          be enabled from the host (L0) in order to be effective; having HV
-+          support in the (L1) guest is very desiderable if it's planned to
-+          run nested (L2) guests inside it, because it will result in those
-+          nested guests having much better performance than they would when
-+          using KVM PR or TCG.
-+          Possible values for the <code>state</code> attribute are
-+          <code>on</code> and <code>off</code>. If the attribute is not
-+          defined, the hypervisor default will be used.
-+          <span class="since">Since 4.10.0</span> (QEMU/KVM only)
-+      </dd>
-     </dl>
- 
-     <h3><a id="elementsTime">Time keeping</a></h3>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index e4ce7804b9..70a7767d9c 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -4925,6 +4925,11 @@
-               <ref name="featurestate"/>
-             </element>
-           </optional>
-+          <optional>
-+            <element name="nested-hv">
-+              <ref name="featurestate"/>
-+            </element>
-+          </optional>
-         </interleave>
-       </element>
-     </optional>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index e013e9f0c5..660e1523fe 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -153,6 +153,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
-               "hpt",
-               "vmcoreinfo",
-               "htm",
-+              "nested-hv",
- );
- 
- VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
-@@ -19987,6 +19988,7 @@ virDomainDefParseXML(xmlDocPtr xml,
-             break;
- 
-         case VIR_DOMAIN_FEATURE_HTM:
-+        case VIR_DOMAIN_FEATURE_NESTED_HV:
-             if (!(tmp = virXMLPropString(nodes[i], "state"))) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                _("missing state attribute '%s' of feature '%s'"),
-@@ -22147,6 +22149,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
-         case VIR_DOMAIN_FEATURE_SMM:
-         case VIR_DOMAIN_FEATURE_VMCOREINFO:
-         case VIR_DOMAIN_FEATURE_HTM:
-+        case VIR_DOMAIN_FEATURE_NESTED_HV:
-             if (src->features[i] != dst->features[i]) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                _("State of feature '%s' differs: "
-@@ -27823,6 +27826,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
-             case VIR_DOMAIN_FEATURE_PVSPINLOCK:
-             case VIR_DOMAIN_FEATURE_VMPORT:
-             case VIR_DOMAIN_FEATURE_HTM:
-+            case VIR_DOMAIN_FEATURE_NESTED_HV:
-                 switch ((virTristateSwitch) def->features[i]) {
-                 case VIR_TRISTATE_SWITCH_LAST:
-                 case VIR_TRISTATE_SWITCH_ABSENT:
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index d32514e7e6..f05fca284f 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1775,6 +1775,7 @@ typedef enum {
-     VIR_DOMAIN_FEATURE_HPT,
-     VIR_DOMAIN_FEATURE_VMCOREINFO,
-     VIR_DOMAIN_FEATURE_HTM,
-+    VIR_DOMAIN_FEATURE_NESTED_HV,
- 
-     VIR_DOMAIN_FEATURE_LAST
- } virDomainFeature;
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 4fcca1e05a..0ddc6ef4a7 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3819,6 +3819,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
- 
-         case VIR_DOMAIN_FEATURE_HPT:
-         case VIR_DOMAIN_FEATURE_HTM:
-+        case VIR_DOMAIN_FEATURE_NESTED_HV:
-             if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
-                 !qemuDomainIsPSeries(def)) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-diff --git a/tests/qemuxml2argvdata/pseries-features.xml b/tests/qemuxml2argvdata/pseries-features.xml
-index 5c842fe87b..6f7d32b065 100644
---- a/tests/qemuxml2argvdata/pseries-features.xml
-+++ b/tests/qemuxml2argvdata/pseries-features.xml
-@@ -11,6 +11,7 @@
-       <maxpagesize unit='GiB'>1</maxpagesize>
-     </hpt>
-     <htm state='on'/>
-+    <nested-hv state='off'/>
-   </features>
-   <devices>
-     <emulator>/usr/bin/qemu-system-ppc64</emulator>
-diff --git a/tests/qemuxml2xmloutdata/pseries-features.xml b/tests/qemuxml2xmloutdata/pseries-features.xml
-index 55a44c75a0..7e12bc9c03 100644
---- a/tests/qemuxml2xmloutdata/pseries-features.xml
-+++ b/tests/qemuxml2xmloutdata/pseries-features.xml
-@@ -13,6 +13,7 @@
-       <maxpagesize unit='KiB'>1048576</maxpagesize>
-     </hpt>
-     <htm state='on'/>
-+    <nested-hv state='off'/>
-   </features>
-   <clock offset='utc'/>
-   <on_poweroff>destroy</on_poweroff>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-conf-Parse-and-format-the-HTM-pSeries-feature.patch b/SOURCES/libvirt-conf-Parse-and-format-the-HTM-pSeries-feature.patch
deleted file mode 100644
index 51d16be..0000000
--- a/SOURCES/libvirt-conf-Parse-and-format-the-HTM-pSeries-feature.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From cb462f891f39ff47179e6fe65437450f9d8c7824 Mon Sep 17 00:00:00 2001
-Message-Id: <cb462f891f39ff47179e6fe65437450f9d8c7824@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 3 Jul 2018 15:25:16 +0200
-Subject: [PATCH] conf: Parse and format the HTM pSeries feature
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-
-(cherry picked from commit 9f3b9100f33036cb14296aa0a788788743b75a23)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1525599
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Acked-by: David Gibson <dgibson@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- docs/formatdomain.html.in                     |  8 ++++++++
- docs/schemas/domaincommon.rng                 |  5 +++++
- src/conf/domain_conf.c                        | 19 +++++++++++++++++++
- src/conf/domain_conf.h                        |  1 +
- src/qemu/qemu_domain.c                        |  1 +
- tests/qemuxml2argvdata/pseries-features.xml   |  1 +
- tests/qemuxml2argvtest.c                      |  1 +
- tests/qemuxml2xmloutdata/pseries-features.xml |  1 +
- tests/qemuxml2xmltest.c                       |  1 +
- 9 files changed, 38 insertions(+)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 0d68596991..a3afe137bf 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -1929,6 +1929,7 @@
-   &lt;smm state='on'&gt;
-     &lt;tseg unit='MiB'&gt;48&lt;/tseg&gt;
-   &lt;/smm&gt;
-+  &lt;htm state='on'/&gt;
- &lt;/features&gt;
- ...</pre>
- 
-@@ -2162,6 +2163,13 @@
-       <dd>Enable QEMU vmcoreinfo device to let the guest kernel save debug
-           details. <span class="since">Since 4.4.0</span> (QEMU only)
-       </dd>
-+      <dt><code>htm</code></dt>
-+      <dd>Configure HTM (Hardware Transational Memory) availability for
-+          pSeries guests. Possible values for the <code>state</code> attribute
-+          are <code>on</code> and <code>off</code>. If the attribute is not
-+          defined, the hypervisor default will be used.
-+          <span class="since">Since 4.6.0</span> (QEMU/KVM only)
-+      </dd>
-     </dl>
- 
-     <h3><a id="elementsTime">Time keeping</a></h3>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index f46145cf9b..bd687ce9d3 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -4907,6 +4907,11 @@
-           <optional>
-             <ref name="vmcoreinfo"/>
-           </optional>
-+          <optional>
-+            <element name="htm">
-+              <ref name="featurestate"/>
-+            </element>
-+          </optional>
-         </interleave>
-       </element>
-     </optional>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index b8b53450fa..f4e59f6c91 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -152,6 +152,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
-               "ioapic",
-               "hpt",
-               "vmcoreinfo",
-+              "htm",
- );
- 
- VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_LAST,
-@@ -19827,6 +19828,22 @@ virDomainDefParseXML(xmlDocPtr xml,
-             }
-             break;
- 
-+        case VIR_DOMAIN_FEATURE_HTM:
-+            if (!(tmp = virXMLPropString(nodes[i], "state"))) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("missing state attribute '%s' of feature '%s'"),
-+                               tmp, virDomainFeatureTypeToString(val));
-+                goto error;
-+            }
-+            if ((def->features[val] = virTristateSwitchTypeFromString(tmp)) < 0) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("unknown state attribute '%s' of feature '%s'"),
-+                               tmp, virDomainFeatureTypeToString(val));
-+                goto error;
-+            }
-+            VIR_FREE(tmp);
-+            break;
-+
-         /* coverity[dead_error_begin] */
-         case VIR_DOMAIN_FEATURE_LAST:
-             break;
-@@ -21961,6 +21978,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
-         case VIR_DOMAIN_FEATURE_VMPORT:
-         case VIR_DOMAIN_FEATURE_SMM:
-         case VIR_DOMAIN_FEATURE_VMCOREINFO:
-+        case VIR_DOMAIN_FEATURE_HTM:
-             if (src->features[i] != dst->features[i]) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                _("State of feature '%s' differs: "
-@@ -27626,6 +27644,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
-             case VIR_DOMAIN_FEATURE_PMU:
-             case VIR_DOMAIN_FEATURE_PVSPINLOCK:
-             case VIR_DOMAIN_FEATURE_VMPORT:
-+            case VIR_DOMAIN_FEATURE_HTM:
-                 switch ((virTristateSwitch) def->features[i]) {
-                 case VIR_TRISTATE_SWITCH_LAST:
-                 case VIR_TRISTATE_SWITCH_ABSENT:
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 71437dc485..41d27482fb 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1771,6 +1771,7 @@ typedef enum {
-     VIR_DOMAIN_FEATURE_IOAPIC,
-     VIR_DOMAIN_FEATURE_HPT,
-     VIR_DOMAIN_FEATURE_VMCOREINFO,
-+    VIR_DOMAIN_FEATURE_HTM,
- 
-     VIR_DOMAIN_FEATURE_LAST
- } virDomainFeature;
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 4c2a162b85..0eacad1e44 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3865,6 +3865,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
-         case VIR_DOMAIN_FEATURE_PMU:
-         case VIR_DOMAIN_FEATURE_VMPORT:
-         case VIR_DOMAIN_FEATURE_VMCOREINFO:
-+        case VIR_DOMAIN_FEATURE_HTM:
-         case VIR_DOMAIN_FEATURE_LAST:
-             break;
-         }
-diff --git a/tests/qemuxml2argvdata/pseries-features.xml b/tests/qemuxml2argvdata/pseries-features.xml
-index 30cee5b81c..5c842fe87b 100644
---- a/tests/qemuxml2argvdata/pseries-features.xml
-+++ b/tests/qemuxml2argvdata/pseries-features.xml
-@@ -10,6 +10,7 @@
-     <hpt resizing='required'>
-       <maxpagesize unit='GiB'>1</maxpagesize>
-     </hpt>
-+    <htm state='on'/>
-   </features>
-   <devices>
-     <emulator>/usr/bin/qemu-system-ppc64</emulator>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index c279ac4975..d6911f9344 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1850,6 +1850,7 @@ mymain(void)
-     DO_TEST("pseries-features",
-             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-             QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
-+            QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
-             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-     DO_TEST_FAILURE("pseries-features",
-                     QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
-diff --git a/tests/qemuxml2xmloutdata/pseries-features.xml b/tests/qemuxml2xmloutdata/pseries-features.xml
-index f36705f011..55a44c75a0 100644
---- a/tests/qemuxml2xmloutdata/pseries-features.xml
-+++ b/tests/qemuxml2xmloutdata/pseries-features.xml
-@@ -12,6 +12,7 @@
-     <hpt resizing='required'>
-       <maxpagesize unit='KiB'>1048576</maxpagesize>
-     </hpt>
-+    <htm state='on'/>
-   </features>
-   <clock offset='utc'/>
-   <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index eac6d5b073..bbb995656e 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -620,6 +620,7 @@ mymain(void)
-     DO_TEST("pseries-features",
-             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-             QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
-+            QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
-             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
- 
-     DO_TEST("pseries-serial-native",
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Parse-guestfwd-channel-device-info-again.patch b/SOURCES/libvirt-conf-Parse-guestfwd-channel-device-info-again.patch
deleted file mode 100644
index fa9640d..0000000
--- a/SOURCES/libvirt-conf-Parse-guestfwd-channel-device-info-again.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ac3ea7982236832f5f2ae86b631aface267d035c Mon Sep 17 00:00:00 2001
-Message-Id: <ac3ea7982236832f5f2ae86b631aface267d035c@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 21 Aug 2018 14:23:40 +0200
-Subject: [PATCH] conf: Parse guestfwd channel device info again
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1610072
-
-Due to historical reasons we were not parsing device info on
-guestfwd channel. Sure, it doesn't make much sense to parse
-<address/> but it surely makes sense to parse its alias (which
-might be an user alias).
-
-This reverts commit 47a3dd46ead20e6fdc30bcdc1b8e707e250d33da
-which fixed https://bugzilla.redhat.com/show_bug.cgi?id=1172526.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit cab1843914d9ce5d1ca28477d2b48e5304e9e6f2)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/conf/domain_conf.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 8a43e607e9..51a79ad8b1 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -12760,14 +12760,8 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
-         }
-     }
- 
--    if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
--        def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD) {
--        VIR_DEBUG("Ignoring device address for gustfwd channel");
--    } else if (virDomainDeviceInfoParseXML(xmlopt, node,
--                                           &def->info, flags) < 0) {
-+    if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
-         goto error;
--    }
--
- 
-     if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-         def->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB &&
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-Replace-error-with-cleanup-in-virDomainHostdevDefParseXMLSubsys.patch b/SOURCES/libvirt-conf-Replace-error-with-cleanup-in-virDomainHostdevDefParseXMLSubsys.patch
deleted file mode 100644
index 8128784..0000000
--- a/SOURCES/libvirt-conf-Replace-error-with-cleanup-in-virDomainHostdevDefParseXMLSubsys.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From fd6fae19231031f3feb83c854efdf2f1abfa7847 Mon Sep 17 00:00:00 2001
-Message-Id: <fd6fae19231031f3feb83c854efdf2f1abfa7847@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:04:01 +0200
-Subject: [PATCH] conf: Replace 'error' with 'cleanup' in
- virDomainHostdevDefParseXMLSubsys
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The exit path is the same for both success and failure, so the label
-should be called cleanup.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f1f6f4858260a77416ed5e0c86c4e0614aaf0a5e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c | 38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 08654ab41d..72086f9e86 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -7690,18 +7690,18 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("unknown host device source address type '%s'"),
-                            type);
--            goto error;
-+            goto cleanup;
-         }
-     } else {
-         virReportError(VIR_ERR_XML_ERROR,
-                        "%s", _("missing source address type"));
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (!(sourcenode = virXPathNode("./source", ctxt))) {
-         virReportError(VIR_ERR_XML_ERROR, "%s",
-                        _("Missing <source> element in hostdev device"));
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
-@@ -7709,20 +7709,20 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("Setting startupPolicy is only allowed for USB"
-                          " devices"));
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (sgio) {
-         if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("sgio is only supported for scsi host device"));
--            goto error;
-+            goto cleanup;
-         }
- 
-         if ((scsisrc->sgio = virDomainDeviceSGIOTypeFromString(sgio)) <= 0) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("unknown sgio mode '%s'"), sgio);
--            goto error;
-+            goto cleanup;
-         }
-     }
- 
-@@ -7730,14 +7730,14 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-         if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("rawio is only supported for scsi host device"));
--            goto error;
-+            goto cleanup;
-         }
- 
-         if ((scsisrc->rawio = virTristateBoolTypeFromString(rawio)) <= 0) {
-             virReportError(VIR_ERR_XML_ERROR,
-                            _("unknown hostdev rawio setting '%s'"),
-                            rawio);
--            goto error;
-+            goto cleanup;
-         }
-     }
- 
-@@ -7746,28 +7746,28 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("'model' attribute in <hostdev> is only supported "
-                              "when type='mdev'"));
--            goto error;
-+            goto cleanup;
-         }
-     } else {
-         if (!model) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("Missing 'model' attribute in mediated device's "
-                              "<hostdev> element"));
--            goto error;
-+            goto cleanup;
-         }
- 
-         if ((mdevsrc->model = virMediatedDeviceModelTypeFromString(model)) < 0) {
-             virReportError(VIR_ERR_XML_ERROR,
-                            _("unknown hostdev model '%s'"),
-                            model);
--            goto error;
-+            goto cleanup;
-         }
-     }
- 
-     switch (def->source.subsys.type) {
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-         if (virDomainHostdevSubsysPCIDefParseXML(sourcenode, def, flags) < 0)
--            goto error;
-+            goto cleanup;
- 
-         backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT;
-         if ((backendStr = virXPathString("string(./driver/@name)", ctxt)) &&
-@@ -7776,7 +7776,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("Unknown PCI device <driver name='%s'/> "
-                              "has been specified"), backendStr);
--            goto error;
-+            goto cleanup;
-         }
-         pcisrc->backend = backend;
- 
-@@ -7784,32 +7784,32 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
- 
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
-         if (virDomainHostdevSubsysUSBDefParseXML(sourcenode, def) < 0)
--            goto error;
-+            goto cleanup;
-         break;
- 
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
-         if (virDomainHostdevSubsysSCSIDefParseXML(sourcenode, scsisrc, ctxt) < 0)
--            goto error;
-+            goto cleanup;
-         break;
- 
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
-         if (virDomainHostdevSubsysSCSIVHostDefParseXML(sourcenode, def) < 0)
--            goto error;
-+            goto cleanup;
-         break;
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-         if (virDomainHostdevSubsysMediatedDevDefParseXML(def, ctxt) < 0)
--            goto error;
-+            goto cleanup;
-         break;
- 
-     default:
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("address type='%s' not supported in hostdev interfaces"),
-                        virDomainHostdevSubsysTypeToString(def->source.subsys.type));
--        goto error;
-+        goto cleanup;
-     }
- 
-     ret = 0;
-- error:
-+ cleanup:
-     VIR_FREE(managed);
-     VIR_FREE(sgio);
-     VIR_FREE(rawio);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-conf-add-new-PCI_CONNECT-flag-AUTOASSIGN.patch b/SOURCES/libvirt-conf-add-new-PCI_CONNECT-flag-AUTOASSIGN.patch
new file mode 100644
index 0000000..7e0dba2
--- /dev/null
+++ b/SOURCES/libvirt-conf-add-new-PCI_CONNECT-flag-AUTOASSIGN.patch
@@ -0,0 +1,87 @@
+From 2780cb41f7682741be2bbe662d629dd1bd3b4f6e Mon Sep 17 00:00:00 2001
+Message-Id: <2780cb41f7682741be2bbe662d629dd1bd3b4f6e@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:10 -0400
+Subject: [PATCH] conf: add new PCI_CONNECT flag AUTOASSIGN
+
+This new flag will be set for any controller that we decide can have
+devices assigned to it automatically during PCI device assignment. In
+the past PCI_CONNECT_TYPE_HOTPLUGGABLE was used for this purpose, but
+that is overloading that flag, and no longer technically correct; what
+we *really* want is to auto-assign devices to any pcie-root-port or
+pcie-switch-downstream-port regardless of whether or not that
+controller happens to have hotplug enabled.
+
+This patch just adds the flag, but doesn't use it at all. Note that
+the numbering of all the other flags was changed in order to insert
+the new flag near the beginning of the list; that doesn't cause any
+problem because the connect flags aren't stored anywhere between runs
+of libvirtd.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit c296a846ad7de3066a17404f4f407d3e1b6d7935)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-8-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_addr.h | 41 +++++++++++++++++++++--------------------
+ 1 file changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
+index dcb90618f8..40738ddb72 100644
+--- a/src/conf/domain_addr.h
++++ b/src/conf/domain_addr.h
+@@ -32,26 +32,27 @@ typedef enum {
+ } virPCIDeviceAddressExtensionFlags;
+ 
+ typedef enum {
+-   VIR_PCI_CONNECT_HOTPLUGGABLE = 1 << 0, /* is hotplug needed/supported */
+-
+-   /* set for devices that can share a single slot in auto-assignment
+-    * (by assigning one device to each of the 8 functions on the slot)
+-    */
+-   VIR_PCI_CONNECT_AGGREGATE_SLOT = 1 << 1,
+-
+-   /* kinds of devices as a bitmap so they can be combined (some PCI
+-    * controllers permit connecting multiple types of devices)
+-    */
+-   VIR_PCI_CONNECT_TYPE_PCI_DEVICE = 1 << 2,
+-   VIR_PCI_CONNECT_TYPE_PCIE_DEVICE = 1 << 3,
+-   VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT = 1 << 4,
+-   VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT = 1 << 5,
+-   VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT = 1 << 6,
+-   VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE = 1 << 7,
+-   VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS = 1 << 8,
+-   VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS = 1 << 9,
+-   VIR_PCI_CONNECT_TYPE_PCI_BRIDGE = 1 << 10,
+-   VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE = 1 << 11,
++    VIR_PCI_CONNECT_AUTOASSIGN = 1 << 0, /* okay to autoassign a device to this controller */
++    VIR_PCI_CONNECT_HOTPLUGGABLE = 1 << 1, /* is hotplug needed/supported */
++
++    /* set for devices that can share a single slot in auto-assignment
++     * (by assigning one device to each of the 8 functions on the slot)
++     */
++    VIR_PCI_CONNECT_AGGREGATE_SLOT = 1 << 2,
++
++    /* kinds of devices as a bitmap so they can be combined (some PCI
++     * controllers permit connecting multiple types of devices)
++     */
++    VIR_PCI_CONNECT_TYPE_PCI_DEVICE = 1 << 3,
++    VIR_PCI_CONNECT_TYPE_PCIE_DEVICE = 1 << 4,
++    VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT = 1 << 5,
++    VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT = 1 << 6,
++    VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT = 1 << 7,
++    VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE = 1 << 8,
++    VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS = 1 << 9,
++    VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS = 1 << 10,
++    VIR_PCI_CONNECT_TYPE_PCI_BRIDGE = 1 << 11,
++    VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE = 1 << 12,
+ } virDomainPCIConnectFlags;
+ 
+ /* a combination of all bits that describe the type of connections
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-conf-add-support-for-specifying-CPU-dies-parameter.patch b/SOURCES/libvirt-conf-add-support-for-specifying-CPU-dies-parameter.patch
new file mode 100644
index 0000000..341c98f
--- /dev/null
+++ b/SOURCES/libvirt-conf-add-support-for-specifying-CPU-dies-parameter.patch
@@ -0,0 +1,1510 @@
+From c86535685add6ff59a6cce0fa48ee27a23d71815 Mon Sep 17 00:00:00 2001
+Message-Id: <c86535685add6ff59a6cce0fa48ee27a23d71815@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 3 Feb 2020 18:07:22 +0000
+Subject: [PATCH] conf: add support for specifying CPU "dies" parameter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Recently CPU hardware vendors have started to support a new structure
+inside the CPU package topology known as a "die". Thus the hierarchy
+is now:
+
+  sockets > dies > cores > threads
+
+This adds support for "dies" in the XML parser, with the value
+defaulting to 1 if not specified for backwards compatibility.
+
+For example a system with 64 logical CPUs might report
+
+   <topology sockets="4" dies="2" cores="4" threads="2"/>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit fbf27730a36da573b1065c179f4d96b9a751f22f)
+
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785207
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785211
+Message-Id: <20200203180726.2203691-2-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/formatcaps.html.in                       |  2 +-
+ docs/formatdomain.html.in                     | 22 ++++++++++--------
+ docs/schemas/cputypes.rng                     |  5 ++++
+ src/bhyve/bhyve_command.c                     |  5 ++++
+ src/conf/cpu_conf.c                           | 23 +++++++++++++++++--
+ src/conf/cpu_conf.h                           |  1 +
+ src/conf/domain_conf.c                        |  3 ++-
+ src/cpu/cpu.c                                 |  1 +
+ src/libxl/libxl_capabilities.c                |  1 +
+ src/qemu/qemu_command.c                       |  5 ++++
+ src/vmx/vmx.c                                 |  7 ++++++
+ .../x86_64-host+guest,model486-result.xml     |  2 +-
+ .../x86_64-host+guest,models-result.xml       |  2 +-
+ .../cputestdata/x86_64-host+guest-result.xml  |  2 +-
+ tests/cputestdata/x86_64-host+guest.xml       |  2 +-
+ .../x86_64-host+host-model-nofallback.xml     |  2 +-
+ ...t-Haswell-noTSX+Haswell,haswell-result.xml |  2 +-
+ ...ell-noTSX+Haswell-noTSX,haswell-result.xml |  2 +-
+ ...ost-Haswell-noTSX+Haswell-noTSX-result.xml |  2 +-
+ .../x86_64-host-worse+guest-result.xml        |  2 +-
+ .../ppc64-modern-bulk-result-conf.xml         |  2 +-
+ .../ppc64-modern-bulk-result-live.xml         |  2 +-
+ .../ppc64-modern-individual-result-conf.xml   |  2 +-
+ .../ppc64-modern-individual-result-live.xml   |  2 +-
+ .../x86-modern-bulk-result-conf.xml           |  2 +-
+ .../x86-modern-bulk-result-live.xml           |  2 +-
+ .../x86-modern-individual-add-result-conf.xml |  2 +-
+ .../x86-modern-individual-add-result-live.xml |  2 +-
+ .../x86-old-bulk-result-conf.xml              |  2 +-
+ .../x86-old-bulk-result-live.xml              |  2 +-
+ .../cpu-hotplug-granularity.xml               |  2 +-
+ .../qemuxml2argvdata/cpu-hotplug-startup.xml  |  2 +-
+ tests/qemuxml2argvdata/cpu-numa-disjoint.xml  |  2 +-
+ .../qemuxml2argvdata/cpu-numa-disordered.xml  |  2 +-
+ tests/qemuxml2argvdata/cpu-numa-memshared.xml |  2 +-
+ .../cpu-numa-no-memory-element.xml            |  2 +-
+ tests/qemuxml2argvdata/cpu-numa1.xml          |  2 +-
+ tests/qemuxml2argvdata/cpu-numa2.xml          |  2 +-
+ tests/qemuxml2argvdata/cpu-numa3.xml          |  2 +-
+ tests/qemuxml2argvdata/cpu-topology1.xml      |  2 +-
+ tests/qemuxml2argvdata/cpu-topology2.xml      |  2 +-
+ tests/qemuxml2argvdata/cpu-topology3.xml      |  2 +-
+ .../fd-memory-no-numa-topology.xml            |  2 +-
+ .../fd-memory-numa-topology.xml               |  2 +-
+ .../fd-memory-numa-topology2.xml              |  2 +-
+ .../fd-memory-numa-topology3.xml              |  2 +-
+ .../graphics-spice-timeout.xml                |  2 +-
+ tests/qemuxml2argvdata/hugepages-nvdimm.xml   |  2 +-
+ .../memfd-memory-default-hugepage.xml         |  2 +-
+ tests/qemuxml2argvdata/memfd-memory-numa.xml  |  2 +-
+ tests/qemuxml2argvdata/memory-align-fail.xml  |  2 +-
+ .../memory-hotplug-dimm-addr.xml              |  2 +-
+ .../qemuxml2argvdata/memory-hotplug-dimm.xml  |  2 +-
+ .../memory-hotplug-nvdimm-access.xml          |  2 +-
+ .../memory-hotplug-nvdimm-align.xml           |  2 +-
+ .../memory-hotplug-nvdimm-label.xml           |  2 +-
+ .../memory-hotplug-nvdimm-pmem.xml            |  2 +-
+ .../memory-hotplug-nvdimm-readonly.xml        |  2 +-
+ .../memory-hotplug-nvdimm.xml                 |  2 +-
+ tests/qemuxml2argvdata/memory-hotplug.xml     |  2 +-
+ .../numad-auto-memory-vcpu-cpuset.xml         |  2 +-
+ ...to-memory-vcpu-no-cpuset-and-placement.xml |  2 +-
+ .../numad-auto-vcpu-no-numatune.xml           |  2 +-
+ ...d-auto-vcpu-static-numatune-no-nodeset.xml |  2 +-
+ .../numad-auto-vcpu-static-numatune.xml       |  2 +-
+ .../numad-static-memory-auto-vcpu.xml         |  2 +-
+ .../numad-static-vcpu-no-numatune.xml         |  2 +-
+ tests/qemuxml2argvdata/numad.xml              |  2 +-
+ .../numatune-auto-nodeset-invalid.xml         |  2 +-
+ .../numatune-memory-invalid-nodeset.xml       |  2 +-
+ tests/qemuxml2argvdata/numatune-memory.xml    |  2 +-
+ .../pci-expander-bus-bad-machine.xml          |  2 +-
+ tests/qemuxml2argvdata/pci-expander-bus.xml   |  2 +-
+ .../pcie-expander-bus-bad-bus.xml             |  2 +-
+ .../pcie-expander-bus-bad-machine.xml         |  2 +-
+ tests/qemuxml2argvdata/pcie-expander-bus.xml  |  2 +-
+ .../pseries-default-phb-numa-node.xml         |  2 +-
+ .../pseries-phb-numa-node.xml                 |  2 +-
+ tests/qemuxml2argvdata/smp.xml                |  2 +-
+ .../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |  2 +-
+ .../cpu-numa-disordered.xml                   |  2 +-
+ .../qemuxml2xmloutdata/cpu-numa-memshared.xml |  2 +-
+ .../cpu-numa-no-memory-element.xml            |  2 +-
+ tests/qemuxml2xmloutdata/cpu-numa1.xml        |  2 +-
+ tests/qemuxml2xmloutdata/cpu-numa2.xml        |  2 +-
+ .../graphics-spice-timeout.xml                |  2 +-
+ .../memory-hotplug-dimm.xml                   |  2 +-
+ tests/qemuxml2xmloutdata/memory-hotplug.xml   |  2 +-
+ .../numad-auto-memory-vcpu-cpuset.xml         |  2 +-
+ ...to-memory-vcpu-no-cpuset-and-placement.xml |  2 +-
+ .../numad-auto-vcpu-no-numatune.xml           |  2 +-
+ .../numad-static-vcpu-no-numatune.xml         |  2 +-
+ tests/qemuxml2xmloutdata/pci-expander-bus.xml |  2 +-
+ .../qemuxml2xmloutdata/pcie-expander-bus.xml  |  2 +-
+ .../pseries-phb-numa-node.xml                 |  2 +-
+ tests/qemuxml2xmloutdata/smp.xml              |  2 +-
+ .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml |  2 +-
+ .../vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml |  2 +-
+ 98 files changed, 148 insertions(+), 101 deletions(-)
+
+diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
+index 2a0aa963bb..59d21a7d9e 100644
+--- a/docs/formatcaps.html.in
++++ b/docs/formatcaps.html.in
+@@ -173,7 +173,7 @@
+       &lt;/features&gt;
+       &lt;model&gt;core2duo&lt;/model&gt;
+       &lt;vendor&gt;Intel&lt;/vendor&gt;
+-      &lt;topology sockets="1" cores="2" threads="1"/&gt;
++      &lt;topology sockets="1" dies="1" cores="2" threads="1"/&gt;
+       &lt;feature name="lahf_lm"/&gt;
+       &lt;feature name='xtpr'/&gt;
+       ...
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 6e86d057a8..4db9c292b7 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -1470,7 +1470,7 @@
+ &lt;cpu match='exact'&gt;
+   &lt;model fallback='allow'&gt;core2duo&lt;/model&gt;
+   &lt;vendor&gt;Intel&lt;/vendor&gt;
+-  &lt;topology sockets='1' cores='2' threads='1'/&gt;
++  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
+   &lt;cache level='3' mode='emulate'/&gt;
+   &lt;feature policy='disable' name='lahf_lm'/&gt;
+ &lt;/cpu&gt;
+@@ -1479,7 +1479,7 @@
+ <pre>
+ &lt;cpu mode='host-model'&gt;
+   &lt;model fallback='forbid'/&gt;
+-  &lt;topology sockets='1' cores='2' threads='1'/&gt;
++  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
+ &lt;/cpu&gt;
+ ...</pre>
+ 
+@@ -1498,7 +1498,7 @@
+ <pre>
+ ...
+ &lt;cpu&gt;
+-  &lt;topology sockets='1' cores='2' threads='1'/&gt;
++  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
+ &lt;/cpu&gt;
+ ...</pre>
+ 
+@@ -1673,13 +1673,15 @@
+ 
+       <dt><code>topology</code></dt>
+       <dd>The <code>topology</code> element specifies requested topology of
+-        virtual CPU provided to the guest. Three non-zero values have to be
+-        given for <code>sockets</code>, <code>cores</code>, and
+-        <code>threads</code>: total number of CPU sockets, number of cores per
+-        socket, and number of threads per core, respectively. Hypervisors may
+-        require that the maximum number of vCPUs specified by the
+-        <code>cpus</code> element equals to the number of vcpus resulting
+-        from the topology.</dd>
++        virtual CPU provided to the guest. Four attributes, <code>sockets</code>,
++        <code>dies</code>, <code>cores</code>, and <code>threads</code>,
++        accept non-zero positive integer values. They refer to the total number
++        of CPU sockets, number of dies per socket, number of cores per die, and
++        number of threads per core, respectively. The <code>dies</code>
++        attribute is optional and will default to 1 if omitted, while the other
++        attributes are all mandatory. Hypervisors may require that the maximum
++        number of vCPUs specified by the <code>cpus</code> element equals to
++        the number of vcpus resulting from the topology.</dd>
+ 
+       <dt><code>feature</code></dt>
+       <dd>The <code>cpu</code> element can contain zero or more
+diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
+index 1f1e0e36d5..e2744acad3 100644
+--- a/docs/schemas/cputypes.rng
++++ b/docs/schemas/cputypes.rng
+@@ -86,6 +86,11 @@
+       <attribute name="sockets">
+         <ref name="positiveInteger"/>
+       </attribute>
++      <optional>
++        <attribute name="dies">
++          <ref name="positiveInteger"/>
++        </attribute>
++      </optional>
+       <attribute name="cores">
+         <ref name="positiveInteger"/>
+       </attribute>
+diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
+index 48336ffa1b..d78221aea8 100644
+--- a/src/bhyve/bhyve_command.c
++++ b/src/bhyve/bhyve_command.c
+@@ -453,6 +453,11 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn,
+     /* CPUs */
+     virCommandAddArg(cmd, "-c");
+     if (def->cpu && def->cpu->sockets) {
++        if (def->dies != 1) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("Only 1 die per socket is supported"));
++            goto cleanup;
++        }
+         if (nvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                            _("Invalid CPU topology: total number of vCPUs "
+diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
+index b463981de0..837d77581c 100644
+--- a/src/conf/cpu_conf.c
++++ b/src/conf/cpu_conf.c
+@@ -239,6 +239,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
+     copy->check = cpu->check;
+     copy->fallback = cpu->fallback;
+     copy->sockets = cpu->sockets;
++    copy->dies = cpu->dies;
+     copy->cores = cpu->cores;
+     copy->threads = cpu->threads;
+     copy->arch = cpu->arch;
+@@ -535,6 +536,17 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
+         }
+         def->sockets = (unsigned int) ul;
+ 
++        if (virXPathNode("./topology[1]/@dies", ctxt)) {
++            if (virXPathULong("string(./topology[1]/@dies)", ctxt, &ul) < 0) {
++                virReportError(VIR_ERR_XML_ERROR, "%s",
++                               _("Malformed 'dies' attribute in CPU topology"));
++                goto cleanup;
++            }
++            def->dies = (unsigned int) ul;
++        } else {
++            def->dies = 1;
++        }
++
+         if (virXPathULong("string(./topology[1]/@cores)", ctxt, &ul) < 0) {
+             virReportError(VIR_ERR_XML_ERROR, "%s",
+                            _("Missing 'cores' attribute in CPU topology"));
+@@ -549,7 +561,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
+         }
+         def->threads = (unsigned int) ul;
+ 
+-        if (!def->sockets || !def->cores || !def->threads) {
++        if (!def->sockets || !def->cores || !def->threads || !def->dies) {
+             virReportError(VIR_ERR_XML_ERROR, "%s",
+                            _("Invalid CPU topology"));
+             goto cleanup;
+@@ -817,9 +829,10 @@ virCPUDefFormatBuf(virBufferPtr buf,
+         virBufferAddLit(buf, "/>\n");
+     }
+ 
+-    if (def->sockets && def->cores && def->threads) {
++    if (def->sockets && def->dies && def->cores && def->threads) {
+         virBufferAddLit(buf, "<topology");
+         virBufferAsprintf(buf, " sockets='%u'", def->sockets);
++        virBufferAsprintf(buf, " dies='%u'", def->dies);
+         virBufferAsprintf(buf, " cores='%u'", def->cores);
+         virBufferAsprintf(buf, " threads='%u'", def->threads);
+         virBufferAddLit(buf, "/>\n");
+@@ -1058,6 +1071,12 @@ virCPUDefIsEqual(virCPUDefPtr src,
+         return false;
+     }
+ 
++    if (src->dies != dst->dies) {
++        MISMATCH(_("Target CPU dies %d does not match source %d"),
++                 dst->dies, src->dies);
++        return false;
++    }
++
+     if (src->cores != dst->cores) {
+         MISMATCH(_("Target CPU cores %d does not match source %d"),
+                  dst->cores, src->cores);
+diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
+index ec3d2379cf..6cef9e9726 100644
+--- a/src/conf/cpu_conf.h
++++ b/src/conf/cpu_conf.h
+@@ -134,6 +134,7 @@ struct _virCPUDef {
+     char *vendor;
+     unsigned int microcodeVersion;
+     unsigned int sockets;
++    unsigned int dies;
+     unsigned int cores;
+     unsigned int threads;
+     size_t nfeatures;
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index ee57152da7..0478914c69 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -2053,7 +2053,8 @@ virDomainDefGetVcpusTopology(const virDomainDef *def,
+     tmp = def->cpu->sockets;
+ 
+     /* multiplication of 32bit numbers fits into a 64bit variable */
+-    if ((tmp *= def->cpu->cores) > UINT_MAX ||
++    if ((tmp *= def->cpu->dies) > UINT_MAX ||
++        (tmp *= def->cpu->cores) > UINT_MAX ||
+         (tmp *= def->cpu->threads) > UINT_MAX) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                        _("cpu topology results in more than %u cpus"), UINT_MAX);
+diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
+index d99466472b..ae3a0acc10 100644
+--- a/src/cpu/cpu.c
++++ b/src/cpu/cpu.c
+@@ -421,6 +421,7 @@ virCPUGetHost(virArch arch,
+ 
+     if (nodeInfo) {
+         cpu->sockets = nodeInfo->sockets;
++        cpu->dies = 1;
+         cpu->cores = nodeInfo->cores;
+         cpu->threads = nodeInfo->threads;
+     }
+diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
+index e9f958cd8a..beac8c8cfc 100644
+--- a/src/libxl/libxl_capabilities.c
++++ b/src/libxl/libxl_capabilities.c
+@@ -186,6 +186,7 @@ libxlCapsInitCPU(virCapsPtr caps, libxl_physinfo *phy_info,
+     cpu->type = VIR_CPU_TYPE_HOST;
+     cpu->cores = phy_info->cores_per_socket;
+     cpu->threads = phy_info->threads_per_core;
++    cpu->dies = 1;
+     cpu->sockets = phy_info->nr_cpus / (cpu->cores * cpu->threads);
+     caps->host.cpu = cpu;
+ 
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index e10cc7fc74..d7e8216092 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -7130,6 +7130,11 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
+     /* sockets, cores, and threads are either all zero
+      * or all non-zero, thus checking one of them is enough */
+     if (def->cpu && def->cpu->sockets) {
++        if (def->cpu->dies != 1) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("Only 1 die per socket is supported"));
++            return -1;
++        }
+         virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
+         virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
+         virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
+diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
+index aa88dfcb5d..4362da6cee 100644
+--- a/src/vmx/vmx.c
++++ b/src/vmx/vmx.c
+@@ -1485,6 +1485,7 @@ virVMXParseConfig(virVMXContext *ctx,
+                              "'numvcpus'"));
+             goto cleanup;
+         }
++        cpu->dies = 1;
+         cpu->cores = coresPerSocket;
+         cpu->threads = 1;
+ 
+@@ -3206,6 +3207,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
+             goto cleanup;
+         }
+ 
++        if (def->cpu->dies != 1) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("Only 1 die per socket is supported"));
++            goto cleanup;
++        }
++
+         calculated_vcpus = def->cpu->sockets * def->cpu->cores;
+         if (calculated_vcpus != maxvcpus) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml
+index 85564ff458..ea8e2d3a48 100644
+--- a/tests/cputestdata/x86_64-host+guest,model486-result.xml
++++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>486</model>
+-  <topology sockets='2' cores='4' threads='1'/>
++  <topology sockets='2' dies='1' cores='4' threads='1'/>
+   <feature policy='require' name='de'/>
+   <feature policy='require' name='tsc'/>
+   <feature policy='require' name='msr'/>
+diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
+index f79ed324c1..0dd6955898 100644
+--- a/tests/cputestdata/x86_64-host+guest,models-result.xml
++++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Nehalem</model>
+-  <topology sockets='2' cores='4' threads='1'/>
++  <topology sockets='2' dies='1' cores='4' threads='1'/>
+   <feature policy='force' name='pbe'/>
+   <feature policy='force' name='monitor'/>
+   <feature policy='require' name='xtpr'/>
+diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml
+index 137a3d6647..28e3152cbf 100644
+--- a/tests/cputestdata/x86_64-host+guest-result.xml
++++ b/tests/cputestdata/x86_64-host+guest-result.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Penryn</model>
+-  <topology sockets='2' cores='4' threads='1'/>
++  <topology sockets='2' dies='1' cores='4' threads='1'/>
+   <feature policy='require' name='dca'/>
+   <feature policy='require' name='xtpr'/>
+   <feature policy='disable' name='sse4.2'/>
+diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml
+index 137a3d6647..28e3152cbf 100644
+--- a/tests/cputestdata/x86_64-host+guest.xml
++++ b/tests/cputestdata/x86_64-host+guest.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Penryn</model>
+-  <topology sockets='2' cores='4' threads='1'/>
++  <topology sockets='2' dies='1' cores='4' threads='1'/>
+   <feature policy='require' name='dca'/>
+   <feature policy='require' name='xtpr'/>
+   <feature policy='disable' name='sse4.2'/>
+diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
+index 0c3ede0f6a..16d6e1daf2 100644
+--- a/tests/cputestdata/x86_64-host+host-model-nofallback.xml
++++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
+@@ -1,7 +1,7 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='forbid'>Penryn</model>
+   <vendor>Intel</vendor>
+-  <topology sockets='1' cores='2' threads='1'/>
++  <topology sockets='1' dies='1' cores='2' threads='1'/>
+   <feature policy='require' name='dca'/>
+   <feature policy='require' name='xtpr'/>
+   <feature policy='require' name='tm2'/>
+diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
+index 2dbe06c314..8eda6684a0 100644
+--- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
++++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Haswell</model>
+-  <topology sockets='1' cores='2' threads='2'/>
++  <topology sockets='1' dies='1' cores='2' threads='2'/>
+   <feature policy='disable' name='rtm'/>
+   <feature policy='disable' name='hle'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
+index 5d149bb295..cb02449d60 100644
+--- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
++++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Haswell</model>
+-  <topology sockets='1' cores='2' threads='2'/>
++  <topology sockets='1' dies='1' cores='2' threads='2'/>
+   <feature policy='disable' name='hle'/>
+   <feature policy='disable' name='rtm'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
+index 3b74089647..7ee926aba8 100644
+--- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
++++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
+@@ -1,4 +1,4 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Haswell-noTSX</model>
+-  <topology sockets='1' cores='2' threads='2'/>
++  <topology sockets='1' dies='1' cores='2' threads='2'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml
+index 2edc8756c4..9d54c66a8f 100644
+--- a/tests/cputestdata/x86_64-host-worse+guest-result.xml
++++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml
+@@ -1,6 +1,6 @@
+ <cpu mode='custom' match='exact'>
+   <model fallback='allow'>Penryn</model>
+-  <topology sockets='2' cores='4' threads='1'/>
++  <topology sockets='2' dies='1' cores='4' threads='1'/>
+   <feature policy='disable' name='dca'/>
+   <feature policy='disable' name='xtpr'/>
+   <feature policy='disable' name='sse4.2'/>
+diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+index 1a769235a3..f80c4367df 100644
+--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
++++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+@@ -43,7 +43,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='4' threads='8'/>
++    <topology sockets='1' dies='1' cores='4' threads='8'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+index 43e6267250..7998b978fb 100644
+--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
++++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+@@ -43,7 +43,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='4' threads='8'/>
++    <topology sockets='1' dies='1' cores='4' threads='8'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+index cfb44cc433..2a48a97eef 100644
+--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
++++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+@@ -43,7 +43,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='4' threads='8'/>
++    <topology sockets='1' dies='1' cores='4' threads='8'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+index 0a8d372149..90518d1fa9 100644
+--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
++++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+@@ -43,7 +43,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='4' threads='8'/>
++    <topology sockets='1' dies='1' cores='4' threads='8'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
+index 6457f4056b..0d622fc8ae 100644
+--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
++++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
+@@ -19,7 +19,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
+index fe9a81a091..ed9deaea4a 100644
+--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
++++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
+@@ -19,7 +19,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
+index 58c088de88..342f172108 100644
+--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
++++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
+@@ -19,7 +19,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
+index 12b28be5fe..b8341c74e5 100644
+--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
++++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
+@@ -19,7 +19,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
+index f635e37b82..29da89f5bc 100644
+--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
++++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
+index 6f50bb5c12..f81194db5b 100644
+--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
++++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml b/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml
+index a94f41e46a..bf6a42c306 100644
+--- a/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml
++++ b/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml
+@@ -7,7 +7,7 @@
+     <type arch='ppc64' machine='pseries'>hvm</type>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='2' threads='4'/>
++    <topology sockets='1' dies='1' cores='2' threads='4'/>
+   </cpu>
+   <devices>
+     <emulator>/usr/bin/qemu-system-ppc64</emulator>
+diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.xml b/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
+index 99987ba15a..9d764e2f8c 100644
+--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
++++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
+@@ -17,7 +17,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets="3" cores="2" threads="1"/>
++    <topology sockets="3" dies="1" cores="2" threads="1"/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.xml b/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
+index b022384e97..c164b15e82 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
++++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.xml b/tests/qemuxml2argvdata/cpu-numa-disordered.xml
+index e209150a55..6e00b91281 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-disordered.xml
++++ b/tests/qemuxml2argvdata/cpu-numa-disordered.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-5' memory='109550' unit='KiB'/>
+       <cell id='2' cpus='6-10' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.xml b/tests/qemuxml2argvdata/cpu-numa-memshared.xml
+index 7e05916f78..f2ef035b00 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-memshared.xml
++++ b/tests/qemuxml2argvdata/cpu-numa-memshared.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/>
+diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
+index ee6b6aa870..97dac01e84 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
++++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
+@@ -8,7 +8,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/cpu-numa1.xml b/tests/qemuxml2argvdata/cpu-numa1.xml
+index b21941d51a..867d21e152 100644
+--- a/tests/qemuxml2argvdata/cpu-numa1.xml
++++ b/tests/qemuxml2argvdata/cpu-numa1.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell cpus='0-7' memory='109550' unit='KiB'/>
+       <cell cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/cpu-numa2.xml b/tests/qemuxml2argvdata/cpu-numa2.xml
+index b85b19f5e0..e589948dc7 100644
+--- a/tests/qemuxml2argvdata/cpu-numa2.xml
++++ b/tests/qemuxml2argvdata/cpu-numa2.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/cpu-numa3.xml b/tests/qemuxml2argvdata/cpu-numa3.xml
+index e2b9e9014d..350fbe7c07 100644
+--- a/tests/qemuxml2argvdata/cpu-numa3.xml
++++ b/tests/qemuxml2argvdata/cpu-numa3.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='1' cpus='0-7' memory='109550' unit='KiB'/>
+       <cell id='2' cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/cpu-topology1.xml b/tests/qemuxml2argvdata/cpu-topology1.xml
+index 9d77d10a5c..af82a1c51a 100644
+--- a/tests/qemuxml2argvdata/cpu-topology1.xml
++++ b/tests/qemuxml2argvdata/cpu-topology1.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets="3" cores="2" threads="1"/>
++    <topology sockets="3" dies="1" cores="2" threads="1"/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/cpu-topology2.xml b/tests/qemuxml2argvdata/cpu-topology2.xml
+index 9d9701914a..1b113b8b13 100644
+--- a/tests/qemuxml2argvdata/cpu-topology2.xml
++++ b/tests/qemuxml2argvdata/cpu-topology2.xml
+@@ -10,7 +10,7 @@
+   </os>
+   <cpu match='exact'>
+     <model>core2duo</model>
+-    <topology sockets="1" cores="2" threads="3"/>
++    <topology sockets="1" dies="1" cores="2" threads="3"/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/cpu-topology3.xml b/tests/qemuxml2argvdata/cpu-topology3.xml
+index 9d77d10a5c..af82a1c51a 100644
+--- a/tests/qemuxml2argvdata/cpu-topology3.xml
++++ b/tests/qemuxml2argvdata/cpu-topology3.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets="3" cores="2" threads="1"/>
++    <topology sockets="3" dies="1" cores="2" threads="1"/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+index 4c30761110..eb3300b1fb 100644
+--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
++++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+@@ -14,7 +14,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='8' cores='1' threads='1'/>
++    <topology sockets='8' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+index f22a8e81f8..b7b5a19166 100644
+--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
++++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+@@ -14,7 +14,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='8' threads='1'/>
++    <topology sockets='1' dies='1' cores='8' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+index 925f39b6ab..07de0bd717 100644
+--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
++++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+@@ -14,7 +14,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='8' threads='1'/>
++    <topology sockets='1' dies='1' cores='8' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
+       <cell id='1' cpus='8-15' memory='14680064' unit='KiB' memAccess='shared'/>
+diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+index 71a8e083c9..8711641b68 100644
+--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
++++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+@@ -14,7 +14,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='24' threads='1'/>
++    <topology sockets='1' dies='1' cores='24' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='14680064' unit='KiB'/>
+       <cell id='1' cpus='2-3' memory='14680064' unit='KiB' memAccess='shared'/>
+diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+index 6bb4eb8f4c..d96f519bf8 100644
+--- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
++++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+@@ -18,7 +18,7 @@
+   <cpu match='exact'>
+     <model>core2duo</model>
+     <vendor>Intel</vendor>
+-    <topology sockets='1' cores='2' threads='1'/>
++    <topology sockets='1' dies='1' cores='2' threads='1'/>
+     <feature policy='require' name='ds'/>
+     <feature policy='require' name='acpi'/>
+     <feature policy='require' name='ss'/>
+diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
+index b784777805..144d02b56e 100644
+--- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml
++++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
+@@ -16,7 +16,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
+index 45ff012711..ded56dd538 100644
+--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
++++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
+@@ -18,7 +18,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='8' threads='1'/>
++    <topology sockets='1' dies='1' cores='8' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
+index f088f01d11..ebe638f600 100644
+--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
++++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
+@@ -20,7 +20,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='1' cores='8' threads='1'/>
++    <topology sockets='1' dies='1' cores='8' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml b/tests/qemuxml2argvdata/memory-align-fail.xml
+index 75c1a46068..636f0e3d8e 100644
+--- a/tests/qemuxml2argvdata/memory-align-fail.xml
++++ b/tests/qemuxml2argvdata/memory-align-fail.xml
+@@ -10,7 +10,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='9007199254740991' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
+index c289fdd5ff..ea4f4fd745 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
+@@ -10,7 +10,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
+index c68336f871..585e0a5f51 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+index 4e62dd0e18..a1cc1264eb 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
+index defa109e80..018a693aaf 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+index 89d01d672f..c9d54a6088 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+index e6a4f7901a..391d70f20e 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
+index dd48540712..09b2c5c833 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+index 9c76dda6c8..a32474da06 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml b/tests/qemuxml2argvdata/memory-hotplug.xml
+index e1f086567b..8d09856e95 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug.xml
+@@ -10,7 +10,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
+index 50dbc3c466..5758e65d09 100644
+--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
++++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+index d9cd6b83f1..80314d05a3 100644
+--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
++++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
+index f21ba0a786..0edf8ee46f 100644
+--- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
++++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
+index 378d17face..517dd5dbd7 100644
+--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
++++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
+index e20bd8db0b..a7f32b6802 100644
+--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
++++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
+index 50dbc3c466..5758e65d09 100644
+--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
++++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
+index 7ccaa5aff4..3237e7c7c5 100644
+--- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
++++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxml2argvdata/numad.xml
+index 081a59a013..ae995e2d6b 100644
+--- a/tests/qemuxml2argvdata/numad.xml
++++ b/tests/qemuxml2argvdata/numad.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
+index 44ec55a810..e6ca895b0d 100644
+--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
++++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
+index 441f2b8989..70e7b92f34 100644
+--- a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
++++ b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml
+index c9887dbebc..93ee70cc0b 100644
+--- a/tests/qemuxml2argvdata/numatune-memory.xml
++++ b/tests/qemuxml2argvdata/numatune-memory.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
+index 606ddfd73c..5093944a1c 100644
+--- a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
++++ b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
+@@ -8,7 +8,7 @@
+     <type arch='x86_64' machine='q35'>hvm</type>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell cpus='0-7' memory='109550' unit='KiB'/>
+       <cell cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/pci-expander-bus.xml b/tests/qemuxml2argvdata/pci-expander-bus.xml
+index 79c959346d..d9aeda1757 100644
+--- a/tests/qemuxml2argvdata/pci-expander-bus.xml
++++ b/tests/qemuxml2argvdata/pci-expander-bus.xml
+@@ -8,7 +8,7 @@
+     <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell cpus='0-7' memory='109550' unit='KiB'/>
+       <cell cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
+index f0ab0a16d1..4a6cb492bb 100644
+--- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
++++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell cpus='0-7' memory='109550' unit='KiB'/>
+       <cell cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
+index dc64d97b83..1c27047b75 100644
+--- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
++++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
+@@ -8,7 +8,7 @@
+     <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell cpus='0-7' memory='109550' unit='KiB'/>
+       <cell cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.xml b/tests/qemuxml2argvdata/pcie-expander-bus.xml
+index 5c5d34d1e0..80693f8a1c 100644
+--- a/tests/qemuxml2argvdata/pcie-expander-bus.xml
++++ b/tests/qemuxml2argvdata/pcie-expander-bus.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell cpus='0-7' memory='109550' unit='KiB'/>
+       <cell cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml b/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
+index 12d277aaf8..27f211d59d 100644
+--- a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
++++ b/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
+@@ -7,7 +7,7 @@
+     <memnode cellid="0" mode="strict" nodeset="1"/>
+   </numatune>
+   <cpu>
+-    <topology sockets='3' cores='1' threads='8'/>
++    <topology sockets='3' dies='1' cores='1' threads='8'/>
+     <numa>
+       <cell id='0' cpus='0-23' memory='1048576' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.xml b/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
+index aeccb14dfb..52c39d5dbd 100644
+--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
++++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
+@@ -8,7 +8,7 @@
+     <memnode cellid="1" mode="strict" nodeset="2"/>
+   </numatune>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='4'/>
++    <topology sockets='2' dies='1' cores='1' threads='4'/>
+     <numa>
+       <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>
+       <cell id='1' cpus='4-7' memory='1048576' unit='KiB'/>
+diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml
+index 55d5cdeff2..6041506ed8 100644
+--- a/tests/qemuxml2argvdata/smp.xml
++++ b/tests/qemuxml2argvdata/smp.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+index f0ca39b5d3..d7f5372fbc 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+index 1e672adc44..487ced1008 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-5' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='11-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+index 3db0db047c..f472bffec3 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+index 8596baae6c..2ef7f84646 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa1.xml
+index 8596baae6c..2ef7f84646 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa1.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa2.xml
+index 8596baae6c..2ef7f84646 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa2.xml
+@@ -9,7 +9,7 @@
+     <boot dev='network'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
+index 3f0babd8fc..6e23652448 100644
+--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
++++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
+@@ -18,7 +18,7 @@
+   <cpu mode='custom' match='exact' check='partial'>
+     <model fallback='allow'>core2duo</model>
+     <vendor>Intel</vendor>
+-    <topology sockets='1' cores='2' threads='1'/>
++    <topology sockets='1' dies='1' cores='2' threads='1'/>
+     <feature policy='require' name='ds'/>
+     <feature policy='require' name='acpi'/>
+     <feature policy='require' name='ss'/>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+index f4a118cea5..326b5c954c 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+@@ -14,7 +14,7 @@
+     <gid start='0' target='1000' count='10'/>
+   </idmap>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
+index 0e02f210bc..0e5295dcd0 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
+@@ -10,7 +10,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+index 133177b679..841ea699a1 100644
+--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
++++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+index dc14ecd139..2e3998e155 100644
+--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
++++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+index 76d7c3b835..7c1f18c216 100644
+--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
++++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+@@ -12,7 +12,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+index 523962117e..3d05790c0e 100644
+--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
++++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+index e0d787e57c..60e4e4af7f 100644
+--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
++++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+index 643b4823bb..452d476da6 100644
+--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
++++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='4' threads='2'/>
++    <topology sockets='2' dies='1' cores='4' threads='2'/>
+     <numa>
+       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
+       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
+index 80b771e89d..b05ac334a6 100644
+--- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
++++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
+@@ -13,7 +13,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='4'/>
++    <topology sockets='2' dies='1' cores='1' threads='4'/>
+     <numa>
+       <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>
+       <cell id='1' cpus='4-7' memory='1048576' unit='KiB'/>
+diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml
+index d3712cb7df..3e00f578e5 100644
+--- a/tests/qemuxml2xmloutdata/smp.xml
++++ b/tests/qemuxml2xmloutdata/smp.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <cpu>
+-    <topology sockets='2' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' cores='1' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
+index eba5f4734a..2011bfb3b9 100644
+--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
++++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
+@@ -11,7 +11,7 @@
+     <type arch='x86_64'>hvm</type>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='2' threads='1'/>
++    <topology sockets='4' dies='1' cores='2' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
+index f1fe6dd4c9..fa428c1986 100644
+--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
++++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
+@@ -12,7 +12,7 @@
+     <type arch='x86_64'>hvm</type>
+   </os>
+   <cpu>
+-    <topology sockets='4' cores='4' threads='1'/>
++    <topology sockets='4' dies='1' cores='4' threads='1'/>
+   </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-add-virtiofs-related-elements-and-attributes.patch b/SOURCES/libvirt-conf-add-virtiofs-related-elements-and-attributes.patch
new file mode 100644
index 0000000..7cf26c8
--- /dev/null
+++ b/SOURCES/libvirt-conf-add-virtiofs-related-elements-and-attributes.patch
@@ -0,0 +1,395 @@
+From c811bd72130364673dd4a0d2a997a1d8f675eb71 Mon Sep 17 00:00:00 2001
+Message-Id: <c811bd72130364673dd4a0d2a997a1d8f675eb71@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:42 +0100
+Subject: [PATCH] conf: add virtiofs-related elements and attributes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add more elements for tuning the virtiofsd daemon
+and the vhost-user-fs device:
+
+  <driver type='virtiofs' queue='1024' xattr='on'>
+    <binary path='/usr/libexec/virtiofsd'>
+      <cache mode='always'/>
+      <lock posix='off' flock='off'/>
+    </binary>
+  </driver>
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 66079339847dc942b9b673e3040b56b055a8d8f5)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <506d0532c6043a9b8c946bdc42c3d9c5529f6fb8.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/formatdomain.html.in                     |  25 ++++-
+ docs/schemas/domaincommon.rng                 |  48 ++++++++
+ src/conf/domain_conf.c                        | 104 +++++++++++++++++-
+ src/conf/domain_conf.h                        |  15 +++
+ src/libvirt_private.syms                      |   1 +
+ .../vhost-user-fs-fd-memory.xml               |   6 +-
+ .../vhost-user-fs-hugepages.xml               |   1 +
+ 7 files changed, 197 insertions(+), 3 deletions(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 337ab01316..e9830ab231 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -3936,7 +3936,11 @@
+     &lt;readonly/&gt;
+   &lt;/filesystem&gt;
+   &lt;filesystem type='mount' accessmode='passthrough'&gt;
+-      &lt;driver type='virtiofs'/&gt;
++      &lt;driver type='virtiofs queue='1024'/&gt;
++      &lt;binary path='/usr/libexec/virtiofsd' xattr='on'&gt;
++         &lt;cache mode='always'/&gt;
++         &lt;lock posix='on' flock='on'/&gt;
++      &lt;/binary&gt;
+       &lt;source dir='/path'/&gt;
+       &lt;target dir='mount_tag'/&gt;
+   &lt;/filesystem&gt;
+@@ -4063,9 +4067,28 @@
+           <a href="#elementsVirtio">Virtio-specific options</a> can also be
+           set. (<span class="since">Since 3.5.0</span>)
+           </li>
++          <li>
++            For <code>virtiofs</code>, the <code>queue</code> attribute can be used
++            to specify the queue size (i.e. how many requests can the queue fit).
++            (<span class="since">Since 6.2.0</span>)
++          </li>
+         </ul>
+       </dd>
+ 
++      <dt><code>binary</code></dt>
++      <dd>
++        The optional <code>binary</code> element can tune the options for virtiofsd.
++        All of the following attributes and elements are optional.
++        The attribute <code>path</code> can be used to override the path to the daemon.
++        Attribute <code>xattr</code> enables the use of filesystem extended attributes.
++        Caching can be tuned via the <code>cache</code> element, possible <code>mode</code>
++        values being <code>none</code> and <code>always</code>.
++        Locking can be controlled via the <code>lock</code>
++        element - attributes <code>posix</code> and <code>flock</code> both accepting
++        values <code>on</code> or <code>off</code>.
++        (<span class="since">Since 6.2.0</span>)
++      </dd>
++
+       <dt><code>source</code></dt>
+       <dd>
+         The resource on the host that is being accessed in the guest. The
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 5a9291b443..aa70e340b9 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -2500,6 +2500,9 @@
+           <optional>
+             <ref name="fsDriver"/>
+           </optional>
++          <optional>
++            <ref name="fsBinary"/>
++          </optional>
+           <interleave>
+             <element name="source">
+               <attribute name="dir">
+@@ -2649,12 +2652,57 @@
+           <attribute name="type">
+             <value>virtiofs</value>
+           </attribute>
++          <optional>
++            <attribute name="queue">
++              <ref name="unsignedInt"/>
++            </attribute>
++          </optional>
+           <ref name='virtioOptions'/>
+         </group>
+         <empty/>
+       </choice>
+     </element>
+   </define>
++  <define name="fsBinary">
++    <element name="binary">
++      <optional>
++        <attribute name="path">
++          <ref name="absFilePath"/>
++        </attribute>
++      </optional>
++      <optional>
++        <attribute name="xattr">
++          <ref name="virOnOff"/>
++        </attribute>
++      </optional>
++      <optional>
++        <element name="cache">
++          <optional>
++            <attribute name="mode">
++              <choice>
++                <value>none</value>
++                <value>always</value>
++              </choice>
++            </attribute>
++          </optional>
++        </element>
++      </optional>
++      <optional>
++        <element name="lock">
++          <optional>
++            <attribute name="posix">
++              <ref name="virOnOff"/>
++            </attribute>
++          </optional>
++          <optional>
++            <attribute name="flock">
++              <ref name="virOnOff"/>
++            </attribute>
++          </optional>
++        </element>
++      </optional>
++    </element>
++  </define>
+ 
+   <define name="interface-network-attributes">
+     <attribute name="network">
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 31d4828802..3a370e6b90 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -500,6 +500,14 @@ VIR_ENUM_IMPL(virDomainFSModel,
+               "virtio-non-transitional",
+ );
+ 
++VIR_ENUM_IMPL(virDomainFSCacheMode,
++              VIR_DOMAIN_FS_CACHE_MODE_LAST,
++              "default",
++              "none",
++              "always",
++);
++
++
+ VIR_ENUM_IMPL(virDomainNet,
+               VIR_DOMAIN_NET_TYPE_LAST,
+               "user",
+@@ -2322,6 +2330,7 @@ void virDomainFSDefFree(virDomainFSDefPtr def)
+     virDomainDeviceInfoClear(&def->info);
+     VIR_FREE(def->virtio);
+     virObjectUnref(def->privateData);
++    VIR_FREE(def->binary);
+ 
+     VIR_FREE(def);
+ }
+@@ -11293,6 +11302,63 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
+         }
+     }
+ 
++    if (def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
++        g_autofree char *queue_size = virXPathString("string(./driver/@queue)", ctxt);
++        g_autofree char *binary = virXPathString("string(./binary/@path)", ctxt);
++        g_autofree char *xattr = virXPathString("string(./binary/@xattr)", ctxt);
++        g_autofree char *cache = virXPathString("string(./binary/cache/@mode)", ctxt);
++        g_autofree char *posix_lock = virXPathString("string(./binary/lock/@posix)", ctxt);
++        g_autofree char *flock = virXPathString("string(./binary/lock/@flock)", ctxt);
++        int val;
++
++        if (queue_size && virStrToLong_ull(queue_size, NULL, 10, &def->queue_size) < 0) {
++            virReportError(VIR_ERR_XML_ERROR,
++                           _("cannot parse queue size '%s' for virtiofs"),
++                           queue_size);
++            goto error;
++        }
++
++        if (binary)
++            def->binary = virFileSanitizePath(binary);
++
++        if (xattr) {
++            if ((val = virTristateSwitchTypeFromString(xattr)) <= 0) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("unknown xattr value '%s'"), xattr);
++                goto error;
++            }
++            def->xattr = val;
++        }
++
++        if (cache) {
++            if ((val = virDomainFSCacheModeTypeFromString(cache)) <= 0) {
++                virReportError(VIR_ERR_XML_ERROR,
++                               _("cannot parse cache mode '%s' for virtiofs"),
++                               cache);
++                goto error;
++            }
++            def->cache = val;
++        }
++
++        if (posix_lock) {
++            if ((val = virTristateSwitchTypeFromString(posix_lock)) <= 0) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("unknown posix lock value '%s'"), posix_lock);
++                goto error;
++            }
++            def->posix_lock = val;
++        }
++
++        if (flock) {
++            if ((val = virTristateSwitchTypeFromString(flock)) <= 0) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("unknown flock value '%s'"), flock);
++                goto error;
++            }
++            def->flock = val;
++        }
++    }
++
+     if (format) {
+         if ((def->format = virStorageFileFormatTypeFromString(format)) <= 0) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+@@ -24994,6 +25060,9 @@ virDomainFSDefFormat(virBufferPtr buf,
+     const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy);
+     const char *src = def->src->path;
+     g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) driverBuf = VIR_BUFFER_INIT_CHILD(buf);
++    g_auto(virBuffer) binaryAttrBuf = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) binaryBuf = VIR_BUFFER_INIT_CHILD(buf);
+ 
+     if (!type) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -25017,6 +25086,8 @@ virDomainFSDefFormat(virBufferPtr buf,
+     virBufferAddLit(buf, ">\n");
+ 
+     virBufferAdjustIndent(buf, 2);
++    virBufferAdjustIndent(&driverBuf, 2);
++    virBufferAdjustIndent(&binaryBuf, 2);
+     if (def->fsdriver) {
+         virBufferAsprintf(&driverAttrBuf, " type='%s'", fsdriver);
+ 
+@@ -25028,11 +25099,42 @@ virDomainFSDefFormat(virBufferPtr buf,
+         if (def->wrpolicy)
+             virBufferAsprintf(&driverAttrBuf, " wrpolicy='%s'", wrpolicy);
+ 
++        if (def->queue_size)
++            virBufferAsprintf(&driverAttrBuf, " queue='%llu'", def->queue_size);
++
++    }
++
++    if (def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
++        g_auto(virBuffer) lockAttrBuf = VIR_BUFFER_INITIALIZER;
++        virBufferEscapeString(&binaryAttrBuf, " path='%s'", def->binary);
++
++        if (def->xattr != VIR_TRISTATE_SWITCH_ABSENT) {
++            virBufferAsprintf(&binaryAttrBuf, " xattr='%s'",
++                              virTristateSwitchTypeToString(def->xattr));
++        }
++
++        if (def->cache != VIR_DOMAIN_FS_CACHE_MODE_DEFAULT) {
++            virBufferAsprintf(&binaryBuf, "<cache mode='%s'/>\n",
++                              virDomainFSCacheModeTypeToString(def->cache));
++        }
++
++        if (def->posix_lock != VIR_TRISTATE_SWITCH_ABSENT) {
++            virBufferAsprintf(&lockAttrBuf, " posix='%s'",
++                              virTristateSwitchTypeToString(def->posix_lock));
++        }
++
++        if (def->flock != VIR_TRISTATE_SWITCH_ABSENT) {
++            virBufferAsprintf(&lockAttrBuf, " flock='%s'",
++                              virTristateSwitchTypeToString(def->flock));
++        }
++
++        virXMLFormatElement(&binaryBuf, "lock", &lockAttrBuf, NULL);
+     }
+ 
+     virDomainVirtioOptionsFormat(&driverAttrBuf, def->virtio);
+ 
+-    virXMLFormatElement(buf, "driver", &driverAttrBuf, NULL);
++    virXMLFormatElement(buf, "driver", &driverAttrBuf, &driverBuf);
++    virXMLFormatElement(buf, "binary", &binaryAttrBuf, &binaryBuf);
+ 
+     switch (def->type) {
+     case VIR_DOMAIN_FS_TYPE_MOUNT:
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index 921cc42a57..2a382ede72 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -802,6 +802,14 @@ typedef enum {
+     VIR_DOMAIN_FS_MODEL_LAST
+ } virDomainFSModel;
+ 
++typedef enum {
++    VIR_DOMAIN_FS_CACHE_MODE_DEFAULT = 0,
++    VIR_DOMAIN_FS_CACHE_MODE_NONE,
++    VIR_DOMAIN_FS_CACHE_MODE_ALWAYS,
++
++    VIR_DOMAIN_FS_CACHE_MODE_LAST
++} virDomainFSCacheMode;
++
+ struct _virDomainFSDef {
+     int type;
+     int fsdriver; /* enum virDomainFSDriverType */
+@@ -817,6 +825,12 @@ struct _virDomainFSDef {
+     unsigned long long space_hard_limit; /* in bytes */
+     unsigned long long space_soft_limit; /* in bytes */
+     bool symlinksResolved;
++    char *binary;
++    unsigned long long queue_size;
++    virTristateSwitch xattr;
++    virDomainFSCacheMode cache;
++    virTristateSwitch posix_lock;
++    virTristateSwitch flock;
+     virDomainVirtioOptionsPtr virtio;
+     virObjectPtr privateData;
+ };
+@@ -3437,6 +3451,7 @@ VIR_ENUM_DECL(virDomainFSDriver);
+ VIR_ENUM_DECL(virDomainFSAccessMode);
+ VIR_ENUM_DECL(virDomainFSWrpolicy);
+ VIR_ENUM_DECL(virDomainFSModel);
++VIR_ENUM_DECL(virDomainFSCacheMode);
+ VIR_ENUM_DECL(virDomainNet);
+ VIR_ENUM_DECL(virDomainNetBackend);
+ VIR_ENUM_DECL(virDomainNetVirtioTxMode);
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index bc2858fc00..5dc99e03cf 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -389,6 +389,7 @@ virDomainDiskSourceFormat;
+ virDomainDiskTranslateSourcePool;
+ virDomainFeatureTypeFromString;
+ virDomainFeatureTypeToString;
++virDomainFSCacheModeTypeToString;
+ virDomainFSDefFree;
+ virDomainFSDefNew;
+ virDomainFSDriverTypeToString;
+diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+index a6b6279fb8..f6bb663e97 100644
+--- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
++++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+@@ -27,7 +27,11 @@
+     <controller type='usb' index='0' model='none'/>
+     <controller type='pci' index='0' model='pci-root'/>
+     <filesystem type='mount' accessmode='passthrough'>
+-      <driver type='virtiofs'/>
++      <driver type='virtiofs' queue='1024'/>
++      <binary path='/usr/libexec/virtiofsd' xattr='on'>
++        <cache mode='always'/>
++        <lock posix='off' flock='off'/>
++      </binary>
+       <source dir='/path'/>
+       <target dir='mount_tag'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+index 70df7b890d..96b9774704 100644
+--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
++++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+@@ -63,6 +63,7 @@
+     </controller>
+     <filesystem type='mount' accessmode='passthrough'>
+       <driver type='virtiofs'/>
++      <binary path='/usr/libexec/virtiofsd'/>
+       <source dir='/path'/>
+       <target dir='mount_tag'/>
+       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-backup-Allow-configuration-of-names-exported-via-NBD.patch b/SOURCES/libvirt-conf-backup-Allow-configuration-of-names-exported-via-NBD.patch
new file mode 100644
index 0000000..1f1335e
--- /dev/null
+++ b/SOURCES/libvirt-conf-backup-Allow-configuration-of-names-exported-via-NBD.patch
@@ -0,0 +1,146 @@
+From 100ae962cd0f4dbfd5270bc2d61f05ec1c524c0a Mon Sep 17 00:00:00 2001
+Message-Id: <100ae962cd0f4dbfd5270bc2d61f05ec1c524c0a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:40 +0100
+Subject: [PATCH] conf: backup: Allow configuration of names exported via NBD
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If users wish to use different name for exported disks or bitmaps
+the new fields allow to do so. Additionally they also document the
+current settings.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 12ccd8d4db12d71a270d903701a8edb83d41f127)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <8043f75d8d4b4ae7e7ae3671d71407f733e6a3cf.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatbackup.html.in                             |  9 +++++++++
+ docs/schemas/domainbackup.rng                         |  8 ++++++++
+ src/conf/backup_conf.c                                | 10 ++++++++++
+ src/conf/backup_conf.h                                |  2 ++
+ tests/domainbackupxml2xmlin/backup-pull-seclabel.xml  |  2 +-
+ tests/domainbackupxml2xmlout/backup-pull-seclabel.xml |  2 +-
+ 6 files changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/docs/formatbackup.html.in b/docs/formatbackup.html.in
+index 1c690901c7..543d913072 100644
+--- a/docs/formatbackup.html.in
++++ b/docs/formatbackup.html.in
+@@ -85,6 +85,15 @@
+               <dd>Setting this attribute to <code>yes</code>(default) specifies
+                 that the disk should take part in the backup and using
+                 <code>no</code> excludes the disk from the backup.</dd>
++              <dt><code>exportname</code></dt>
++              <dd>Allows modification of the NBD export name for the given disk.
++                By default equal to disk target.
++                Valid only for pull mode backups.</dd>
++              <dt><code>exportbitmap</code></dt>
++              <dd>Allows modification of the name of the bitmap describing dirty
++                blocks for an incremental backup exported via NBD export name
++                for the given disk.
++                Valid only for pull mode backups.</dd>
+               <dt><code>type</code></dt>
+               <dd>A mandatory attribute to describe the type of the
+                 disk, except when <code>backup='no'</code> is
+diff --git a/docs/schemas/domainbackup.rng b/docs/schemas/domainbackup.rng
+index c1e4d80302..395ea841f9 100644
+--- a/docs/schemas/domainbackup.rng
++++ b/docs/schemas/domainbackup.rng
+@@ -165,6 +165,14 @@
+             <attribute name='name'>
+               <ref name='diskTarget'/>
+             </attribute>
++            <optional>
++              <attribute name='exportname'>
++                <text/>
++              </attribute>
++              <attribute name='exportbitmap'>
++                <text/>
++              </attribute>
++            </optional>
+             <choice>
+               <group>
+                 <attribute name='backup'>
+diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c
+index 61dc8cd4b2..b370b686f1 100644
+--- a/src/conf/backup_conf.c
++++ b/src/conf/backup_conf.c
+@@ -71,6 +71,8 @@ virDomainBackupDefFree(virDomainBackupDefPtr def)
+         virDomainBackupDiskDefPtr disk = def->disks + i;
+ 
+         g_free(disk->name);
++        g_free(disk->exportname);
++        g_free(disk->exportbitmap);
+         virObjectUnref(disk->store);
+     }
+ 
+@@ -124,6 +126,11 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node,
+     if (def->backup == VIR_TRISTATE_BOOL_NO)
+         return 0;
+ 
++    if (!push) {
++        def->exportname = virXMLPropString(node, "exportname");
++        def->exportbitmap = virXMLPropString(node, "exportbitmap");
++    }
++
+     if (internal) {
+         if (!(state = virXMLPropString(node, "state")) ||
+             (tmp = virDomainBackupDiskStateTypeFromString(state)) < 0) {
+@@ -333,6 +340,9 @@ virDomainBackupDiskDefFormat(virBufferPtr buf,
+     if (disk->backup == VIR_TRISTATE_BOOL_YES) {
+         virBufferAsprintf(&attrBuf, " type='%s'", virStorageTypeToString(disk->store->type));
+ 
++        virBufferEscapeString(&attrBuf, " exportname='%s'", disk->exportname);
++        virBufferEscapeString(&attrBuf, " exportbitmap='%s'", disk->exportbitmap);
++
+         if (disk->store->format > 0)
+             virBufferEscapeString(&childBuf, "<driver type='%s'/>\n",
+                                   virStorageFileFormatTypeToString(disk->store->format));
+diff --git a/src/conf/backup_conf.h b/src/conf/backup_conf.h
+index 7cf44245d4..672fd52ee7 100644
+--- a/src/conf/backup_conf.h
++++ b/src/conf/backup_conf.h
+@@ -51,6 +51,8 @@ typedef virDomainBackupDiskDef *virDomainBackupDiskDefPtr;
+ struct _virDomainBackupDiskDef {
+     char *name;     /* name matching the <target dev='...' of the domain */
+     virTristateBool backup; /* whether backup is requested */
++    char *exportname; /* name of the NBD export for pull mode backup */
++    char *exportbitmap; /* name of the bitmap exposed in NBD for pull mode backup */
+ 
+     /* details of target for push-mode, or of the scratch file for pull-mode */
+     virStorageSourcePtr store;
+diff --git a/tests/domainbackupxml2xmlin/backup-pull-seclabel.xml b/tests/domainbackupxml2xmlin/backup-pull-seclabel.xml
+index a00d8758bb..4e6e602c19 100644
+--- a/tests/domainbackupxml2xmlin/backup-pull-seclabel.xml
++++ b/tests/domainbackupxml2xmlin/backup-pull-seclabel.xml
+@@ -2,7 +2,7 @@
+   <incremental>1525889631</incremental>
+   <server transport='tcp' name='localhost' port='10809'/>
+   <disks>
+-    <disk name='vda' type='file'>
++    <disk name='vda' type='file' exportname='test-vda' exportbitmap='blah'>
+       <driver type='qcow2'/>
+       <scratch file='/path/to/file'>
+         <seclabel model='dac' relabel='no'/>
+diff --git a/tests/domainbackupxml2xmlout/backup-pull-seclabel.xml b/tests/domainbackupxml2xmlout/backup-pull-seclabel.xml
+index c631c9b979..450f007d3a 100644
+--- a/tests/domainbackupxml2xmlout/backup-pull-seclabel.xml
++++ b/tests/domainbackupxml2xmlout/backup-pull-seclabel.xml
+@@ -2,7 +2,7 @@
+   <incremental>1525889631</incremental>
+   <server transport='tcp' name='localhost' port='10809'/>
+   <disks>
+-    <disk name='vda' backup='yes' type='file'>
++    <disk name='vda' backup='yes' type='file' exportname='test-vda' exportbitmap='blah'>
+       <driver type='qcow2'/>
+       <scratch file='/path/to/file'>
+         <seclabel model='dac' relabel='no'/>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-backup-Store-incremental-backup-checkpoint-name-per-disk.patch b/SOURCES/libvirt-conf-backup-Store-incremental-backup-checkpoint-name-per-disk.patch
new file mode 100644
index 0000000..acc76c3
--- /dev/null
+++ b/SOURCES/libvirt-conf-backup-Store-incremental-backup-checkpoint-name-per-disk.patch
@@ -0,0 +1,67 @@
+From 7f5c44bfd2b6290e142380775b6a6205ccc43840 Mon Sep 17 00:00:00 2001
+Message-Id: <7f5c44bfd2b6290e142380775b6a6205ccc43840@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:37 +0200
+Subject: [PATCH] conf: backup: Store incremental backup checkpoint name
+ per-disk
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In preparation to allow heterogenous backups store the 'incremental'
+field per-disk and fill it by default from the per-backup field.
+
+Having this will be important once we'll want to allow incremental
+backup working while hotplugging a new disk.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit b8295160c36e555d8bcaef5015d0c1e3ae85fb17)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <ee6c31ce5f3400523559793fe40e789656068f7c.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/backup_conf.c | 8 ++++++++
+ src/conf/backup_conf.h | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c
+index 64c8f6cc09..58fb3ec759 100644
+--- a/src/conf/backup_conf.c
++++ b/src/conf/backup_conf.c
+@@ -71,6 +71,7 @@ virDomainBackupDefFree(virDomainBackupDefPtr def)
+         virDomainBackupDiskDefPtr disk = def->disks + i;
+ 
+         g_free(disk->name);
++        g_free(disk->incremental);
+         g_free(disk->exportname);
+         g_free(disk->exportbitmap);
+         virObjectUnref(disk->store);
+@@ -503,5 +504,12 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def,
+         }
+     }
+ 
++    for (i = 0; i < def->ndisks; i++) {
++        virDomainBackupDiskDefPtr backupdisk = &def->disks[i];
++
++        if (def->incremental && !backupdisk->incremental)
++            backupdisk->incremental = g_strdup(def->incremental);
++    }
++
+     return 0;
+ }
+diff --git a/src/conf/backup_conf.h b/src/conf/backup_conf.h
+index 672fd52ee7..7ce7a46ad4 100644
+--- a/src/conf/backup_conf.h
++++ b/src/conf/backup_conf.h
+@@ -51,6 +51,7 @@ typedef virDomainBackupDiskDef *virDomainBackupDiskDefPtr;
+ struct _virDomainBackupDiskDef {
+     char *name;     /* name matching the <target dev='...' of the domain */
+     virTristateBool backup; /* whether backup is requested */
++    char *incremental; /* name of the starting point checkpoint of an incremental backup */
+     char *exportname; /* name of the NBD export for pull mode backup */
+     char *exportbitmap; /* name of the bitmap exposed in NBD for pull mode backup */
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-conf-check-HOTPLUGGABLE-connect-flag-when-validating-a-PCI-address.patch b/SOURCES/libvirt-conf-check-HOTPLUGGABLE-connect-flag-when-validating-a-PCI-address.patch
new file mode 100644
index 0000000..f93050e
--- /dev/null
+++ b/SOURCES/libvirt-conf-check-HOTPLUGGABLE-connect-flag-when-validating-a-PCI-address.patch
@@ -0,0 +1,51 @@
+From 28094095fe6e4b05b25e459a34d93d195b7afb62 Mon Sep 17 00:00:00 2001
+Message-Id: <28094095fe6e4b05b25e459a34d93d195b7afb62@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:17:02 -0400
+Subject: [PATCH] conf: check HOTPLUGGABLE connect flag when validating a PCI
+ address
+
+The HOTPLUGGABLE flag is set for appropriates buses in a PCI address
+set, and thnis patch updates virDomainPCIAddressFlagsCompatible() to
+check the HOTPLUGGABLE flag when searching for a suitable bus/slot for
+a device. No devices request HOTPLUGGABLE though (yet), so there is no
+observable effect.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit a283189f8c64882681ea99259ccfc8d1b8e524dd)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426171703.18808-2-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_addr.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index cc45a0bbf1..ed41eca114 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -376,6 +376,18 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr,
+         return false;
+     }
+ 
++    if ((devFlags & VIR_PCI_CONNECT_HOTPLUGGABLE) &&
++        !(busFlags & VIR_PCI_CONNECT_HOTPLUGGABLE)) {
++        if (reportError) {
++            virReportError(errType,
++                           _("The device at PCI address %s requires "
++                             "hotplug capability, but the PCI controller "
++                             "with index='%d' doesn't support hotplug"),
++                           addrStr, addr->bus);
++        }
++        return false;
++    }
++
+     /* If this bus doesn't allow the type of connection (PCI
+      * vs. PCIe) required by the device, or if the device requires
+      * hot-plug and this bus doesn't have it, return false.
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-conf-correct-false-boot-order-error-during-domain-parse.patch b/SOURCES/libvirt-conf-correct-false-boot-order-error-during-domain-parse.patch
deleted file mode 100644
index a255b84..0000000
--- a/SOURCES/libvirt-conf-correct-false-boot-order-error-during-domain-parse.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From b56deb73400af9518bdc86802b8ac8da0670d806 Mon Sep 17 00:00:00 2001
-Message-Id: <b56deb73400af9518bdc86802b8ac8da0670d806@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Thu, 10 Jan 2019 09:44:45 -0500
-Subject: [PATCH] conf: correct false boot order error during domain parse
-
-virDomainDefCollectBootOrder() is called for every item on the list
-for each type of device. One of the checks it makes is to gather the
-order attributes from the <boot> element of all devices, and assure
-that no two devices have been given the same order.
-
-Since (internally to libvirt, *not* in the domain XML) an <interface
-type='hostdev'> is on both the list of hostdev devices and the list of
-network devices, it will be counted twice, and the code that checks
-for multiple devices with the same boot order will give a false
-positive.
-
-To remedy this, we make sure to return early for hostdev devices that
-have a parent.type != NONE.
-
-This was introduced in commit 5b75a4, which was first in libvirt-4.4.0.
-
-Resolves: https://bugzilla.redhat.com/1630393 (RHEL8)
-Resolves: https://bugzilla.redhat.com/1601318 (RHEL7)
-
-Change from upstream: upstream has eliminated QEMU_CAPS_BOOTINDEX and
-QEMU_CAPS_PCI_BOOTINDEX so they're no longer necessary in test cases.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-(cherry picked from commit 7ea7342996d74591e00bcbf14b1eb3995f77a199)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/conf/domain_conf.c                        |  8 ++++
- .../net-hostdev-bootorder.args                | 27 ++++++++++++
- .../net-hostdev-bootorder.xml                 | 36 ++++++++++++++++
- tests/qemuxml2argvtest.c                      |  3 ++
- .../net-hostdev-bootorder.xml                 | 42 +++++++++++++++++++
- tests/qemuxml2xmltest.c                       |  1 +
- 6 files changed, 117 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/net-hostdev-bootorder.args
- create mode 100644 tests/qemuxml2argvdata/net-hostdev-bootorder.xml
- create mode 100644 tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 660e1523fe..d431441f62 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -5076,6 +5076,14 @@ virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED,
-     if (info->bootIndex == 0)
-         return 0;
- 
-+    if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
-+        dev->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE) {
-+        /* This hostdev is a child of a higher level device
-+         * (e.g. interface), and thus already being counted on the
-+         * list for the other device type.
-+         */
-+        return 0;
-+    }
-     if (virAsprintf(&order, "%u", info->bootIndex) < 0)
-         goto cleanup;
- 
-diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
-new file mode 100644
-index 0000000000..e632d9b195
---- /dev/null
-+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
-@@ -0,0 +1,27 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-usb \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\
-+bootindex=2 \
-+-device pci-assign,host=03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
-new file mode 100644
-index 0000000000..cd9f32b2f3
---- /dev/null
-+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
-@@ -0,0 +1,36 @@
-+<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='i686' machine='pc'>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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+      <boot order='2'/>
-+    </disk>
-+    <controller type='usb' index='0'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <interface type='hostdev' managed='yes'>
-+      <mac address='00:11:22:33:44:55'/>
-+      <source>
-+        <address type='pci' domain='0x0000' bus='0x03' slot='0x07' function='0x1'/>
-+      </source>
-+      <boot order='1'/>
-+    </interface>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index bd4aa1266d..690a39054e 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1324,6 +1324,9 @@ mymain(void)
-     DO_TEST("net-mcast", NONE);
-     DO_TEST("net-udp", NONE);
-     DO_TEST("net-hostdev", NONE);
-+    DO_TEST("net-hostdev-bootorder",
-+            QEMU_CAPS_BOOTINDEX,
-+            QEMU_CAPS_PCI_BOOTINDEX);
-     DO_TEST("net-hostdev-multidomain", NONE);
-     DO_TEST("net-hostdev-vfio",
-             QEMU_CAPS_DEVICE_VFIO_PCI);
-diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
-new file mode 100644
-index 0000000000..d9ecf40cf0
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
-@@ -0,0 +1,42 @@
-+<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='i686' machine='pc'>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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <boot order='2'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+      <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'/>
-+    <interface type='hostdev' managed='yes'>
-+      <mac address='00:11:22:33:44:55'/>
-+      <source>
-+        <address type='pci' domain='0x0000' bus='0x03' slot='0x07' function='0x1'/>
-+      </source>
-+      <boot order='1'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </interface>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index db088fff6b..dbac863239 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -454,6 +454,7 @@ mymain(void)
-     DO_TEST("net-virtio-network-portgroup", NONE);
-     DO_TEST("net-virtio-rxtxqueuesize", NONE);
-     DO_TEST("net-hostdev", NONE);
-+    DO_TEST("net-hostdev-bootorder", NONE);
-     DO_TEST("net-hostdev-vfio", NONE);
-     DO_TEST("net-midonet", NONE);
-     DO_TEST("net-openvswitch", NONE);
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-conf-do-not-generate-machine-names-ending-with-a-dash.patch b/SOURCES/libvirt-conf-do-not-generate-machine-names-ending-with-a-dash.patch
new file mode 100644
index 0000000..e67d233
--- /dev/null
+++ b/SOURCES/libvirt-conf-do-not-generate-machine-names-ending-with-a-dash.patch
@@ -0,0 +1,70 @@
+From f9fdeb29a61a98868d1a9f5284a85c57f826d6d1 Mon Sep 17 00:00:00 2001
+Message-Id: <f9fdeb29a61a98868d1a9f5284a85c57f826d6d1@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:08 +0100
+Subject: [PATCH] conf: do not generate machine names ending with a dash
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As of systemd commit:
+
+commit d65652f1f21a4b0c59711320f34266c635393c89
+Author:     Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+CommitDate: 2018-12-10 09:56:56 +0100
+
+    Partially unify hostname_is_valid() and dns_name_is_valid()
+
+Dashes are no longer allowed at the end of machine names.
+
+Trim the trailing dashes from the generated name before passing
+it to machined.
+
+Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1790409
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 45464db8ba502764cf37ec9335770248bdb3d9a8)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <ae17f80d69ee7772d32dd5c34c332be6b77e7afb.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 3 +++
+ tests/virsystemdtest.c | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 77e3d25a2d..4b297c96bc 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -30708,6 +30708,9 @@ virDomainMachineNameAppendValid(virBufferPtr buf,
+ 
+         virBufferAddChar(buf, *name);
+     }
++
++    /* trailing dashes are not allowed */
++    virBufferTrimChars(buf, "-");
+ }
+ 
+ #undef HOSTNAME_CHARS
+diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
+index 9b95ca6789..26876850b8 100644
+--- a/tests/virsystemdtest.c
++++ b/tests/virsystemdtest.c
+@@ -740,6 +740,10 @@ mymain(void)
+                  "qemu-7-123456789012345678901234567890123456789012345678901234567");
+     TEST_MACHINE("123456789012345678901234567890123456789012345678901234567890", 8,
+                  "qemu-8-123456789012345678901234567890123456789012345678901234567");
++    TEST_MACHINE("kstest-network-device-default-httpks_(c9eed63e-981e-48ec-acdc-56b3f8c5f678)", 100,
++                 "qemu-100-kstest-network-device-default-httpksc9eed63e-981e-48ec");
++    TEST_MACHINE("kstest-network-device-default-httpks_(c9eed63e-981e-48ec--cdc-56b3f8c5f678)", 10,
++                 "qemu-10-kstest-network-device-default-httpksc9eed63e-981e-48ec");
+ 
+ # define TESTS_PM_SUPPORT_HELPER(name, function) \
+     do { \
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-domain-Remove-checking-of-return-value-of-virHashCreateFull.patch b/SOURCES/libvirt-conf-domain-Remove-checking-of-return-value-of-virHashCreateFull.patch
new file mode 100644
index 0000000..fe8367a
--- /dev/null
+++ b/SOURCES/libvirt-conf-domain-Remove-checking-of-return-value-of-virHashCreateFull.patch
@@ -0,0 +1,73 @@
+From 04792aa0715be4e779fca81fa8f7e9f2c5c1b71f Mon Sep 17 00:00:00 2001
+Message-Id: <04792aa0715be4e779fca81fa8f7e9f2c5c1b71f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:00 +0100
+Subject: [PATCH] conf: domain: Remove checking of return value of
+ virHashCreateFull
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This module has last two direct checks whether the value returned by
+virHashCreateFull is NULL. Remove them so that static analyzers don't
+get the false idea that checking the value is necessary.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 2a5ea0a0c1843c7c43e673b3d2082cc3abdef602)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <2e310ad44b341511caba735608bc0bba4b072d6c.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_addr.c | 30 ++++++++++++------------------
+ 1 file changed, 12 insertions(+), 18 deletions(-)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index 607ba56efd..f07b3d9725 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -1044,28 +1044,22 @@ virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSetPtr addrs,
+         if (VIR_ALLOC(addrs->zpciIds) < 0)
+             return -1;
+ 
+-        if (!(addrs->zpciIds->uids = virHashCreateFull(10, NULL,
+-                                                       virZPCIAddrKeyCode,
+-                                                       virZPCIAddrKeyEqual,
+-                                                       virZPCIAddrKeyCopy,
+-                                                       virZPCIAddrKeyPrintHuman,
+-                                                       virZPCIAddrKeyFree)))
+-            goto error;
++        addrs->zpciIds->uids = virHashCreateFull(10, NULL,
++                                                 virZPCIAddrKeyCode,
++                                                 virZPCIAddrKeyEqual,
++                                                 virZPCIAddrKeyCopy,
++                                                 virZPCIAddrKeyPrintHuman,
++                                                 virZPCIAddrKeyFree);
+ 
+-        if (!(addrs->zpciIds->fids = virHashCreateFull(10, NULL,
+-                                                       virZPCIAddrKeyCode,
+-                                                       virZPCIAddrKeyEqual,
+-                                                       virZPCIAddrKeyCopy,
+-                                                       virZPCIAddrKeyPrintHuman,
+-                                                       virZPCIAddrKeyFree)))
+-            goto error;
++        addrs->zpciIds->fids = virHashCreateFull(10, NULL,
++                                                 virZPCIAddrKeyCode,
++                                                 virZPCIAddrKeyEqual,
++                                                 virZPCIAddrKeyCopy,
++                                                 virZPCIAddrKeyPrintHuman,
++                                                 virZPCIAddrKeyFree);
+     }
+ 
+     return 0;
+-
+- error:
+-    virDomainPCIAddressSetExtensionFree(addrs);
+-    return -1;
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-during-PCI-hotplug-require-that-the-controller-support-hotplug.patch b/SOURCES/libvirt-conf-during-PCI-hotplug-require-that-the-controller-support-hotplug.patch
new file mode 100644
index 0000000..a66d8c1
--- /dev/null
+++ b/SOURCES/libvirt-conf-during-PCI-hotplug-require-that-the-controller-support-hotplug.patch
@@ -0,0 +1,47 @@
+From 5ec240811e391f97378d0b6b726e0dee13ae8a40 Mon Sep 17 00:00:00 2001
+Message-Id: <5ec240811e391f97378d0b6b726e0dee13ae8a40@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:17:03 -0400
+Subject: [PATCH] conf: during PCI hotplug, require that the controller support
+ hotplug
+
+Before this patch we would simply rely on QEMU failing to attach the
+device. Since we have a flag in the address set telling us which
+controllers support hotplug, we can fail the operation sooner.
+
+This also assures that when hotplugging with no provided PCI address,
+that we skip any controllers with hotplug='off', and attempt to assign
+the device to a controller that not only supports hotplug, but also
+has it enabled.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7118bdee1550b6022e7362402ca8204add4cf80b)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426171703.18808-3-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_addr.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index ed41eca114..34ea7bc051 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -936,6 +936,11 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
+     if (!flags)
+        return 0;
+ 
++    /* This function is only called during hotplug, so we require hotplug
++     * support from the controller.
++     */
++    flags |= VIR_PCI_CONNECT_HOTPLUGGABLE;
++
+     if (!(addrStr = virPCIDeviceAddressAsString(&dev->addr.pci)))
+         goto cleanup;
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-conf-new-attribute-hotplug-for-pci-controllers.patch b/SOURCES/libvirt-conf-new-attribute-hotplug-for-pci-controllers.patch
new file mode 100644
index 0000000..7d6bd50
--- /dev/null
+++ b/SOURCES/libvirt-conf-new-attribute-hotplug-for-pci-controllers.patch
@@ -0,0 +1,290 @@
+From 12892e0376be4dc07dc317b807f2ec86c27a94b2 Mon Sep 17 00:00:00 2001
+Message-Id: <12892e0376be4dc07dc317b807f2ec86c27a94b2@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:07 -0400
+Subject: [PATCH] conf: new attribute "hotplug" for pci controllers
+
+a <controller type='pci'...> element can now have a "hotplug"
+attribute in the <target> subelement. This is intended to control
+whether or not the slot(s) of the controller support
+hotplugging/unplugging a device:
+
+   <controller type='pci' model='pcie-root-port'>
+     <target hotplug='off'/>
+   </controller>
+
+The default value of hotplug is "on".
+
+Since support for configuring such an option is hypervisor-dependent
+(and will vary among different types of PCI controllers even on a
+single hypervisor), no validation is done in this patch - that
+validation will be done in the patch that wires support for the
+setting into the hypervisor.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 78f4d5e6f188a9f0f8d6da6b1fe78b9f4172d9ad)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+
+Conflicts/Changes from upstread:
+
+  tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml:
+
+    had to be modified to remove reference to the qemu64 CPU type.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-5-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/formatdomain.html.in                     | 11 +++
+ docs/schemas/domaincommon.rng                 |  5 ++
+ src/conf/domain_conf.c                        | 20 +++++-
+ src/conf/domain_conf.h                        |  1 +
+ .../pcie-root-port-nohotplug.xml              | 35 ++++++++++
+ ...pcie-root-port-nohotplug.x86_64-latest.xml | 67 +++++++++++++++++++
+ tests/qemuxml2xmltest.c                       |  2 +-
+ 7 files changed, 139 insertions(+), 2 deletions(-)
+ create mode 100644 tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml
+ create mode 100644 tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 9c588185df..76799f5ffc 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -4651,6 +4651,17 @@
+         which is visible to the virtual machine. If set, port must be
+         between 0 and 255.
+       </dd>
++      <dt><code>hotplug</code></dt>
++      <dd>
++        pcie-root-port and pcie-switch-downstream-port controllers can
++        also have a <code>hotplug</code> attribute in
++        the <code>&lt;target&gt;</code> subelement, which is used to
++        disable hotplug/unplug of devices on a particular
++        controller. The default setting of <code>hotplug</code>
++        is <code>on</code>; it should be set to <code>off</code> to
++        disable hotplug/unplug of devices on a particular controller.
++        <span class="since">Since 6.3.0</span>
++      </dd>
+       <dt><code>busNr</code></dt>
+       <dd>
+         pci-expander-bus and pcie-expander-bus controllers can have an
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index dd8f27243a..9fda5f17e0 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -2475,6 +2475,11 @@
+                     <ref name='uint8'/>
+                   </attribute>
+                 </optional>
++                <optional>
++                  <attribute name='hotplug'>
++                    <ref name="virOnOff"/>
++                  </attribute>
++                </optional>
+                 <optional>
+                   <element name='node'>
+                     <ref name='unsignedInt'/>
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 28160a2967..ed9ca0e9d8 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -10933,6 +10933,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
+     g_autofree char *port = NULL;
+     g_autofree char *busNr = NULL;
+     g_autofree char *targetIndex = NULL;
++    g_autofree char *hotplug = NULL;
+     g_autofree char *ioeventfd = NULL;
+     g_autofree char *portsStr = NULL;
+     g_autofree char *iothread = NULL;
+@@ -11004,6 +11005,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
+                 chassis = virXMLPropString(cur, "chassis");
+                 port = virXMLPropString(cur, "port");
+                 busNr = virXMLPropString(cur, "busNr");
++                hotplug = virXMLPropString(cur, "hotplug");
+                 targetIndex = virXMLPropString(cur, "index");
+                 processedTarget = true;
+             }
+@@ -11240,6 +11242,17 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
+             }
+             def->opts.pciopts.numaNode = numaNode;
+         }
++        if (hotplug) {
++            int val = virTristateSwitchTypeFromString(hotplug);
++
++            if (val <= 0) {
++                virReportError(VIR_ERR_XML_ERROR,
++                               _("PCI controller unrecognized hotplug setting '%s'"),
++                               hotplug);
++                goto error;
++            }
++            def->opts.pciopts.hotplug = val;
++        }
+         break;
+     case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: {
+         g_autofree char *gntframes = virXMLPropString(node, "maxGrantFrames");
+@@ -25112,7 +25125,8 @@ virDomainControllerDefFormat(virBufferPtr buf,
+             def->opts.pciopts.port != -1 ||
+             def->opts.pciopts.busNr != -1 ||
+             def->opts.pciopts.targetIndex != -1 ||
+-            def->opts.pciopts.numaNode != -1) {
++            def->opts.pciopts.numaNode != -1 ||
++            def->opts.pciopts.hotplug != VIR_TRISTATE_SWITCH_ABSENT) {
+             virBufferAddLit(&childBuf, "<target");
+             if (def->opts.pciopts.chassisNr != -1)
+                 virBufferAsprintf(&childBuf, " chassisNr='%d'",
+@@ -25129,6 +25143,10 @@ virDomainControllerDefFormat(virBufferPtr buf,
+             if (def->opts.pciopts.targetIndex != -1)
+                 virBufferAsprintf(&childBuf, " index='%d'",
+                                   def->opts.pciopts.targetIndex);
++            if (def->opts.pciopts.hotplug != VIR_TRISTATE_SWITCH_ABSENT) {
++                virBufferAsprintf(&childBuf, " hotplug='%s'",
++                                  virTristateSwitchTypeToString(def->opts.pciopts.hotplug));
++            }
+             if (def->opts.pciopts.numaNode == -1) {
+                 virBufferAddLit(&childBuf, "/>\n");
+             } else {
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index 2a382ede72..118077edaa 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -719,6 +719,7 @@ struct _virDomainPCIControllerOpts {
+      * item in memory target config) -1 == unspecified
+      */
+     int numaNode;
++    virTristateSwitch hotplug; /* 'off' to prevent hotplug/unplug, default 'on' */
+ };
+ 
+ struct _virDomainUSBControllerOpts {
+diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml
+new file mode 100644
+index 0000000000..8a01494470
+--- /dev/null
++++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml
+@@ -0,0 +1,35 @@
++<domain type='qemu'>
++  <name>guest</name>
++  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
++  <memory unit='KiB'>2097152</memory>
++  <currentMemory unit='KiB'>2097152</currentMemory>
++  <vcpu placement='static'>2</vcpu>
++  <os>
++    <type arch='x86_64' machine='q35'>hvm</type>
++  </os>
++  <devices>
++    <emulator>/usr/bin/qemu-system-x86_64</emulator>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <controller type='pci' index='1' model='pcie-root-port'/>
++    <controller type='pci' index='2' model='pcie-root-port'>
++      <target hotplug='off'/>
++    </controller>
++    <controller type='pci' index='3' model='pcie-root-port'>
++      <model name='ioh3420'/>
++      <target hotplug='off'/>
++    </controller>
++    <controller type='pci' index='4' model='pcie-switch-upstream-port'/>
++    <controller type='pci' index='5' model='pcie-switch-downstream-port'>
++      <target hotplug='off'/>
++    </controller>
++    <controller type='pci' index='6' model='pcie-switch-downstream-port'>
++      <target hotplug='on'/>
++    </controller>
++    <controller type='pci' index='7' model='pcie-switch-downstream-port'/>
++    <controller type='pci' index='8' model='pcie-switch-downstream-port'>
++      <model name='xio3130-downstream'/>
++      <target chassis='30' port='0x27'/>
++    </controller>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
+new file mode 100644
+index 0000000000..f7dbaccae9
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
+@@ -0,0 +1,67 @@
++<domain type='qemu'>
++  <name>guest</name>
++  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
++  <memory unit='KiB'>2097152</memory>
++  <currentMemory unit='KiB'>2097152</currentMemory>
++  <vcpu placement='static'>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>
++    <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' hotplug='off'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
++    </controller>
++    <controller type='pci' index='3' model='pcie-root-port'>
++      <model name='ioh3420'/>
++      <target chassis='3' port='0xa' hotplug='off'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
++    </controller>
++    <controller type='pci' index='4' model='pcie-switch-upstream-port'>
++      <model name='x3130-upstream'/>
++      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
++    </controller>
++    <controller type='pci' index='5' model='pcie-switch-downstream-port'>
++      <model name='xio3130-downstream'/>
++      <target chassis='5' port='0x0' hotplug='off'/>
++      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
++    </controller>
++    <controller type='pci' index='6' model='pcie-switch-downstream-port'>
++      <model name='xio3130-downstream'/>
++      <target chassis='6' port='0x1' hotplug='on'/>
++      <address type='pci' domain='0x0000' bus='0x04' slot='0x01' function='0x0'/>
++    </controller>
++    <controller type='pci' index='7' model='pcie-switch-downstream-port'>
++      <model name='xio3130-downstream'/>
++      <target chassis='7' port='0x2'/>
++      <address type='pci' domain='0x0000' bus='0x04' slot='0x02' function='0x0'/>
++    </controller>
++    <controller type='pci' index='8' model='pcie-switch-downstream-port'>
++      <model name='xio3130-downstream'/>
++      <target chassis='30' port='0x27'/>
++      <address type='pci' domain='0x0000' bus='0x04' slot='0x03' function='0x0'/>
++    </controller>
++    <controller type='usb' index='0' model='qemu-xhci'>
++      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
++    </controller>
++    <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'/>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index 15110dd104..c8218e423e 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -953,7 +953,7 @@ mymain(void)
+             QEMU_CAPS_DEVICE_IOH3420);
+     DO_TEST("pcie-root-port-model-ioh3420",
+             QEMU_CAPS_DEVICE_IOH3420);
+-
++    DO_TEST_CAPS_LATEST("pcie-root-port-nohotplug");
+     DO_TEST("pcie-switch-upstream-port",
+             QEMU_CAPS_DEVICE_IOH3420,
+             QEMU_CAPS_DEVICE_X3130_UPSTREAM,
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-conf-parse-format-teaming-subelement-of-interface.patch b/SOURCES/libvirt-conf-parse-format-teaming-subelement-of-interface.patch
new file mode 100644
index 0000000..10aec7f
--- /dev/null
+++ b/SOURCES/libvirt-conf-parse-format-teaming-subelement-of-interface.patch
@@ -0,0 +1,468 @@
+From 653245c4de76aba4e75131da8d40eed5b15ffd0d Mon Sep 17 00:00:00 2001
+Message-Id: <653245c4de76aba4e75131da8d40eed5b15ffd0d@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 30 Jan 2020 14:12:40 -0500
+Subject: [PATCH] conf: parse/format <teaming> subelement of <interface>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The subelement <teaming> of <interface> devices is used to configure a
+simple teaming association between two interfaces in a domain. Example:
+
+  <interface type='bridge'>
+    <source bridge='br0'/>
+    <model type='virtio'/>
+    <mac address='00:11:22:33:44:55'/>
+    <alias name='ua-backup0'/>
+    <teaming type='persistent'/>
+  </interface>
+  <interface type='hostdev'>
+    <source>
+      <address type='pci' bus='0x02' slot='0x10' function='0x4'/>
+    </source>
+    <mac address='00:11:22:33:44:55'/>
+    <teaming type='transient' persistent='ua-backup0'/>
+  </interface>
+
+The interface with <teaming type='persistent'/> is assumed to always
+be present, while the interface with type='transient' may be be
+unplugged and later re-plugged; the persistent='blah' attribute (and
+in the one currently available implementation, also the matching MAC
+addresses) is what associates the two devices with each other. It is
+up to the hypervisor and the guest network drivers to determine what
+to do with this information.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit fb0509d06ac57434c2edbd81ee63deb32a0e598a)
+
+https://bugzilla.redhat.com/1693587
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200130191244.24174-3-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/schemas/domaincommon.rng                 | 19 ++++++
+ src/conf/domain_conf.c                        | 47 +++++++++++++
+ src/conf/domain_conf.h                        | 14 ++++
+ .../net-virtio-teaming-network.xml            | 37 +++++++++++
+ tests/qemuxml2argvdata/net-virtio-teaming.xml | 50 ++++++++++++++
+ .../net-virtio-teaming-network.xml            | 51 ++++++++++++++
+ .../qemuxml2xmloutdata/net-virtio-teaming.xml | 66 +++++++++++++++++++
+ tests/qemuxml2xmltest.c                       |  6 ++
+ 8 files changed, 290 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-network.xml
+ create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.xml
+ create mode 100644 tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+ create mode 100644 tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 76d94b156f..026e753567 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -3158,6 +3158,25 @@
+       <optional>
+         <ref name="vlan"/>
+       </optional>
++      <optional>
++        <element name="teaming">
++          <choice>
++            <group>
++              <attribute name="type">
++                <value>persistent</value>
++              </attribute>
++            </group>
++            <group>
++              <attribute name="type">
++                <value>transient</value>
++              </attribute>
++              <attribute name="persistent">
++                <ref name="aliasName"/>
++              </attribute>
++            </group>
++          </choice>
++        </element>
++      </optional>
+     </interleave>
+   </define>
+ 
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 0478914c69..58f72b3b0f 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -554,6 +554,13 @@ VIR_ENUM_IMPL(virDomainNetVirtioTxMode,
+               "timer",
+ );
+ 
++VIR_ENUM_IMPL(virDomainNetTeaming,
++              VIR_DOMAIN_NET_TEAMING_TYPE_LAST,
++              "none",
++              "persistent",
++              "transient",
++);
++
+ VIR_ENUM_IMPL(virDomainNetInterfaceLinkState,
+               VIR_DOMAIN_NET_INTERFACE_LINK_STATE_LAST,
+               "default",
+@@ -6276,6 +6283,21 @@ virDomainNetDefValidate(const virDomainNetDef *net)
+                        virDomainNetTypeToString(net->type));
+         return -1;
+     }
++
++    if (net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT) {
++        if (!net->teaming.persistent) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("teaming persistent attribute must be set if teaming type is 'transient'"));
++            return -1;
++        }
++    } else {
++        if (net->teaming.persistent) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("teaming persistent attribute not allowed if teaming type is '%s'"),
++                           virDomainNetTeamingTypeToString(net->teaming.type));
++            return -1;
++        }
++    }
+     return 0;
+ }
+ 
+@@ -11574,6 +11596,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
+     g_autofree char *vhostuser_type = NULL;
+     g_autofree char *trustGuestRxFilters = NULL;
+     g_autofree char *vhost_path = NULL;
++    g_autofree char *teamingType = NULL;
++    g_autofree char *teamingPersistent = NULL;
+     const char *prefix = xmlopt ? xmlopt->config.netPrefix : NULL;
+ 
+     if (!(def = virDomainNetDefNew(xmlopt)))
+@@ -11775,6 +11799,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
+                 if (!vhost_path && (tmp = virXMLPropString(cur, "vhost")))
+                     vhost_path = virFileSanitizePath(tmp);
+                 VIR_FREE(tmp);
++            } else if (virXMLNodeNameEqual(cur, "teaming") &&
++                       !teamingType && !teamingPersistent) {
++                teamingType = virXMLPropString(cur, "type");
++                teamingPersistent =  virXMLPropString(cur, "persistent");
+             }
+         }
+         cur = cur->next;
+@@ -12296,6 +12324,19 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
+         }
+     }
+ 
++    if (teamingType) {
++        int tmpTeaming;
++
++        if ((tmpTeaming = virDomainNetTeamingTypeFromString(teamingType)) <= 0) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                           _("unknown teaming type '%s'"),
++                           teamingType);
++            goto error;
++        }
++        def->teaming.type = tmpTeaming;
++    }
++    def->teaming.persistent = g_steal_pointer(&teamingPersistent);
++
+     rv = virXPathULong("string(./tune/sndbuf)", ctxt, &def->tune.sndbuf);
+     if (rv >= 0) {
+         def->tune.sndbuf_specified = true;
+@@ -25741,6 +25782,12 @@ virDomainNetDefFormat(virBufferPtr buf,
+         virBufferAddLit(buf,   "</tune>\n");
+     }
+ 
++    if (def->teaming.type != VIR_DOMAIN_NET_TEAMING_TYPE_NONE) {
++        virBufferAsprintf(buf, "<teaming type='%s'",
++                          virDomainNetTeamingTypeToString(def->teaming.type));
++        virBufferEscapeString(buf, " persistent='%s'", def->teaming.persistent);
++        virBufferAddLit(buf, "/>\n");
++    }
+     if (def->linkstate) {
+         virBufferAsprintf(buf, "<link state='%s'/>\n",
+                           virDomainNetInterfaceLinkStateTypeToString(def->linkstate));
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index 6ae89fa498..ee8eb3ddc0 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -884,6 +884,15 @@ typedef enum {
+     VIR_DOMAIN_NET_VIRTIO_TX_MODE_LAST
+ } virDomainNetVirtioTxModeType;
+ 
++/* the type of teaming device */
++typedef enum {
++    VIR_DOMAIN_NET_TEAMING_TYPE_NONE,
++    VIR_DOMAIN_NET_TEAMING_TYPE_PERSISTENT,
++    VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT,
++
++    VIR_DOMAIN_NET_TEAMING_TYPE_LAST
++} virDomainNetTeamingType;
++
+ /* link interface states */
+ typedef enum {
+         VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT = 0, /* Default link state (up) */
+@@ -958,6 +967,10 @@ struct _virDomainNetDef {
+         char *tap;
+         char *vhost;
+     } backend;
++    struct {
++        virDomainNetTeamingType type;
++        char *persistent; /* alias name of persistent device */
++    } teaming;
+     union {
+         virDomainChrSourceDefPtr vhostuser;
+         struct {
+@@ -3425,6 +3438,7 @@ VIR_ENUM_DECL(virDomainFSModel);
+ VIR_ENUM_DECL(virDomainNet);
+ VIR_ENUM_DECL(virDomainNetBackend);
+ VIR_ENUM_DECL(virDomainNetVirtioTxMode);
++VIR_ENUM_DECL(virDomainNetTeaming);
+ VIR_ENUM_DECL(virDomainNetInterfaceLinkState);
+ VIR_ENUM_DECL(virDomainNetModel);
+ VIR_ENUM_DECL(virDomainChrDevice);
+diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
+new file mode 100644
+index 0000000000..edab52f3a1
+--- /dev/null
++++ b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
+@@ -0,0 +1,37 @@
++<domain type='qemu'>
++  <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='i686' 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-i386</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <controller type='usb' index='0'/>
++    <interface type='network'>
++      <mac address='00:11:22:33:44:55'/>
++      <source network='mybridge'/>
++      <model type='virtio'/>
++      <teaming type='persistent'/>
++      <alias name='ua-backup0'/>
++    </interface>
++    <interface type='network'>
++      <mac address='00:11:22:33:44:55'/>
++      <source network='myhostdevpool'/>
++      <model type='virtio'/>
++      <teaming type='transient' persistent='ua-backup0'/>
++    </interface>
++    <memballoon model='virtio'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.xml b/tests/qemuxml2argvdata/net-virtio-teaming.xml
+new file mode 100644
+index 0000000000..830ce28524
+--- /dev/null
++++ b/tests/qemuxml2argvdata/net-virtio-teaming.xml
+@@ -0,0 +1,50 @@
++<domain type='qemu'>
++  <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='i686' 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-i386</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <controller type='usb' index='0'/>
++    <interface type='user'>
++      <mac address='00:11:22:33:44:55'/>
++      <model type='virtio'/>
++      <teaming type='persistent'/>
++      <alias name='ua-backup0'/>
++    </interface>
++    <interface type='user'>
++      <mac address='66:44:33:22:11:00'/>
++      <model type='virtio'/>
++      <teaming type='persistent'/>
++      <alias name='ua-backup1'/>
++    </interface>
++    <interface type='hostdev' managed='yes'>
++      <mac address='00:11:22:33:44:55'/>
++      <source>
++        <address type='pci' domain='0x0000' bus='0x03' slot='0x07' function='0x1'/>
++      </source>
++      <teaming type='transient' persistent='ua-backup0'/>
++    </interface>
++    <interface type='hostdev' managed='yes'>
++      <mac address='66:44:33:22:11:00'/>
++      <source>
++        <address type='pci' domain='0x0000' bus='0x03' slot='0x07' function='0x2'/>
++      </source>
++      <teaming type='transient' persistent='ua-backup1'/>
++    </interface>
++    <memballoon model='virtio'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+new file mode 100644
+index 0000000000..e0dbeafe02
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+@@ -0,0 +1,51 @@
++<domain type='qemu'>
++  <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='i686' 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-i386</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'>
++      <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>
++    <interface type='network'>
++      <mac address='00:11:22:33:44:55'/>
++      <source network='mybridge'/>
++      <model type='virtio'/>
++      <teaming type='persistent'/>
++      <alias name='ua-backup0'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </interface>
++    <interface type='network'>
++      <mac address='00:11:22:33:44:55'/>
++      <source network='myhostdevpool'/>
++      <model type='virtio'/>
++      <teaming type='transient' persistent='ua-backup0'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
++    </interface>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='virtio'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
++    </memballoon>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+new file mode 100644
+index 0000000000..5a5695794a
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+@@ -0,0 +1,66 @@
++<domain type='qemu'>
++  <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='i686' 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-i386</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'>
++      <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>
++    <interface type='user'>
++      <mac address='00:11:22:33:44:55'/>
++      <model type='virtio'/>
++      <teaming type='persistent'/>
++      <alias name='ua-backup0'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </interface>
++    <interface type='user'>
++      <mac address='66:44:33:22:11:00'/>
++      <model type='virtio'/>
++      <teaming type='persistent'/>
++      <alias name='ua-backup1'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
++    </interface>
++    <interface type='hostdev' managed='yes'>
++      <mac address='00:11:22:33:44:55'/>
++      <source>
++        <address type='pci' domain='0x0000' bus='0x03' slot='0x07' function='0x1'/>
++      </source>
++      <teaming type='transient' persistent='ua-backup0'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
++    </interface>
++    <interface type='hostdev' managed='yes'>
++      <mac address='66:44:33:22:11:00'/>
++      <source>
++        <address type='pci' domain='0x0000' bus='0x03' slot='0x07' function='0x2'/>
++      </source>
++      <teaming type='transient' persistent='ua-backup1'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
++    </interface>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='virtio'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
++    </memballoon>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index 3cefc64833..e54c540ef6 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -451,6 +451,12 @@ mymain(void)
+     DO_TEST("net-eth-unmanaged-tap", NONE);
+     DO_TEST("net-virtio-network-portgroup", NONE);
+     DO_TEST("net-virtio-rxtxqueuesize", NONE);
++    DO_TEST("net-virtio-teaming",
++            QEMU_CAPS_VIRTIO_NET_FAILOVER,
++            QEMU_CAPS_DEVICE_VFIO_PCI);
++    DO_TEST("net-virtio-teaming-network",
++            QEMU_CAPS_VIRTIO_NET_FAILOVER,
++            QEMU_CAPS_DEVICE_VFIO_PCI);
+     DO_TEST("net-hostdev", NONE);
+     DO_TEST("net-hostdev-bootorder", NONE);
+     DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-PV-TLB-flush.patch b/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-PV-TLB-flush.patch
deleted file mode 100644
index 6ad8b27..0000000
--- a/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-PV-TLB-flush.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From efc0312e1edb3d8196806606fbb639bbbd0bd6d4 Mon Sep 17 00:00:00 2001
-Message-Id: <efc0312e1edb3d8196806606fbb639bbbd0bd6d4@dist-git>
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Thu, 9 Aug 2018 15:14:21 +0200
-Subject: [PATCH] conf: qemu: add support for Hyper-V PV TLB flush
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qemu-3.0 supports Hyper-V-style PV TLB flush, Windows guests can benefit
-from this feature as KVM knows which vCPUs are not currently scheduled (and
-thus don't require any immediate action).
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit f4c39db7366376bd95e1751b0e3ced9c73c14f5b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1589702
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in               | 7 +++++++
- docs/schemas/domaincommon.rng           | 5 +++++
- src/conf/domain_conf.c                  | 6 +++++-
- src/conf/domain_conf.h                  | 1 +
- src/cpu/cpu_x86.c                       | 3 +++
- src/cpu/cpu_x86_data.h                  | 1 +
- src/qemu/qemu_command.c                 | 1 +
- src/qemu/qemu_parse_command.c           | 1 +
- src/qemu/qemu_process.c                 | 1 +
- tests/qemuxml2argvdata/hyperv-off.xml   | 1 +
- tests/qemuxml2argvdata/hyperv.args      | 2 +-
- tests/qemuxml2argvdata/hyperv.xml       | 1 +
- tests/qemuxml2xmloutdata/hyperv-off.xml | 1 +
- tests/qemuxml2xmloutdata/hyperv.xml     | 1 +
- 14 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 43a1067501..c019b26644 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -1917,6 +1917,7 @@
-     &lt;vendor_id state='on' value='KVM Hv'/&gt;
-     &lt;frequencies state='on'/&gt;
-     &lt;reenlightenment state='on'/&gt;
-+    &lt;tlbflush state='on'/&gt;
-   &lt;/hyperv&gt;
-   &lt;kvm&gt;
-     &lt;hidden state='on'/&gt;
-@@ -2051,6 +2052,12 @@
-           <td> on, off</td>
-           <td><span class="since">4.7.0 (QEMU 3.0)</span></td>
-         </tr>
-+        <tr>
-+          <td>tlbflush</td>
-+          <td>Enable PV TLB flush support</td>
-+          <td> on, off</td>
-+          <td><span class="since">4.7.0 (QEMU 3.0)</span></td>
-+        </tr>
-       </table>
-       </dd>
-       <dt><code>pvspinlock</code></dt>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index ceee7a8efe..1c6f2a295d 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -5723,6 +5723,11 @@
-             <ref name="featurestate"/>
-           </element>
-         </optional>
-+        <optional>
-+          <element name="tlbflush">
-+            <ref name="featurestate"/>
-+          </element>
-+        </optional>
-       </interleave>
-     </element>
-   </define>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 18b4d03a61..e013e9f0c5 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -171,7 +171,8 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
-               "reset",
-               "vendor_id",
-               "frequencies",
--              "reenlightenment")
-+              "reenlightenment",
-+              "tlbflush")
- 
- VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
-               "hidden")
-@@ -20055,6 +20056,7 @@ virDomainDefParseXML(xmlDocPtr xml,
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-+            case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                 break;
- 
-             case VIR_DOMAIN_HYPERV_SPINLOCKS:
-@@ -22248,6 +22250,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-+            case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                 if (src->hyperv_features[i] != dst->hyperv_features[i]) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("State of HyperV enlightenment "
-@@ -27898,6 +27901,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
-                     case VIR_DOMAIN_HYPERV_RESET:
-                     case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                     case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-+                    case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                         break;
- 
-                     case VIR_DOMAIN_HYPERV_SPINLOCKS:
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index e450923019..d32514e7e6 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1793,6 +1793,7 @@ typedef enum {
-     VIR_DOMAIN_HYPERV_VENDOR_ID,
-     VIR_DOMAIN_HYPERV_FREQUENCIES,
-     VIR_DOMAIN_HYPERV_REENLIGHTENMENT,
-+    VIR_DOMAIN_HYPERV_TLBFLUSH,
- 
-     VIR_DOMAIN_HYPERV_LAST
- } virDomainHyperv;
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 7a48b78eb9..7fa84f6014 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -113,6 +113,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_FREQUENCIES,
-                 0x40000003, 0x00000800);
- KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT,
-                 0x40000003, 0x00002000);
-+KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_TLBFLUSH,
-+                0x40000004, 0x00000004);
- 
- static virCPUx86Feature x86_kvm_features[] =
- {
-@@ -135,6 +137,7 @@ static virCPUx86Feature x86_kvm_features[] =
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET),
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_FREQUENCIES),
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT),
-+    KVM_FEATURE(VIR_CPU_x86_KVM_HV_TLBFLUSH),
- };
- 
- typedef struct _virCPUx86Model virCPUx86Model;
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index a810c64fc9..090a21156f 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -65,6 +65,7 @@ struct _virCPUx86CPUID {
- # define VIR_CPU_x86_KVM_HV_RESET     "__kvm_hv_reset"
- # define VIR_CPU_x86_KVM_HV_FREQUENCIES "__kvm_hv_frequencies"
- # define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "__kvm_hv_reenlightenment"
-+# define VIR_CPU_x86_KVM_HV_TLBFLUSH  "__kvm_hv_tlbflush"
- 
- 
- # define VIR_CPU_X86_DATA_INIT { 0 }
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 48f3b09ec9..a3d605c00f 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6921,6 +6921,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-+            case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
-                     virBufferAsprintf(&buf, ",hv_%s",
-                                       virDomainHypervTypeToString(i));
-diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
-index 1e67a5a8c8..fdc1d34068 100644
---- a/src/qemu/qemu_parse_command.c
-+++ b/src/qemu/qemu_parse_command.c
-@@ -1538,6 +1538,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-+            case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                 if (value) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("HyperV feature '%s' should not "
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 990d4d3046..23958bcbce 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3925,6 +3925,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
-         case VIR_DOMAIN_HYPERV_RESET:
-         case VIR_DOMAIN_HYPERV_FREQUENCIES:
-         case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-+        case VIR_DOMAIN_HYPERV_TLBFLUSH:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("host doesn't support hyperv '%s' feature"),
-                            virDomainHypervTypeToString(i));
-diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml
-index b2e3612df9..dc5777355f 100644
---- a/tests/qemuxml2argvdata/hyperv-off.xml
-+++ b/tests/qemuxml2argvdata/hyperv-off.xml
-@@ -22,6 +22,7 @@
-       <vendor_id state='off'/>
-       <frequencies state='off'/>
-       <reenlightenment state='off'/>
-+      <tlbflush state='off'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
-index 4feafad8e2..6ee6198fb0 100644
---- a/tests/qemuxml2argvdata/hyperv.args
-+++ b/tests/qemuxml2argvdata/hyperv.args
-@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
- -cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
- hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies,\
--hv_reenlightenment' \
-+hv_reenlightenment,hv_tlbflush' \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml
-index 20fcdba59e..816adf6907 100644
---- a/tests/qemuxml2argvdata/hyperv.xml
-+++ b/tests/qemuxml2argvdata/hyperv.xml
-@@ -22,6 +22,7 @@
-       <vendor_id state='on' value='KVM Hv'/>
-       <frequencies state='on'/>
-       <reenlightenment state='on'/>
-+      <tlbflush state='on'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
-index 4a41e0c37e..77a8dac810 100644
---- a/tests/qemuxml2xmloutdata/hyperv-off.xml
-+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
-@@ -22,6 +22,7 @@
-       <vendor_id state='off'/>
-       <frequencies state='off'/>
-       <reenlightenment state='off'/>
-+      <tlbflush state='off'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
-index 183b45980b..fc8c59a557 100644
---- a/tests/qemuxml2xmloutdata/hyperv.xml
-+++ b/tests/qemuxml2xmloutdata/hyperv.xml
-@@ -22,6 +22,7 @@
-       <vendor_id state='on' value='KVM Hv'/>
-       <frequencies state='on'/>
-       <reenlightenment state='on'/>
-+      <tlbflush state='on'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-frequency-MSRs.patch b/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-frequency-MSRs.patch
deleted file mode 100644
index 566f64a..0000000
--- a/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-frequency-MSRs.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From b4335c3290082dd8aa0915e340b625197d80fdc3 Mon Sep 17 00:00:00 2001
-Message-Id: <b4335c3290082dd8aa0915e340b625197d80fdc3@dist-git>
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Thu, 9 Aug 2018 15:14:19 +0200
-Subject: [PATCH] conf: qemu: add support for Hyper-V frequency MSRs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qemu-2.12 gained 'hv-frequencies' cpu flag to enable Hyper-V frequency
-MSRs. These MSRs are required (but not sufficient) to make Hyper-V on
-KVM pass stable TSC page clocksource to L2 guests.
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 8253bca9615233f670c7dad659c120e4556a748a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1589702
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in               | 7 +++++++
- docs/schemas/domaincommon.rng           | 5 +++++
- src/conf/domain_conf.c                  | 6 +++++-
- src/conf/domain_conf.h                  | 1 +
- src/cpu/cpu_x86.c                       | 3 +++
- src/cpu/cpu_x86_data.h                  | 1 +
- src/qemu/qemu_command.c                 | 1 +
- src/qemu/qemu_parse_command.c           | 1 +
- src/qemu/qemu_process.c                 | 1 +
- tests/qemuxml2argvdata/hyperv-off.xml   | 1 +
- tests/qemuxml2argvdata/hyperv.args      | 2 +-
- tests/qemuxml2argvdata/hyperv.xml       | 1 +
- tests/qemuxml2xmloutdata/hyperv-off.xml | 1 +
- tests/qemuxml2xmloutdata/hyperv.xml     | 1 +
- 14 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 42acf7a828..3b493a98ac 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -1915,6 +1915,7 @@
-     &lt;synic state='on'/&gt;
-     &lt;reset state='on'/&gt;
-     &lt;vendor_id state='on' value='KVM Hv'/&gt;
-+    &lt;frequencies state='on'/&gt;
-   &lt;/hyperv&gt;
-   &lt;kvm&gt;
-     &lt;hidden state='on'/&gt;
-@@ -2037,6 +2038,12 @@
-           <td>on, off; value - string, up to 12 characters</td>
-           <td><span class="since">1.3.3 (QEMU 2.5)</span></td>
-         </tr>
-+        <tr>
-+          <td>frequencies</td>
-+          <td>Expose frequency MSRs</td>
-+          <td> on, off</td>
-+          <td><span class="since">4.7.0 (QEMU 2.12)</span></td>
-+        </tr>
-       </table>
-       </dd>
-       <dt><code>pvspinlock</code></dt>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index ac04af51a1..f156a6b7c4 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -5713,6 +5713,11 @@
-             </optional>
-           </element>
-         </optional>
-+        <optional>
-+          <element name="frequencies">
-+            <ref name="featurestate"/>
-+          </element>
-+        </optional>
-       </interleave>
-     </element>
-   </define>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 240b33f28c..150dd8acc8 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -169,7 +169,8 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
-               "synic",
-               "stimer",
-               "reset",
--              "vendor_id")
-+              "vendor_id",
-+              "frequencies")
- 
- VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
-               "hidden")
-@@ -20051,6 +20052,7 @@ virDomainDefParseXML(xmlDocPtr xml,
-             case VIR_DOMAIN_HYPERV_SYNIC:
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                 break;
- 
-             case VIR_DOMAIN_HYPERV_SPINLOCKS:
-@@ -22242,6 +22244,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
-             case VIR_DOMAIN_HYPERV_SYNIC:
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                 if (src->hyperv_features[i] != dst->hyperv_features[i]) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("State of HyperV enlightenment "
-@@ -27890,6 +27893,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
-                     case VIR_DOMAIN_HYPERV_SYNIC:
-                     case VIR_DOMAIN_HYPERV_STIMER:
-                     case VIR_DOMAIN_HYPERV_RESET:
-+                    case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                         break;
- 
-                     case VIR_DOMAIN_HYPERV_SPINLOCKS:
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 5e2f21dea3..97d38ff7b9 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1791,6 +1791,7 @@ typedef enum {
-     VIR_DOMAIN_HYPERV_STIMER,
-     VIR_DOMAIN_HYPERV_RESET,
-     VIR_DOMAIN_HYPERV_VENDOR_ID,
-+    VIR_DOMAIN_HYPERV_FREQUENCIES,
- 
-     VIR_DOMAIN_HYPERV_LAST
- } virDomainHyperv;
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 809da94117..a2fbfb577d 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -109,6 +109,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_VPINDEX,
-                 0x40000003, 0x00000040);
- KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RESET,
-                 0x40000003, 0x00000080);
-+KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_FREQUENCIES,
-+                0x40000003, 0x00000800);
- 
- static virCPUx86Feature x86_kvm_features[] =
- {
-@@ -129,6 +131,7 @@ static virCPUx86Feature x86_kvm_features[] =
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_VAPIC),
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_VPINDEX),
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET),
-+    KVM_FEATURE(VIR_CPU_x86_KVM_HV_FREQUENCIES),
- };
- 
- typedef struct _virCPUx86Model virCPUx86Model;
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index b89110f16c..c01eb41be5 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -63,6 +63,7 @@ struct _virCPUx86CPUID {
- # define VIR_CPU_x86_KVM_HV_VAPIC     "__kvm_hv_vapic"
- # define VIR_CPU_x86_KVM_HV_VPINDEX   "__kvm_hv_vpindex"
- # define VIR_CPU_x86_KVM_HV_RESET     "__kvm_hv_reset"
-+# define VIR_CPU_x86_KVM_HV_FREQUENCIES "__kvm_hv_frequencies"
- 
- 
- # define VIR_CPU_X86_DATA_INIT { 0 }
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 028f48310b..82c349819e 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6919,6 +6919,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             case VIR_DOMAIN_HYPERV_SYNIC:
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
-                     virBufferAsprintf(&buf, ",hv_%s",
-                                       virDomainHypervTypeToString(i));
-diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
-index 351425fedd..ffea9a26bd 100644
---- a/src/qemu/qemu_parse_command.c
-+++ b/src/qemu/qemu_parse_command.c
-@@ -1536,6 +1536,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
-             case VIR_DOMAIN_HYPERV_SYNIC:
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
-                 if (value) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("HyperV feature '%s' should not "
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 2d51c0fa25..dd92a6c179 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3923,6 +3923,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
-         case VIR_DOMAIN_HYPERV_SYNIC:
-         case VIR_DOMAIN_HYPERV_STIMER:
-         case VIR_DOMAIN_HYPERV_RESET:
-+        case VIR_DOMAIN_HYPERV_FREQUENCIES:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("host doesn't support hyperv '%s' feature"),
-                            virDomainHypervTypeToString(i));
-diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml
-index ba9c978848..d3a8455ac3 100644
---- a/tests/qemuxml2argvdata/hyperv-off.xml
-+++ b/tests/qemuxml2argvdata/hyperv-off.xml
-@@ -20,6 +20,7 @@
-       <stimer state='off'/>
-       <reset state='off'/>
-       <vendor_id state='off'/>
-+      <frequencies state='off'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
-index a1acbb63de..53026bb2d5 100644
---- a/tests/qemuxml2argvdata/hyperv.args
-+++ b/tests/qemuxml2argvdata/hyperv.args
-@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
- -S \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
- -cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
--hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv' \
-+hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies' \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml
-index 09f6d21024..27372d1636 100644
---- a/tests/qemuxml2argvdata/hyperv.xml
-+++ b/tests/qemuxml2argvdata/hyperv.xml
-@@ -20,6 +20,7 @@
-       <stimer state='on'/>
-       <reset state='on'/>
-       <vendor_id state='on' value='KVM Hv'/>
-+      <frequencies state='on'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
-index 07eaf7219d..3ba0b827c3 100644
---- a/tests/qemuxml2xmloutdata/hyperv-off.xml
-+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
-@@ -20,6 +20,7 @@
-       <stimer state='off'/>
-       <reset state='off'/>
-       <vendor_id state='off'/>
-+      <frequencies state='off'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
-index f9ae9504de..1e47a946d6 100644
---- a/tests/qemuxml2xmloutdata/hyperv.xml
-+++ b/tests/qemuxml2xmloutdata/hyperv.xml
-@@ -20,6 +20,7 @@
-       <stimer state='on'/>
-       <reset state='on'/>
-       <vendor_id state='on' value='KVM Hv'/>
-+      <frequencies state='on'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-reenlightenment-notifications.patch b/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-reenlightenment-notifications.patch
deleted file mode 100644
index 3369c8a..0000000
--- a/SOURCES/libvirt-conf-qemu-add-support-for-Hyper-V-reenlightenment-notifications.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From 7b4320c2371e10cf717c7bc28f83485cf176e03d Mon Sep 17 00:00:00 2001
-Message-Id: <7b4320c2371e10cf717c7bc28f83485cf176e03d@dist-git>
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Thu, 9 Aug 2018 15:14:20 +0200
-Subject: [PATCH] conf: qemu: add support for Hyper-V reenlightenment
- notifications
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Qemu-3.0 supports so-called 'Reenlightenment' notifications and this (in
-conjunction with 'hv-frequencies') can be used make Hyper-V on KVM pass
-stable TSC page clocksource to L2 guests.
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit b5d770e155cbb7eec036b3d33ee0d81863ffc9a1)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1589702
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in               | 7 +++++++
- docs/schemas/domaincommon.rng           | 5 +++++
- src/conf/domain_conf.c                  | 6 +++++-
- src/conf/domain_conf.h                  | 1 +
- src/cpu/cpu_x86.c                       | 3 +++
- src/cpu/cpu_x86_data.h                  | 1 +
- src/qemu/qemu_command.c                 | 1 +
- src/qemu/qemu_parse_command.c           | 1 +
- src/qemu/qemu_process.c                 | 1 +
- tests/qemuxml2argvdata/hyperv-off.xml   | 1 +
- tests/qemuxml2argvdata/hyperv.args      | 3 ++-
- tests/qemuxml2argvdata/hyperv.xml       | 1 +
- tests/qemuxml2xmloutdata/hyperv-off.xml | 1 +
- tests/qemuxml2xmloutdata/hyperv.xml     | 1 +
- 14 files changed, 31 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 3b493a98ac..43a1067501 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -1916,6 +1916,7 @@
-     &lt;reset state='on'/&gt;
-     &lt;vendor_id state='on' value='KVM Hv'/&gt;
-     &lt;frequencies state='on'/&gt;
-+    &lt;reenlightenment state='on'/&gt;
-   &lt;/hyperv&gt;
-   &lt;kvm&gt;
-     &lt;hidden state='on'/&gt;
-@@ -2044,6 +2045,12 @@
-           <td> on, off</td>
-           <td><span class="since">4.7.0 (QEMU 2.12)</span></td>
-         </tr>
-+        <tr>
-+          <td>reenlightenment</td>
-+          <td>Enable re-enlightenment notification on migration</td>
-+          <td> on, off</td>
-+          <td><span class="since">4.7.0 (QEMU 3.0)</span></td>
-+        </tr>
-       </table>
-       </dd>
-       <dt><code>pvspinlock</code></dt>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index f156a6b7c4..ceee7a8efe 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -5718,6 +5718,11 @@
-             <ref name="featurestate"/>
-           </element>
-         </optional>
-+        <optional>
-+          <element name="reenlightenment">
-+            <ref name="featurestate"/>
-+          </element>
-+        </optional>
-       </interleave>
-     </element>
-   </define>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 150dd8acc8..18b4d03a61 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -170,7 +170,8 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
-               "stimer",
-               "reset",
-               "vendor_id",
--              "frequencies")
-+              "frequencies",
-+              "reenlightenment")
- 
- VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
-               "hidden")
-@@ -20053,6 +20054,7 @@ virDomainDefParseXML(xmlDocPtr xml,
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-+            case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-                 break;
- 
-             case VIR_DOMAIN_HYPERV_SPINLOCKS:
-@@ -22245,6 +22247,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-+            case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-                 if (src->hyperv_features[i] != dst->hyperv_features[i]) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("State of HyperV enlightenment "
-@@ -27894,6 +27897,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
-                     case VIR_DOMAIN_HYPERV_STIMER:
-                     case VIR_DOMAIN_HYPERV_RESET:
-                     case VIR_DOMAIN_HYPERV_FREQUENCIES:
-+                    case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-                         break;
- 
-                     case VIR_DOMAIN_HYPERV_SPINLOCKS:
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 97d38ff7b9..e450923019 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1792,6 +1792,7 @@ typedef enum {
-     VIR_DOMAIN_HYPERV_RESET,
-     VIR_DOMAIN_HYPERV_VENDOR_ID,
-     VIR_DOMAIN_HYPERV_FREQUENCIES,
-+    VIR_DOMAIN_HYPERV_REENLIGHTENMENT,
- 
-     VIR_DOMAIN_HYPERV_LAST
- } virDomainHyperv;
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index a2fbfb577d..7a48b78eb9 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -111,6 +111,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RESET,
-                 0x40000003, 0x00000080);
- KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_FREQUENCIES,
-                 0x40000003, 0x00000800);
-+KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT,
-+                0x40000003, 0x00002000);
- 
- static virCPUx86Feature x86_kvm_features[] =
- {
-@@ -132,6 +134,7 @@ static virCPUx86Feature x86_kvm_features[] =
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_VPINDEX),
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET),
-     KVM_FEATURE(VIR_CPU_x86_KVM_HV_FREQUENCIES),
-+    KVM_FEATURE(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT),
- };
- 
- typedef struct _virCPUx86Model virCPUx86Model;
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index c01eb41be5..a810c64fc9 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -64,6 +64,7 @@ struct _virCPUx86CPUID {
- # define VIR_CPU_x86_KVM_HV_VPINDEX   "__kvm_hv_vpindex"
- # define VIR_CPU_x86_KVM_HV_RESET     "__kvm_hv_reset"
- # define VIR_CPU_x86_KVM_HV_FREQUENCIES "__kvm_hv_frequencies"
-+# define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "__kvm_hv_reenlightenment"
- 
- 
- # define VIR_CPU_X86_DATA_INIT { 0 }
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 82c349819e..48f3b09ec9 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6920,6 +6920,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-+            case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
-                     virBufferAsprintf(&buf, ",hv_%s",
-                                       virDomainHypervTypeToString(i));
-diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
-index ffea9a26bd..1e67a5a8c8 100644
---- a/src/qemu/qemu_parse_command.c
-+++ b/src/qemu/qemu_parse_command.c
-@@ -1537,6 +1537,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
-             case VIR_DOMAIN_HYPERV_STIMER:
-             case VIR_DOMAIN_HYPERV_RESET:
-             case VIR_DOMAIN_HYPERV_FREQUENCIES:
-+            case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-                 if (value) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("HyperV feature '%s' should not "
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index dd92a6c179..990d4d3046 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3924,6 +3924,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
-         case VIR_DOMAIN_HYPERV_STIMER:
-         case VIR_DOMAIN_HYPERV_RESET:
-         case VIR_DOMAIN_HYPERV_FREQUENCIES:
-+        case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("host doesn't support hyperv '%s' feature"),
-                            virDomainHypervTypeToString(i));
-diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml
-index d3a8455ac3..b2e3612df9 100644
---- a/tests/qemuxml2argvdata/hyperv-off.xml
-+++ b/tests/qemuxml2argvdata/hyperv-off.xml
-@@ -21,6 +21,7 @@
-       <reset state='off'/>
-       <vendor_id state='off'/>
-       <frequencies state='off'/>
-+      <reenlightenment state='off'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
-index 53026bb2d5..4feafad8e2 100644
---- a/tests/qemuxml2argvdata/hyperv.args
-+++ b/tests/qemuxml2argvdata/hyperv.args
-@@ -9,7 +9,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
- -cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
--hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies' \
-+hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies,\
-+hv_reenlightenment' \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml
-index 27372d1636..20fcdba59e 100644
---- a/tests/qemuxml2argvdata/hyperv.xml
-+++ b/tests/qemuxml2argvdata/hyperv.xml
-@@ -21,6 +21,7 @@
-       <reset state='on'/>
-       <vendor_id state='on' value='KVM Hv'/>
-       <frequencies state='on'/>
-+      <reenlightenment state='on'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
-index 3ba0b827c3..4a41e0c37e 100644
---- a/tests/qemuxml2xmloutdata/hyperv-off.xml
-+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
-@@ -21,6 +21,7 @@
-       <reset state='off'/>
-       <vendor_id state='off'/>
-       <frequencies state='off'/>
-+      <reenlightenment state='off'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
-index 1e47a946d6..183b45980b 100644
---- a/tests/qemuxml2xmloutdata/hyperv.xml
-+++ b/tests/qemuxml2xmloutdata/hyperv.xml
-@@ -21,6 +21,7 @@
-       <reset state='on'/>
-       <vendor_id state='on' value='KVM Hv'/>
-       <frequencies state='on'/>
-+      <reenlightenment state='on'/>
-     </hyperv>
-   </features>
-   <clock offset='utc'/>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-conf-qemu-add-virtiofs-fsdriver-type.patch b/SOURCES/libvirt-conf-qemu-add-virtiofs-fsdriver-type.patch
new file mode 100644
index 0000000..edad185
--- /dev/null
+++ b/SOURCES/libvirt-conf-qemu-add-virtiofs-fsdriver-type.patch
@@ -0,0 +1,327 @@
+From 2fce649fb569ab21c224f387456c996428f8a251 Mon Sep 17 00:00:00 2001
+Message-Id: <2fce649fb569ab21c224f387456c996428f8a251@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:41 +0100
+Subject: [PATCH] conf: qemu: add virtiofs fsdriver type
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce a new 'virtiofs' driver type for filesystem.
+
+<filesystem type='mount' accessmode='passthrough'>
+  <driver type='virtiofs'/>
+  <source dir='/path'/>
+  <target dir='mount_tag'>
+  <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+</filesystem>
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit ecc6ad6b90ad674a903c95d2a637f8b1b5833be2)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <abe26807f06ed14b2be3cbd098461afc307e88e3.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/formatdomain.html.in                     | 12 ++-
+ docs/schemas/domaincommon.rng                 |  6 ++
+ src/conf/domain_conf.c                        |  1 +
+ src/conf/domain_conf.h                        |  1 +
+ src/qemu/qemu_command.c                       |  4 +
+ src/qemu/qemu_domain.c                        |  4 +
+ src/qemu/qemu_domain_address.c                |  4 +
+ .../vhost-user-fs-fd-memory.xml               | 39 ++++++++++
+ .../vhost-user-fs-hugepages.xml               | 74 +++++++++++++++++++
+ .../vhost-user-fs-fd-memory.x86_64-latest.xml |  1 +
+ .../vhost-user-fs-hugepages.x86_64-latest.xml |  1 +
+ tests/qemuxml2xmltest.c                       |  3 +
+ 12 files changed, 149 insertions(+), 1 deletion(-)
+ create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+ create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+ create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml
+ create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 50914a5207..337ab01316 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -3935,6 +3935,11 @@
+     &lt;target dir='/import/from/host'/&gt;
+     &lt;readonly/&gt;
+   &lt;/filesystem&gt;
++  &lt;filesystem type='mount' accessmode='passthrough'&gt;
++      &lt;driver type='virtiofs'/&gt;
++      &lt;source dir='/path'/&gt;
++      &lt;target dir='mount_tag'/&gt;
++  &lt;/filesystem&gt;
+   ...
+ &lt;/devices&gt;
+ ...</pre>
+@@ -3963,6 +3968,9 @@
+         while the value <code>immediate</code> means that a host writeback
+         is immediately triggered for all pages touched during a guest file
+         write operation <span class="since">(since 0.9.10)</span>.
++        <span class="since">Since 6.2.0</span>, <code>type='virtiofs'</code>
++        is also supported. Using virtiofs requires setting up shared memory,
++        see the guide: <a href="kbase/virtiofs.html">Virtio-FS</a>
+         </dd>
+         <dt><code>template</code></dt>
+         <dd>
+@@ -3998,7 +4006,9 @@
+       The filesystem element has an optional attribute <code>accessmode</code>
+       which specifies the security mode for accessing the source
+       <span class="since">(since 0.8.5)</span>. Currently this only works
+-      with <code>type='mount'</code> for the QEMU/KVM driver. The possible
++      with <code>type='mount'</code> for the QEMU/KVM driver.
++      For driver type <code>virtiofs</code>, only <code>passthrough</code> is
++      supported. For other driver types, the possible
+       values are:
+ 
+         <dl>
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index bfd8786ea8..5a9291b443 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -2645,6 +2645,12 @@
+           </optional>
+           <ref name='virtioOptions'/>
+         </group>
++        <group>
++          <attribute name="type">
++            <value>virtiofs</value>
++          </attribute>
++          <ref name='virtioOptions'/>
++        </group>
+         <empty/>
+       </choice>
+     </element>
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 990c5bcc1e..31d4828802 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -476,6 +476,7 @@ VIR_ENUM_IMPL(virDomainFSDriver,
+               "loop",
+               "nbd",
+               "ploop",
++              "virtiofs",
+ );
+ 
+ VIR_ENUM_IMPL(virDomainFSAccessMode,
+diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
+index ef2c1b80f7..921cc42a57 100644
+--- a/src/conf/domain_conf.h
++++ b/src/conf/domain_conf.h
+@@ -771,6 +771,7 @@ typedef enum {
+     VIR_DOMAIN_FS_DRIVER_TYPE_LOOP,
+     VIR_DOMAIN_FS_DRIVER_TYPE_NBD,
+     VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP,
++    VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS,
+ 
+     VIR_DOMAIN_FS_DRIVER_TYPE_LAST
+ } virDomainFSDriverType;
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 252809a8d7..7fdf58f067 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -2695,6 +2695,10 @@ qemuBuildFilesystemCommandLine(virCommandPtr cmd,
+                 return -1;
+             break;
+ 
++        case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS:
++            /* TODO: vhost-user-fs-pci */
++            break;
++
+         case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP:
+         case VIR_DOMAIN_FS_DRIVER_TYPE_NBD:
+         case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP:
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index ed35260712..402b079b09 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -8361,6 +8361,10 @@ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs,
+                        _("Filesystem driver type not supported"));
+         return -1;
+ 
++    case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS:
++        /* TODO: vhost-user-fs-pci */
++        return 0;
++
+     case VIR_DOMAIN_FS_DRIVER_TYPE_LAST:
+     default:
+         virReportEnumRangeError(virDomainFSDriverType, fs->fsdriver);
+diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
+index 9e3bcc434d..3c6ac62ff5 100644
+--- a/src/qemu/qemu_domain_address.c
++++ b/src/qemu/qemu_domain_address.c
+@@ -690,6 +690,10 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
+             }
+             break;
+ 
++        case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS:
++            /* vhost-user-fs-pci */
++            return virtioFlags;
++
+         case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP:
+         case VIR_DOMAIN_FS_DRIVER_TYPE_NBD:
+         case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP:
+diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+new file mode 100644
+index 0000000000..a6b6279fb8
+--- /dev/null
++++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+@@ -0,0 +1,39 @@
++<domain type='kvm'>
++  <name>guest</name>
++  <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid>
++  <memory unit='KiB'>14680064</memory>
++  <currentMemory unit='KiB'>14680064</currentMemory>
++  <memoryBacking>
++    <source type='file'/>
++    <access mode='shared'/>
++  </memoryBacking>
++  <vcpu placement='static'>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>
++    <numa>
++      <cell id='0' cpus='0-1' memory='14680064' unit='KiB' memAccess='shared'/>
++    </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-x86_64</emulator>
++    <controller type='usb' index='0' model='none'/>
++    <controller type='pci' index='0' model='pci-root'/>
++    <filesystem type='mount' accessmode='passthrough'>
++      <driver type='virtiofs'/>
++      <source dir='/path'/>
++      <target dir='mount_tag'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
++    </filesystem>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+new file mode 100644
+index 0000000000..70df7b890d
+--- /dev/null
++++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+@@ -0,0 +1,74 @@
++<domain type='qemu'>
++  <name>guest</name>
++  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
++  <memory unit='KiB'>4194304</memory>
++  <currentMemory unit='KiB'>4194304</currentMemory>
++  <memoryBacking>
++    <hugepages>
++      <page size='2048' unit='KiB'/>
++    </hugepages>
++    <access mode='shared'/>
++  </memoryBacking>
++  <vcpu placement='static'>2</vcpu>
++  <os>
++    <type arch='x86_64' machine='q35'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <features>
++    <acpi/>
++    <apic/>
++  </features>
++  <cpu mode='custom' match='exact' check='none'>
++    <model fallback='forbid'>qemu64</model>
++    <numa>
++      <cell id='0' cpus='0-1' memory='2097152' unit='KiB' memAccess='shared'/>
++    </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-x86_64</emulator>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2'/>
++      <source file='/var/lib/libvirt/images/guest.qcow2'/>
++      <target dev='vda' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
++    </disk>
++    <controller type='usb' index='0' model='none'/>
++    <controller type='sata' index='0'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
++    </controller>
++    <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>
++    <controller type='pci' index='4' model='pcie-root-port'>
++      <model name='pcie-root-port'/>
++      <target chassis='4' port='0xb'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
++    </controller>
++    <filesystem type='mount' accessmode='passthrough'>
++      <driver type='virtiofs'/>
++      <source dir='/path'/>
++      <target dir='mount_tag'/>
++      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
++    </filesystem>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml
+new file mode 120000
+index 0000000000..fbc552ef94
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml
+@@ -0,0 +1 @@
++../qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+\ No newline at end of file
+diff --git a/tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml b/tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml
+new file mode 120000
+index 0000000000..0c0f05b254
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml
+@@ -0,0 +1 @@
++../qemuxml2argvdata/vhost-user-fs-hugepages.xml
+\ No newline at end of file
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index d58259587b..f77f59fa3c 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -1428,6 +1428,9 @@ mymain(void)
+     DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK,
+             QEMU_CAPS_CCW);
+ 
++    DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory");
++    DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
++
+     DO_TEST("riscv64-virt",
+             QEMU_CAPS_DEVICE_VIRTIO_MMIO);
+     DO_TEST("riscv64-virt-pci",
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-conf-qemu-s-VIR_PCI_CONNECT_HOTPLUGGABLE-VIR_PCI_CONNECT_AUTOASSIGN-g.patch b/SOURCES/libvirt-conf-qemu-s-VIR_PCI_CONNECT_HOTPLUGGABLE-VIR_PCI_CONNECT_AUTOASSIGN-g.patch
new file mode 100644
index 0000000..b6c0102
--- /dev/null
+++ b/SOURCES/libvirt-conf-qemu-s-VIR_PCI_CONNECT_HOTPLUGGABLE-VIR_PCI_CONNECT_AUTOASSIGN-g.patch
@@ -0,0 +1,161 @@
+From 4f2bf4edfb640c38281d63e54145433ce8a78d28 Mon Sep 17 00:00:00 2001
+Message-Id: <4f2bf4edfb640c38281d63e54145433ce8a78d28@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:11 -0400
+Subject: [PATCH] conf/qemu:
+ s/VIR_PCI_CONNECT_HOTPLUGGABLE/VIR_PCI_CONNECT_AUTOASSIGN/g
+
+When the HOTPLUGGABLE flag was originally added, it was set for all
+the PCI controllers that accepted hotplugged devices, and requested
+for all devices that were auto-assigned to a controller. While we're
+still autoassigning to the same list of controllers, those controllers
+may or may not support hotplug, so let's use the flag that fits what
+we're actually doing.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7c98f5e3652e19e4eb015d290c1eed2f1b58ee72)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-9-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_addr.c         | 18 +++++++++---------
+ src/qemu/qemu_domain_address.c | 14 +++++++-------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index e0be655772..53be6cd34b 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -362,8 +362,8 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr,
+          * libvirt's assumptions about whether or not hotplug
+          * capability will be required.
+          */
+-        if (devFlags & VIR_PCI_CONNECT_HOTPLUGGABLE)
+-            busFlags |= VIR_PCI_CONNECT_HOTPLUGGABLE;
++        if (devFlags & VIR_PCI_CONNECT_AUTOASSIGN)
++            busFlags |= VIR_PCI_CONNECT_AUTOASSIGN;
+         /* if the device is a pci-bridge, allow manually
+          * assigning to any bus that would also accept a
+          * standard PCI device.
+@@ -419,8 +419,8 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr,
+                        addrStr, addr->bus, connectStr);
+         return false;
+     }
+-    if ((devFlags & VIR_PCI_CONNECT_HOTPLUGGABLE) &&
+-        !(busFlags & VIR_PCI_CONNECT_HOTPLUGGABLE)) {
++    if ((devFlags & VIR_PCI_CONNECT_AUTOASSIGN) &&
++        !(busFlags & VIR_PCI_CONNECT_AUTOASSIGN)) {
+         if (reportError) {
+             virReportError(errType,
+                            _("The device at PCI address %s requires "
+@@ -509,7 +509,7 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+      */
+     switch (model) {
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
+-        bus->flags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++        bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCI_BRIDGE |
+                       VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS);
+@@ -517,14 +517,14 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+         bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
+         break;
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
+-        bus->flags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++        bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCI_BRIDGE);
+         bus->minSlot = 1;
+         bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
+         break;
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS:
+-        bus->flags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++        bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCI_BRIDGE);
+         bus->minSlot = 0;
+@@ -555,7 +555,7 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE:
+         /* Same as pci-bridge: 32 hotpluggable traditional PCI slots (0-31),
+          * the first of which is not usable because of the SHPC */
+-        bus->flags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++        bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCI_BRIDGE);
+         bus->minSlot = 1;
+@@ -566,7 +566,7 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+         /* provides one slot which is pcie, can be used by endpoint
+          * devices, pcie-switch-upstream-ports or pcie-to-pci-bridges,
+          * and is hotpluggable */
+-        bus->flags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++        bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCIE_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT |
+                       VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE);
+diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
+index 3c6ac62ff5..e81585bc6c 100644
+--- a/src/qemu/qemu_domain_address.c
++++ b/src/qemu/qemu_domain_address.c
+@@ -571,7 +571,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
+                                          virDomainPCIConnectFlags virtioFlags)
+ {
+     virDomainPCIConnectFlags pciFlags = (VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+-                                         VIR_PCI_CONNECT_HOTPLUGGABLE);
++                                         VIR_PCI_CONNECT_AUTOASSIGN);
+ 
+     switch ((virDomainDeviceType)dev->type) {
+     case VIR_DOMAIN_DEVICE_CONTROLLER: {
+@@ -1063,17 +1063,17 @@ qemuDomainFillDevicePCIConnectFlagsIterInit(virDomainDefPtr def,
+ 
+     if (qemuDomainHasPCIeRoot(def)) {
+         data->pcieFlags = (VIR_PCI_CONNECT_TYPE_PCIE_DEVICE |
+-                           VIR_PCI_CONNECT_HOTPLUGGABLE);
++                           VIR_PCI_CONNECT_AUTOASSIGN);
+     } else {
+         data->pcieFlags = (VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+-                           VIR_PCI_CONNECT_HOTPLUGGABLE);
++                           VIR_PCI_CONNECT_AUTOASSIGN);
+     }
+ 
+     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY)) {
+         data->virtioFlags = data->pcieFlags;
+     } else {
+         data->virtioFlags = (VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+-                             VIR_PCI_CONNECT_HOTPLUGGABLE);
++                             VIR_PCI_CONNECT_AUTOASSIGN);
+     }
+ }
+ 
+@@ -1729,7 +1729,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
+     virPCIDeviceAddress tmp_addr;
+     bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+     g_autofree char *addrStr = NULL;
+-    virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_HOTPLUGGABLE
++    virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_AUTOASSIGN
+                                       | VIR_PCI_CONNECT_TYPE_PCI_DEVICE);
+ 
+     /* Verify that first IDE and USB controllers (if any) is on the PIIX3, fn 1 */
+@@ -2666,7 +2666,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
+              * domain.
+              */
+             virDomainDeviceInfo info = {
+-                .pciConnectFlags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++                .pciConnectFlags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                                     VIR_PCI_CONNECT_TYPE_PCI_DEVICE),
+                 .pciAddrExtFlags = VIR_PCI_ADDRESS_EXTENSION_NONE
+             };
+@@ -2707,7 +2707,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
+             addrs->nbuses > max_idx + 1 &&
+             qemuDomainHasPCIeRoot(def)) {
+             virDomainDeviceInfo info = {
+-                .pciConnectFlags = (VIR_PCI_CONNECT_HOTPLUGGABLE |
++                .pciConnectFlags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                                     VIR_PCI_CONNECT_TYPE_PCIE_DEVICE),
+                 .pciAddrExtFlags = VIR_PCI_ADDRESS_EXTENSION_NONE
+             };
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-conf-remove-unused-virCapabilitiesSetHostCPU-method.patch b/SOURCES/libvirt-conf-remove-unused-virCapabilitiesSetHostCPU-method.patch
new file mode 100644
index 0000000..c2f8d2f
--- /dev/null
+++ b/SOURCES/libvirt-conf-remove-unused-virCapabilitiesSetHostCPU-method.patch
@@ -0,0 +1,88 @@
+From 6ece5388a7fb7fc3c703cd1bc9e214ad411451d8 Mon Sep 17 00:00:00 2001
+Message-Id: <6ece5388a7fb7fc3c703cd1bc9e214ad411451d8@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 3 Feb 2020 18:07:23 +0000
+Subject: [PATCH] conf: remove unused virCapabilitiesSetHostCPU method
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 2ce9474c2a6ba3df4977068dcee35d3fa5468749)
+
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785207
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785211
+Message-Id: <20200203180726.2203691-3-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/conf/capabilities.c  | 21 ---------------------
+ src/conf/capabilities.h  |  6 ------
+ src/libvirt_private.syms |  1 -
+ 3 files changed, 28 deletions(-)
+
+diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
+index 9a39858280..bf1d9936ed 100644
+--- a/src/conf/capabilities.c
++++ b/src/conf/capabilities.c
+@@ -368,27 +368,6 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMAPtr caps,
+     g_ptr_array_add(caps->cells, cell);
+ }
+ 
+-
+-/**
+- * virCapabilitiesSetHostCPU:
+- * @caps: capabilities to extend
+- * @cpu: CPU definition
+- *
+- * Sets host CPU specification
+- */
+-int
+-virCapabilitiesSetHostCPU(virCapsPtr caps,
+-                          virCPUDefPtr cpu)
+-{
+-    if (cpu == NULL)
+-        return -1;
+-
+-    caps->host.cpu = cpu;
+-
+-    return 0;
+-}
+-
+-
+ /**
+  * virCapabilitiesAllocMachines:
+  * @machines: machine variants for emulator ('pc', or 'isapc', etc)
+diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
+index f604e7b95e..4a49e94aa5 100644
+--- a/src/conf/capabilities.h
++++ b/src/conf/capabilities.h
+@@ -258,12 +258,6 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMAPtr caps,
+                                int npageinfo,
+                                virCapsHostNUMACellPageInfoPtr pageinfo);
+ 
+-
+-int
+-virCapabilitiesSetHostCPU(virCapsPtr caps,
+-                          virCPUDefPtr cpu);
+-
+-
+ virCapsGuestMachinePtr *
+ virCapabilitiesAllocMachines(const char *const *names,
+                              int nnames);
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index b97906b852..afa7d4fcae 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -77,7 +77,6 @@ virCapabilitiesHostSecModelAddBaseLabel;
+ virCapabilitiesInitCaches;
+ virCapabilitiesInitPages;
+ virCapabilitiesNew;
+-virCapabilitiesSetHostCPU;
+ virCapabilitiesSetNetPrefix;
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-conf-rename-namespace-property-of-struct-_virStorageSourceNVMeDef.patch b/SOURCES/libvirt-conf-rename-namespace-property-of-struct-_virStorageSourceNVMeDef.patch
new file mode 100644
index 0000000..dce9fb3
--- /dev/null
+++ b/SOURCES/libvirt-conf-rename-namespace-property-of-struct-_virStorageSourceNVMeDef.patch
@@ -0,0 +1,144 @@
+From 9b070e02e7b5bb95728a1fcdc8b7dfaaacc5f30a Mon Sep 17 00:00:00 2001
+Message-Id: <9b070e02e7b5bb95728a1fcdc8b7dfaaacc5f30a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:25:55 +0100
+Subject: [PATCH] conf: rename 'namespace' property of struct
+ _virStorageSourceNVMeDef
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+While 'namespace' is not a reserved word in C, it is in C++. Our
+compilers are happy with it but syntax-hilighting in some editors
+hilights is as a keyword. Rename it to prevent confusion.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 5793b8baa75747860f6ba97470969047e60c8579)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <bfe6cf10a95868ae56a91f362a1ea50667754027.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c    | 12 ++++++------
+ src/qemu/qemu_block.c     |  2 +-
+ src/util/virhostdev.c     |  2 +-
+ src/util/virstoragefile.c |  4 ++--
+ src/util/virstoragefile.h |  2 +-
+ 5 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 8aec85e83c..1e8518139c 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -6054,7 +6054,7 @@ virDomainDiskDefValidate(const virDomainDef *def,
+ 
+     if (disk->src->type == VIR_STORAGE_TYPE_NVME) {
+         /* NVMe namespaces start from 1 */
+-        if (disk->src->nvme->namespace == 0) {
++        if (disk->src->nvme->namespc == 0) {
+             virReportError(VIR_ERR_XML_ERROR, "%s",
+                            _("NVMe namespace can't be zero"));
+             return -1;
+@@ -9433,7 +9433,7 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node,
+ {
+     g_autoptr(virStorageSourceNVMeDef) nvme = NULL;
+     g_autofree char *type = NULL;
+-    g_autofree char *namespace = NULL;
++    g_autofree char *namespc = NULL;
+     g_autofree char *managed = NULL;
+     xmlNodePtr address;
+ 
+@@ -9452,16 +9452,16 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node,
+         return -1;
+     }
+ 
+-    if (!(namespace = virXMLPropString(node, "namespace"))) {
++    if (!(namespc = virXMLPropString(node, "namespace"))) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+                        _("missing 'namespace' attribute to disk source"));
+         return -1;
+     }
+ 
+-    if (virStrToLong_ull(namespace, NULL, 10, &nvme->namespace) < 0) {
++    if (virStrToLong_ull(namespc, NULL, 10, &nvme->namespc) < 0) {
+         virReportError(VIR_ERR_XML_ERROR,
+                        _("malformed namespace '%s'"),
+-                       namespace);
++                       namespc);
+         return -1;
+     }
+ 
+@@ -24444,7 +24444,7 @@ virDomainDiskSourceNVMeFormat(virBufferPtr attrBuf,
+     virBufferAddLit(attrBuf, " type='pci'");
+     virBufferAsprintf(attrBuf, " managed='%s'",
+                       virTristateBoolTypeToString(nvme->managed));
+-    virBufferAsprintf(attrBuf, " namespace='%llu'", nvme->namespace);
++    virBufferAsprintf(attrBuf, " namespace='%llu'", nvme->namespc);
+     virPCIDeviceAddressFormat(childBuf, nvme->pciAddr, false);
+ }
+ 
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 73cb5ba4bc..5697d4fc73 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1008,7 +1008,7 @@ qemuBlockStorageSourceGetNVMeProps(virStorageSourcePtr src)
+     ignore_value(virJSONValueObjectCreate(&ret,
+                                           "s:driver", "nvme",
+                                           "s:device", pciAddr,
+-                                          "U:namespace", nvme->namespace,
++                                          "U:namespace", nvme->namespc,
+                                           NULL));
+     return ret;
+ }
+diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
+index 9b4ea30216..9596482146 100644
+--- a/src/util/virhostdev.c
++++ b/src/util/virhostdev.c
+@@ -2256,7 +2256,7 @@ virHostdevGetNVMeDeviceList(virNVMeDeviceListPtr nvmeDevices,
+             continue;
+ 
+         if (!(dev = virNVMeDeviceNew(&srcNVMe->pciAddr,
+-                                     srcNVMe->namespace,
++                                     srcNVMe->namespc,
+                                      srcNVMe->managed)))
+             return -1;
+ 
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index fa37840532..2e54620139 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2052,7 +2052,7 @@ virStorageSourceNVMeDefCopy(const virStorageSourceNVMeDef *src)
+ 
+     ret = g_new0(virStorageSourceNVMeDef, 1);
+ 
+-    ret->namespace = src->namespace;
++    ret->namespc = src->namespc;
+     ret->managed = src->managed;
+     virPCIDeviceAddressCopy(&ret->pciAddr, &src->pciAddr);
+     return ret;
+@@ -2069,7 +2069,7 @@ virStorageSourceNVMeDefIsEqual(const virStorageSourceNVMeDef *a,
+     if (!a || !b)
+         return false;
+ 
+-    if (a->namespace != b->namespace ||
++    if (a->namespc != b->namespc ||
+         a->managed != b->managed ||
+         !virPCIDeviceAddressEqual(&a->pciAddr, &b->pciAddr))
+         return false;
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index c1430cadd1..0230f44652 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -246,7 +246,7 @@ struct _virStorageSourceInitiatorDef {
+ typedef struct _virStorageSourceNVMeDef virStorageSourceNVMeDef;
+ typedef virStorageSourceNVMeDef *virStorageSourceNVMeDefPtr;
+ struct _virStorageSourceNVMeDef {
+-    unsigned long long namespace;
++    unsigned long long namespc;
+     int managed; /* enum virTristateBool */
+     virPCIDeviceAddress pciAddr;
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-conf-simplify-logic-when-checking-for-AUTOASSIGN-PCI-addresses.patch b/SOURCES/libvirt-conf-simplify-logic-when-checking-for-AUTOASSIGN-PCI-addresses.patch
new file mode 100644
index 0000000..cedc221
--- /dev/null
+++ b/SOURCES/libvirt-conf-simplify-logic-when-checking-for-AUTOASSIGN-PCI-addresses.patch
@@ -0,0 +1,83 @@
+From f52197675b2babfafb1b89058e3fd01decebd8ab Mon Sep 17 00:00:00 2001
+Message-Id: <f52197675b2babfafb1b89058e3fd01decebd8ab@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:12 -0400
+Subject: [PATCH] conf: simplify logic when checking for AUTOASSIGN PCI
+ addresses
+
+Old behavior: If the address was manually provided by config, copy
+device AUTOASSIGN flag into the bus flag, and then later on in the
+function *always* check for a match of the flags (which will always
+match if the address came from config, since we just copied it).
+
+New behavior: Don't mess with the bus flags - just directly check if
+the AUTOASSIGN flag matches in bus and dev, but only make the check if
+the address didn't come from config (i.e. it was auto-assigned by
+libvirt).
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit fcdf87d3ef14de9dfb0acaf4b4445e1580dfc629)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-10-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_addr.c | 27 ++++++++++-----------------
+ 1 file changed, 10 insertions(+), 17 deletions(-)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index 53be6cd34b..05f036e3e6 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -358,18 +358,22 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr,
+          */
+         if (busFlags & VIR_PCI_CONNECT_TYPES_ENDPOINT)
+             busFlags |= VIR_PCI_CONNECT_TYPES_ENDPOINT;
+-        /* Also allow manual specification of bus to override
+-         * libvirt's assumptions about whether or not hotplug
+-         * capability will be required.
+-         */
+-        if (devFlags & VIR_PCI_CONNECT_AUTOASSIGN)
+-            busFlags |= VIR_PCI_CONNECT_AUTOASSIGN;
+         /* if the device is a pci-bridge, allow manually
+          * assigning to any bus that would also accept a
+          * standard PCI device.
+          */
+         if (devFlags & VIR_PCI_CONNECT_TYPE_PCI_BRIDGE)
+             devFlags |= VIR_PCI_CONNECT_TYPE_PCI_DEVICE;
++    } else if ((devFlags & VIR_PCI_CONNECT_AUTOASSIGN) &&
++               !(busFlags & VIR_PCI_CONNECT_AUTOASSIGN)) {
++        if (reportError) {
++            virReportError(errType,
++                           _("The device at PCI address %s was auto-assigned "
++                             "this address, but the PCI controller "
++                             "with index='%d' doesn't allow auto-assignment"),
++                           addrStr, addr->bus);
++        }
++        return false;
+     }
+ 
+     /* If this bus doesn't allow the type of connection (PCI
+@@ -419,17 +423,6 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr,
+                        addrStr, addr->bus, connectStr);
+         return false;
+     }
+-    if ((devFlags & VIR_PCI_CONNECT_AUTOASSIGN) &&
+-        !(busFlags & VIR_PCI_CONNECT_AUTOASSIGN)) {
+-        if (reportError) {
+-            virReportError(errType,
+-                           _("The device at PCI address %s requires "
+-                             "hotplug capability, but the PCI controller "
+-                             "with index='%d' doesn't support hotplug"),
+-                           addrStr, addr->bus);
+-        }
+-        return false;
+-    }
+     return true;
+ }
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainDeviceInfoFormat.patch b/SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainDeviceInfoFormat.patch
deleted file mode 100644
index 1747e21..0000000
--- a/SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainDeviceInfoFormat.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 2566a32fae64fa5cc8a3d3c30778d0ea7d8c4faa Mon Sep 17 00:00:00 2001
-Message-Id: <2566a32fae64fa5cc8a3d3c30778d0ea7d8c4faa@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:24 +0200
-Subject: [PATCH] conf: use virXMLFormatElement() in
- virDomainDeviceInfoFormat()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to add zPCI child element for PCI address, we update
-virDomainDeviceInfoFormat() to format device info by helper function
-virXMLFormatElement(). Then we could simply format zPCI address into
-child buffer later.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit 0d6b87335c00451b0923ecc91d617f71e4135bf8)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-8-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c | 40 ++++++++++++++++++++++------------------
- 1 file changed, 22 insertions(+), 18 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index e62f78471c..bcb0558bc3 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -6447,6 +6447,8 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-                           virDomainDeviceInfoPtr info,
-                           unsigned int flags)
- {
-+    virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
-+
-     if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) && info->bootIndex) {
-         virBufferAsprintf(buf, "<boot order='%u'", info->bootIndex);
- 
-@@ -6491,13 +6493,13 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-         info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)
-         return;
- 
--    virBufferAsprintf(buf, "<address type='%s'",
-+    virBufferAsprintf(&attrBuf, " type='%s'",
-                       virDomainDeviceAddressTypeToString(info->type));
- 
-     switch ((virDomainDeviceAddressType) info->type) {
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
-         if (!virPCIDeviceAddressIsEmpty(&info->addr.pci)) {
--            virBufferAsprintf(buf, " domain='0x%.4x' bus='0x%.2x' "
-+            virBufferAsprintf(&attrBuf, " domain='0x%.4x' bus='0x%.2x' "
-                               "slot='0x%.2x' function='0x%.1x'",
-                               info->addr.pci.domain,
-                               info->addr.pci.bus,
-@@ -6505,13 +6507,13 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-                               info->addr.pci.function);
-         }
-         if (info->addr.pci.multi) {
--           virBufferAsprintf(buf, " multifunction='%s'",
--                             virTristateSwitchTypeToString(info->addr.pci.multi));
-+            virBufferAsprintf(&attrBuf, " multifunction='%s'",
-+                              virTristateSwitchTypeToString(info->addr.pci.multi));
-         }
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE:
--        virBufferAsprintf(buf, " controller='%d' bus='%d' target='%d' unit='%d'",
-+        virBufferAsprintf(&attrBuf, " controller='%d' bus='%d' target='%d' unit='%d'",
-                           info->addr.drive.controller,
-                           info->addr.drive.bus,
-                           info->addr.drive.target,
-@@ -6519,34 +6521,34 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL:
--        virBufferAsprintf(buf, " controller='%d' bus='%d' port='%d'",
-+        virBufferAsprintf(&attrBuf, " controller='%d' bus='%d' port='%d'",
-                           info->addr.vioserial.controller,
-                           info->addr.vioserial.bus,
-                           info->addr.vioserial.port);
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID:
--        virBufferAsprintf(buf, " controller='%d' slot='%d'",
-+        virBufferAsprintf(&attrBuf, " controller='%d' slot='%d'",
-                           info->addr.ccid.controller,
-                           info->addr.ccid.slot);
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB:
--        virBufferAsprintf(buf, " bus='%d'", info->addr.usb.bus);
-+        virBufferAsprintf(&attrBuf, " bus='%d'", info->addr.usb.bus);
-         if (virDomainUSBAddressPortIsValid(info->addr.usb.port)) {
--            virBufferAddLit(buf, " port='");
--            virDomainUSBAddressPortFormatBuf(buf, info->addr.usb.port);
--            virBufferAddLit(buf, "'");
-+            virBufferAddLit(&attrBuf, " port='");
-+            virDomainUSBAddressPortFormatBuf(&attrBuf, info->addr.usb.port);
-+            virBufferAddLit(&attrBuf, "'");
-         }
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO:
-         if (info->addr.spaprvio.has_reg)
--            virBufferAsprintf(buf, " reg='0x%llx'", info->addr.spaprvio.reg);
-+            virBufferAsprintf(&attrBuf, " reg='0x%llx'", info->addr.spaprvio.reg);
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
--        virBufferAsprintf(buf, " cssid='0x%x' ssid='0x%x' devno='0x%04x'",
-+        virBufferAsprintf(&attrBuf, " cssid='0x%x' ssid='0x%x' devno='0x%04x'",
-                           info->addr.ccw.cssid,
-                           info->addr.ccw.ssid,
-                           info->addr.ccw.devno);
-@@ -6557,15 +6559,15 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA:
-         if (info->addr.isa.iobase > 0)
--            virBufferAsprintf(buf, " iobase='0x%x'", info->addr.isa.iobase);
-+            virBufferAsprintf(&attrBuf, " iobase='0x%x'", info->addr.isa.iobase);
-         if (info->addr.isa.irq > 0)
--            virBufferAsprintf(buf, " irq='0x%x'", info->addr.isa.irq);
-+            virBufferAsprintf(&attrBuf, " irq='0x%x'", info->addr.isa.irq);
-         break;
- 
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM:
--        virBufferAsprintf(buf, " slot='%u'", info->addr.dimm.slot);
-+        virBufferAsprintf(&attrBuf, " slot='%u'", info->addr.dimm.slot);
-         if (info->addr.dimm.base)
--            virBufferAsprintf(buf, " base='0x%llx'", info->addr.dimm.base);
-+            virBufferAsprintf(&attrBuf, " base='0x%llx'", info->addr.dimm.base);
- 
-         break;
- 
-@@ -6575,7 +6577,9 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
-         break;
-     }
- 
--    virBufferAddLit(buf, "/>\n");
-+    virXMLFormatElement(buf, "address", &attrBuf, NULL);
-+
-+    virBufferFreeAndReset(&attrBuf);
- }
- 
- static int
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainFSDefFormat.patch b/SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainFSDefFormat.patch
new file mode 100644
index 0000000..3e5d5df
--- /dev/null
+++ b/SOURCES/libvirt-conf-use-virXMLFormatElement-in-virDomainFSDefFormat.patch
@@ -0,0 +1,70 @@
+From d77f180068dab8747f5e2c098a9c59213ce19108 Mon Sep 17 00:00:00 2001
+Message-Id: <d77f180068dab8747f5e2c098a9c59213ce19108@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:29 +0100
+Subject: [PATCH] conf: use virXMLFormatElement in virDomainFSDefFormat
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the virXMLFormatElement helper to format the driver element
+to simplify adding further sub-elements.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 3efdbae5bf054d1a2bdc98fdccff0273abe54c88)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <966ad0eebcb1ae5f20f59fc6cc84008bbfa6426f.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_conf.c | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 8a5f14d6cb..88117187c8 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -24991,7 +24991,7 @@ virDomainFSDefFormat(virBufferPtr buf,
+     const char *fsdriver = virDomainFSDriverTypeToString(def->fsdriver);
+     const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy);
+     const char *src = def->src->path;
+-    g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER;
+ 
+     if (!type) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -25016,25 +25016,21 @@ virDomainFSDefFormat(virBufferPtr buf,
+ 
+     virBufferAdjustIndent(buf, 2);
+     if (def->fsdriver) {
+-        virBufferAsprintf(&driverBuf, " type='%s'", fsdriver);
++        virBufferAsprintf(&driverAttrBuf, " type='%s'", fsdriver);
+ 
+         if (def->format)
+-            virBufferAsprintf(&driverBuf, " format='%s'",
++            virBufferAsprintf(&driverAttrBuf, " format='%s'",
+                               virStorageFileFormatTypeToString(def->format));
+ 
+         /* Don't generate anything if wrpolicy is set to default */
+         if (def->wrpolicy)
+-            virBufferAsprintf(&driverBuf, " wrpolicy='%s'", wrpolicy);
++            virBufferAsprintf(&driverAttrBuf, " wrpolicy='%s'", wrpolicy);
+ 
+     }
+ 
+-    virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
++    virDomainVirtioOptionsFormat(&driverAttrBuf, def->virtio);
+ 
+-    if (virBufferUse(&driverBuf)) {
+-        virBufferAddLit(buf, "<driver");
+-        virBufferAddBuffer(buf, &driverBuf);
+-        virBufferAddLit(buf, "/>\n");
+-    }
++    virXMLFormatElement(buf, "driver", &driverAttrBuf, NULL);
+ 
+     switch (def->type) {
+     case VIR_DOMAIN_FS_TYPE_MOUNT:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-configure-change-HAVE_FIREWALLD-to-WITH_FIREWALLD.patch b/SOURCES/libvirt-configure-change-HAVE_FIREWALLD-to-WITH_FIREWALLD.patch
deleted file mode 100644
index c23f866..0000000
--- a/SOURCES/libvirt-configure-change-HAVE_FIREWALLD-to-WITH_FIREWALLD.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 5b3cf2163da13ac79129ca2bb85ae1908922644c Mon Sep 17 00:00:00 2001
-Message-Id: <5b3cf2163da13ac79129ca2bb85ae1908922644c@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Fri, 1 Feb 2019 20:29:27 -0500
-Subject: [PATCH] configure: change HAVE_FIREWALLD to WITH_FIREWALLD
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Support for firewalld is a feature that can be selectively enabled or
-disabled (using --with-firewalld/--without-firewalld), not merely
-something that must be accounted for in the code if it is present with
-no exceptions. It is more consistent with other usage in libvirt to
-use WITH_FIREWALLD rather than HAVE_FIREWALLD.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 4bf0f390ed57307050a213f3f6364061f2717b00)
-
-https://bugzilla.redhat.com/1650320
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- m4/virt-firewalld.m4           | 4 ++--
- src/network/bridge_driver.c    | 6 +++---
- src/nwfilter/nwfilter_driver.c | 6 +++---
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/m4/virt-firewalld.m4 b/m4/virt-firewalld.m4
-index 08d2ff83d6..89efa47589 100644
---- a/m4/virt-firewalld.m4
-+++ b/m4/virt-firewalld.m4
-@@ -32,10 +32,10 @@ AC_DEFUN([LIBVIRT_CHECK_FIREWALLD], [
-     if test "x$with_dbus" != "xyes" ; then
-       AC_MSG_ERROR([You must have dbus enabled for firewalld support])
-     fi
--    AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled])
-+    AC_DEFINE_UNQUOTED([WITH_FIREWALLD], [1], [whether firewalld support is enabled])
-   fi
- 
--  AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" != "xno"])
-+  AM_CONDITIONAL([WITH_FIREWALLD], [test "x$with_firewalld" != "xno"])
- ])
- 
- AC_DEFUN([LIBVIRT_RESULT_FIREWALLD], [
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index 1ad95d524c..d153a8cdb6 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -538,7 +538,7 @@ networkAutostartConfig(virNetworkObjPtr obj,
- }
- 
- 
--#if HAVE_FIREWALLD
-+#ifdef WITH_FIREWALLD
- static DBusHandlerResult
- firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED,
-                              DBusMessage *message,
-@@ -659,7 +659,7 @@ networkStateInitialize(bool privileged,
-     int ret = -1;
-     char *configdir = NULL;
-     char *rundir = NULL;
--#ifdef HAVE_FIREWALLD
-+#ifdef WITH_FIREWALLD
-     DBusConnection *sysbus = NULL;
- #endif
- 
-@@ -757,7 +757,7 @@ networkStateInitialize(bool privileged,
- 
-     network_driver->networkEventState = virObjectEventStateNew();
- 
--#ifdef HAVE_FIREWALLD
-+#ifdef WITH_FIREWALLD
-     if (!(sysbus = virDBusGetSystemBus())) {
-         VIR_WARN("DBus not available, disabling firewalld support "
-                  "in bridge_network_driver: %s", virGetLastErrorMessage());
-diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
-index ed34586105..a657b750e6 100644
---- a/src/nwfilter/nwfilter_driver.c
-+++ b/src/nwfilter/nwfilter_driver.c
-@@ -79,7 +79,7 @@ static void nwfilterDriverUnlock(void)
-     virMutexUnlock(&driver->lock);
- }
- 
--#if HAVE_FIREWALLD
-+#ifdef WITH_FIREWALLD
- 
- static DBusHandlerResult
- nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED,
-@@ -148,7 +148,7 @@ nwfilterDriverInstallDBusMatches(DBusConnection *sysbus)
-     return ret;
- }
- 
--#else /* HAVE_FIREWALLD */
-+#else /* WITH_FIREWALLD */
- 
- static void
- nwfilterDriverRemoveDBusMatches(void)
-@@ -161,7 +161,7 @@ nwfilterDriverInstallDBusMatches(DBusConnection *sysbus ATTRIBUTE_UNUSED)
-     return 0;
- }
- 
--#endif /* HAVE_FIREWALLD */
-+#endif /* WITH_FIREWALLD */
- 
- static int
- virNWFilterTriggerRebuildImpl(void *opaque)
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-configure-selectively-install-a-firewalld-libvirt-zone.patch b/SOURCES/libvirt-configure-selectively-install-a-firewalld-libvirt-zone.patch
deleted file mode 100644
index 28307d8..0000000
--- a/SOURCES/libvirt-configure-selectively-install-a-firewalld-libvirt-zone.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From f89135129d722dca4e5eb7dbcc6845ab757f2e08 Mon Sep 17 00:00:00 2001
-Message-Id: <f89135129d722dca4e5eb7dbcc6845ab757f2e08@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Fri, 1 Feb 2019 20:29:30 -0500
-Subject: [PATCH] configure: selectively install a firewalld 'libvirt' zone
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the past (when both libvirt and firewalld used iptables), if either
-libvirt's rules *OR* firewalld's rules accepted a packet, it would
-be accepted. This was because libvirt and firewalld rules were
-processed during the same kernel hook, and a single ACCEPT result
-would terminate the rule traversal and cause the packet to be
-accepted.
-
-But now firewalld can use nftables for its backend, while libvirt's
-firewall rules are still using iptables; iptables rules are still
-processed, but at a different time during packet processing
-(i.e. during a different hook) than the firewalld nftables rules. The
-result is that a packet must be accepted by *BOTH* the libvirt
-iptables rules *AND* the firewalld nftable rules in order to be
-accepted.
-
-This causes pain because
-
-1) libvirt always adds rules to permit DNS and DHCP (and sometimes
-TFTP) from guests to the host network's bridge interface. But
-libvirt's bridges are in firewalld's "default" zone (which is usually
-the zone called "public"). The public zone allows ssh, but doesn't
-allow DNS, DHCP, or TFTP. So even though libvirt's rules allow the
-DHCP and DNS traffic, the firewalld rules (now processed during a
-different hook) dont, thus guests connected to libvirt's bridges can't
-acquire an IP address from DHCP, nor can they make DNS queries to the
-DNS server libvirt has setup on the host. (This could be solved by
-modifying the default firewalld zone to allow DNS and DHCP, but that
-would open *all* interfaces in the default zone to those services,
-which is most likely not what the host's admin wants.)
-
-2) Even though libvirt adds iptables rules to allow forwarded traffic
-to pass the iptables hook, firewalld's higher level "rich rules" don't
-yet have the ability to configure the acceptance of forwarded traffic
-(traffic that is going somewhere beyond the host), so any traffic that
-needs to be forwarded from guests to the network beyond the host is
-rejected during the nftables hook by the default zone's "default
-reject" policy (which rejects all traffic in the zone not specifically
-allowed by the rules in the zone, whether that traffic is destined to
-be forwarded or locally received by the host).
-
-libvirt can't send "direct" nftables rules (firewalld only supports
-direct/passthrough rules for iptables), so we can't solve this problem
-by just sending explicit nftables rules instead of explicit iptables
-rules (which, if it could be done, would place libvirt's rules in the
-same hook as firewalld's native rules, and thus eliminate the need for
-packets to be accepted by both libvirt's and firewalld's own rules).
-
-However, we can take advantage of a quirk in firewalld zones that have
-a default policy of "accept" (meaning any packet that doesn't match a
-specific rule in the zone will be *accepted*) - this default accept will
-also accept forwarded traffic (not just traffic destined for the host).
-
-Of course we don't want to modify firewalld's default zone in that
-way, because that would affect the filtering of traffic coming into
-the host from other interfaces using that zone. Instead, we will
-create a new zone called "libvirt". The libvirt zone will have a
-default policy of accept so that forwarded traffic can pass and list
-specific services that will be allowed into the host from guests (DNS,
-DHCP, SSH, and TFTP).
-
-But the same default accept policy that fixes forwarded traffic also
-causes *all* traffic from guest to host to be accepted. To close this
-new hole, the libvirt zone can take advantage of a new feature in
-firewalld (currently slated for firewalld-0.7.0) - priorities for rich
-rules - to add a low priority rule that rejects all local traffic (but
-leaves alone all forwarded traffic).
-
-So, our new zone will start with a list of services that are allowed
-(dhcp, dns, tftp, and ssh to start, but configurable via any firewalld
-management application, or direct editing of the zone file in
-/etc/firewalld/zones/libvirt.xml), followed by a low priority
-<reject/> rule (to reject all other traffic from guest to host), and
-finally with a default policy of accept (to allow forwarded traffic).
-
-This patch only creates the zonefile for the new zone, and implements
-a configure.ac option to selectively enable/disable installation of
-the new zone. A separate patch contains the necessary code to actually
-place bridge interfaces in the libvirt zone.
-
-Why do we need a configure option to disable installation of the new
-libvirt zone? It uses a new firewalld attribute that sets the priority
-of a rich rule; this feature first appears in firewalld-0.7.0 (unless
-it has been backported to am earlier firewalld by a downstream
-maintainer). If the file were installed on a system with firewalld
-that didn't support rule priorities, firewalld would log an error
-every time it restarted, causing confusion and lots of extra bug
-reports.
-
-So we add two new configure.ac switches to avoid polluting the system
-logs with this error on systems that don't support rule priorities -
-"--with-firewalld-zone" and "--without-firewalld-zone". A package
-builder can use these to include/exclude the libvirt zone file in the
-installation. If firewalld is enabled (--with-firewalld), the default
-is --with-firewalld-zone, but it can be disabled during configure
-(using --without-firewalld-zone). Targets that are using a firewalld
-version too old to support the rule priority setting in the libvirt
-zone file can simply add --without-firewalld-zone to their configure
-commandline.
-
-These switches only affect whether or not the libvirt zone file is
-*installed* in /usr/lib/firewalld/zones, but have no effect on whether
-or not libvirt looks for a zone called libvirt and tries to use it.
-
-NB: firewalld zones can only be added to the permanent config of
-firewalld, and won't be loaded/enabled until firewalld is restarted,
-so at package install/upgrade time we have to restart firewalld. For
-rpm-based distros, this is done in the libvirt.spec file by calling
-the %firewalld_restart rpm macro, which is a part of the
-firewalld-filesystem package. (For distros that don't use rpm
-packages, the command "firewalld-cmd --reload" will have the same
-effect).
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 3b71f2e42dc6c5453d09136578bfb868874da088)
-
-https://bugzilla.redhat.com/1650320
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- configure.ac                |  3 +++
- libvirt.spec.in             | 31 +++++++++++++++++++++++++
- m4/virt-firewalld-zone.m4   | 45 +++++++++++++++++++++++++++++++++++++
- src/network/Makefile.inc.am | 10 ++++++++-
- src/network/libvirt.zone    | 23 +++++++++++++++++++
- 5 files changed, 111 insertions(+), 1 deletion(-)
- create mode 100644 m4/virt-firewalld-zone.m4
- create mode 100644 src/network/libvirt.zone
-
-diff --git a/configure.ac b/configure.ac
-index e25bf0a6ec..3da26484d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,6 +247,7 @@ LIBVIRT_ARG_CAPNG
- LIBVIRT_ARG_CURL
- LIBVIRT_ARG_DBUS
- LIBVIRT_ARG_FIREWALLD
-+LIBVIRT_ARG_FIREWALLD_ZONE
- LIBVIRT_ARG_FUSE
- LIBVIRT_ARG_GLUSTER
- LIBVIRT_ARG_HAL
-@@ -286,6 +287,7 @@ LIBVIRT_CHECK_DBUS
- LIBVIRT_CHECK_DEVMAPPER
- LIBVIRT_CHECK_DLOPEN
- LIBVIRT_CHECK_FIREWALLD
-+LIBVIRT_CHECK_FIREWALLD_ZONE
- LIBVIRT_CHECK_FUSE
- LIBVIRT_CHECK_GLUSTER
- LIBVIRT_CHECK_GNUTLS
-@@ -959,6 +961,7 @@ LIBVIRT_RESULT_CURL
- LIBVIRT_RESULT_DBUS
- LIBVIRT_RESULT_DLOPEN
- LIBVIRT_RESULT_FIREWALLD
-+LIBVIRT_RESULT_FIREWALLD_ZONE
- LIBVIRT_RESULT_FUSE
- LIBVIRT_RESULT_GLUSTER
- LIBVIRT_RESULT_GNUTLS
-diff --git a/m4/virt-firewalld-zone.m4 b/m4/virt-firewalld-zone.m4
-new file mode 100644
-index 0000000000..b67d1a0b2f
---- /dev/null
-+++ b/m4/virt-firewalld-zone.m4
-@@ -0,0 +1,45 @@
-+dnl firewalld_zone check - whether or not to install the firewall "libvirt" zone
-+dnl
-+dnl Copyright (C) 2019 Red Hat, Inc.
-+dnl
-+dnl This library is free software; you can redistribute it and/or
-+dnl modify it under the terms of the GNU Lesser General Public
-+dnl License as published by the Free Software Foundation; either
-+dnl version 2.1 of the License, or (at your option) any later version.
-+dnl
-+dnl This library is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+dnl Lesser General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU Lesser General Public
-+dnl License along with this library.  If not, see
-+dnl <http://www.gnu.org/licenses/>.
-+dnl
-+
-+AC_DEFUN([LIBVIRT_ARG_FIREWALLD_ZONE], [
-+  LIBVIRT_ARG_WITH([FIREWALLD_ZONE], [Whether to install firewalld libvirt zone], [check])
-+])
-+
-+AC_DEFUN([LIBVIRT_CHECK_FIREWALLD_ZONE], [
-+  AC_REQUIRE([LIBVIRT_CHECK_FIREWALLD])
-+  AC_MSG_CHECKING([for whether to install firewalld libvirt zone])
-+
-+  if test "x$with_firewalld_zone" = "xcheck" ; then
-+    with_firewalld_zone=$with_firewalld
-+  fi
-+
-+  if test "x$with_firewalld_zone" = "xyes" ; then
-+    if test "x$with_firewalld" != "xyes" ; then
-+      AC_MSG_ERROR([You must have firewalld support enabled to enable firewalld-zone])
-+    fi
-+    AC_DEFINE_UNQUOTED([WITH_FIREWALLD_ZONE], [1], [whether firewalld libvirt zone is installed])
-+  fi
-+
-+  AM_CONDITIONAL([WITH_FIREWALLD_ZONE], [test "x$with_firewalld_zone" != "xno"])
-+  AC_MSG_RESULT($with_firewalld_zone)
-+])
-+
-+AC_DEFUN([LIBVIRT_RESULT_FIREWALLD_ZONE], [
-+  LIBVIRT_RESULT([firewalld-zone], [$with_firewalld_zone])
-+])
-diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
-index 508c8c0422..cbaaa7ea68 100644
---- a/src/network/Makefile.inc.am
-+++ b/src/network/Makefile.inc.am
-@@ -87,6 +87,11 @@ install-data-network:
- 	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
- 	  rm -f default.xml && \
- 	  $(LN_S) ../default.xml default.xml )
-+if WITH_FIREWALLD_ZONE
-+	$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
-+	$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
-+	  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
-+endif WITH_FIREWALLD_ZONE
- 
- uninstall-data-network:
- 	rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
-@@ -95,10 +100,13 @@ uninstall-data-network:
- 	rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
- 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
- 	rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
-+if WITH_FIREWALLD_ZONE
-+	rm -f  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
-+endif WITH_FIREWALLD_ZONE
- 
- endif WITH_NETWORK
- 
--EXTRA_DIST += network/default.xml
-+EXTRA_DIST += network/default.xml network/libvirt.zone
- 
- .PHONY: \
- 	install-data-network \
-diff --git a/src/network/libvirt.zone b/src/network/libvirt.zone
-new file mode 100644
-index 0000000000..bf81db1b6e
---- /dev/null
-+++ b/src/network/libvirt.zone
-@@ -0,0 +1,23 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<zone target="ACCEPT">
-+  <short>libvirt</short>
-+
-+  <description>
-+    The default policy of "ACCEPT" allows all packets to/from
-+    interfaces in the zone to be forwarded, while the (*low priority*)
-+    reject rule blocks any traffic destined for the host, except those
-+    services explicitly listed (that list can be modified as required
-+    by the local admin). This zone is intended to be used only by
-+    libvirt virtual networks - libvirt will add the bridge devices for
-+    all new virtual networks to this zone by default.
-+  </description>
-+
-+<rule priority='32767'>
-+  <reject/>
-+</rule>
-+<service name='dhcp'/>
-+<service name='dhcpv6'/>
-+<service name='dns'/>
-+<service name='ssh'/>
-+<service name='tftp'/>
-+</zone>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-cpu-Add-support-for-stibp-x86_64-feature.patch b/SOURCES/libvirt-cpu-Add-support-for-stibp-x86_64-feature.patch
deleted file mode 100644
index aea8214..0000000
--- a/SOURCES/libvirt-cpu-Add-support-for-stibp-x86_64-feature.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 41a79702b10fc039aa76524626b77f91dc01edbd Mon Sep 17 00:00:00 2001
-Message-Id: <41a79702b10fc039aa76524626b77f91dc01edbd@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Mon, 17 Dec 2018 16:24:32 +0100
-Subject: [PATCH] cpu: Add support for "stibp" x86_64 feature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU commit v3.1.0-4-g0e89165829
-KVM patch: https://lore.kernel.org/lkml/20181205191956.31480-1-ehabkost@redhat.com/
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit eb1b551d21e316c1e80aba0b2af6969fdd849f0c)
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - cpu_map.xml is still monolithic in RHEL-8
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1655032
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu/cpu_map.xml                                            | 3 +++
- tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml    | 1 +
- tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml     | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml    | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml       | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml        | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml    | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml       | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml        | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml     | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml        | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml         | 1 +
- 13 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index cdb023e936..095d49a69a 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -328,6 +328,9 @@
-     <feature name='spec-ctrl'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
-     </feature>
-+    <feature name='stibp'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
-+    </feature>
-     <feature name='ssbd'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
-     </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
-index e033bb141f..5c9cfa9bd6 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
-@@ -1,6 +1,6 @@
- <!-- Features disabled by QEMU -->
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
--  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x04000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x0c000000'/>
-   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
-index 4fa4770208..5d3093cec1 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
-@@ -23,6 +23,7 @@
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
-index 25690c099c..a534d2dec5 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
-@@ -24,6 +24,7 @@
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-   <feature name='intel-pt'/>
-+  <feature name='stibp'/>
-   <feature name='xsaveopt'/>
-   <feature name='pdpe1gb'/>
-   <feature name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
-index aacc7a2b14..ec299652f7 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
-@@ -1,6 +1,6 @@
- <!-- Features disabled by QEMU -->
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
--  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x08000000'/>
-   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
-index a66c7a5644..d8aaaad29d 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
-@@ -24,6 +24,7 @@
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-+  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
-index 624d71db20..9bac4b4648 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
-@@ -25,6 +25,7 @@
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
-+  <feature name='stibp'/>
-   <feature name='xsaveopt'/>
-   <feature name='pdpe1gb'/>
-   <feature name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
-index d904808cec..85369d755c 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
-@@ -1,7 +1,7 @@
- <!-- Features disabled by QEMU -->
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
--  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x08000000'/>
-   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
-   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-index 7b93df3f1b..7718d7ca59 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-@@ -21,6 +21,7 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-   <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
-index 5078420c7a..43a0b93ab4 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
-@@ -26,6 +26,7 @@
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
-   <feature name='intel-pt'/>
-+  <feature name='stibp'/>
-   <feature name='xsaveopt'/>
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
-index b5c70a9dc4..a5b85a15c2 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
-@@ -1,7 +1,7 @@
- <!-- Features disabled by QEMU -->
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
--  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000008' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000008' edx='0x08000000'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
-   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
-index 480127f341..8f014f6e28 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
-@@ -23,6 +23,7 @@
-   <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='pku'/>
-+  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
-index 680b10acef..9de76fd640 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
-@@ -24,6 +24,7 @@
-   <feature name='clflushopt'/>
-   <feature name='intel-pt'/>
-   <feature name='pku'/>
-+  <feature name='stibp'/>
-   <feature name='xsaves'/>
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-cpu-Change-control-flow-in-virCPUUpdateLive.patch b/SOURCES/libvirt-cpu-Change-control-flow-in-virCPUUpdateLive.patch
new file mode 100644
index 0000000..b4dcabc
--- /dev/null
+++ b/SOURCES/libvirt-cpu-Change-control-flow-in-virCPUUpdateLive.patch
@@ -0,0 +1,53 @@
+From 2145d7b6f4370dfcd7dadae7daf544767cde0392 Mon Sep 17 00:00:00 2001
+Message-Id: <2145d7b6f4370dfcd7dadae7daf544767cde0392@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:51 +0200
+Subject: [PATCH] cpu: Change control flow in virCPUUpdateLive
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The updateLive CPU sub-driver function is supposed to be called only for
+a subset of CPU definitions. Let's make it more obvious by turning a
+negative test and return into a positive check.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 68c0b85ecb07c8cefcf4f4a2ffc28e123baa9e8c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1839999
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <2633727669ca50970bd10abe9b045e24b76028d1.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
+index ae3a0acc10..1cb2dd04f4 100644
+--- a/src/cpu/cpu.c
++++ b/src/cpu/cpu.c
+@@ -647,13 +647,14 @@ virCPUUpdateLive(virArch arch,
+     if (!driver->updateLive)
+         return 1;
+ 
+-    if (cpu->mode != VIR_CPU_MODE_CUSTOM)
+-        return 1;
++    if (cpu->mode == VIR_CPU_MODE_CUSTOM) {
++        if (driver->updateLive(cpu, dataEnabled, dataDisabled) < 0)
++            return -1;
+ 
+-    if (driver->updateLive(cpu, dataEnabled, dataDisabled) < 0)
+-        return -1;
++        return 0;
++    }
+ 
+-    return 0;
++    return 1;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu-Don-t-access-invalid-memory-in-virCPUx86Translate.patch b/SOURCES/libvirt-cpu-Don-t-access-invalid-memory-in-virCPUx86Translate.patch
deleted file mode 100644
index d8224ba..0000000
--- a/SOURCES/libvirt-cpu-Don-t-access-invalid-memory-in-virCPUx86Translate.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b339a54e493d97a5616be8883d1a0b4ebcd149d3 Mon Sep 17 00:00:00 2001
-Message-Id: <b339a54e493d97a5616be8883d1a0b4ebcd149d3@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:18 +0200
-Subject: [PATCH] cpu: Don't access invalid memory in virCPUx86Translate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem is that if there are no signatures for a CPU, then we
-still allocate cpu->signatures (even though with size 0). Later,
-we access cpu->signatures[0] if cpu->signatures is not NULL.
-
- Invalid read of size 4
-    at 0x5F439D7: virCPUx86Translate (cpu_x86.c:2930)
-    by 0x5F3C239: virCPUTranslate (cpu.c:927)
-    by 0x57CE7A1: qemuProcessUpdateGuestCPU (qemu_process.c:5870)
-    ...
-  Address 0xf752d40 is 0 bytes after a block of size 0 alloc'd
-    at 0x4C30EC6: calloc (vg_replace_malloc.c:711)
-    by 0x5DBDE4E: virAllocN (viralloc.c:190)
-    by 0x5F3E4FA: x86ModelCopySignatures (cpu_x86.c:990)
-    by 0x5F3E60F: x86ModelCopy (cpu_x86.c:1008)
-    by 0x5F3E7CB: x86ModelFromCPU (cpu_x86.c:1068)
-    by 0x5F4397E: virCPUx86Translate (cpu_x86.c:2922)
-    by 0x5F3C239: virCPUTranslate (cpu.c:927)
-    by 0x57CE7A1: qemuProcessUpdateGuestCPU (qemu_process.c:5870)
-    ...
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 62cb9c335c43a722e81ac0a1ed6e1111ba1d428b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <b36b22d237a7044a473e9b72de9763b2c603198c.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 24569a90f3..66aa5a612c 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -985,6 +985,9 @@ x86ModelCopySignatures(virCPUx86ModelPtr dst,
- {
-     size_t i;
- 
-+    if (src->nsignatures == 0)
-+        return 0;
-+
-     if (VIR_ALLOC_N(dst->signatures, src->nsignatures) < 0)
-         return -1;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu-Drop-CPUID-definition-for-hv-spinlocks.patch b/SOURCES/libvirt-cpu-Drop-CPUID-definition-for-hv-spinlocks.patch
deleted file mode 100644
index e2cf15d..0000000
--- a/SOURCES/libvirt-cpu-Drop-CPUID-definition-for-hv-spinlocks.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 900c638797181010d2341a8a5496c1335286353e Mon Sep 17 00:00:00 2001
-Message-Id: <900c638797181010d2341a8a5496c1335286353e@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Feb 2020 12:01:18 +0100
-Subject: [PATCH] cpu: Drop CPUID definition for hv-spinlocks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-hv-spinlocks is not a CPUID feature and should not be checked as such.
-While starting a domain with hv-spinlocks enabled, we would report a
-warning about unsupported hyperv spinlocks feature even though it was
-set properly.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit ad9d5d3a6a1fc86fca1620278cbd113e08370ba2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1794868
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <f3040b3536c025c78b1613a487c519993a950c24.1581073232.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c       | 3 ---
- src/qemu/qemu_process.c | 5 +++--
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 0459a0d1c8..a985913e5e 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -88,8 +88,6 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_STIMER,
-                 0x40000003, 0x00000008);
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_RELAXED,
-                 0x40000003, 0x00000020);
--KVM_FEATURE_DEF(VIR_CPU_x86_HV_SPINLOCKS,
--                0x40000003, 0x00000022);
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_VAPIC,
-                 0x40000003, 0x00000030);
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_VPINDEX,
-@@ -110,7 +108,6 @@ static virCPUx86Feature x86_kvm_features[] =
-     KVM_FEATURE(VIR_CPU_x86_HV_SYNIC),
-     KVM_FEATURE(VIR_CPU_x86_HV_STIMER),
-     KVM_FEATURE(VIR_CPU_x86_HV_RELAXED),
--    KVM_FEATURE(VIR_CPU_x86_HV_SPINLOCKS),
-     KVM_FEATURE(VIR_CPU_x86_HV_VAPIC),
-     KVM_FEATURE(VIR_CPU_x86_HV_VPINDEX),
-     KVM_FEATURE(VIR_CPU_x86_HV_RESET),
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 312ce69ba5..17d48357b3 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3917,7 +3917,8 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
- 
-     for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) {
-         /* always supported string property */
--        if (i == VIR_DOMAIN_HYPERV_VENDOR_ID)
-+        if (i == VIR_DOMAIN_HYPERV_VENDOR_ID ||
-+            i == VIR_DOMAIN_HYPERV_SPINLOCKS)
-             continue;
- 
-         if (def->hyperv_features[i] != VIR_TRISTATE_SWITCH_ON)
-@@ -3938,7 +3939,6 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
-         switch ((virDomainHyperv) i) {
-         case VIR_DOMAIN_HYPERV_RELAXED:
-         case VIR_DOMAIN_HYPERV_VAPIC:
--        case VIR_DOMAIN_HYPERV_SPINLOCKS:
-             VIR_WARN("host doesn't support hyperv '%s' feature",
-                      virDomainHypervTypeToString(i));
-             break;
-@@ -3957,6 +3957,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
-             return -1;
- 
-         /* coverity[dead_error_begin] */
-+        case VIR_DOMAIN_HYPERV_SPINLOCKS:
-         case VIR_DOMAIN_HYPERV_VENDOR_ID:
-         case VIR_DOMAIN_HYPERV_LAST:
-             break;
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-cpu-Drop-KVM_-from-hyperv-feature-macros.patch b/SOURCES/libvirt-cpu-Drop-KVM_-from-hyperv-feature-macros.patch
deleted file mode 100644
index 15d8e68..0000000
--- a/SOURCES/libvirt-cpu-Drop-KVM_-from-hyperv-feature-macros.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From a7a5fd909ea7a5d7608568e94f9a0f7d4478719b Mon Sep 17 00:00:00 2001
-Message-Id: <a7a5fd909ea7a5d7608568e94f9a0f7d4478719b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Feb 2020 10:41:43 +0100
-Subject: [PATCH] cpu: Drop KVM_ from hyperv feature macros
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-All the features are hyperv features even though they are provided by
-KVM with QEMU. The "KVM" part in the macro names does not make a lot of
-sense.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Tested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 1ddf014fef4468a15303029fbc563da0aaaf8ce4)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1794868
-
-Conflicts:
-	src/cpu/cpu_x86.c
-	src/cpu/cpu_x86_data.h
-            - a few extra hyperv features upstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <c98a0f397787d6b62621728aed00f48b77521c2c.1581064395.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c       | 45 +++++++++++++++++++++--------------------
- src/cpu/cpu_x86_data.h  | 22 ++++++++++----------
- src/qemu/qemu_command.c |  2 +-
- 3 files changed, 35 insertions(+), 34 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index cf5ef442e7..ecf11926b4 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -95,27 +95,28 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_PV_UNHALT,
-                 0x40000001, 0x00000080);
- KVM_FEATURE_DEF(VIR_CPU_x86_KVM_CLOCKSOURCE_STABLE_BIT,
-                 0x40000001, 0x01000000);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RUNTIME,
-+
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_RUNTIME,
-                 0x40000003, 0x00000001);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_SYNIC,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_SYNIC,
-                 0x40000003, 0x00000004);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_STIMER,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_STIMER,
-                 0x40000003, 0x00000008);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RELAXED,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_RELAXED,
-                 0x40000003, 0x00000020);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_SPINLOCKS,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_SPINLOCKS,
-                 0x40000003, 0x00000022);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_VAPIC,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_VAPIC,
-                 0x40000003, 0x00000030);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_VPINDEX,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_VPINDEX,
-                 0x40000003, 0x00000040);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RESET,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_RESET,
-                 0x40000003, 0x00000080);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_FREQUENCIES,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_FREQUENCIES,
-                 0x40000003, 0x00000800);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_REENLIGHTENMENT,
-                 0x40000003, 0x00002000);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_TLBFLUSH,
-+KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH,
-                 0x40000004, 0x00000004);
- 
- static virCPUx86Feature x86_kvm_features[] =
-@@ -129,17 +130,17 @@ static virCPUx86Feature x86_kvm_features[] =
-     KVM_FEATURE(VIR_CPU_x86_KVM_PV_EOI),
-     KVM_FEATURE(VIR_CPU_x86_KVM_PV_UNHALT),
-     KVM_FEATURE(VIR_CPU_x86_KVM_CLOCKSOURCE_STABLE_BIT),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_RUNTIME),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_SYNIC),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_STIMER),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_RELAXED),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_SPINLOCKS),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_VAPIC),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_VPINDEX),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_FREQUENCIES),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT),
--    KVM_FEATURE(VIR_CPU_x86_KVM_HV_TLBFLUSH),
-+    KVM_FEATURE(VIR_CPU_x86_HV_RUNTIME),
-+    KVM_FEATURE(VIR_CPU_x86_HV_SYNIC),
-+    KVM_FEATURE(VIR_CPU_x86_HV_STIMER),
-+    KVM_FEATURE(VIR_CPU_x86_HV_RELAXED),
-+    KVM_FEATURE(VIR_CPU_x86_HV_SPINLOCKS),
-+    KVM_FEATURE(VIR_CPU_x86_HV_VAPIC),
-+    KVM_FEATURE(VIR_CPU_x86_HV_VPINDEX),
-+    KVM_FEATURE(VIR_CPU_x86_HV_RESET),
-+    KVM_FEATURE(VIR_CPU_x86_HV_FREQUENCIES),
-+    KVM_FEATURE(VIR_CPU_x86_HV_REENLIGHTENMENT),
-+    KVM_FEATURE(VIR_CPU_x86_HV_TLBFLUSH),
- };
- 
- typedef struct _virCPUx86Model virCPUx86Model;
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index 77797f633c..9668b13eb9 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -64,17 +64,17 @@ struct _virCPUx86MSR {
-  * ones defined for virDomainHyperv in domain_conf.c.
-  * E.g "hv-runtime" -> "runtime", "hv-spinlocks" -> "spinlocks" etc.
- */
--# define VIR_CPU_x86_KVM_HV_RUNTIME   "hv-runtime"
--# define VIR_CPU_x86_KVM_HV_SYNIC     "hv-synic"
--# define VIR_CPU_x86_KVM_HV_STIMER    "hv-stimer"
--# define VIR_CPU_x86_KVM_HV_RELAXED   "hv-relaxed"
--# define VIR_CPU_x86_KVM_HV_SPINLOCKS "hv-spinlocks"
--# define VIR_CPU_x86_KVM_HV_VAPIC     "hv-vapic"
--# define VIR_CPU_x86_KVM_HV_VPINDEX   "hv-vpindex"
--# define VIR_CPU_x86_KVM_HV_RESET     "hv-reset"
--# define VIR_CPU_x86_KVM_HV_FREQUENCIES "hv-frequencies"
--# define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "hv-reenlightenment"
--# define VIR_CPU_x86_KVM_HV_TLBFLUSH  "hv-tlbflush"
-+# define VIR_CPU_x86_HV_RUNTIME   "hv-runtime"
-+# define VIR_CPU_x86_HV_SYNIC     "hv-synic"
-+# define VIR_CPU_x86_HV_STIMER    "hv-stimer"
-+# define VIR_CPU_x86_HV_RELAXED   "hv-relaxed"
-+# define VIR_CPU_x86_HV_SPINLOCKS "hv-spinlocks"
-+# define VIR_CPU_x86_HV_VAPIC     "hv-vapic"
-+# define VIR_CPU_x86_HV_VPINDEX   "hv-vpindex"
-+# define VIR_CPU_x86_HV_RESET     "hv-reset"
-+# 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_DATA_INIT { 0 }
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 0289a907a1..71e102747c 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7039,7 +7039,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             case VIR_DOMAIN_HYPERV_SPINLOCKS:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
-                     virBufferAsprintf(&buf, ",%s=0x%x",
--                                      VIR_CPU_x86_KVM_HV_SPINLOCKS,
-+                                      VIR_CPU_x86_HV_SPINLOCKS,
-                                       def->hyperv_spinlocks);
-                 break;
- 
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-cpu-Drop-unused-KVM-features.patch b/SOURCES/libvirt-cpu-Drop-unused-KVM-features.patch
deleted file mode 100644
index ba0a85f..0000000
--- a/SOURCES/libvirt-cpu-Drop-unused-KVM-features.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 3ad9cd82d4fe7e87665a0233662712725f5d3d5d Mon Sep 17 00:00:00 2001
-Message-Id: <3ad9cd82d4fe7e87665a0233662712725f5d3d5d@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Feb 2020 10:41:44 +0100
-Subject: [PATCH] cpu: Drop unused KVM features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Most of the internally defined KVM CPUID features are not actually used
-by libvirt. The QEMU driver may enable or disable them on the command
-line, but we don't check for the associated CPU properties or CPUID
-bits. They would be useless with QEMU 4.1 anyway since their names were
-only remotely similar to the actual feature names.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Tested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 9e6172937f8d8f832359dd5eeb4e7c92f9defcbf)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1794868
-
-Conflicts:
-	src/cpu/cpu_x86_data.h
-            - all defines are indented as downstream lacks #pragma once
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <763f5d57b6cb930d9edbfbe8edbb7d5797a48150.1581064395.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c      | 24 ------------------------
- src/cpu/cpu_x86_data.h |  8 --------
- 2 files changed, 32 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index ecf11926b4..0459a0d1c8 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -77,24 +77,8 @@ struct _virCPUx86Feature {
-         } \
-     }
- 
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_CLOCKSOURCE,
--                0x40000001, 0x00000001);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_NOP_IO_DELAY,
--                0x40000001, 0x00000002);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_MMU_OP,
--                0x40000001, 0x00000004);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_CLOCKSOURCE2,
--                0x40000001, 0x00000008);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_ASYNC_PF,
--                0x40000001, 0x00000010);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_STEAL_TIME,
--                0x40000001, 0x00000020);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_PV_EOI,
--                0x40000001, 0x00000040);
- KVM_FEATURE_DEF(VIR_CPU_x86_KVM_PV_UNHALT,
-                 0x40000001, 0x00000080);
--KVM_FEATURE_DEF(VIR_CPU_x86_KVM_CLOCKSOURCE_STABLE_BIT,
--                0x40000001, 0x01000000);
- 
- KVM_FEATURE_DEF(VIR_CPU_x86_HV_RUNTIME,
-                 0x40000003, 0x00000001);
-@@ -121,15 +105,7 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_TLBFLUSH,
- 
- static virCPUx86Feature x86_kvm_features[] =
- {
--    KVM_FEATURE(VIR_CPU_x86_KVM_CLOCKSOURCE),
--    KVM_FEATURE(VIR_CPU_x86_KVM_NOP_IO_DELAY),
--    KVM_FEATURE(VIR_CPU_x86_KVM_MMU_OP),
--    KVM_FEATURE(VIR_CPU_x86_KVM_CLOCKSOURCE2),
--    KVM_FEATURE(VIR_CPU_x86_KVM_ASYNC_PF),
--    KVM_FEATURE(VIR_CPU_x86_KVM_STEAL_TIME),
--    KVM_FEATURE(VIR_CPU_x86_KVM_PV_EOI),
-     KVM_FEATURE(VIR_CPU_x86_KVM_PV_UNHALT),
--    KVM_FEATURE(VIR_CPU_x86_KVM_CLOCKSOURCE_STABLE_BIT),
-     KVM_FEATURE(VIR_CPU_x86_HV_RUNTIME),
-     KVM_FEATURE(VIR_CPU_x86_HV_SYNIC),
-     KVM_FEATURE(VIR_CPU_x86_HV_STIMER),
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index 9668b13eb9..8a189f854e 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -49,15 +49,7 @@ struct _virCPUx86MSR {
- # define CPUX86_KVM      0x40000000
- # define CPUX86_EXTENDED 0x80000000
- 
--# define VIR_CPU_x86_KVM_CLOCKSOURCE  "__kvm_clocksource"
--# define VIR_CPU_x86_KVM_NOP_IO_DELAY "__kvm_no_io_delay"
--# define VIR_CPU_x86_KVM_MMU_OP       "__kvm_mmu_op"
--# define VIR_CPU_x86_KVM_CLOCKSOURCE2 "__kvm_clocksource2"
--# define VIR_CPU_x86_KVM_ASYNC_PF     "__kvm_async_pf"
--# define VIR_CPU_x86_KVM_STEAL_TIME   "__kvm_steal_time"
--# define VIR_CPU_x86_KVM_PV_EOI       "__kvm_pv_eoi"
- # define VIR_CPU_x86_KVM_PV_UNHALT    "__kvm_pv_unhalt"
--# define VIR_CPU_x86_KVM_CLOCKSOURCE_STABLE_BIT "__kvm_clocksource_stable"
- 
- /*
-  * The following HyperV feature names suffixes must exactly match corresponding
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-cpu-Honor-check-full-for-host-passthrough-CPUs.patch b/SOURCES/libvirt-cpu-Honor-check-full-for-host-passthrough-CPUs.patch
new file mode 100644
index 0000000..ff0dbcf
--- /dev/null
+++ b/SOURCES/libvirt-cpu-Honor-check-full-for-host-passthrough-CPUs.patch
@@ -0,0 +1,100 @@
+From 781e82d0330afe60ab1c366e43dfe8292fcf68eb Mon Sep 17 00:00:00 2001
+Message-Id: <781e82d0330afe60ab1c366e43dfe8292fcf68eb@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:53 +0200
+Subject: [PATCH] cpu: Honor check='full' for host-passthrough CPUs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The check attribute was completely ignored for host-passthrough CPUs
+even if they explicitly requested some features to be enabled. For
+example, a domain with the following CPU definition
+
+  <cpu mode='host-passthrough' check='full'>
+    <feature policy='require' name='svm'/>
+  </cpu>
+
+would happily start even when 'svm' cannot be enabled.
+
+Let's call virCPUArchUpdateLive for host-passthrough CPUs with
+VIR_CPU_CHECK_FULL to make sure the architecture specific code can
+validate the provided virtual CPU against the desired definition.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1515677
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit ac36a824641862dcac057c6403b27ab1e91874f5)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1839999
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <b8d30055a0df31c423d6c1832ca0bfbf3eafd222.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu.c     |  3 ++-
+ src/cpu/cpu_x86.c | 10 +++++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
+index 1cb2dd04f4..f2a0f560f6 100644
+--- a/src/cpu/cpu.c
++++ b/src/cpu/cpu.c
+@@ -647,7 +647,8 @@ virCPUUpdateLive(virArch arch,
+     if (!driver->updateLive)
+         return 1;
+ 
+-    if (cpu->mode == VIR_CPU_MODE_CUSTOM) {
++    if (cpu->mode == VIR_CPU_MODE_CUSTOM ||
++        cpu->check == VIR_CPU_CHECK_FULL) {
+         if (driver->updateLive(cpu, dataEnabled, dataDisabled) < 0)
+             return -1;
+ 
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 9e686a86d2..8c865bdaa4 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3009,8 +3009,10 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                     virCPUDataPtr dataEnabled,
+                     virCPUDataPtr dataDisabled)
+ {
++    bool hostPassthrough = cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH;
+     virCPUx86MapPtr map;
+     virCPUx86ModelPtr model = NULL;
++    virCPUx86ModelPtr modelDisabled = NULL;
+     virCPUx86Data enabled = VIR_CPU_X86_DATA_INIT;
+     virCPUx86Data disabled = VIR_CPU_X86_DATA_INIT;
+     virBuffer bufAdded = VIR_BUFFER_INITIALIZER;
+@@ -3026,6 +3028,10 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+         goto cleanup;
+ 
++    if (hostPassthrough &&
++        !(modelDisabled = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)))
++        goto cleanup;
++
+     if (dataEnabled &&
+         x86DataCopy(&enabled, &dataEnabled->data.x86) < 0)
+         goto cleanup;
+@@ -3040,7 +3046,8 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+ 
+         if (x86DataIsSubset(&model->data, &feature->data))
+             expected = VIR_CPU_FEATURE_REQUIRE;
+-        else
++        else if (!hostPassthrough ||
++                 x86DataIsSubset(&modelDisabled->data, &feature->data))
+             expected = VIR_CPU_FEATURE_DISABLE;
+ 
+         if (expected == VIR_CPU_FEATURE_DISABLE &&
+@@ -3101,6 +3108,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+ 
+  cleanup:
+     x86ModelFree(model);
++    x86ModelFree(modelDisabled);
+     virCPUx86DataClear(&enabled);
+     virCPUx86DataClear(&disabled);
+     VIR_FREE(added);
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu-Introduce-virCPUDataAddFeature.patch b/SOURCES/libvirt-cpu-Introduce-virCPUDataAddFeature.patch
deleted file mode 100644
index 89765cf..0000000
--- a/SOURCES/libvirt-cpu-Introduce-virCPUDataAddFeature.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 992af2f6564b899142a2be5f342e0cdbdd13eadc Mon Sep 17 00:00:00 2001
-Message-Id: <992af2f6564b899142a2be5f342e0cdbdd13eadc@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:59 +0200
-Subject: [PATCH] cpu: Introduce virCPUDataAddFeature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a generic replacement for the former virCPUx86DataAddFeature,
-which worked on the generic virCPUDataPtr anyway.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit df73078c612a70e48aa76e889a7026e2daa47b16)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/cpu/cpu_x86.h
-            - downstream did not switch to #pragma once
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <4e946f702092fe5eb4c8235dbb98402b30876a5f.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu.c                | 33 +++++++++++++++++++++++++++++++++
- src/cpu/cpu.h                |  9 +++++++++
- src/cpu/cpu_x86.c            |  3 ++-
- src/cpu/cpu_x86.h            |  3 ---
- src/libvirt_private.syms     |  2 +-
- src/qemu/qemu_capabilities.c |  2 +-
- 6 files changed, 46 insertions(+), 6 deletions(-)
-
-diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
-index cc93c49418..a2d143c94a 100644
---- a/src/cpu/cpu.c
-+++ b/src/cpu/cpu.c
-@@ -1078,3 +1078,36 @@ virCPUValidateFeatures(virArch arch,
-     else
-         return 0;
- }
-+
-+
-+/**
-+ * virCPUDataAddFeature:
-+ *
-+ * @cpuData: CPU data
-+ * @name: feature to be added to @cpuData
-+ *
-+ * Adds a feature called @name to @cpuData.
-+ *
-+ * Returns 0 on success, -1 on error.
-+ */
-+int
-+virCPUDataAddFeature(virCPUDataPtr cpuData,
-+                     const char *name)
-+{
-+    struct cpuArchDriver *driver;
-+
-+    VIR_DEBUG("arch=%s, cpuData=%p, name=%s",
-+              virArchToString(cpuData->arch), cpuData, name);
-+
-+    if (!(driver = cpuGetSubDriver(cpuData->arch)))
-+        return -1;
-+
-+    if (!driver->dataAddFeature) {
-+        virReportError(VIR_ERR_NO_SUPPORT,
-+                       _("cannot add guest CPU feature for %s architecture"),
-+                       virArchToString(cpuData->arch));
-+        return -1;
-+    }
-+
-+    return driver->dataAddFeature(cpuData, name);
-+}
-diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
-index 81119b6aeb..e5fae31e30 100644
---- a/src/cpu/cpu.h
-+++ b/src/cpu/cpu.h
-@@ -121,6 +121,10 @@ typedef virCPUDefPtr
- typedef int
- (*virCPUArchValidateFeatures)(virCPUDefPtr cpu);
- 
-+typedef int
-+(*virCPUArchDataAddFeature)(virCPUDataPtr cpuData,
-+                            const char *name);
-+
- struct cpuArchDriver {
-     const char *name;
-     const virArch *arch;
-@@ -143,6 +147,7 @@ struct cpuArchDriver {
-     virCPUArchExpandFeatures expandFeatures;
-     virCPUArchCopyMigratable copyMigratable;
-     virCPUArchValidateFeatures validateFeatures;
-+    virCPUArchDataAddFeature dataAddFeature;
- };
- 
- 
-@@ -260,6 +265,10 @@ virCPUValidateFeatures(virArch arch,
-                        virCPUDefPtr cpu)
-     ATTRIBUTE_NONNULL(2);
- 
-+int
-+virCPUDataAddFeature(virCPUDataPtr cpuData,
-+                     const char *name);
-+
- /* virCPUDataFormat and virCPUDataParse are implemented for unit tests only and
-  * have no real-life usage
-  */
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 3c1bd623db..ead962ae06 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -3316,7 +3316,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpuData,
- }
- 
- 
--int
-+static int
- virCPUx86DataAddFeature(virCPUDataPtr cpuData,
-                         const char *name)
- {
-@@ -3361,4 +3361,5 @@ struct cpuArchDriver cpuDriverX86 = {
-     .expandFeatures = virCPUx86ExpandFeatures,
-     .copyMigratable = virCPUx86CopyMigratable,
-     .validateFeatures = virCPUx86ValidateFeatures,
-+    .dataAddFeature = virCPUx86DataAddFeature,
- };
-diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
-index 8b51cef9c1..519024b7c0 100644
---- a/src/cpu/cpu_x86.h
-+++ b/src/cpu/cpu_x86.h
-@@ -45,7 +45,4 @@ uint32_t virCPUx86DataGetSignature(virCPUDataPtr cpuData,
- int virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                            const char *vendor);
- 
--int virCPUx86DataAddFeature(virCPUDataPtr cpuData,
--                            const char *name);
--
- #endif /* __VIR_CPU_X86_H__ */
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 57508de0c1..a20e0593f0 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1187,6 +1187,7 @@ virCPUCompare;
- virCPUCompareXML;
- virCPUConvertLegacy;
- virCPUCopyMigratable;
-+virCPUDataAddFeature;
- virCPUDataCheckFeature;
- virCPUDataFormat;
- virCPUDataFree;
-@@ -1205,7 +1206,6 @@ virCPUValidateFeatures;
- 
- # cpu/cpu_x86.h
- virCPUx86DataAdd;
--virCPUx86DataAddFeature;
- virCPUx86DataGetSignature;
- virCPUx86DataSetSignature;
- virCPUx86DataSetVendor;
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 78be2d35f4..4be0ec305f 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2916,7 +2916,7 @@ virQEMUCapsGetCPUModelX86Data(virQEMUCapsPtr qemuCaps,
-                 (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO))
-                 continue;
- 
--            if (virCPUx86DataAddFeature(data, name) < 0)
-+            if (virCPUDataAddFeature(data, name) < 0)
-                 goto cleanup;
- 
-             break;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu-allow-include-files-for-CPU-definition.patch b/SOURCES/libvirt-cpu-allow-include-files-for-CPU-definition.patch
deleted file mode 100644
index 84abe17..0000000
--- a/SOURCES/libvirt-cpu-allow-include-files-for-CPU-definition.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 6438640b53fef3e889c21a2ed016638b91c5ac80 Mon Sep 17 00:00:00 2001
-Message-Id: <6438640b53fef3e889c21a2ed016638b91c5ac80@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:44 +0200
-Subject: [PATCH] cpu: allow include files for CPU definition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Allow for syntax
-
-    <include filename="subdir/fooo.xml"/>
-
-to reference other files in the CPU database directory
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit eda5f575f2a7530fc7f6471f88496778a9bc9fcb)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <800e5ebbc30502fd780a3ef84fe524f1dc0ffd67.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 89 insertions(+), 3 deletions(-)
-
-diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
-index d263eb8cdd..333c7ef24f 100644
---- a/src/cpu/cpu_map.c
-+++ b/src/cpu/cpu_map.c
-@@ -1,7 +1,7 @@
- /*
-  * cpu_map.c: internal functions for handling CPU mapping configuration
-  *
-- * Copyright (C) 2009-2010 Red Hat, Inc.
-+ * Copyright (C) 2009-2018 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
-@@ -70,6 +70,89 @@ static int load(xmlXPathContextPtr ctxt,
-     return ret;
- }
- 
-+static int
-+cpuMapLoadInclude(const char *filename,
-+                  cpuMapLoadCallback cb,
-+                  void *data)
-+{
-+    xmlDocPtr xml = NULL;
-+    xmlXPathContextPtr ctxt = NULL;
-+    int ret = -1;
-+    int element;
-+    char *mapfile;
-+
-+    if (!(mapfile = virFileFindResource(filename,
-+                                        abs_topsrcdir "/src/cpu",
-+                                        PKGDATADIR)))
-+        return -1;
-+
-+    VIR_DEBUG("Loading CPU map include from %s", mapfile);
-+
-+    if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt)))
-+        goto cleanup;
-+
-+    ctxt->node = xmlDocGetRootElement(xml);
-+
-+    for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) {
-+        if (load(ctxt, element, cb, data) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse CPU map '%s'"), mapfile);
-+            goto cleanup;
-+        }
-+    }
-+
-+    ret = 0;
-+
-+ cleanup:
-+    xmlXPathFreeContext(ctxt);
-+    xmlFreeDoc(xml);
-+    VIR_FREE(mapfile);
-+
-+    return ret;
-+}
-+
-+
-+static int
-+loadIncludes(xmlXPathContextPtr ctxt,
-+             cpuMapLoadCallback callback,
-+             void *data)
-+{
-+    int ret = -1;
-+    xmlNodePtr ctxt_node;
-+    xmlNodePtr *nodes = NULL;
-+    int n;
-+    size_t i;
-+
-+    ctxt_node = ctxt->node;
-+
-+    n = virXPathNodeSet("include", ctxt, &nodes);
-+    if (n < 0)
-+        goto cleanup;
-+
-+    for (i = 0; i < n; i++) {
-+        char *filename = virXMLPropString(nodes[i], "filename");
-+        if (!filename) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("Missing 'filename' in CPU map include"));
-+            goto cleanup;
-+        }
-+        VIR_DEBUG("Finding CPU map include '%s'", filename);
-+        if (cpuMapLoadInclude(filename, callback, data) < 0) {
-+            VIR_FREE(filename);
-+            goto cleanup;
-+        }
-+        VIR_FREE(filename);
-+    }
-+
-+    ret = 0;
-+
-+ cleanup:
-+    ctxt->node = ctxt_node;
-+    VIR_FREE(nodes);
-+
-+    return ret;
-+}
-+
- 
- int cpuMapLoad(const char *arch,
-                cpuMapLoadCallback cb,
-@@ -88,7 +171,7 @@ int cpuMapLoad(const char *arch,
-                                         PKGDATADIR)))
-         return -1;
- 
--    VIR_DEBUG("Loading CPU map from %s", mapfile);
-+    VIR_DEBUG("Loading '%s' CPU map from %s", NULLSTR(arch), mapfile);
- 
-     if (arch == NULL) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -122,11 +205,14 @@ int cpuMapLoad(const char *arch,
-     for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) {
-         if (load(ctxt, element, cb, data) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("cannot parse CPU map for %s architecture"), arch);
-+                           _("cannot parse CPU map '%s'"), mapfile);
-             goto cleanup;
-         }
-     }
- 
-+    if (loadIncludes(ctxt, cb, data) < 0)
-+        goto cleanup;
-+
-     ret = 0;
- 
-  cleanup:
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu-fix-cleanup-when-signature-parsing-fails.patch b/SOURCES/libvirt-cpu-fix-cleanup-when-signature-parsing-fails.patch
deleted file mode 100644
index 1b253a4..0000000
--- a/SOURCES/libvirt-cpu-fix-cleanup-when-signature-parsing-fails.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 612913a764992dc1a9ae63762749ecee447427d7 Mon Sep 17 00:00:00 2001
-Message-Id: <612913a764992dc1a9ae63762749ecee447427d7@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:45 +0200
-Subject: [PATCH] cpu: fix cleanup when signature parsing fails
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Two pieces of code accidentally jumped to the wrong label when they
-failed causing incorrect cleanup, returning a partially initialized
-CPU model struct.
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 118fcdd480ad38a3e8477f466f6a876dce7e9fa6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5e9aedc6fd4f4570322a7d13626863bec0449283.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 89baf94d7d..124aa5fd5e 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1250,7 +1250,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid CPU signature family in model %s"),
-                            model->name);
--            goto cleanup;
-+            goto error;
-         }
- 
-         rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
-@@ -1258,7 +1258,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid CPU signature model in model %s"),
-                            model->name);
--            goto cleanup;
-+            goto error;
-         }
- 
-         model->signature = x86MakeSignature(sigFamily, sigModel, 0);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu-push-more-parsing-logic-into-common-code.patch b/SOURCES/libvirt-cpu-push-more-parsing-logic-into-common-code.patch
deleted file mode 100644
index 357b983..0000000
--- a/SOURCES/libvirt-cpu-push-more-parsing-logic-into-common-code.patch
+++ /dev/null
@@ -1,782 +0,0 @@
-From 728231dcbbf2a4ab8a4bfe03fdf43d78bdeccbb0 Mon Sep 17 00:00:00 2001
-Message-Id: <728231dcbbf2a4ab8a4bfe03fdf43d78bdeccbb0@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:46 +0200
-Subject: [PATCH] cpu: push more parsing logic into common code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The x86 and ppc impls both duplicate some logic when parsing CPU
-features. Change the callback signature so that this duplication can be
-pushed up a level to common code.
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 0815f519784a7c565c543498777dc25f129620f9)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <c770b678131dc5e207cbe84d276a2774e0c807c7.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.c   |  98 +++++++++++++---------
- src/cpu/cpu_map.h   |  22 ++---
- src/cpu/cpu_ppc64.c | 112 ++++++-------------------
- src/cpu/cpu_x86.c   | 196 +++++++++++++-------------------------------
- 4 files changed, 143 insertions(+), 285 deletions(-)
-
-diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
-index 333c7ef24f..ac7e58037a 100644
---- a/src/cpu/cpu_map.c
-+++ b/src/cpu/cpu_map.c
-@@ -35,31 +35,47 @@
- 
- VIR_LOG_INIT("cpu.cpu_map");
- 
--VIR_ENUM_IMPL(cpuMapElement, CPU_MAP_ELEMENT_LAST,
--    "vendor",
--    "feature",
--    "model")
--
--
--static int load(xmlXPathContextPtr ctxt,
--                cpuMapElement element,
--                cpuMapLoadCallback callback,
--                void *data)
-+static int
-+loadData(const char *mapfile,
-+         xmlXPathContextPtr ctxt,
-+         const char *element,
-+         cpuMapLoadCallback callback,
-+         void *data)
- {
-     int ret = -1;
-     xmlNodePtr ctxt_node;
-     xmlNodePtr *nodes = NULL;
-     int n;
-+    size_t i;
-+    int rv;
- 
-     ctxt_node = ctxt->node;
- 
--    n = virXPathNodeSet(cpuMapElementTypeToString(element), ctxt, &nodes);
--    if (n < 0)
-+    if ((n = virXPathNodeSet(element, ctxt, &nodes)) < 0)
-         goto cleanup;
- 
--    if (n > 0 &&
--        callback(element, ctxt, nodes, n, data) < 0)
-+    if (n > 0 && !callback) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unexpected element '%s' in CPU map '%s'"), element, mapfile);
-         goto cleanup;
-+    }
-+
-+    for (i = 0; i < n; i++) {
-+        xmlNodePtr old = ctxt->node;
-+        char *name = virXMLPropString(nodes[i], "name");
-+        if (!name) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot find %s name in CPU map '%s'"), element, mapfile);
-+            goto cleanup;
-+        }
-+        VIR_DEBUG("Load %s name %s", element, name);
-+        ctxt->node = nodes[i];
-+        rv = callback(ctxt, name, data);
-+        ctxt->node = old;
-+        VIR_FREE(name);
-+        if (rv < 0)
-+            goto cleanup;
-+    }
- 
-     ret = 0;
- 
-@@ -72,13 +88,14 @@ static int load(xmlXPathContextPtr ctxt,
- 
- static int
- cpuMapLoadInclude(const char *filename,
--                  cpuMapLoadCallback cb,
-+                  cpuMapLoadCallback vendorCB,
-+                  cpuMapLoadCallback featureCB,
-+                  cpuMapLoadCallback modelCB,
-                   void *data)
- {
-     xmlDocPtr xml = NULL;
-     xmlXPathContextPtr ctxt = NULL;
-     int ret = -1;
--    int element;
-     char *mapfile;
- 
-     if (!(mapfile = virFileFindResource(filename,
-@@ -93,13 +110,14 @@ cpuMapLoadInclude(const char *filename,
- 
-     ctxt->node = xmlDocGetRootElement(xml);
- 
--    for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) {
--        if (load(ctxt, element, cb, data) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("cannot parse CPU map '%s'"), mapfile);
--            goto cleanup;
--        }
--    }
-+    if (loadData(mapfile, ctxt, "vendor", vendorCB, data) < 0)
-+        goto cleanup;
-+
-+    if (loadData(mapfile, ctxt, "feature", featureCB, data) < 0)
-+        goto cleanup;
-+
-+    if (loadData(mapfile, ctxt, "model", modelCB, data) < 0)
-+        goto cleanup;
- 
-     ret = 0;
- 
-@@ -114,7 +132,9 @@ cpuMapLoadInclude(const char *filename,
- 
- static int
- loadIncludes(xmlXPathContextPtr ctxt,
--             cpuMapLoadCallback callback,
-+             cpuMapLoadCallback vendorCB,
-+             cpuMapLoadCallback featureCB,
-+             cpuMapLoadCallback modelCB,
-              void *data)
- {
-     int ret = -1;
-@@ -137,7 +157,7 @@ loadIncludes(xmlXPathContextPtr ctxt,
-             goto cleanup;
-         }
-         VIR_DEBUG("Finding CPU map include '%s'", filename);
--        if (cpuMapLoadInclude(filename, callback, data) < 0) {
-+        if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data) < 0) {
-             VIR_FREE(filename);
-             goto cleanup;
-         }
-@@ -155,7 +175,9 @@ loadIncludes(xmlXPathContextPtr ctxt,
- 
- 
- int cpuMapLoad(const char *arch,
--               cpuMapLoadCallback cb,
-+               cpuMapLoadCallback vendorCB,
-+               cpuMapLoadCallback featureCB,
-+               cpuMapLoadCallback modelCB,
-                void *data)
- {
-     xmlDocPtr xml = NULL;
-@@ -163,7 +185,6 @@ int cpuMapLoad(const char *arch,
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     char *xpath = NULL;
-     int ret = -1;
--    int element;
-     char *mapfile;
- 
-     if (!(mapfile = virFileFindResource("cpu_map.xml",
-@@ -179,12 +200,6 @@ int cpuMapLoad(const char *arch,
-         goto cleanup;
-     }
- 
--    if (cb == NULL) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       "%s", _("no callback provided"));
--        goto cleanup;
--    }
--
-     if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt)))
-         goto cleanup;
- 
-@@ -202,15 +217,16 @@ int cpuMapLoad(const char *arch,
-         goto cleanup;
-     }
- 
--    for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) {
--        if (load(ctxt, element, cb, data) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("cannot parse CPU map '%s'"), mapfile);
--            goto cleanup;
--        }
--    }
-+    if (loadData(mapfile, ctxt, "vendor", vendorCB, data) < 0)
-+        goto cleanup;
- 
--    if (loadIncludes(ctxt, cb, data) < 0)
-+    if (loadData(mapfile, ctxt, "feature", featureCB, data) < 0)
-+        goto cleanup;
-+
-+    if (loadData(mapfile, ctxt, "model", modelCB, data) < 0)
-+        goto cleanup;
-+
-+    if (loadIncludes(ctxt, vendorCB, featureCB, modelCB, data) < 0)
-         goto cleanup;
- 
-     ret = 0;
-diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h
-index 0c7507e98f..4596987150 100644
---- a/src/cpu/cpu_map.h
-+++ b/src/cpu/cpu_map.h
-@@ -26,28 +26,16 @@
- 
- # include "virxml.h"
- 
--
--typedef enum {
--    CPU_MAP_ELEMENT_VENDOR,
--    CPU_MAP_ELEMENT_FEATURE,
--    CPU_MAP_ELEMENT_MODEL,
--
--    CPU_MAP_ELEMENT_LAST
--} cpuMapElement;
--
--VIR_ENUM_DECL(cpuMapElement)
--
--
- typedef int
--(*cpuMapLoadCallback)  (cpuMapElement element,
--                        xmlXPathContextPtr ctxt,
--                        xmlNodePtr *nodes,
--                        int n,
-+(*cpuMapLoadCallback)  (xmlXPathContextPtr ctxt,
-+                        const char *name,
-                         void *data);
- 
- int
- cpuMapLoad(const char *arch,
--           cpuMapLoadCallback cb,
-+           cpuMapLoadCallback vendorCB,
-+           cpuMapLoadCallback featureCB,
-+           cpuMapLoadCallback modelCB,
-            void *data);
- 
- #endif /* __VIR_CPU_MAP_H__ */
-diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
-index d562677fa3..75da5b77d8 100644
---- a/src/cpu/cpu_ppc64.c
-+++ b/src/cpu/cpu_ppc64.c
-@@ -281,21 +281,19 @@ ppc64MapFree(struct ppc64_map *map)
-     VIR_FREE(map);
- }
- 
--static struct ppc64_vendor *
--ppc64VendorParse(xmlXPathContextPtr ctxt,
--                 struct ppc64_map *map)
-+static int
-+ppc64VendorParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED,
-+                 const char *name,
-+                 void *data)
- {
-+    struct ppc64_map *map = data;
-     struct ppc64_vendor *vendor;
- 
-     if (VIR_ALLOC(vendor) < 0)
--        return NULL;
-+        return -1;
- 
--    vendor->name = virXPathString("string(@name)", ctxt);
--    if (!vendor->name) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       "%s", _("Missing CPU vendor name"));
-+    if (VIR_STRDUP(vendor->name, name) < 0)
-         goto error;
--    }
- 
-     if (ppc64VendorFind(map, vendor->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -303,57 +301,36 @@ ppc64VendorParse(xmlXPathContextPtr ctxt,
-         goto error;
-     }
- 
--    return vendor;
-+    if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
-+        goto error;
-+
-+    return 0;
- 
-  error:
-     ppc64VendorFree(vendor);
--    return NULL;
-+    return -1;
- }
- 
- 
- static int
--ppc64VendorsLoad(struct ppc64_map *map,
--                 xmlXPathContextPtr ctxt,
--                 xmlNodePtr *nodes,
--                 int n)
--{
--    struct ppc64_vendor *vendor;
--    size_t i;
--
--    if (VIR_ALLOC_N(map->vendors, n) < 0)
--        return -1;
--
--    for (i = 0; i < n; i++) {
--        ctxt->node = nodes[i];
--        if (!(vendor = ppc64VendorParse(ctxt, map)))
--            return -1;
--        map->vendors[map->nvendors++] = vendor;
--    }
--
--    return 0;
--}
--
--
--static struct ppc64_model *
- ppc64ModelParse(xmlXPathContextPtr ctxt,
--                struct ppc64_map *map)
-+                const char *name,
-+                void *data)
- {
-+    struct ppc64_map *map = data;
-     struct ppc64_model *model;
-     xmlNodePtr *nodes = NULL;
-     char *vendor = NULL;
-     unsigned long pvr;
-     size_t i;
-     int n;
-+    int ret = -1;
- 
-     if (VIR_ALLOC(model) < 0)
-         goto error;
- 
--    model->name = virXPathString("string(@name)", ctxt);
--    if (!model->name) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       "%s", _("Missing CPU model name"));
-+    if (VIR_STRDUP(model->name, name) < 0)
-         goto error;
--    }
- 
-     if (ppc64ModelFind(map, model->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -410,63 +387,22 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
-         model->data.pvr[i].mask = pvr;
-     }
- 
-+    if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
-+        goto error;
-+
-+    ret = 0;
-+
-  cleanup:
-     VIR_FREE(vendor);
-     VIR_FREE(nodes);
--    return model;
-+    return ret;
- 
-  error:
-     ppc64ModelFree(model);
--    model = NULL;
-     goto cleanup;
- }
- 
- 
--static int
--ppc64ModelsLoad(struct ppc64_map *map,
--                xmlXPathContextPtr ctxt,
--                xmlNodePtr *nodes,
--                int n)
--{
--    struct ppc64_model *model;
--    size_t i;
--
--    if (VIR_ALLOC_N(map->models, n) < 0)
--        return -1;
--
--    for (i = 0; i < n; i++) {
--        ctxt->node = nodes[i];
--        if (!(model = ppc64ModelParse(ctxt, map)))
--            return -1;
--        map->models[map->nmodels++] = model;
--    }
--
--    return 0;
--}
--
--
--static int
--ppc64MapLoadCallback(cpuMapElement element,
--                     xmlXPathContextPtr ctxt,
--                     xmlNodePtr *nodes,
--                     int n,
--                     void *data)
--{
--    struct ppc64_map *map = data;
--
--    switch (element) {
--    case CPU_MAP_ELEMENT_VENDOR:
--        return ppc64VendorsLoad(map, ctxt, nodes, n);
--    case CPU_MAP_ELEMENT_MODEL:
--        return ppc64ModelsLoad(map, ctxt, nodes, n);
--    case CPU_MAP_ELEMENT_FEATURE:
--    case CPU_MAP_ELEMENT_LAST:
--        break;
--    }
--
--    return 0;
--}
--
- static struct ppc64_map *
- ppc64LoadMap(void)
- {
-@@ -475,7 +411,7 @@ ppc64LoadMap(void)
-     if (VIR_ALLOC(map) < 0)
-         goto error;
- 
--    if (cpuMapLoad("ppc64", ppc64MapLoadCallback, map) < 0)
-+    if (cpuMapLoad("ppc64", ppc64VendorParse, NULL, ppc64ModelParse, map) < 0)
-         goto error;
- 
-     return map;
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 124aa5fd5e..11dbd1e757 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -720,22 +720,21 @@ x86VendorFind(virCPUx86MapPtr map,
- }
- 
- 
--static virCPUx86VendorPtr
-+static int
- x86VendorParse(xmlXPathContextPtr ctxt,
--               virCPUx86MapPtr map)
-+               const char *name,
-+               void *data)
- {
-+    virCPUx86MapPtr map = data;
-     virCPUx86VendorPtr vendor = NULL;
-     char *string = NULL;
-+    int ret = -1;
- 
-     if (VIR_ALLOC(vendor) < 0)
-         goto error;
- 
--    vendor->name = virXPathString("string(@name)", ctxt);
--    if (!vendor->name) {
--        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                       _("Missing CPU vendor name"));
-+    if (VIR_STRDUP(vendor->name, name) < 0)
-         goto error;
--    }
- 
-     if (x86VendorFind(map, vendor->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -754,40 +753,21 @@ x86VendorParse(xmlXPathContextPtr ctxt,
-     if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0)
-         goto error;
- 
-+    if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
-+        goto error;
-+
-+    ret = 0;
-+
-  cleanup:
-     VIR_FREE(string);
--    return vendor;
-+    return ret;
- 
-  error:
-     x86VendorFree(vendor);
--    vendor = NULL;
-     goto cleanup;
- }
- 
- 
--static int
--x86VendorsLoad(virCPUx86MapPtr map,
--               xmlXPathContextPtr ctxt,
--               xmlNodePtr *nodes,
--               int n)
--{
--    virCPUx86VendorPtr vendor;
--    size_t i;
--
--    if (VIR_ALLOC_N(map->vendors, n) < 0)
--        return -1;
--
--    for (i = 0; i < n; i++) {
--        ctxt->node = nodes[i];
--        if (!(vendor = x86VendorParse(ctxt, map)))
--            return -1;
--        map->vendors[map->nvendors++] = vendor;
--    }
--
--    return 0;
--}
--
--
- static virCPUx86FeaturePtr
- x86FeatureNew(void)
- {
-@@ -909,27 +889,27 @@ x86ParseCPUID(xmlXPathContextPtr ctxt,
- }
- 
- 
--static virCPUx86FeaturePtr
-+static int
- x86FeatureParse(xmlXPathContextPtr ctxt,
--                virCPUx86MapPtr map)
-+                const char *name,
-+                void *data)
- {
-+    virCPUx86MapPtr map = data;
-     xmlNodePtr *nodes = NULL;
-     virCPUx86FeaturePtr feature;
-     virCPUx86CPUID cpuid;
-     size_t i;
-     int n;
-     char *str = NULL;
-+    int ret = -1;
- 
-     if (!(feature = x86FeatureNew()))
-         goto error;
- 
-     feature->migratable = true;
--    feature->name = virXPathString("string(@name)", ctxt);
--    if (!feature->name) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       "%s", _("Missing CPU feature name"));
-+
-+    if (VIR_STRDUP(feature->name, name) < 0)
-         goto error;
--    }
- 
-     if (x86FeatureFind(map, feature->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -957,46 +937,28 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-             goto error;
-     }
- 
-+    if (!feature->migratable &&
-+        VIR_APPEND_ELEMENT_COPY(map->migrate_blockers,
-+                                map->nblockers,
-+                                feature) < 0)
-+        goto error;
-+
-+    if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0)
-+        goto error;
-+
-+    ret = 0;
-+
-  cleanup:
-     VIR_FREE(nodes);
-     VIR_FREE(str);
--    return feature;
-+    return ret;
- 
-  error:
-     x86FeatureFree(feature);
--    feature = NULL;
-     goto cleanup;
- }
- 
- 
--static int
--x86FeaturesLoad(virCPUx86MapPtr map,
--                xmlXPathContextPtr ctxt,
--                xmlNodePtr *nodes,
--                int n)
--{
--    virCPUx86FeaturePtr feature;
--    size_t i;
--
--    if (VIR_ALLOC_N(map->features, n) < 0)
--        return -1;
--
--    for (i = 0; i < n; i++) {
--        ctxt->node = nodes[i];
--        if (!(feature = x86FeatureParse(ctxt, map)))
--            return -1;
--        map->features[map->nfeatures++] = feature;
--        if (!feature->migratable &&
--            VIR_APPEND_ELEMENT(map->migrate_blockers,
--                               map->nblockers,
--                               feature) < 0)
--            return -1;
--    }
--
--    return 0;
--}
--
--
- static virCPUx86ModelPtr
- x86ModelNew(void)
- {
-@@ -1192,47 +1154,46 @@ x86ModelCompare(virCPUx86ModelPtr model1,
- }
- 
- 
--static virCPUx86ModelPtr
-+static int
- x86ModelParse(xmlXPathContextPtr ctxt,
--              virCPUx86MapPtr map)
-+              const char *name,
-+              void *data)
- {
-+    virCPUx86MapPtr map = data;
-     xmlNodePtr *nodes = NULL;
-     virCPUx86ModelPtr model;
-     char *vendor = NULL;
-     size_t i;
-     int n;
-+    int ret = -1;
- 
-     if (!(model = x86ModelNew()))
-         goto error;
- 
--    model->name = virXPathString("string(@name)", ctxt);
--    if (!model->name) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       "%s", _("Missing CPU model name"));
-+    if (VIR_STRDUP(model->name, name) < 0)
-         goto error;
--    }
- 
-     if (virXPathNode("./model", ctxt)) {
-         virCPUx86ModelPtr ancestor;
--        char *name;
-+        char *anname;
- 
--        name = virXPathString("string(./model/@name)", ctxt);
--        if (!name) {
-+        anname = virXPathString("string(./model/@name)", ctxt);
-+        if (!anname) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Missing ancestor's name in CPU model %s"),
-                            model->name);
-             goto error;
-         }
- 
--        if (!(ancestor = x86ModelFind(map, name))) {
-+        if (!(ancestor = x86ModelFind(map, anname))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Ancestor model %s not found for CPU model %s"),
--                           name, model->name);
--            VIR_FREE(name);
-+                           anname, model->name);
-+            VIR_FREE(anname);
-             goto error;
-         }
- 
--        VIR_FREE(name);
-+        VIR_FREE(anname);
- 
-         model->vendor = ancestor->vendor;
-         model->signature = ancestor->signature;
-@@ -1287,62 +1248,43 @@ x86ModelParse(xmlXPathContextPtr ctxt,
- 
-     for (i = 0; i < n; i++) {
-         virCPUx86FeaturePtr feature;
--        char *name;
-+        char *ftname;
- 
--        if (!(name = virXMLPropString(nodes[i], "name"))) {
-+        if (!(ftname = virXMLPropString(nodes[i], "name"))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Missing feature name for CPU model %s"), model->name);
-             goto error;
-         }
- 
--        if (!(feature = x86FeatureFind(map, name))) {
-+        if (!(feature = x86FeatureFind(map, ftname))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Feature %s required by CPU model %s not found"),
--                           name, model->name);
--            VIR_FREE(name);
-+                           ftname, model->name);
-+            VIR_FREE(ftname);
-             goto error;
-         }
--        VIR_FREE(name);
-+        VIR_FREE(ftname);
- 
-         if (x86DataAdd(&model->data, &feature->data))
-             goto error;
-     }
- 
-+    if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
-+        goto error;
-+
-+    ret = 0;
-+
-  cleanup:
-     VIR_FREE(vendor);
-     VIR_FREE(nodes);
--    return model;
-+    return ret;
- 
-  error:
-     x86ModelFree(model);
--    model = NULL;
-     goto cleanup;
- }
- 
- 
--static int
--x86ModelsLoad(virCPUx86MapPtr map,
--              xmlXPathContextPtr ctxt,
--              xmlNodePtr *nodes,
--              int n)
--{
--    virCPUx86ModelPtr model;
--    size_t i;
--
--    if (VIR_ALLOC_N(map->models, n) < 0)
--        return -1;
--
--    for (i = 0; i < n; i++) {
--        ctxt->node = nodes[i];
--        if (!(model = x86ModelParse(ctxt, map)))
--            return -1;
--        map->models[map->nmodels++] = model;
--    }
--
--    return 0;
--}
--
--
- static void
- x86MapFree(virCPUx86MapPtr map)
- {
-@@ -1372,30 +1314,6 @@ x86MapFree(virCPUx86MapPtr map)
- }
- 
- 
--static int
--x86MapLoadCallback(cpuMapElement element,
--                   xmlXPathContextPtr ctxt,
--                   xmlNodePtr *nodes,
--                   int n,
--                   void *data)
--{
--    virCPUx86MapPtr map = data;
--
--    switch (element) {
--    case CPU_MAP_ELEMENT_VENDOR:
--        return x86VendorsLoad(map, ctxt, nodes, n);
--    case CPU_MAP_ELEMENT_FEATURE:
--        return x86FeaturesLoad(map, ctxt, nodes, n);
--    case CPU_MAP_ELEMENT_MODEL:
--        return x86ModelsLoad(map, ctxt, nodes, n);
--    case CPU_MAP_ELEMENT_LAST:
--        break;
--    }
--
--    return 0;
--}
--
--
- static virCPUx86MapPtr
- virCPUx86LoadMap(void)
- {
-@@ -1404,7 +1322,7 @@ virCPUx86LoadMap(void)
-     if (VIR_ALLOC(map) < 0)
-         return NULL;
- 
--    if (cpuMapLoad("x86", x86MapLoadCallback, map) < 0)
-+    if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0)
-         goto error;
- 
-     return map;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu-simplify-failure-cleanup-paths.patch b/SOURCES/libvirt-cpu-simplify-failure-cleanup-paths.patch
deleted file mode 100644
index 74ad548..0000000
--- a/SOURCES/libvirt-cpu-simplify-failure-cleanup-paths.patch
+++ /dev/null
@@ -1,397 +0,0 @@
-From 85d367abe6063225117cc27c85e01e36a7b70409 Mon Sep 17 00:00:00 2001
-Message-Id: <85d367abe6063225117cc27c85e01e36a7b70409@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:47 +0200
-Subject: [PATCH] cpu: simplify failure cleanup paths
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Get rid of the separate 'error:' label, so all code paths jump straight
-to the 'cleanup:' label.
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 18cab54c3a0bc72390f29300684396690a7ecf51)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <40ff4abfea153cf8210286a84967c3ca7850b775.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_ppc64.c | 38 ++++++++++++------------
- src/cpu/cpu_x86.c   | 71 ++++++++++++++++++++-------------------------
- 2 files changed, 49 insertions(+), 60 deletions(-)
-
-diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
-index 75da5b77d8..fcba7e9b37 100644
---- a/src/cpu/cpu_ppc64.c
-+++ b/src/cpu/cpu_ppc64.c
-@@ -288,27 +288,28 @@ ppc64VendorParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED,
- {
-     struct ppc64_map *map = data;
-     struct ppc64_vendor *vendor;
-+    int ret = -1;
- 
-     if (VIR_ALLOC(vendor) < 0)
-         return -1;
- 
-     if (VIR_STRDUP(vendor->name, name) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (ppc64VendorFind(map, vendor->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("CPU vendor %s already defined"), vendor->name);
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
--        goto error;
-+        goto cleanup;
- 
--    return 0;
-+    ret = 0;
- 
-- error:
-+ cleanup:
-     ppc64VendorFree(vendor);
--    return -1;
-+    return ret;
- }
- 
- 
-@@ -327,15 +328,15 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
-     int ret = -1;
- 
-     if (VIR_ALLOC(model) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (VIR_STRDUP(model->name, name) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (ppc64ModelFind(map, model->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("CPU model %s already defined"), model->name);
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (virXPathBoolean("boolean(./vendor)", ctxt)) {
-@@ -344,14 +345,14 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid vendor element in CPU model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
- 
-         if (!(model->vendor = ppc64VendorFind(map, vendor))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Unknown vendor %s referenced by CPU model %s"),
-                            vendor, model->name);
--            goto error;
-+            goto cleanup;
-         }
-     }
- 
-@@ -359,11 +360,11 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Missing PVR information for CPU model %s"),
-                        model->name);
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (VIR_ALLOC_N(model->data.pvr, n) < 0)
--        goto error;
-+        goto cleanup;
- 
-     model->data.len = n;
- 
-@@ -374,7 +375,7 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Missing or invalid PVR value in CPU model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
-         model->data.pvr[i].value = pvr;
- 
-@@ -382,24 +383,21 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Missing or invalid PVR mask in CPU model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
-         model->data.pvr[i].mask = pvr;
-     }
- 
-     if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
--        goto error;
-+        goto cleanup;
- 
-     ret = 0;
- 
-  cleanup:
-+    ppc64ModelFree(model);
-     VIR_FREE(vendor);
-     VIR_FREE(nodes);
-     return ret;
--
-- error:
--    ppc64ModelFree(model);
--    goto cleanup;
- }
- 
- 
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 11dbd1e757..ce48ca6867 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -731,15 +731,15 @@ x86VendorParse(xmlXPathContextPtr ctxt,
-     int ret = -1;
- 
-     if (VIR_ALLOC(vendor) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (VIR_STRDUP(vendor->name, name) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (x86VendorFind(map, vendor->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("CPU vendor %s already defined"), vendor->name);
--        goto error;
-+        goto cleanup;
-     }
- 
-     string = virXPathString("string(@string)", ctxt);
-@@ -747,24 +747,21 @@ x86VendorParse(xmlXPathContextPtr ctxt,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Missing vendor string for CPU vendor %s"),
-                        vendor->name);
--        goto error;
-+        goto cleanup;
-     }
- 
-     if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
--        goto error;
-+        goto cleanup;
- 
-     ret = 0;
- 
-  cleanup:
-+    x86VendorFree(vendor);
-     VIR_FREE(string);
-     return ret;
--
-- error:
--    x86VendorFree(vendor);
--    goto cleanup;
- }
- 
- 
-@@ -904,17 +901,17 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-     int ret = -1;
- 
-     if (!(feature = x86FeatureNew()))
--        goto error;
-+        goto cleanup;
- 
-     feature->migratable = true;
- 
-     if (VIR_STRDUP(feature->name, name) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (x86FeatureFind(map, feature->name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("CPU feature %s already defined"), feature->name);
--        goto error;
-+        goto cleanup;
-     }
- 
-     str = virXPathString("string(@migratable)", ctxt);
-@@ -923,7 +920,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
- 
-     n = virXPathNodeSet("./cpuid", ctxt, &nodes);
-     if (n < 0)
--        goto error;
-+        goto cleanup;
- 
-     for (i = 0; i < n; i++) {
-         ctxt->node = nodes[i];
-@@ -931,31 +928,28 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid cpuid[%zu] in %s feature"),
-                            i, feature->name);
--            goto error;
-+            goto cleanup;
-         }
-         if (virCPUx86DataAddCPUIDInt(&feature->data, &cpuid))
--            goto error;
-+            goto cleanup;
-     }
- 
-     if (!feature->migratable &&
-         VIR_APPEND_ELEMENT_COPY(map->migrate_blockers,
-                                 map->nblockers,
-                                 feature) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0)
--        goto error;
-+        goto cleanup;
- 
-     ret = 0;
- 
-  cleanup:
-+    x86FeatureFree(feature);
-     VIR_FREE(nodes);
-     VIR_FREE(str);
-     return ret;
--
-- error:
--    x86FeatureFree(feature);
--    goto cleanup;
- }
- 
- 
-@@ -1168,10 +1162,10 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     int ret = -1;
- 
-     if (!(model = x86ModelNew()))
--        goto error;
-+        goto cleanup;
- 
-     if (VIR_STRDUP(model->name, name) < 0)
--        goto error;
-+        goto cleanup;
- 
-     if (virXPathNode("./model", ctxt)) {
-         virCPUx86ModelPtr ancestor;
-@@ -1182,7 +1176,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Missing ancestor's name in CPU model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
- 
-         if (!(ancestor = x86ModelFind(map, anname))) {
-@@ -1190,7 +1184,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-                            _("Ancestor model %s not found for CPU model %s"),
-                            anname, model->name);
-             VIR_FREE(anname);
--            goto error;
-+            goto cleanup;
-         }
- 
-         VIR_FREE(anname);
-@@ -1198,7 +1192,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-         model->vendor = ancestor->vendor;
-         model->signature = ancestor->signature;
-         if (x86DataCopy(&model->data, &ancestor->data) < 0)
--            goto error;
-+            goto cleanup;
-     }
- 
-     if (virXPathBoolean("boolean(./signature)", ctxt)) {
-@@ -1211,7 +1205,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid CPU signature family in model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
- 
-         rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
-@@ -1219,7 +1213,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid CPU signature model in model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
- 
-         model->signature = x86MakeSignature(sigFamily, sigModel, 0);
-@@ -1231,20 +1225,20 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid vendor element in CPU model %s"),
-                            model->name);
--            goto error;
-+            goto cleanup;
-         }
- 
-         if (!(model->vendor = x86VendorFind(map, vendor))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Unknown vendor %s referenced by CPU model %s"),
-                            vendor, model->name);
--            goto error;
-+            goto cleanup;
-         }
-     }
- 
-     n = virXPathNodeSet("./feature", ctxt, &nodes);
-     if (n < 0)
--        goto error;
-+        goto cleanup;
- 
-     for (i = 0; i < n; i++) {
-         virCPUx86FeaturePtr feature;
-@@ -1253,7 +1247,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-         if (!(ftname = virXMLPropString(nodes[i], "name"))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Missing feature name for CPU model %s"), model->name);
--            goto error;
-+            goto cleanup;
-         }
- 
-         if (!(feature = x86FeatureFind(map, ftname))) {
-@@ -1261,27 +1255,24 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-                            _("Feature %s required by CPU model %s not found"),
-                            ftname, model->name);
-             VIR_FREE(ftname);
--            goto error;
-+            goto cleanup;
-         }
-         VIR_FREE(ftname);
- 
-         if (x86DataAdd(&model->data, &feature->data))
--            goto error;
-+            goto cleanup;
-     }
- 
-     if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
--        goto error;
-+        goto cleanup;
- 
-     ret = 0;
- 
-  cleanup:
-+    x86ModelFree(model);
-     VIR_FREE(vendor);
-     VIR_FREE(nodes);
-     return ret;
--
-- error:
--    x86ModelFree(model);
--    goto cleanup;
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu.c-Check-properly-for-virCapabilitiesGetNodeInfo-retval.patch b/SOURCES/libvirt-cpu.c-Check-properly-for-virCapabilitiesGetNodeInfo-retval.patch
new file mode 100644
index 0000000..df7e1a6
--- /dev/null
+++ b/SOURCES/libvirt-cpu.c-Check-properly-for-virCapabilitiesGetNodeInfo-retval.patch
@@ -0,0 +1,41 @@
+From 4b8dbdb81eb6a755dc58b359e65b769ee1dc3f86 Mon Sep 17 00:00:00 2001
+Message-Id: <4b8dbdb81eb6a755dc58b359e65b769ee1dc3f86@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 24 Jan 2020 15:05:49 +0100
+Subject: [PATCH] cpu.c: Check properly for virCapabilitiesGetNodeInfo() retval
+
+The virCapabilitiesGetNodeInfo() function has the usual return
+value semantics for integeres: a negative value means an error,
+zero or a positive value means success. However, the function
+call done in virCPUProbeHost() doesn't check for the return value
+accordingly.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 609acf1f5d5d666148355719346c8ee05f911e33)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1794691
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <033f07f79bc9fa26f669c83f9aa790bfaef25b93.1579874719.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/cpu/cpu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
+index a2ae5b8c07..d99466472b 100644
+--- a/src/cpu/cpu.c
++++ b/src/cpu/cpu.c
+@@ -455,7 +455,7 @@ virCPUProbeHost(virArch arch)
+ {
+     virNodeInfo nodeinfo;
+ 
+-    if (virCapabilitiesGetNodeInfo(&nodeinfo))
++    if (virCapabilitiesGetNodeInfo(&nodeinfo) < 0)
+         return NULL;
+ 
+     return virCPUGetHost(arch, VIR_CPU_TYPE_HOST, &nodeinfo, NULL);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-cpu_conf-Format-vendor_id-for-host-model-CPUs.patch b/SOURCES/libvirt-cpu_conf-Format-vendor_id-for-host-model-CPUs.patch
new file mode 100644
index 0000000..e088020
--- /dev/null
+++ b/SOURCES/libvirt-cpu_conf-Format-vendor_id-for-host-model-CPUs.patch
@@ -0,0 +1,80 @@
+From 37b27a297ecb87e65f41c212aaabde7311b042d6 Mon Sep 17 00:00:00 2001
+Message-Id: <37b27a297ecb87e65f41c212aaabde7311b042d6@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 20 Feb 2020 09:08:05 +0100
+Subject: [PATCH] cpu_conf: Format vendor_id for host-model CPUs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In commit v5.9.0-400-gaf8e39921a I removed printing model's fallback and
+vendor_id attributes when no model is specified. However, vendor_id
+makes sense even without a specific CPU model (for host-model CPUs).
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804549
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 0905f222f1bfd9d741e94a8d653e05bb174846d3)
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <0b46ae9e26d1c7dbaa7f2dd58fd1156db237a853.1582186015.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/cpu_conf.c                                | 14 +++++++++-----
+ tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml |  4 +++-
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
+index 837d77581c..1a2948ce11 100644
+--- a/src/conf/cpu_conf.c
++++ b/src/conf/cpu_conf.c
+@@ -791,10 +791,10 @@ virCPUDefFormatBuf(virBufferPtr buf,
+         return -1;
+     }
+ 
+-    if (formatModel && def->model) {
++    if (formatModel && (def->model || def->vendor_id)) {
+         virBufferAddLit(buf, "<model");
+ 
+-        if (def->type == VIR_CPU_TYPE_GUEST) {
++        if (def->type == VIR_CPU_TYPE_GUEST && def->model) {
+             const char *fallback;
+ 
+             fallback = virCPUFallbackTypeToString(def->fallback);
+@@ -805,11 +805,15 @@ virCPUDefFormatBuf(virBufferPtr buf,
+                 return -1;
+             }
+             virBufferAsprintf(buf, " fallback='%s'", fallback);
+-            if (def->vendor_id)
+-                virBufferEscapeString(buf, " vendor_id='%s'", def->vendor_id);
+         }
+ 
+-        virBufferEscapeString(buf, ">%s</model>\n", def->model);
++        if (def->type == VIR_CPU_TYPE_GUEST)
++            virBufferEscapeString(buf, " vendor_id='%s'", def->vendor_id);
++
++        if (def->model)
++            virBufferEscapeString(buf, ">%s</model>\n", def->model);
++        else
++            virBufferAddLit(buf, "/>\n");
+     }
+ 
+     if (formatModel && def->vendor)
+diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+index d2447ccd10..2a7d0246cc 100644
+--- a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
++++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+@@ -8,7 +8,9 @@
+     <type arch='x86_64' machine='pc'>hvm</type>
+     <boot dev='network'/>
+   </os>
+-  <cpu mode='host-model' check='partial'/>
++  <cpu mode='host-model' check='partial'>
++    <model vendor_id='Libvirt QEMU'/>
++  </cpu>
+   <clock offset='utc'/>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-cpu_conf-Introduce-virCPUDefFilterFeatures.patch b/SOURCES/libvirt-cpu_conf-Introduce-virCPUDefFilterFeatures.patch
deleted file mode 100644
index debce13..0000000
--- a/SOURCES/libvirt-cpu_conf-Introduce-virCPUDefFilterFeatures.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 296ff8fbba31a8052bdf24e409b0bb9e3c041c8f Mon Sep 17 00:00:00 2001
-Message-Id: <296ff8fbba31a8052bdf24e409b0bb9e3c041c8f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:46 +0200
-Subject: [PATCH] cpu_conf: Introduce virCPUDefFilterFeatures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This new internal API can be used for in place filtering of CPU features
-in virCPUDef.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c145b660b8225f73db16660461077ef931730939)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <b3bd18c6e9cdf5256a7369bd06e5f773e160d9f3.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/cpu_conf.c      | 22 ++++++++++++++++++++++
- src/conf/cpu_conf.h      |  5 +++++
- src/libvirt_private.syms |  1 +
- 3 files changed, 28 insertions(+)
-
-diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index 43a3ab5dcd..51e2a83eae 100644
---- a/src/conf/cpu_conf.c
-+++ b/src/conf/cpu_conf.c
-@@ -850,6 +850,28 @@ virCPUDefFindFeature(virCPUDefPtr def,
- }
- 
- 
-+int
-+virCPUDefFilterFeatures(virCPUDefPtr cpu,
-+                        virCPUDefFeatureFilter filter,
-+                        void *opaque)
-+{
-+    size_t i = 0;
-+
-+    while (i < cpu->nfeatures) {
-+        if (filter(cpu->features[i].name, opaque)) {
-+            i++;
-+            continue;
-+        }
-+
-+        VIR_FREE(cpu->features[i].name);
-+        if (VIR_DELETE_ELEMENT_INPLACE(cpu->features, i, cpu->nfeatures) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- bool
- virCPUDefIsEqual(virCPUDefPtr src,
-                  virCPUDefPtr dst,
-diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
-index 9f2e7ee264..ad25932b9b 100644
---- a/src/conf/cpu_conf.h
-+++ b/src/conf/cpu_conf.h
-@@ -220,6 +220,11 @@ virCPUFeatureDefPtr
- virCPUDefFindFeature(virCPUDefPtr def,
-                      const char *name);
- 
-+int
-+virCPUDefFilterFeatures(virCPUDefPtr cpu,
-+                        virCPUDefFeatureFilter filter,
-+                        void *opaque);
-+
- virCPUDefPtr *
- virCPUDefListParse(const char **xmlCPUs,
-                    unsigned int ncpus,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 9ebc5384fb..57508de0c1 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -76,6 +76,7 @@ virCPUDefCopy;
- virCPUDefCopyModel;
- virCPUDefCopyModelFilter;
- virCPUDefCopyWithoutModel;
-+virCPUDefFilterFeatures;
- virCPUDefFindFeature;
- virCPUDefFormat;
- virCPUDefFormatBuf;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_conf-Pass-policy-to-CPU-feature-filtering-callbacks.patch b/SOURCES/libvirt-cpu_conf-Pass-policy-to-CPU-feature-filtering-callbacks.patch
deleted file mode 100644
index b0265c9..0000000
--- a/SOURCES/libvirt-cpu_conf-Pass-policy-to-CPU-feature-filtering-callbacks.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From acb2d441abd4b584c40748cbaf4f6f7a376753aa Mon Sep 17 00:00:00 2001
-Message-Id: <acb2d441abd4b584c40748cbaf4f6f7a376753aa@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Nov 2019 17:52:32 +0100
-Subject: [PATCH] cpu_conf: Pass policy to CPU feature filtering callbacks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 668797dc5cb474585609559dbe610e09517e23e6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749672
-https://bugzilla.redhat.com/show_bug.cgi?id=1756156
-https://bugzilla.redhat.com/show_bug.cgi?id=1721608
-
-Conflicts:
-	src/cpu/cpu_x86.c
-	src/qemu/qemu_capabilities.c
-            - no glib stuff downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <e35cd40bd84f7304288051c24fa0d4581c3d43cb.1573836581.git.jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/conf/cpu_conf.c          |  6 +++---
- src/conf/cpu_conf.h          |  1 +
- src/cpu/cpu_x86.c            | 13 ++++++++++++-
- src/cpu/cpu_x86.h            |  2 ++
- src/qemu/qemu_capabilities.c |  1 +
- src/qemu/qemu_capabilities.h |  1 +
- 6 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index 4cccea9981..d4e3c81145 100644
---- a/src/conf/cpu_conf.c
-+++ b/src/conf/cpu_conf.c
-@@ -135,7 +135,7 @@ virCPUDefCopyModelFilter(virCPUDefPtr dst,
-     dst->nfeatures = 0;
- 
-     for (i = 0; i < src->nfeatures; i++) {
--        if (filter && !filter(src->features[i].name, opaque))
-+        if (filter && !filter(src->features[i].name, src->features[i].policy, opaque))
-             continue;
- 
-         n = dst->nfeatures++;
-@@ -858,7 +858,7 @@ virCPUDefFilterFeatures(virCPUDefPtr cpu,
-     size_t i = 0;
- 
-     while (i < cpu->nfeatures) {
--        if (filter(cpu->features[i].name, opaque)) {
-+        if (filter(cpu->features[i].name, cpu->features[i].policy, opaque)) {
-             i++;
-             continue;
-         }
-@@ -893,7 +893,7 @@ virCPUDefCheckFeatures(virCPUDefPtr cpu,
-     *features = NULL;
- 
-     for (i = 0; i < cpu->nfeatures; i++) {
--        if (filter(cpu->features[i].name, opaque)) {
-+        if (filter(cpu->features[i].name, cpu->features[i].policy, opaque)) {
-             if (virStringListAdd(&list, cpu->features[i].name) < 0)
-                 return -1;
-             n++;
-diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
-index cba0ec7c81..687e1b09d2 100644
---- a/src/conf/cpu_conf.h
-+++ b/src/conf/cpu_conf.h
-@@ -162,6 +162,7 @@ virCPUDefCopyModel(virCPUDefPtr dst,
-  * Returns true if feature @name should copied, false otherwise.
-  */
- typedef bool (*virCPUDefFeatureFilter)(const char *name,
-+                                       virCPUFeaturePolicy policy,
-                                        void *opaque);
- 
- int
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 9104bdbf1e..cf5ef442e7 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -3260,6 +3260,15 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
- }
- 
- 
-+static bool
-+x86FeatureFilterMigratable(const char *name,
-+                           virCPUFeaturePolicy policy ATTRIBUTE_UNUSED,
-+                           void *cpu_map)
-+{
-+    return x86FeatureIsMigratable(name, cpu_map);
-+}
-+
-+
- static virCPUDefPtr
- virCPUx86CopyMigratable(virCPUDefPtr cpu)
- {
-@@ -3273,7 +3282,7 @@ virCPUx86CopyMigratable(virCPUDefPtr cpu)
-         return NULL;
- 
-     if (virCPUDefCopyModelFilter(copy, cpu, false,
--                                 x86FeatureIsMigratable, map) < 0)
-+                                 x86FeatureFilterMigratable, map) < 0)
-         goto error;
- 
-     return copy;
-@@ -3408,6 +3417,7 @@ virCPUx86FeatureIsMSR(const char *name)
-  */
- bool
- virCPUx86FeatureFilterSelectMSR(const char *name,
-+                                virCPUFeaturePolicy policy ATTRIBUTE_UNUSED,
-                                 void *opaque ATTRIBUTE_UNUSED)
- {
-     return virCPUx86FeatureIsMSR(name);
-@@ -3424,6 +3434,7 @@ virCPUx86FeatureFilterSelectMSR(const char *name,
-  */
- bool
- virCPUx86FeatureFilterDropMSR(const char *name,
-+                              virCPUFeaturePolicy policy ATTRIBUTE_UNUSED,
-                               void *opaque ATTRIBUTE_UNUSED)
- {
-     return !virCPUx86FeatureIsMSR(name);
-diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
-index 5126679985..866fe17e88 100644
---- a/src/cpu/cpu_x86.h
-+++ b/src/cpu/cpu_x86.h
-@@ -46,9 +46,11 @@ int virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                            const char *vendor);
- 
- bool virCPUx86FeatureFilterSelectMSR(const char *name,
-+                                     virCPUFeaturePolicy policy,
-                                      void *opaque);
- 
- bool virCPUx86FeatureFilterDropMSR(const char *name,
-+                                   virCPUFeaturePolicy policy,
-                                    void *opaque);
- 
- #endif /* __VIR_CPU_X86_H__ */
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index fbfe74d45b..c25d8c3e1a 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2753,6 +2753,7 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCapsPtr qemuCaps,
- 
- bool
- virQEMUCapsCPUFilterFeatures(const char *name,
-+                             virCPUFeaturePolicy policy ATTRIBUTE_UNUSED,
-                              void *opaque)
- {
-     virArch *arch = opaque;
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 1767b2ab6c..a4055d5458 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -629,6 +629,7 @@ bool virQEMUCapsGuestIsNative(virArch host,
-                               virArch guest);
- 
- bool virQEMUCapsCPUFilterFeatures(const char *name,
-+                                  virCPUFeaturePolicy policy,
-                                   void *opaque);
- 
- const char *
--- 
-2.24.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-Cascadelake-Server-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Cascadelake-Server-CPU-model.patch
deleted file mode 100644
index 7febd6c..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Cascadelake-Server-CPU-model.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-From 6d31e77ae83bb2b29d3bff5bd08742ee4c611e25 Mon Sep 17 00:00:00 2001
-Message-Id: <6d31e77ae83bb2b29d3bff5bd08742ee4c611e25@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:21 +0200
-Subject: [PATCH] cpu_map: Add Cascadelake-Server CPU model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduced in QEMU 3.1.0 by commit
-c7a88b52f62b30c04158eeb07f73e3f72221b6a8
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2878278c74cc450a7e28a3830ed0ceff3126f12f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1693433
-
-Conflicts:
-	src/cpu_map/index.xml
-        src/cpu_map/x86_Cascadelake-Server.xml
-            - cpu_map split not backported
-
-	tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
-	tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
-            - test data missing
-
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-            - md-clear feature did not exist at the time of the original
-              patch, but downstream already has it
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <d99c9ab500eb9a482450ba87dec52f5f3cf03429.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml                           | 81 +++++++++++++++++++
- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml |  5 +-
- .../x86_64-cpuid-Xeon-Platinum-8268-host.xml  |  5 +-
- .../x86_64-cpuid-Xeon-Platinum-8268-json.xml  |  5 +-
- 4 files changed, 84 insertions(+), 12 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index b2eb07b832..9b289556e8 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -2193,6 +2193,87 @@
-       <feature name='xsaveopt'/>
-     </model>
- 
-+    <model name='Cascadelake-Server'>
-+      <signature family='6' model='85'/> <!-- 050654 -->
-+      <vendor name='Intel'/>
-+      <feature name='3dnowprefetch'/>
-+      <feature name='abm'/>
-+      <feature name='adx'/>
-+      <feature name='aes'/>
-+      <feature name='apic'/>
-+      <feature name='arat'/>
-+      <feature name='avx'/>
-+      <feature name='avx2'/>
-+      <feature name='avx512bw'/>
-+      <feature name='avx512cd'/>
-+      <feature name='avx512dq'/>
-+      <feature name='avx512f'/>
-+      <feature name='avx512vl'/>
-+      <feature name='avx512vnni'/>
-+      <feature name='bmi1'/>
-+      <feature name='bmi2'/>
-+      <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='fma'/>
-+      <feature name='fpu'/>
-+      <feature name='fsgsbase'/>
-+      <feature name='fxsr'/>
-+      <feature name='hle'/>
-+      <feature name='invpcid'/>
-+      <feature name='lahf_lm'/>
-+      <feature name='lm'/>
-+      <feature name='mca'/>
-+      <feature name='mce'/>
-+      <feature name='mmx'/>
-+      <feature name='movbe'/>
-+      <feature name='mpx'/>
-+      <feature name='msr'/>
-+      <feature name='mtrr'/>
-+      <feature name='nx'/>
-+      <!-- 'ospke' is a dynamic feature and cannot be enabled manually
-+           see QEMU's commit 9ccb9784b57 for more details -->
-+      <feature name='pae'/>
-+      <feature name='pat'/>
-+      <feature name='pcid'/>
-+      <feature name='pclmuldq'/>
-+      <feature name='pdpe1gb'/>
-+      <feature name='pge'/>
-+      <feature name='pni'/>
-+      <feature name='popcnt'/>
-+      <feature name='pse'/>
-+      <feature name='pse36'/>
-+      <feature name='rdrand'/>
-+      <feature name='rdseed'/>
-+      <feature name='rdtscp'/>
-+      <feature name='rtm'/>
-+      <feature name='sep'/>
-+      <feature name='smap'/>
-+      <feature name='smep'/>
-+      <feature name='spec-ctrl'/>
-+      <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='tsc'/>
-+      <feature name='tsc-deadline'/>
-+      <feature name='vme'/>
-+      <feature name='x2apic'/>
-+      <feature name='xgetbv1'/>
-+      <feature name='xsave'/>
-+      <feature name='xsavec'/>
-+      <feature name='xsaveopt'/>
-+    </model>
-+
-     <!-- AMD CPUs -->
-     <model name='athlon'>
-       <vendor name='AMD'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-index 2836481454..c7e8a1fccf 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-@@ -1,5 +1,5 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Server-IBRS</model>
-+  <model fallback='forbid'>Cascadelake-Server</model>
-   <vendor>Intel</vendor>
-   <feature policy='require' name='ds'/>
-   <feature policy='require' name='acpi'/>
-@@ -20,15 +20,12 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
--  <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='pku'/>
-   <feature policy='require' name='ospke'/>
--  <feature policy='require' name='avx512vnni'/>
-   <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='arch-capabilities'/>
--  <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-index 032d8ffeca..d7482751b4 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Skylake-Server-IBRS</model>
-+  <model>Cascadelake-Server</model>
-   <vendor>Intel</vendor>
-   <feature name='ds'/>
-   <feature name='acpi'/>
-@@ -21,15 +21,12 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
--  <feature name='clflushopt'/>
-   <feature name='intel-pt'/>
-   <feature name='pku'/>
-   <feature name='ospke'/>
--  <feature name='avx512vnni'/>
-   <feature name='md-clear'/>
-   <feature name='stibp'/>
-   <feature name='arch-capabilities'/>
--  <feature name='ssbd'/>
-   <feature name='xsaves'/>
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-index 12431de213..b7d12dced7 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-@@ -1,13 +1,10 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Server-IBRS</model>
-+  <model fallback='forbid'>Cascadelake-Server</model>
-   <vendor>Intel</vendor>
-   <feature policy='require' name='ss'/>
-   <feature policy='require' name='hypervisor'/>
-   <feature policy='require' name='tsc_adjust'/>
--  <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='umip'/>
-   <feature policy='require' name='pku'/>
--  <feature policy='require' name='avx512vnni'/>
--  <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
- </cpu>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-Cooperlake-x86-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-Cooperlake-x86-CPU-model.patch
new file mode 100644
index 0000000..45155f5
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Add-Cooperlake-x86-CPU-model.patch
@@ -0,0 +1,289 @@
+From 1c8af21807f2cdaaa24651808f6dfeebfbcf75bb Mon Sep 17 00:00:00 2001
+Message-Id: <1c8af21807f2cdaaa24651808f6dfeebfbcf75bb@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:40 +0200
+Subject: [PATCH] cpu_map: Add Cooperlake x86 CPU model
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stepping range (10-11) is likely incomplete. QEMU uses 10 and the
+CPUID data for Cooperlake show 11. We will update the range if needed
+once more details about he CPU are available.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 3944f6855b9d4df73754bb6e5c8023d77399879b)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1781878
+
+Conflicts:
+	tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+	tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+	tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+            - test data files do not exist downstream
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <62f2fa3e2ecab2026c41e93430b4e2b695c674f0.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu_map/index.xml                         |  1 +
+ src/cpu_map/x86_Cooperlake.xml                | 90 +++++++++++++++++++
+ .../x86_64-cpuid-Cooperlake-guest.xml         | 13 +--
+ .../x86_64-cpuid-Cooperlake-host.xml          | 13 +--
+ .../x86_64-cpuid-Cooperlake-json.xml          | 13 +--
+ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
+ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
+ tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
+ 8 files changed, 100 insertions(+), 33 deletions(-)
+ create mode 100644 src/cpu_map/x86_Cooperlake.xml
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 50b030de29..ff1da2e677 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -54,6 +54,7 @@
+     <include filename="x86_Icelake-Client-noTSX.xml"/>
+     <include filename="x86_Icelake-Server.xml"/>
+     <include filename="x86_Icelake-Server-noTSX.xml"/>
++    <include filename="x86_Cooperlake.xml"/>
+ 
+     <!-- AMD CPUs -->
+     <include filename="x86_athlon.xml"/>
+diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
+new file mode 100644
+index 0000000000..41bd210638
+--- /dev/null
++++ b/src/cpu_map/x86_Cooperlake.xml
+@@ -0,0 +1,90 @@
++<cpus>
++  <model name='Cooperlake'>
++    <decode host='on' guest='on'/>
++    <signature family='6' model='85' stepping='10-11'/> <!-- 05065b -->
++    <vendor name='Intel'/>
++    <feature name="3dnowprefetch"/>
++    <feature name="abm"/>
++    <feature name="adx"/>
++    <feature name="aes"/>
++    <feature name="apic"/>
++    <feature name="arat"/>
++    <feature name="arch-capabilities"/>
++    <feature name="avx"/>
++    <feature name="avx2"/>
++    <feature name="avx512-bf16"/>
++    <feature name="avx512bw"/>
++    <feature name="avx512cd"/>
++    <feature name="avx512dq"/>
++    <feature name="avx512f"/>
++    <feature name="avx512vl"/>
++    <feature name="avx512vnni"/>
++    <feature name="bmi1"/>
++    <feature name="bmi2"/>
++    <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="fma"/>
++    <feature name="fpu"/>
++    <feature name="fsgsbase"/>
++    <feature name="fxsr"/>
++    <feature name="hle"/>
++    <feature name="ibrs-all"/>
++    <feature name="invpcid"/>
++    <feature name="lahf_lm"/>
++    <feature name="lm"/>
++    <feature name="mca"/>
++    <feature name="mce"/>
++    <feature name="mds-no"/>
++    <feature name="mmx"/>
++    <feature name="movbe"/>
++    <feature name="msr"/>
++    <feature name="mtrr"/>
++    <feature name="nx"/>
++    <feature name="pae"/>
++    <feature name="pat"/>
++    <feature name="pcid"/>
++    <feature name="pclmuldq"/>
++    <feature name="pdpe1gb"/>
++    <feature name="pge"/>
++    <feature name="pku"/>
++    <feature name="pni"/>
++    <feature name="popcnt"/>
++    <feature name="pschange-mc-no"/>
++    <feature name="pse"/>
++    <feature name="pse36"/>
++    <feature name="rdctl-no"/>
++    <feature name="rdrand"/>
++    <feature name="rdseed"/>
++    <feature name="rdtscp"/>
++    <feature name="rtm"/>
++    <feature name="sep"/>
++    <feature name="skip-l1dfl-vmentry"/>
++    <feature name="smap"/>
++    <feature name="smep"/>
++    <feature name="spec-ctrl"/>
++    <feature name="ssbd"/>
++    <feature name="sse"/>
++    <feature name="sse2"/>
++    <feature name="sse4.1"/>
++    <feature name="sse4.2"/>
++    <feature name="ssse3"/>
++    <feature name="stibp"/>
++    <feature name="syscall"/>
++    <feature name="taa-no"/>
++    <feature name="tsc"/>
++    <feature name="tsc-deadline"/>
++    <feature name="vme"/>
++    <feature name="x2apic"/>
++    <feature name="xgetbv1"/>
++    <feature name="xsave"/>
++    <feature name="xsavec"/>
++    <feature name="xsaveopt"/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+index db5598740c..f169458399 100644
+--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Cascadelake-Server</model>
++  <model fallback='forbid'>Cooperlake</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ds'/>
+   <feature policy='require' name='acpi'/>
+@@ -20,22 +20,13 @@
+   <feature policy='require' name='osxsave'/>
+   <feature policy='require' name='tsc_adjust'/>
+   <feature policy='require' name='cmt'/>
++  <feature policy='require' name='mpx'/>
+   <feature policy='require' name='intel-pt'/>
+-  <feature policy='require' name='pku'/>
+   <feature policy='require' name='ospke'/>
+   <feature policy='require' name='md-clear'/>
+-  <feature policy='require' name='stibp'/>
+-  <feature policy='require' name='arch-capabilities'/>
+-  <feature policy='require' name='avx512-bf16'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='mbm_total'/>
+   <feature policy='require' name='mbm_local'/>
+   <feature policy='require' name='invtsc'/>
+-  <feature policy='require' name='rdctl-no'/>
+-  <feature policy='require' name='ibrs-all'/>
+-  <feature policy='require' name='skip-l1dfl-vmentry'/>
+-  <feature policy='require' name='mds-no'/>
+-  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='require' name='tsx-ctrl'/>
+-  <feature policy='require' name='taa-no'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+index 6926b7c975..b0777181bb 100644
+--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+@@ -1,6 +1,6 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Cascadelake-Server</model>
++  <model>Cooperlake</model>
+   <vendor>Intel</vendor>
+   <feature name='ds'/>
+   <feature name='acpi'/>
+@@ -21,22 +21,13 @@
+   <feature name='osxsave'/>
+   <feature name='tsc_adjust'/>
+   <feature name='cmt'/>
++  <feature name='mpx'/>
+   <feature name='intel-pt'/>
+-  <feature name='pku'/>
+   <feature name='ospke'/>
+   <feature name='md-clear'/>
+-  <feature name='stibp'/>
+-  <feature name='arch-capabilities'/>
+-  <feature name='avx512-bf16'/>
+   <feature name='xsaves'/>
+   <feature name='mbm_total'/>
+   <feature name='mbm_local'/>
+   <feature name='invtsc'/>
+-  <feature name='rdctl-no'/>
+-  <feature name='ibrs-all'/>
+-  <feature name='skip-l1dfl-vmentry'/>
+-  <feature name='mds-no'/>
+-  <feature name='pschange-mc-no'/>
+   <feature name='tsx-ctrl'/>
+-  <feature name='taa-no'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+index fc52805b2f..fb319d547c 100644
+--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+@@ -1,24 +1,15 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Cascadelake-Server</model>
++  <model fallback='forbid'>Cooperlake</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ss'/>
+   <feature policy='require' name='vmx'/>
+   <feature policy='require' name='hypervisor'/>
+   <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='mpx'/>
+   <feature policy='require' name='umip'/>
+-  <feature policy='require' name='pku'/>
+   <feature policy='require' name='md-clear'/>
+-  <feature policy='require' name='stibp'/>
+-  <feature policy='require' name='arch-capabilities'/>
+-  <feature policy='require' name='avx512-bf16'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='ibpb'/>
+   <feature policy='require' name='amd-ssbd'/>
+-  <feature policy='require' name='rdctl-no'/>
+-  <feature policy='require' name='ibrs-all'/>
+-  <feature policy='require' name='skip-l1dfl-vmentry'/>
+-  <feature policy='require' name='mds-no'/>
+-  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='require' name='tsx-ctrl'/>
+-  <feature policy='require' name='taa-no'/>
+ </cpu>
+diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+index b7e2c8a4fe..7bfd786ff6 100644
+--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+@@ -93,6 +93,7 @@
+       <model usable='no'>EPYC-IBPB</model>
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
++      <model usable='no'>Cooperlake</model>
+       <model usable='yes'>Conroe</model>
+       <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+index d634803b29..0a4bb16a89 100644
+--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+@@ -101,6 +101,7 @@
+       <model usable='no'>EPYC-IBPB</model>
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
++      <model usable='no'>Cooperlake</model>
+       <model usable='yes'>Conroe</model>
+       <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+index d2741375b4..d6ee66ab60 100644
+--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+@@ -92,6 +92,7 @@
+       <model usable='no'>EPYC-IBPB</model>
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
++      <model usable='no'>Cooperlake</model>
+       <model usable='yes'>Conroe</model>
+       <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Add-Icelake-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-Icelake-CPU-models.patch
deleted file mode 100644
index e5b2285..0000000
--- a/SOURCES/libvirt-cpu_map-Add-Icelake-CPU-models.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 08c5219ec08bf4383278e3de8e86768f5148f0e0 Mon Sep 17 00:00:00 2001
-Message-Id: <08c5219ec08bf4383278e3de8e86768f5148f0e0@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 29 Aug 2018 14:29:20 +0200
-Subject: [PATCH] cpu_map: Add Icelake CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduced in QEMU by commit v3.0.0-156-g8a11c62da9.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 993d85ae5e2422a664ba5f700ed3bf7abd989cfc)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1526625
-
-Conflicts:
-        src/cpu_map/x86_Icelake-Client.xml
-        src/cpu_map/x86_Icelake-Server.xml
-            - cpu_map.xml is still monolithic in RHEL-8
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 178 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 178 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 4d19a7c811..cdb023e936 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -1955,6 +1955,184 @@
-       <feature name='xsaveopt'/>
-     </model>
- 
-+    <model name='Icelake-Client'>
-+      <signature family='6' model='126'/>
-+      <vendor name='Intel'/>
-+      <feature name='3dnowprefetch'/>
-+      <feature name='abm'/>
-+      <feature name='adx'/>
-+      <feature name='aes'/>
-+      <feature name='apic'/>
-+      <feature name='arat'/>
-+      <feature name='avx'/>
-+      <feature name='avx2'/>
-+      <feature name='avx512-vpopcntdq'/>
-+      <feature name='avx512bitalg'/>
-+      <feature name='avx512vbmi'/>
-+      <feature name='avx512vbmi2'/>
-+      <feature name='avx512vnni'/>
-+      <feature name='bmi1'/>
-+      <feature name='bmi2'/>
-+      <feature name='clflush'/>
-+      <feature name='cmov'/>
-+      <feature name='cx16'/>
-+      <feature name='cx8'/>
-+      <feature name='de'/>
-+      <feature name='erms'/>
-+      <feature name='f16c'/>
-+      <feature name='fma'/>
-+      <feature name='fpu'/>
-+      <feature name='fsgsbase'/>
-+      <feature name='fxsr'/>
-+      <feature name='gfni'/>
-+      <feature name='hle'/>
-+      <feature name='intel-pt'/>
-+      <feature name='invpcid'/>
-+      <feature name='lahf_lm'/>
-+      <feature name='lm'/>
-+      <feature name='mca'/>
-+      <feature name='mce'/>
-+      <feature name='mmx'/>
-+      <feature name='movbe'/>
-+      <feature name='mpx'/>
-+      <feature name='msr'/>
-+      <feature name='mtrr'/>
-+      <feature name='nx'/>
-+      <!-- 'ospke' is a dynamic feature and cannot be enabled manually
-+           see QEMU's commit 9ccb9784b57 for more details -->
-+      <feature name='pae'/>
-+      <feature name='pat'/>
-+      <feature name='pcid'/>
-+      <feature name='pclmuldq'/>
-+      <feature name='pge'/>
-+      <feature name='pku'/>
-+      <feature name='pni'/>
-+      <feature name='popcnt'/>
-+      <feature name='pse'/>
-+      <feature name='pse36'/>
-+      <feature name='rdrand'/>
-+      <feature name='rdseed'/>
-+      <feature name='rdtscp'/>
-+      <feature name='rtm'/>
-+      <feature name='sep'/>
-+      <feature name='smap'/>
-+      <feature name='smep'/>
-+      <feature name='spec-ctrl'/>
-+      <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='tsc'/>
-+      <feature name='tsc-deadline'/>
-+      <feature name='umip'/>
-+      <feature name='vaes'/>
-+      <feature name='vme'/>
-+      <feature name='vpclmulqdq'/>
-+      <feature name='wbnoinvd'/>
-+      <feature name='x2apic'/>
-+      <feature name='xgetbv1'/>
-+      <feature name='xsave'/>
-+      <feature name='xsavec'/>
-+      <feature name='xsaveopt'/>
-+    </model>
-+
-+    <model name='Icelake-Server'>
-+      <signature family='6' model='134'/>
-+      <vendor name='Intel'/>
-+      <feature name='3dnowprefetch'/>
-+      <feature name='abm'/>
-+      <feature name='adx'/>
-+      <feature name='aes'/>
-+      <feature name='apic'/>
-+      <feature name='arat'/>
-+      <feature name='avx'/>
-+      <feature name='avx2'/>
-+      <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='bmi1'/>
-+      <feature name='bmi2'/>
-+      <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='fma'/>
-+      <feature name='fpu'/>
-+      <feature name='fsgsbase'/>
-+      <feature name='fxsr'/>
-+      <feature name='gfni'/>
-+      <feature name='hle'/>
-+      <feature name='intel-pt'/>
-+      <feature name='invpcid'/>
-+      <feature name='la57'/>
-+      <feature name='lahf_lm'/>
-+      <feature name='lm'/>
-+      <feature name='mca'/>
-+      <feature name='mce'/>
-+      <feature name='mmx'/>
-+      <feature name='movbe'/>
-+      <feature name='mpx'/>
-+      <feature name='msr'/>
-+      <feature name='mtrr'/>
-+      <feature name='nx'/>
-+      <!-- 'ospke' is a dynamic feature and cannot be enabled manually
-+           see QEMU's commit 9ccb9784b57 for more details -->
-+      <feature name='pae'/>
-+      <feature name='pat'/>
-+      <feature name='pcid'/>
-+      <feature name='pclmuldq'/>
-+      <feature name='pconfig'/>
-+      <feature name='pdpe1gb'/>
-+      <feature name='pge'/>
-+      <feature name='pku'/>
-+      <feature name='pni'/>
-+      <feature name='popcnt'/>
-+      <feature name='pse'/>
-+      <feature name='pse36'/>
-+      <feature name='rdrand'/>
-+      <feature name='rdseed'/>
-+      <feature name='rdtscp'/>
-+      <feature name='rtm'/>
-+      <feature name='sep'/>
-+      <feature name='smap'/>
-+      <feature name='smep'/>
-+      <feature name='spec-ctrl'/>
-+      <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='tsc'/>
-+      <feature name='tsc-deadline'/>
-+      <feature name='umip'/>
-+      <feature name='vaes'/>
-+      <feature name='vme'/>
-+      <feature name='vpclmulqdq'/>
-+      <feature name='wbnoinvd'/>
-+      <feature name='x2apic'/>
-+      <feature name='xgetbv1'/>
-+      <feature name='xsave'/>
-+      <feature name='xsavec'/>
-+      <feature name='xsaveopt'/>
-+    </model>
-+
-     <!-- AMD CPUs -->
-     <model name='athlon'>
-       <vendor name='AMD'/>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-cpu_map-Add-TAA_NO-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch b/SOURCES/libvirt-cpu_map-Add-TAA_NO-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
deleted file mode 100644
index b3c3e7c..0000000
--- a/SOURCES/libvirt-cpu_map-Add-TAA_NO-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 06a798d6c6283b7041ec8fd631c1289b6fc1b29c Mon Sep 17 00:00:00 2001
-Message-Id: <06a798d6c6283b7041ec8fd631c1289b6fc1b29c@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 13 Dec 2019 14:28:07 +0100
-Subject: [PATCH] cpu_map: Add TAA_NO bit for IA32_ARCH_CAPABILITIES MSR
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2019-11135
-
-CPUs with TAA_NO bit of IA32_ARCH_CAPABILITIES MSR set to 1 are not
-vulnerable to TSX Asynchronous Abort and passing this bit to a guest
-may avoid unnecessary mitigations.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 07aaced4e6ea6db8b27f44636f51cafa6f1847a8)
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - cpu_map is still monolithic downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0ff574a85f1cc7b53140d41a6a62254bea08a06f.1576243094.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 7b9f8bb452..c2b3fca47a 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -501,6 +501,9 @@
-     <feature name='mds-no'>
-       <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
-     </feature>
-+    <feature name='taa-no'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
-+    </feature>
- 
-     <!-- models -->
-     <model name='486'>
--- 
-2.24.1
-
diff --git a/SOURCES/libvirt-cpu_map-Add-TSX_CTRL-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch b/SOURCES/libvirt-cpu_map-Add-TSX_CTRL-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
deleted file mode 100644
index 45743c2..0000000
--- a/SOURCES/libvirt-cpu_map-Add-TSX_CTRL-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From acc51748038a8074fe3a7c769b101455afd64eb7 Mon Sep 17 00:00:00 2001
-Message-Id: <acc51748038a8074fe3a7c769b101455afd64eb7@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 13 Dec 2019 14:28:08 +0100
-Subject: [PATCH] cpu_map: Add TSX_CTRL bit for IA32_ARCH_CAPABILITIES MSR
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2019-11135
-
-When TSX_CTRL bit of IA32_ARCH_CAPABILITIES MSR is set to 1, the CPU
-supports IA32_TSX_CTRL MSR which can be used to disable and/or mask TSX.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f411b7ef68221e82dec0129aaf2f2a26a8987504)
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - cpu_map is still monolithic downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <cb4f05c8c84ed910bcd4bceae58f6fd090684031.1576243094.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index c2b3fca47a..9609ce71a7 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -501,6 +501,9 @@
-     <feature name='mds-no'>
-       <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
-     </feature>
-+    <feature name='tsx-ctrl'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
-+    </feature>
-     <feature name='taa-no'>
-       <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
-     </feature>
--- 
-2.24.1
-
diff --git a/SOURCES/libvirt-cpu_map-Add-decode-element-to-x86-CPU-model-definitions.patch b/SOURCES/libvirt-cpu_map-Add-decode-element-to-x86-CPU-model-definitions.patch
new file mode 100644
index 0000000..515fa17
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Add-decode-element-to-x86-CPU-model-definitions.patch
@@ -0,0 +1,749 @@
+From 4658a565f5536002c3a65e942eed0d877cd1d070 Mon Sep 17 00:00:00 2001
+Message-Id: <4658a565f5536002c3a65e942eed0d877cd1d070@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:56 +0200
+Subject: [PATCH] cpu_map: Add <decode> element to x86 CPU model definitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The element specifies whether a particular CPU model can be used when
+creating a CPU definition from raw CPUID/MSR data. The @host attribute
+determines whether the CPU model can be used (host='on') for creating
+CPU definition for host capabilities. Usability of the model for domain
+capabilities and host-model CPU definitions is controlled by the @guest
+attribute.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit f4914045c2bff46b120c6c2af80066d24e48b609)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840008
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <3097db79eff1e45257ef12f891e8f9243bc8580f.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c                             | 43 +++++++++++++++++++
+ src/cpu_map/x86_486.xml                       |  1 +
+ src/cpu_map/x86_Broadwell-IBRS.xml            |  1 +
+ src/cpu_map/x86_Broadwell-noTSX-IBRS.xml      |  1 +
+ src/cpu_map/x86_Broadwell-noTSX.xml           |  1 +
+ src/cpu_map/x86_Broadwell.xml                 |  1 +
+ src/cpu_map/x86_Cascadelake-Server-noTSX.xml  |  1 +
+ src/cpu_map/x86_Cascadelake-Server.xml        |  1 +
+ src/cpu_map/x86_Conroe.xml                    |  1 +
+ src/cpu_map/x86_Dhyana.xml                    |  1 +
+ src/cpu_map/x86_EPYC-IBPB.xml                 |  1 +
+ src/cpu_map/x86_EPYC.xml                      |  1 +
+ src/cpu_map/x86_Haswell-IBRS.xml              |  1 +
+ src/cpu_map/x86_Haswell-noTSX-IBRS.xml        |  1 +
+ src/cpu_map/x86_Haswell-noTSX.xml             |  1 +
+ src/cpu_map/x86_Haswell.xml                   |  1 +
+ src/cpu_map/x86_Icelake-Client-noTSX.xml      |  1 +
+ src/cpu_map/x86_Icelake-Client.xml            |  1 +
+ src/cpu_map/x86_Icelake-Server-noTSX.xml      |  1 +
+ src/cpu_map/x86_Icelake-Server.xml            |  1 +
+ src/cpu_map/x86_IvyBridge-IBRS.xml            |  1 +
+ src/cpu_map/x86_IvyBridge.xml                 |  1 +
+ src/cpu_map/x86_Nehalem-IBRS.xml              |  1 +
+ src/cpu_map/x86_Nehalem.xml                   |  1 +
+ src/cpu_map/x86_Opteron_G1.xml                |  1 +
+ src/cpu_map/x86_Opteron_G2.xml                |  1 +
+ src/cpu_map/x86_Opteron_G3.xml                |  1 +
+ src/cpu_map/x86_Opteron_G4.xml                |  1 +
+ src/cpu_map/x86_Opteron_G5.xml                |  1 +
+ src/cpu_map/x86_Penryn.xml                    |  1 +
+ src/cpu_map/x86_SandyBridge-IBRS.xml          |  1 +
+ src/cpu_map/x86_SandyBridge.xml               |  1 +
+ src/cpu_map/x86_Skylake-Client-IBRS.xml       |  1 +
+ src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml |  1 +
+ src/cpu_map/x86_Skylake-Client.xml            |  1 +
+ src/cpu_map/x86_Skylake-Server-IBRS.xml       |  1 +
+ src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml |  1 +
+ src/cpu_map/x86_Skylake-Server.xml            |  1 +
+ src/cpu_map/x86_Westmere-IBRS.xml             |  1 +
+ src/cpu_map/x86_Westmere.xml                  |  1 +
+ src/cpu_map/x86_athlon.xml                    |  1 +
+ src/cpu_map/x86_core2duo.xml                  |  1 +
+ src/cpu_map/x86_coreduo.xml                   |  1 +
+ src/cpu_map/x86_cpu64-rhel5.xml               |  1 +
+ src/cpu_map/x86_cpu64-rhel6.xml               |  1 +
+ src/cpu_map/x86_kvm32.xml                     |  1 +
+ src/cpu_map/x86_kvm64.xml                     |  1 +
+ src/cpu_map/x86_n270.xml                      |  1 +
+ src/cpu_map/x86_pentium.xml                   |  1 +
+ src/cpu_map/x86_pentium2.xml                  |  1 +
+ src/cpu_map/x86_pentium3.xml                  |  1 +
+ src/cpu_map/x86_pentiumpro.xml                |  1 +
+ src/cpu_map/x86_phenom.xml                    |  1 +
+ src/cpu_map/x86_qemu32.xml                    |  1 +
+ src/cpu_map/x86_qemu64.xml                    |  1 +
+ 55 files changed, 97 insertions(+)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 8c865bdaa4..7fbb4c9a6c 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -125,6 +125,8 @@ typedef struct _virCPUx86Model virCPUx86Model;
+ typedef virCPUx86Model *virCPUx86ModelPtr;
+ struct _virCPUx86Model {
+     char *name;
++    bool decodeHost;
++    bool decodeGuest;
+     virCPUx86VendorPtr vendor;
+     size_t nsignatures;
+     uint32_t *signatures;
+@@ -1347,6 +1349,44 @@ x86ModelCompare(virCPUx86ModelPtr model1,
+ }
+ 
+ 
++static int
++x86ModelParseDecode(virCPUx86ModelPtr model,
++                    xmlXPathContextPtr ctxt)
++{
++    g_autofree char *host = NULL;
++    g_autofree char *guest = NULL;
++    int val;
++
++    if ((host = virXPathString("string(./decode/@host)", ctxt)))
++        val = virTristateSwitchTypeFromString(host);
++    else
++        val = VIR_TRISTATE_SWITCH_ABSENT;
++
++    if (val <= 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("invalid or missing decode/host attribute in CPU model %s"),
++                       model->name);
++        return -1;
++    }
++    model->decodeHost = val == VIR_TRISTATE_SWITCH_ON;
++
++    if ((guest = virXPathString("string(./decode/@guest)", ctxt)))
++        val = virTristateSwitchTypeFromString(guest);
++    else
++        val = VIR_TRISTATE_SWITCH_ABSENT;
++
++    if (val <= 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("invalid or missing decode/guest attribute in CPU model %s"),
++                       model->name);
++        return -1;
++    }
++    model->decodeGuest = val == VIR_TRISTATE_SWITCH_ON;
++
++    return 0;
++}
++
++
+ static int
+ x86ModelParseAncestor(virCPUx86ModelPtr model,
+                       xmlXPathContextPtr ctxt,
+@@ -1521,6 +1561,9 @@ x86ModelParse(xmlXPathContextPtr ctxt,
+ 
+     model->name = g_strdup(name);
+ 
++    if (x86ModelParseDecode(model, ctxt) < 0)
++        goto cleanup;
++
+     if (x86ModelParseAncestor(model, ctxt, map) < 0)
+         goto cleanup;
+ 
+diff --git a/src/cpu_map/x86_486.xml b/src/cpu_map/x86_486.xml
+index 61fa3797e8..d05b277392 100644
+--- a/src/cpu_map/x86_486.xml
++++ b/src/cpu_map/x86_486.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='486'>
++    <decode host='on' guest='on'/>
+     <feature name='fpu'/>
+     <feature name='pse'/>
+     <feature name='vme'/>
+diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
+index 4600cacec0..9033d5fcd5 100644
+--- a/src/cpu_map/x86_Broadwell-IBRS.xml
++++ b/src/cpu_map/x86_Broadwell-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Broadwell-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='61'/> <!-- 0306d0 -->
+     <signature family='6' model='71'/> <!-- 040670 -->
+     <signature family='6' model='79'/> <!-- 0406f0 -->
+diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+index b3fc0b726a..c044b60e36 100644
+--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Broadwell-noTSX-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='61'/> <!-- 0306d0 -->
+     <signature family='6' model='71'/> <!-- 040670 -->
+     <signature family='6' model='79'/> <!-- 0406f0 -->
+diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
+index ad932d0853..637f29ba1c 100644
+--- a/src/cpu_map/x86_Broadwell-noTSX.xml
++++ b/src/cpu_map/x86_Broadwell-noTSX.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Broadwell-noTSX'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='61'/> <!-- 0306d0 -->
+     <signature family='6' model='71'/> <!-- 040670 -->
+     <signature family='6' model='79'/> <!-- 0406f0 -->
+diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
+index 6de9227322..82939a4509 100644
+--- a/src/cpu_map/x86_Broadwell.xml
++++ b/src/cpu_map/x86_Broadwell.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Broadwell'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='61'/> <!-- 0306d0 -->
+     <signature family='6' model='71'/> <!-- 040670 -->
+     <signature family='6' model='79'/> <!-- 0406f0 -->
+diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+index d24415ebce..5adea664e9 100644
+--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
++++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Cascadelake-Server-noTSX'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
+index b69ac198b6..d7ec42f57e 100644
+--- a/src/cpu_map/x86_Cascadelake-Server.xml
++++ b/src/cpu_map/x86_Cascadelake-Server.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Cascadelake-Server'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Conroe.xml b/src/cpu_map/x86_Conroe.xml
+index 89fe0ad2cf..4cacee6142 100644
+--- a/src/cpu_map/x86_Conroe.xml
++++ b/src/cpu_map/x86_Conroe.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Conroe'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='15'/> <!-- 0006f0 -->
+     <signature family='6' model='22'/> <!-- 010660 -->
+     <vendor name='Intel'/>
+diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
+index cbc8020a94..689daf8649 100644
+--- a/src/cpu_map/x86_Dhyana.xml
++++ b/src/cpu_map/x86_Dhyana.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Dhyana'>
++    <decode host='on' guest='on'/>
+     <signature family='24' model='0'/> <!-- 900f00 -->
+     <vendor name='Hygon'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
+index 283697ebd1..983c5f4445 100644
+--- a/src/cpu_map/x86_EPYC-IBPB.xml
++++ b/src/cpu_map/x86_EPYC-IBPB.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='EPYC-IBPB'>
++    <decode host='on' guest='on'/>
+     <signature family='23' model='1'/> <!-- 800f10 -->
+     <vendor name='AMD'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
+index f0601392fd..3ebba9f4ed 100644
+--- a/src/cpu_map/x86_EPYC.xml
++++ b/src/cpu_map/x86_EPYC.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='EPYC'>
++    <decode host='on' guest='on'/>
+     <signature family='23' model='1'/> <!-- 800f10 -->
+     <vendor name='AMD'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
+index 4f86db838f..0ffe2bae0d 100644
+--- a/src/cpu_map/x86_Haswell-IBRS.xml
++++ b/src/cpu_map/x86_Haswell-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Haswell-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='60'/> <!-- 0306c0 -->
+     <signature family='6' model='63'/> <!-- 0306f0 -->
+     <signature family='6' model='69'/> <!-- 040650 -->
+diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+index 47318be6d5..75d709c009 100644
+--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Haswell-noTSX-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='60'/> <!-- 0306c0 -->
+     <signature family='6' model='63'/> <!-- 0306f0 -->
+     <signature family='6' model='69'/> <!-- 040650 -->
+diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
+index efd10c47de..b0a0faa856 100644
+--- a/src/cpu_map/x86_Haswell-noTSX.xml
++++ b/src/cpu_map/x86_Haswell-noTSX.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Haswell-noTSX'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='60'/> <!-- 0306c0 -->
+     <signature family='6' model='63'/> <!-- 0306f0 -->
+     <signature family='6' model='69'/> <!-- 040650 -->
+diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
+index ac358d7967..ee16b30f19 100644
+--- a/src/cpu_map/x86_Haswell.xml
++++ b/src/cpu_map/x86_Haswell.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Haswell'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='60'/> <!-- 0306c0 -->
+     <signature family='6' model='63'/> <!-- 0306f0 -->
+     <signature family='6' model='69'/> <!-- 040650 -->
+diff --git a/src/cpu_map/x86_Icelake-Client-noTSX.xml b/src/cpu_map/x86_Icelake-Client-noTSX.xml
+index cd51881f40..540732af6f 100644
+--- a/src/cpu_map/x86_Icelake-Client-noTSX.xml
++++ b/src/cpu_map/x86_Icelake-Client-noTSX.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Icelake-Client-noTSX'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='126'/> <!-- 0706e0 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Icelake-Client.xml b/src/cpu_map/x86_Icelake-Client.xml
+index fbd53bbe11..5cf32e91fa 100644
+--- a/src/cpu_map/x86_Icelake-Client.xml
++++ b/src/cpu_map/x86_Icelake-Client.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Icelake-Client'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='126'/> <!-- 0706e0 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
+index 538c656712..5a53da23c7 100644
+--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
++++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Icelake-Server-noTSX'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='134'/> <!-- 080660 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
+index a565371977..367ade7240 100644
+--- a/src/cpu_map/x86_Icelake-Server.xml
++++ b/src/cpu_map/x86_Icelake-Server.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Icelake-Server'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='134'/> <!-- 080660 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
+index e0f2adfa82..430bc3232d 100644
+--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
++++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='IvyBridge-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='58'/> <!-- 0306a0 -->
+     <signature family='6' model='62'/> <!-- 0306e0 -->
+     <vendor name='Intel'/>
+diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
+index 16213dbc62..eaf5d02e82 100644
+--- a/src/cpu_map/x86_IvyBridge.xml
++++ b/src/cpu_map/x86_IvyBridge.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='IvyBridge'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='58'/> <!-- 0306a0 -->
+     <signature family='6' model='62'/> <!-- 0306e0 -->
+     <vendor name='Intel'/>
+diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
+index 8cc19eff03..00d0d2fe51 100644
+--- a/src/cpu_map/x86_Nehalem-IBRS.xml
++++ b/src/cpu_map/x86_Nehalem-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Nehalem-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='26'/> <!-- 0106a0 -->
+     <signature family='6' model='30'/> <!-- 0106e0 -->
+     <signature family='6' model='31'/> <!-- 0106f0 -->
+diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
+index 530e5e8a0d..9968001fe7 100644
+--- a/src/cpu_map/x86_Nehalem.xml
++++ b/src/cpu_map/x86_Nehalem.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Nehalem'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='26'/> <!-- 0106a0 -->
+     <signature family='6' model='30'/> <!-- 0106e0 -->
+     <signature family='6' model='31'/> <!-- 0106f0 -->
+diff --git a/src/cpu_map/x86_Opteron_G1.xml b/src/cpu_map/x86_Opteron_G1.xml
+index 73cf1de71e..57648ca93f 100644
+--- a/src/cpu_map/x86_Opteron_G1.xml
++++ b/src/cpu_map/x86_Opteron_G1.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Opteron_G1'>
++    <decode host='on' guest='on'/>
+     <signature family='15' model='6'/> <!-- 100e60 -->
+     <vendor name='AMD'/>
+     <feature name='apic'/>
+diff --git a/src/cpu_map/x86_Opteron_G2.xml b/src/cpu_map/x86_Opteron_G2.xml
+index 342105730e..db961b0067 100644
+--- a/src/cpu_map/x86_Opteron_G2.xml
++++ b/src/cpu_map/x86_Opteron_G2.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Opteron_G2'>
++    <decode host='on' guest='on'/>
+     <signature family='15' model='6'/> <!-- 100e60 -->
+     <vendor name='AMD'/>
+     <feature name='apic'/>
+diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml
+index 7fbf8ac9e9..dab59d4f82 100644
+--- a/src/cpu_map/x86_Opteron_G3.xml
++++ b/src/cpu_map/x86_Opteron_G3.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Opteron_G3'>
++    <decode host='on' guest='on'/>
+     <signature family='15' model='6'/> <!-- 100e60 -->
+     <vendor name='AMD'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Opteron_G4.xml b/src/cpu_map/x86_Opteron_G4.xml
+index 463b3676a0..a7fc8d5828 100644
+--- a/src/cpu_map/x86_Opteron_G4.xml
++++ b/src/cpu_map/x86_Opteron_G4.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Opteron_G4'>
++    <decode host='on' guest='on'/>
+     <signature family='21' model='1'/> <!-- 600f10 -->
+     <vendor name='AMD'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Opteron_G5.xml b/src/cpu_map/x86_Opteron_G5.xml
+index 0f8fe32c87..ff775bdcef 100644
+--- a/src/cpu_map/x86_Opteron_G5.xml
++++ b/src/cpu_map/x86_Opteron_G5.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Opteron_G5'>
++    <decode host='on' guest='on'/>
+     <signature family='21' model='2'/> <!-- 600f20 -->
+     <vendor name='AMD'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Penryn.xml b/src/cpu_map/x86_Penryn.xml
+index 279bb05570..29d4cd635b 100644
+--- a/src/cpu_map/x86_Penryn.xml
++++ b/src/cpu_map/x86_Penryn.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Penryn'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='23'/> <!-- 010670 -->
+     <signature family='6' model='29'/> <!-- 0106d0 -->
+     <vendor name='Intel'/>
+diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
+index 7d1342ec6f..fbdb4f2bf6 100644
+--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
++++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='SandyBridge-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='42'/> <!-- 0206a0 -->
+     <signature family='6' model='45'/> <!-- 0206d0 -->
+     <vendor name='Intel'/>
+diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
+index 48e4ac8082..7c85ed42df 100644
+--- a/src/cpu_map/x86_SandyBridge.xml
++++ b/src/cpu_map/x86_SandyBridge.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='SandyBridge'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='42'/> <!-- 0206a0 -->
+     <signature family='6' model='45'/> <!-- 0206d0 -->
+     <vendor name='Intel'/>
+diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skylake-Client-IBRS.xml
+index 4440313fc4..5709e7c2f9 100644
+--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Skylake-Client-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='94'/> <!-- 0506e0 -->
+     <signature family='6' model='78'/> <!-- 0406e0 -->
+     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
+diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+index 3d2976692f..0c2f1e6ac4 100644
+--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Skylake-Client-noTSX-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='94'/> <!-- 0506e0 -->
+     <signature family='6' model='78'/> <!-- 0406e0 -->
+     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
+diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
+index 1053fa4a04..14cd57e176 100644
+--- a/src/cpu_map/x86_Skylake-Client.xml
++++ b/src/cpu_map/x86_Skylake-Client.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Skylake-Client'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='94'/> <!-- 0506e0 -->
+     <signature family='6' model='78'/> <!-- 0406e0 -->
+     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
+diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
+index 71179f9f74..bd6b6457ad 100644
+--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Skylake-Server-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+index 455a072119..91a206f575 100644
+--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Skylake-Server-noTSX-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
+index 2da69e0dfc..f96875a85f 100644
+--- a/src/cpu_map/x86_Skylake-Server.xml
++++ b/src/cpu_map/x86_Skylake-Server.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Skylake-Server'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
+index 3baf56f47a..c7898f0c22 100644
+--- a/src/cpu_map/x86_Westmere-IBRS.xml
++++ b/src/cpu_map/x86_Westmere-IBRS.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Westmere-IBRS'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='44'/> <!-- 0206c0 -->
+     <vendor name='Intel'/>
+     <feature name='aes'/>
+diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
+index 95c1d690c8..16e4ad6c30 100644
+--- a/src/cpu_map/x86_Westmere.xml
++++ b/src/cpu_map/x86_Westmere.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='Westmere'>
++    <decode host='on' guest='on'/>
+     <signature family='6' model='44'/> <!-- 0206c0 -->
+     <signature family='6' model='47'/> <!-- 0206f0 -->
+     <signature family='6' model='37'/> <!-- 020650 -->
+diff --git a/src/cpu_map/x86_athlon.xml b/src/cpu_map/x86_athlon.xml
+index 0d44508e20..81c43c81e8 100644
+--- a/src/cpu_map/x86_athlon.xml
++++ b/src/cpu_map/x86_athlon.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='athlon'>
++    <decode host='on' guest='on'/>
+     <vendor name='AMD'/>
+     <feature name='3dnow'/>
+     <feature name='3dnowext'/>
+diff --git a/src/cpu_map/x86_core2duo.xml b/src/cpu_map/x86_core2duo.xml
+index 3c9a148f3c..412039fe55 100644
+--- a/src/cpu_map/x86_core2duo.xml
++++ b/src/cpu_map/x86_core2duo.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='core2duo'>
++    <decode host='on' guest='on'/>
+     <vendor name='Intel'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+diff --git a/src/cpu_map/x86_coreduo.xml b/src/cpu_map/x86_coreduo.xml
+index 676e846920..e2fda9a1d4 100644
+--- a/src/cpu_map/x86_coreduo.xml
++++ b/src/cpu_map/x86_coreduo.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='coreduo'>
++    <decode host='on' guest='on'/>
+     <vendor name='Intel'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+diff --git a/src/cpu_map/x86_cpu64-rhel5.xml b/src/cpu_map/x86_cpu64-rhel5.xml
+index 670a92f274..be6bcdb7a6 100644
+--- a/src/cpu_map/x86_cpu64-rhel5.xml
++++ b/src/cpu_map/x86_cpu64-rhel5.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='cpu64-rhel5'>
++    <decode host='on' guest='on'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+     <feature name='cmov'/>
+diff --git a/src/cpu_map/x86_cpu64-rhel6.xml b/src/cpu_map/x86_cpu64-rhel6.xml
+index 3cae0f00c2..c62b1b5575 100644
+--- a/src/cpu_map/x86_cpu64-rhel6.xml
++++ b/src/cpu_map/x86_cpu64-rhel6.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='cpu64-rhel6'>
++    <decode host='on' guest='on'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+     <feature name='cmov'/>
+diff --git a/src/cpu_map/x86_kvm32.xml b/src/cpu_map/x86_kvm32.xml
+index 5f08a5e7fc..9dd96d5b56 100644
+--- a/src/cpu_map/x86_kvm32.xml
++++ b/src/cpu_map/x86_kvm32.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='kvm32'>
++    <decode host='on' guest='on'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+     <feature name='cmov'/>
+diff --git a/src/cpu_map/x86_kvm64.xml b/src/cpu_map/x86_kvm64.xml
+index 80b24e2a49..185af06f78 100644
+--- a/src/cpu_map/x86_kvm64.xml
++++ b/src/cpu_map/x86_kvm64.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='kvm64'>
++    <decode host='on' guest='on'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+     <feature name='cmov'/>
+diff --git a/src/cpu_map/x86_n270.xml b/src/cpu_map/x86_n270.xml
+index cb359d968e..5507d2ea3b 100644
+--- a/src/cpu_map/x86_n270.xml
++++ b/src/cpu_map/x86_n270.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='n270'>
++    <decode host='on' guest='on'/>
+     <vendor name='Intel'/>
+     <feature name='apic'/>
+     <feature name='clflush'/>
+diff --git a/src/cpu_map/x86_pentium.xml b/src/cpu_map/x86_pentium.xml
+index d44c1399b0..f0a8982115 100644
+--- a/src/cpu_map/x86_pentium.xml
++++ b/src/cpu_map/x86_pentium.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='pentium'>
++    <decode host='on' guest='on'/>
+     <feature name='cx8'/>
+     <feature name='de'/>
+     <feature name='fpu'/>
+diff --git a/src/cpu_map/x86_pentium2.xml b/src/cpu_map/x86_pentium2.xml
+index 0d772bad2f..aeba082297 100644
+--- a/src/cpu_map/x86_pentium2.xml
++++ b/src/cpu_map/x86_pentium2.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='pentium2'>
++    <decode host='on' guest='on'/>
+     <feature name='cmov'/>
+     <feature name='cx8'/>
+     <feature name='de'/>
+diff --git a/src/cpu_map/x86_pentium3.xml b/src/cpu_map/x86_pentium3.xml
+index 24eb227c28..ab85d2967f 100644
+--- a/src/cpu_map/x86_pentium3.xml
++++ b/src/cpu_map/x86_pentium3.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='pentium3'>
++    <decode host='on' guest='on'/>
+     <feature name='cmov'/>
+     <feature name='cx8'/>
+     <feature name='de'/>
+diff --git a/src/cpu_map/x86_pentiumpro.xml b/src/cpu_map/x86_pentiumpro.xml
+index 9f7a610a87..b6e061187c 100644
+--- a/src/cpu_map/x86_pentiumpro.xml
++++ b/src/cpu_map/x86_pentiumpro.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='pentiumpro'>
++    <decode host='on' guest='on'/>
+     <feature name='apic'/>
+     <feature name='cmov'/>
+     <feature name='cx8'/>
+diff --git a/src/cpu_map/x86_phenom.xml b/src/cpu_map/x86_phenom.xml
+index 71f004057b..f0f8ece57a 100644
+--- a/src/cpu_map/x86_phenom.xml
++++ b/src/cpu_map/x86_phenom.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='phenom'>
++    <decode host='on' guest='on'/>
+     <vendor name='AMD'/>
+     <feature name='3dnow'/>
+     <feature name='3dnowext'/>
+diff --git a/src/cpu_map/x86_qemu32.xml b/src/cpu_map/x86_qemu32.xml
+index 3c9cdec981..f3fb1959be 100644
+--- a/src/cpu_map/x86_qemu32.xml
++++ b/src/cpu_map/x86_qemu32.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='qemu32'>
++    <decode host='on' guest='on'/>
+     <feature name='apic'/>
+     <feature name='cmov'/>
+     <feature name='cx8'/>
+diff --git a/src/cpu_map/x86_qemu64.xml b/src/cpu_map/x86_qemu64.xml
+index a8e8dfe58d..0fe207a2b4 100644
+--- a/src/cpu_map/x86_qemu64.xml
++++ b/src/cpu_map/x86_qemu64.xml
+@@ -1,5 +1,6 @@
+ <cpus>
+   <model name='qemu64'>
++    <decode host='on' guest='on'/>
+     <!-- These are supported only by TCG.  KVM supports them only if the
+          host does.  So we leave them out:
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Add-features-for-Icelake-CPUs.patch b/SOURCES/libvirt-cpu_map-Add-features-for-Icelake-CPUs.patch
deleted file mode 100644
index 482be75..0000000
--- a/SOURCES/libvirt-cpu_map-Add-features-for-Icelake-CPUs.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From fe47728e25c3e12ea5b22a07902bf19a4b3afb43 Mon Sep 17 00:00:00 2001
-Message-Id: <fe47728e25c3e12ea5b22a07902bf19a4b3afb43@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 29 Aug 2018 14:28:39 +0200
-Subject: [PATCH] cpu_map: Add features for Icelake CPUs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU commits:
-
-    e37a5c7fa4 (v2.12.0)
-        i386: Add Intel Processor Trace feature support
-
-    c2f193b538 (v2.7.0)
-        target-i386: Add support for UMIP and RDPID CPUID bits
-
-    aff9e6e46a (v2.12.0)
-        x86/cpu: Enable new SSE/AVX/AVX512 cpu features
-
-    f77543772d (v2.9.0)
-        x86: add AVX512_VPOPCNTDQ features
-
-    5131dc433d (v3.1.0)
-        i386: Add CPUID bit for PCONFIG
-
-    59a80a19ca (v3.1.0)
-        i386: Add CPUID bit for WBNOINVD
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 9813081119b6727c8b6067a783465addef06525e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1526625
-https://bugzilla.redhat.com/show_bug.cgi?id=1527657
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - cpu_map.xml is still monolithic in RHEL-8
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml                           | 33 +++++++++++++++++++
- .../x86_64-cpuid-Core-i5-6600-guest.xml       |  1 +
- .../x86_64-cpuid-Core-i5-6600-host.xml        |  1 +
- .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml |  1 +
- .../x86_64-cpuid-Core-i7-5600U-arat-host.xml  |  1 +
- .../x86_64-cpuid-Core-i7-5600U-guest.xml      |  1 +
- .../x86_64-cpuid-Core-i7-5600U-host.xml       |  1 +
- .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml |  1 +
- .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml  |  1 +
- .../x86_64-cpuid-Core-i7-7700-guest.xml       |  1 +
- .../x86_64-cpuid-Core-i7-7700-host.xml        |  1 +
- .../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml    |  1 +
- .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml     |  1 +
- .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml    |  1 +
- .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml     |  1 +
- .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml    |  1 +
- .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml     |  1 +
- .../x86_64-cpuid-Xeon-Gold-5115-guest.xml     |  1 +
- .../x86_64-cpuid-Xeon-Gold-5115-host.xml      |  1 +
- .../x86_64-cpuid-Xeon-Gold-6148-guest.xml     |  1 +
- .../x86_64-cpuid-Xeon-Gold-6148-host.xml      |  1 +
- 21 files changed, 53 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 96daa0f9af..4d19a7c811 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -257,6 +257,9 @@
-     <feature name='clwb'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/>
-     </feature>
-+    <feature name='intel-pt'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x02000000'/>
-+    </feature>
-     <feature name='avx512pf'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/>
-     </feature>
-@@ -279,12 +282,36 @@
-     <feature name='avx512vbmi'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000002'/>
-     </feature>
-+    <feature name='umip'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000004'/>
-+    </feature>
-     <feature name='pku'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000008'/>
-     </feature>
-     <feature name='ospke'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000010'/>
-     </feature>
-+    <feature name='avx512vbmi2'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000040'/>
-+    </feature>
-+    <feature name='gfni'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000100'/>
-+    </feature>
-+    <feature name='vaes'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000200'/>
-+    </feature>
-+    <feature name='vpclmulqdq'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000400'/>
-+    </feature>
-+    <feature name='avx512vnni'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000800'/>
-+    </feature>
-+    <feature name='avx512bitalg'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00001000'/>
-+    </feature>
-+    <feature name='avx512-vpopcntdq'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00004000'/>
-+    </feature>
-     <feature name='la57'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/>
-     </feature>
-@@ -295,6 +322,9 @@
-     <feature name='avx512-4fmaps'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
-     </feature>
-+    <feature name='pconfig'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
-+    </feature>
-     <feature name='spec-ctrl'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
-     </feature>
-@@ -430,6 +460,9 @@
-     </feature>
- 
-     <!-- More AMD-specific features -->
-+    <feature name='wbnoinvd'>
-+      <cpuid eax_in='0x80000008' ebx='0x00000200'/>
-+    </feature>
-     <feature name='ibpb'>
-       <cpuid eax_in='0x80000008' ebx='0x00001000'/>
-     </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
-index c3561d5971..5777a0bfba 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
-@@ -19,6 +19,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='invtsc'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
-index c799394eaf..faaa07f19b 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
-@@ -20,6 +20,7 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaves'/>
-   <feature name='pdpe1gb'/>
-   <feature name='invtsc'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
-index 877895cf15..e825e2a0fb 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
-@@ -22,6 +22,7 @@
-   <feature policy='require' name='rdrand'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
-index 9b24941e0e..ea622c87c7 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
-@@ -23,6 +23,7 @@
-   <feature name='rdrand'/>
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaveopt'/>
-   <feature name='pdpe1gb'/>
-   <feature name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
-index 877895cf15..e825e2a0fb 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
-@@ -22,6 +22,7 @@
-   <feature policy='require' name='rdrand'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
-index 9b24941e0e..ea622c87c7 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
-@@ -23,6 +23,7 @@
-   <feature name='rdrand'/>
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaveopt'/>
-   <feature name='pdpe1gb'/>
-   <feature name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
-index a70cb6d46a..4fa4770208 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
-@@ -22,6 +22,7 @@
-   <feature policy='require' name='rdrand'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
-index b8e3399103..25690c099c 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
-@@ -23,6 +23,7 @@
-   <feature name='rdrand'/>
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaveopt'/>
-   <feature name='pdpe1gb'/>
-   <feature name='abm'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
-index c3561d5971..5777a0bfba 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
-@@ -19,6 +19,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='invtsc'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
-index c799394eaf..faaa07f19b 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
-@@ -20,6 +20,7 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaves'/>
-   <feature name='pdpe1gb'/>
-   <feature name='invtsc'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
-index c3561d5971..5777a0bfba 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
-@@ -19,6 +19,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='invtsc'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
-index c799394eaf..faaa07f19b 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
-@@ -20,6 +20,7 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaves'/>
-   <feature name='pdpe1gb'/>
-   <feature name='invtsc'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-index 60609f5c70..7b93df3f1b 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-@@ -20,6 +20,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
-index 357cafd10a..5078420c7a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
-@@ -25,6 +25,7 @@
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaveopt'/>
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
-index 2fac54355c..cd7e25b52a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
-@@ -20,6 +20,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
-index f482864a98..5dd8d749de 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
-@@ -25,6 +25,7 @@
-   <feature name='arat'/>
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
-+  <feature name='intel-pt'/>
-   <feature name='xsaveopt'/>
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
-index 5f51dea631..480127f341 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
-@@ -21,6 +21,7 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='pku'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='mbm_total'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
-index a11b31369d..680b10acef 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
-@@ -22,6 +22,7 @@
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
-   <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-   <feature name='pku'/>
-   <feature name='xsaves'/>
-   <feature name='mbm_total'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
-index f72bcea68b..f31ca1ffc5 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
-@@ -21,6 +21,7 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='pku'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='mbm_total'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
-index 1a68e35c19..b18ceddc60 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
-@@ -22,6 +22,7 @@
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
-   <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-   <feature name='pku'/>
-   <feature name='xsaves'/>
-   <feature name='mbm_total'/>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-cpu_map-Add-hex-representation-of-signatures.patch b/SOURCES/libvirt-cpu_map-Add-hex-representation-of-signatures.patch
deleted file mode 100644
index 3319ca2..0000000
--- a/SOURCES/libvirt-cpu_map-Add-hex-representation-of-signatures.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From 83a1114820c95f9cd98789b14044a229dcc090a7 Mon Sep 17 00:00:00 2001
-Message-Id: <83a1114820c95f9cd98789b14044a229dcc090a7@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:07 +0200
-Subject: [PATCH] cpu_map: Add hex representation of signatures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The family/model numbers are nice for humans or for comparing with
-/proc/cpuinfo, but sometimes there's a need to see the CPUID
-representation of the signature. Let's add it into a comment for each
-signature in out cpu_map XMLs as the conversion is not exactly
-straightforward.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 61be05a00fd383f11070761fac5ae28272b784dd)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-        src/cpu/cpu_map.xml
-            - the cpu_map split was not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <e8e2e0bdf183bec170df5252cf927ff5fbe0ef47.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 62 ++++++++++++++++++++++-----------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index a9f284fbbe..a5a5290a09 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -828,7 +828,7 @@
- 
-     <!-- Intel CPU models -->
-     <model name='Conroe'>
--      <signature family='6' model='15'/>
-+      <signature family='6' model='15'/> <!-- 0006f0 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -860,7 +860,7 @@
-     </model>
- 
-     <model name='Penryn'>
--      <signature family='6' model='23'/>
-+      <signature family='6' model='23'/> <!-- 010670 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -894,7 +894,7 @@
-     </model>
- 
-     <model name='Nehalem'>
--      <signature family='6' model='26'/>
-+      <signature family='6' model='26'/> <!-- 0106a0 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -930,7 +930,7 @@
-     </model>
- 
-     <model name='Nehalem-IBRS'>
--      <signature family='6' model='26'/>
-+      <signature family='6' model='26'/> <!-- 0106a0 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -967,7 +967,7 @@
-     </model>
- 
-     <model name='Westmere'>
--      <signature family='6' model='44'/>
-+      <signature family='6' model='44'/> <!-- 0206c0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1004,7 +1004,7 @@
-     </model>
- 
-     <model name='Westmere-IBRS'>
--      <signature family='6' model='44'/>
-+      <signature family='6' model='44'/> <!-- 0206c0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1042,7 +1042,7 @@
-     </model>
- 
-     <model name='SandyBridge'>
--      <signature family='6' model='42'/>
-+      <signature family='6' model='42'/> <!-- 0206a0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1085,7 +1085,7 @@
-     </model>
- 
-     <model name='SandyBridge-IBRS'>
--      <signature family='6' model='42'/>
-+      <signature family='6' model='42'/> <!-- 0206a0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1129,7 +1129,7 @@
-     </model>
- 
-     <model name='IvyBridge'>
--      <signature family='6' model='58'/>
-+      <signature family='6' model='58'/> <!-- 0306a0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1178,7 +1178,7 @@
-     </model>
- 
-     <model name='IvyBridge-IBRS'>
--      <signature family='6' model='58'/>
-+      <signature family='6' model='58'/> <!-- 0306a0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1228,7 +1228,7 @@
-     </model>
- 
-     <model name='Haswell-noTSX'>
--      <signature family='6' model='60'/>
-+      <signature family='6' model='60'/> <!-- 0306c0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1281,7 +1281,7 @@
-     </model>
- 
-     <model name='Haswell-noTSX-IBRS'>
--      <signature family='6' model='60'/>
-+      <signature family='6' model='60'/> <!-- 0306c0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1335,7 +1335,7 @@
-     </model>
- 
-     <model name='Haswell'>
--      <signature family='6' model='60'/>
-+      <signature family='6' model='60'/> <!-- 0306c0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1390,7 +1390,7 @@
-     </model>
- 
-     <model name='Haswell-IBRS'>
--      <signature family='6' model='60'/>
-+      <signature family='6' model='60'/> <!-- 0306c0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1446,7 +1446,7 @@
-     </model>
- 
-     <model name='Broadwell-noTSX'>
--      <signature family='6' model='61'/>
-+      <signature family='6' model='61'/> <!-- 0306d0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1503,7 +1503,7 @@
-     </model>
- 
-     <model name='Broadwell-noTSX-IBRS'>
--      <signature family='6' model='61'/>
-+      <signature family='6' model='61'/> <!-- 0306d0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1561,7 +1561,7 @@
-     </model>
- 
-     <model name='Broadwell'>
--      <signature family='6' model='61'/>
-+      <signature family='6' model='61'/> <!-- 0306d0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1620,7 +1620,7 @@
-     </model>
- 
-     <model name='Broadwell-IBRS'>
--      <signature family='6' model='61'/>
-+      <signature family='6' model='61'/> <!-- 0306d0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1680,7 +1680,7 @@
-     </model>
- 
-     <model name='Skylake-Client'>
--      <signature family='6' model='94'/>
-+      <signature family='6' model='94'/> <!-- 0506e0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -1748,7 +1748,7 @@
-     </model>
- 
-     <model name='Skylake-Client-IBRS'>
--      <signature family='6' model='94'/>
-+      <signature family='6' model='94'/> <!-- 0506e0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -1817,7 +1817,7 @@
-     </model>
- 
-     <model name='Skylake-Server'>
--      <signature family='6' model='85'/>
-+      <signature family='6' model='85'/> <!-- 050654 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -1892,7 +1892,7 @@
-     </model>
- 
-     <model name='Skylake-Server-IBRS'>
--      <signature family='6' model='85'/>
-+      <signature family='6' model='85'/> <!-- 050654 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -1968,7 +1968,7 @@
-     </model>
- 
-     <model name='Icelake-Client'>
--      <signature family='6' model='126'/>
-+      <signature family='6' model='126'/> <!-- 0706e0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -2052,7 +2052,7 @@
-     </model>
- 
-     <model name='Icelake-Server'>
--      <signature family='6' model='134'/>
-+      <signature family='6' model='134'/> <!-- 080660 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -2209,7 +2209,7 @@
-     </model>
- 
-     <model name='Opteron_G1'>
--      <signature family='15' model='6'/>
-+      <signature family='15' model='6'/> <!-- 100e60 -->
-       <vendor name='AMD'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -2239,7 +2239,7 @@
-     </model>
- 
-     <model name='Opteron_G2'>
--      <signature family='15' model='6'/>
-+      <signature family='15' model='6'/> <!-- 100e60 -->
-       <vendor name='AMD'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -2273,7 +2273,7 @@
-     </model>
- 
-     <model name='Opteron_G3'>
--      <signature family='15' model='6'/>
-+      <signature family='15' model='6'/> <!-- 100e60 -->
-       <vendor name='AMD'/>
-       <feature name='abm'/>
-       <feature name='apic'/>
-@@ -2312,7 +2312,7 @@
-     </model>
- 
-     <model name='Opteron_G4'>
--      <signature family='21' model='1'/>
-+      <signature family='21' model='1'/> <!-- 600f10 -->
-       <vendor name='AMD'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -2361,7 +2361,7 @@
-     </model>
- 
-     <model name='Opteron_G5'>
--      <signature family='21' model='2'/>
-+      <signature family='21' model='2'/> <!-- 600f20 -->
-       <vendor name='AMD'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -2413,7 +2413,7 @@
-     </model>
- 
-     <model name='EPYC'>
--      <signature family='23' model='1'/>
-+      <signature family='23' model='1'/> <!-- 800f10 -->
-       <vendor name='AMD'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -2484,7 +2484,7 @@
-     </model>
- 
-     <model name='EPYC-IBPB'>
--      <signature family='23' model='1'/>
-+      <signature family='23' model='1'/> <!-- 800f10 -->
-       <vendor name='AMD'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-noTSX-x86-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-noTSX-x86-CPU-models.patch
new file mode 100644
index 0000000..5815a88
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Add-more-noTSX-x86-CPU-models.patch
@@ -0,0 +1,831 @@
+From 59287d64100517e89dbd3a88af6fec4755ceab42 Mon Sep 17 00:00:00 2001
+Message-Id: <59287d64100517e89dbd3a88af6fec4755ceab42@dist-git>
+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Date: Tue, 26 May 2020 10:58:55 +0200
+Subject: [PATCH] cpu_map: Add more -noTSX x86 CPU models
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+One of the mitigation methods for TAA[1] is to disable TSX
+support on the host system.  Linux added a mechanism to disable
+TSX globally through the kernel command line, and many Linux
+distributions now default to tsx=off.  This makes existing CPU
+models that have HLE and RTM enabled not usable anymore.
+
+Add new versions of all CPU models that have the HLE and RTM
+features enabled, that can be used when TSX is disabled in the
+host system.
+
+On systems disabling the features without those types defined
+in cpu-maps users end up without modern CPU types in the list
+of usable CPUs to use in the likes of virsh domcapabilities
+or tools higher in the stack like virt-manager.
+
+This adds:
+-Cascadelake-Server-noTSX
+-Icelake-Client-noTSX
+-Icelake-Server-noTSX
+-Skylake-Server-noTSX-IBRS
+-Skylake-Client-noTSX-IBRS
+
+Introduced in QEMU by commit v4.2.0-rc2-3-g9ab2237f19 (function)
+                  and commit v4.2.0-rc2-4-g02fa60d101 (names)
+
+References:
+
+    [1] TAA, TSX asynchronous Abort:
+        https://software.intel.com/security-software-guidance/insights/deep-dive-intel-transactional-synchronization-extensions-intel-tsx-asynchronous-abort
+        https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/tsx_async_abort.html
+
+Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1853200
+
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Message-Id: <20200310104806.2723-2-christian.ehrhardt@canonical.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit dd17a4eba8618aeb0144f268f2222f65a85425fc)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840008
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <ab2edc2c9107c87dfa7153b6c54ddd1401c82a4b.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu_map/Makefile.inc.am                   |  5 ++
+ src/cpu_map/index.xml                         |  5 ++
+ src/cpu_map/x86_Cascadelake-Server-noTSX.xml  | 78 ++++++++++++++++
+ src/cpu_map/x86_Icelake-Client-noTSX.xml      | 81 +++++++++++++++++
+ src/cpu_map/x86_Icelake-Server-noTSX.xml      | 90 +++++++++++++++++++
+ src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 73 +++++++++++++++
+ src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 75 ++++++++++++++++
+ .../x86_64-cpuid-Core-i7-8550U-guest.xml      |  4 +-
+ .../x86_64-cpuid-Core-i7-8550U-host.xml       | 11 +--
+ .../x86_64-cpuid-Core-i7-8550U-json.xml       |  4 +-
+ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  5 ++
+ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  5 ++
+ tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  5 ++
+ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  5 ++
+ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  5 ++
+ tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  5 ++
+ 16 files changed, 440 insertions(+), 16 deletions(-)
+ create mode 100644 src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+ create mode 100644 src/cpu_map/x86_Icelake-Client-noTSX.xml
+ create mode 100644 src/cpu_map/x86_Icelake-Server-noTSX.xml
+ create mode 100644 src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+ create mode 100644 src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+
+diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
+index e935178304..be64c9a0d4 100644
+--- a/src/cpu_map/Makefile.inc.am
++++ b/src/cpu_map/Makefile.inc.am
+@@ -20,6 +20,7 @@ cpumap_DATA = \
+ 	cpu_map/x86_Broadwell-noTSX.xml \
+ 	cpu_map/x86_Broadwell-noTSX-IBRS.xml \
+ 	cpu_map/x86_Cascadelake-Server.xml \
++	cpu_map/x86_Cascadelake-Server-noTSX.xml \
+ 	cpu_map/x86_Conroe.xml \
+ 	cpu_map/x86_core2duo.xml \
+ 	cpu_map/x86_coreduo.xml \
+@@ -33,7 +34,9 @@ cpumap_DATA = \
+ 	cpu_map/x86_Haswell-noTSX.xml \
+ 	cpu_map/x86_Haswell-noTSX-IBRS.xml \
+ 	cpu_map/x86_Icelake-Client.xml \
++	cpu_map/x86_Icelake-Client-noTSX.xml \
+ 	cpu_map/x86_Icelake-Server.xml \
++	cpu_map/x86_Icelake-Server-noTSX.xml \
+ 	cpu_map/x86_IvyBridge.xml \
+ 	cpu_map/x86_IvyBridge-IBRS.xml \
+ 	cpu_map/x86_kvm32.xml \
+@@ -58,8 +61,10 @@ cpumap_DATA = \
+ 	cpu_map/x86_SandyBridge-IBRS.xml \
+ 	cpu_map/x86_Skylake-Client.xml \
+ 	cpu_map/x86_Skylake-Client-IBRS.xml \
++	cpu_map/x86_Skylake-Client-noTSX-IBRS.xml \
+ 	cpu_map/x86_Skylake-Server.xml \
+ 	cpu_map/x86_Skylake-Server-IBRS.xml \
++	cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \
+ 	cpu_map/x86_Westmere.xml \
+ 	cpu_map/x86_Westmere-IBRS.xml \
+ 	$(NULL)
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index ffb2f6fe1b..50b030de29 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -44,11 +44,16 @@
+     <include filename="x86_Broadwell-IBRS.xml"/>
+     <include filename="x86_Skylake-Client.xml"/>
+     <include filename="x86_Skylake-Client-IBRS.xml"/>
++    <include filename="x86_Skylake-Client-noTSX-IBRS.xml"/>
+     <include filename="x86_Skylake-Server.xml"/>
+     <include filename="x86_Skylake-Server-IBRS.xml"/>
++    <include filename="x86_Skylake-Server-noTSX-IBRS.xml"/>
+     <include filename="x86_Cascadelake-Server.xml"/>
++    <include filename="x86_Cascadelake-Server-noTSX.xml"/>
+     <include filename="x86_Icelake-Client.xml"/>
++    <include filename="x86_Icelake-Client-noTSX.xml"/>
+     <include filename="x86_Icelake-Server.xml"/>
++    <include filename="x86_Icelake-Server-noTSX.xml"/>
+ 
+     <!-- AMD CPUs -->
+     <include filename="x86_athlon.xml"/>
+diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+new file mode 100644
+index 0000000000..d24415ebce
+--- /dev/null
++++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+@@ -0,0 +1,78 @@
++<cpus>
++  <model name='Cascadelake-Server-noTSX'>
++    <signature family='6' model='85'/> <!-- 050654 -->
++    <vendor name='Intel'/>
++    <feature name='3dnowprefetch'/>
++    <feature name='abm'/>
++    <feature name='adx'/>
++    <feature name='aes'/>
++    <feature name='apic'/>
++    <feature name='arat'/>
++    <feature name='avx'/>
++    <feature name='avx2'/>
++    <feature name='avx512bw'/>
++    <feature name='avx512cd'/>
++    <feature name='avx512dq'/>
++    <feature name='avx512f'/>
++    <feature name='avx512vl'/>
++    <feature name='avx512vnni'/>
++    <feature name='bmi1'/>
++    <feature name='bmi2'/>
++    <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='fma'/>
++    <feature name='fpu'/>
++    <feature name='fsgsbase'/>
++    <feature name='fxsr'/>
++    <feature name='invpcid'/>
++    <feature name='lahf_lm'/>
++    <feature name='lm'/>
++    <feature name='mca'/>
++    <feature name='mce'/>
++    <feature name='mmx'/>
++    <feature name='movbe'/>
++    <feature name='mpx'/>
++    <feature name='msr'/>
++    <feature name='mtrr'/>
++    <feature name='nx'/>
++    <feature name='pae'/>
++    <feature name='pat'/>
++    <feature name='pcid'/>
++    <feature name='pclmuldq'/>
++    <feature name='pdpe1gb'/>
++    <feature name='pge'/>
++    <feature name='pni'/>
++    <feature name='popcnt'/>
++    <feature name='pse'/>
++    <feature name='pse36'/>
++    <feature name='rdrand'/>
++    <feature name='rdseed'/>
++    <feature name='rdtscp'/>
++    <feature name='sep'/>
++    <feature name='smap'/>
++    <feature name='smep'/>
++    <feature name='spec-ctrl'/>
++    <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='tsc'/>
++    <feature name='tsc-deadline'/>
++    <feature name='vme'/>
++    <feature name='x2apic'/>
++    <feature name='xgetbv1'/>
++    <feature name='xsave'/>
++    <feature name='xsavec'/>
++    <feature name='xsaveopt'/>
++  </model>
++</cpus>
+diff --git a/src/cpu_map/x86_Icelake-Client-noTSX.xml b/src/cpu_map/x86_Icelake-Client-noTSX.xml
+new file mode 100644
+index 0000000000..cd51881f40
+--- /dev/null
++++ b/src/cpu_map/x86_Icelake-Client-noTSX.xml
+@@ -0,0 +1,81 @@
++<cpus>
++  <model name='Icelake-Client-noTSX'>
++    <signature family='6' model='126'/> <!-- 0706e0 -->
++    <vendor name='Intel'/>
++    <feature name='3dnowprefetch'/>
++    <feature name='abm'/>
++    <feature name='adx'/>
++    <feature name='aes'/>
++    <feature name='apic'/>
++    <feature name='arat'/>
++    <feature name='avx'/>
++    <feature name='avx2'/>
++    <feature name='avx512-vpopcntdq'/>
++    <feature name='avx512bitalg'/>
++    <feature name='avx512vbmi'/>
++    <feature name='avx512vbmi2'/>
++    <feature name='avx512vnni'/>
++    <feature name='bmi1'/>
++    <feature name='bmi2'/>
++    <feature name='clflush'/>
++    <feature name='cmov'/>
++    <feature name='cx16'/>
++    <feature name='cx8'/>
++    <feature name='de'/>
++    <feature name='erms'/>
++    <feature name='f16c'/>
++    <feature name='fma'/>
++    <feature name='fpu'/>
++    <feature name='fsgsbase'/>
++    <feature name='fxsr'/>
++    <feature name='gfni'/>
++    <feature name='intel-pt'/>
++    <feature name='invpcid'/>
++    <feature name='lahf_lm'/>
++    <feature name='lm'/>
++    <feature name='mca'/>
++    <feature name='mce'/>
++    <feature name='mmx'/>
++    <feature name='movbe'/>
++    <feature name='mpx'/>
++    <feature name='msr'/>
++    <feature name='mtrr'/>
++    <feature name='nx'/>
++    <feature name='pae'/>
++    <feature name='pat'/>
++    <feature name='pcid'/>
++    <feature name='pclmuldq'/>
++    <feature name='pge'/>
++    <feature name='pku'/>
++    <feature name='pni'/>
++    <feature name='popcnt'/>
++    <feature name='pse'/>
++    <feature name='pse36'/>
++    <feature name='rdrand'/>
++    <feature name='rdseed'/>
++    <feature name='rdtscp'/>
++    <feature name='sep'/>
++    <feature name='smap'/>
++    <feature name='smep'/>
++    <feature name='spec-ctrl'/>
++    <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='tsc'/>
++    <feature name='tsc-deadline'/>
++    <feature name='umip'/>
++    <feature name='vaes'/>
++    <feature name='vme'/>
++    <feature name='vpclmulqdq'/>
++    <feature name='wbnoinvd'/>
++    <feature name='x2apic'/>
++    <feature name='xgetbv1'/>
++    <feature name='xsave'/>
++    <feature name='xsavec'/>
++    <feature name='xsaveopt'/>
++  </model>
++</cpus>
+diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
+new file mode 100644
+index 0000000000..538c656712
+--- /dev/null
++++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
+@@ -0,0 +1,90 @@
++<cpus>
++  <model name='Icelake-Server-noTSX'>
++    <signature family='6' model='134'/> <!-- 080660 -->
++    <vendor name='Intel'/>
++    <feature name='3dnowprefetch'/>
++    <feature name='abm'/>
++    <feature name='adx'/>
++    <feature name='aes'/>
++    <feature name='apic'/>
++    <feature name='arat'/>
++    <feature name='avx'/>
++    <feature name='avx2'/>
++    <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='bmi1'/>
++    <feature name='bmi2'/>
++    <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='fma'/>
++    <feature name='fpu'/>
++    <feature name='fsgsbase'/>
++    <feature name='fxsr'/>
++    <feature name='gfni'/>
++    <feature name='intel-pt'/>
++    <feature name='invpcid'/>
++    <feature name='la57'/>
++    <feature name='lahf_lm'/>
++    <feature name='lm'/>
++    <feature name='mca'/>
++    <feature name='mce'/>
++    <feature name='mmx'/>
++    <feature name='movbe'/>
++    <feature name='mpx'/>
++    <feature name='msr'/>
++    <feature name='mtrr'/>
++    <feature name='nx'/>
++    <feature name='pae'/>
++    <feature name='pat'/>
++    <feature name='pcid'/>
++    <feature name='pclmuldq'/>
++    <feature name='pdpe1gb'/>
++    <feature name='pge'/>
++    <feature name='pku'/>
++    <feature name='pni'/>
++    <feature name='popcnt'/>
++    <feature name='pse'/>
++    <feature name='pse36'/>
++    <feature name='rdrand'/>
++    <feature name='rdseed'/>
++    <feature name='rdtscp'/>
++    <feature name='sep'/>
++    <feature name='smap'/>
++    <feature name='smep'/>
++    <feature name='spec-ctrl'/>
++    <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='tsc'/>
++    <feature name='tsc-deadline'/>
++    <feature name='umip'/>
++    <feature name='vaes'/>
++    <feature name='vme'/>
++    <feature name='vpclmulqdq'/>
++    <feature name='wbnoinvd'/>
++    <feature name='x2apic'/>
++    <feature name='xgetbv1'/>
++    <feature name='xsave'/>
++    <feature name='xsavec'/>
++    <feature name='xsaveopt'/>
++  </model>
++</cpus>
+diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+new file mode 100644
+index 0000000000..3d2976692f
+--- /dev/null
++++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+@@ -0,0 +1,73 @@
++<cpus>
++  <model name='Skylake-Client-noTSX-IBRS'>
++    <signature family='6' model='94'/> <!-- 0506e0 -->
++    <signature family='6' model='78'/> <!-- 0406e0 -->
++    <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
++         but we don't have specific models for them. -->
++    <signature family='6' model='142'/> <!-- 0806e0 -->
++    <signature family='6' model='158'/> <!-- 0906e0 -->
++    <vendor name='Intel'/>
++    <feature name='3dnowprefetch'/>
++    <feature name='abm'/>
++    <feature name='adx'/>
++    <feature name='aes'/>
++    <feature name='apic'/>
++    <feature name='arat'/>
++    <feature name='avx'/>
++    <feature name='avx2'/>
++    <feature name='bmi1'/>
++    <feature name='bmi2'/>
++    <feature name='clflush'/>
++    <feature name='cmov'/>
++    <feature name='cx16'/>
++    <feature name='cx8'/>
++    <feature name='de'/>
++    <feature name='erms'/>
++    <feature name='f16c'/>
++    <feature name='fma'/>
++    <feature name='fpu'/>
++    <feature name='fsgsbase'/>
++    <feature name='fxsr'/>
++    <feature name='invpcid'/>
++    <feature name='lahf_lm'/>
++    <feature name='lm'/>
++    <feature name='mca'/>
++    <feature name='mce'/>
++    <feature name='mmx'/>
++    <feature name='movbe'/>
++    <feature name='mpx'/>
++    <feature name='msr'/>
++    <feature name='mtrr'/>
++    <feature name='nx'/>
++    <feature name='pae'/>
++    <feature name='pat'/>
++    <feature name='pcid'/>
++    <feature name='pclmuldq'/>
++    <feature name='pge'/>
++    <feature name='pni'/>
++    <feature name='popcnt'/>
++    <feature name='pse'/>
++    <feature name='pse36'/>
++    <feature name='rdrand'/>
++    <feature name='rdseed'/>
++    <feature name='rdtscp'/>
++    <feature name='sep'/>
++    <feature name='smap'/>
++    <feature name='smep'/>
++    <feature name='spec-ctrl'/>
++    <feature name='sse'/>
++    <feature name='sse2'/>
++    <feature name='sse4.1'/>
++    <feature name='sse4.2'/>
++    <feature name='ssse3'/>
++    <feature name='syscall'/>
++    <feature name='tsc'/>
++    <feature name='tsc-deadline'/>
++    <feature name='vme'/>
++    <feature name='x2apic'/>
++    <feature name='xgetbv1'/>
++    <feature name='xsave'/>
++    <feature name='xsavec'/>
++    <feature name='xsaveopt'/>
++  </model>
++</cpus>
+diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+new file mode 100644
+index 0000000000..455a072119
+--- /dev/null
++++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+@@ -0,0 +1,75 @@
++<cpus>
++  <model name='Skylake-Server-noTSX-IBRS'>
++    <signature family='6' model='85'/> <!-- 050654 -->
++    <vendor name='Intel'/>
++    <feature name='3dnowprefetch'/>
++    <feature name='abm'/>
++    <feature name='adx'/>
++    <feature name='aes'/>
++    <feature name='apic'/>
++    <feature name='arat'/>
++    <feature name='avx'/>
++    <feature name='avx2'/>
++    <feature name='avx512bw'/>
++    <feature name='avx512cd'/>
++    <feature name='avx512dq'/>
++    <feature name='avx512f'/>
++    <feature name='avx512vl'/>
++    <feature name='bmi1'/>
++    <feature name='bmi2'/>
++    <feature name='clflush'/>
++    <feature name='clwb'/>
++    <feature name='cmov'/>
++    <feature name='cx16'/>
++    <feature name='cx8'/>
++    <feature name='de'/>
++    <feature name='erms'/>
++    <feature name='f16c'/>
++    <feature name='fma'/>
++    <feature name='fpu'/>
++    <feature name='fsgsbase'/>
++    <feature name='fxsr'/>
++    <feature name='invpcid'/>
++    <feature name='lahf_lm'/>
++    <feature name='lm'/>
++    <feature name='mca'/>
++    <feature name='mce'/>
++    <feature name='mmx'/>
++    <feature name='movbe'/>
++    <feature name='mpx'/>
++    <feature name='msr'/>
++    <feature name='mtrr'/>
++    <feature name='nx'/>
++    <feature name='pae'/>
++    <feature name='pat'/>
++    <feature name='pcid'/>
++    <feature name='pclmuldq'/>
++    <feature name='pdpe1gb'/>
++    <feature name='pge'/>
++    <feature name='pni'/>
++    <feature name='popcnt'/>
++    <feature name='pse'/>
++    <feature name='pse36'/>
++    <feature name='rdrand'/>
++    <feature name='rdseed'/>
++    <feature name='rdtscp'/>
++    <feature name='sep'/>
++    <feature name='smap'/>
++    <feature name='smep'/>
++    <feature name='spec-ctrl'/>
++    <feature name='sse'/>
++    <feature name='sse2'/>
++    <feature name='sse4.1'/>
++    <feature name='sse4.2'/>
++    <feature name='ssse3'/>
++    <feature name='syscall'/>
++    <feature name='tsc'/>
++    <feature name='tsc-deadline'/>
++    <feature name='vme'/>
++    <feature name='x2apic'/>
++    <feature name='xgetbv1'/>
++    <feature name='xsave'/>
++    <feature name='xsavec'/>
++    <feature name='xsaveopt'/>
++  </model>
++</cpus>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+index 92404e4d03..e03c4a06ba 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Skylake-Client-IBRS</model>
++  <model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ds'/>
+   <feature policy='require' name='acpi'/>
+@@ -26,6 +26,4 @@
+   <feature policy='require' name='pdpe1gb'/>
+   <feature policy='require' name='invtsc'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+-  <feature policy='disable' name='hle'/>
+-  <feature policy='disable' name='rtm'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+index 808a8ff969..7f6fe2eac3 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+@@ -1,8 +1,7 @@
+ <cpu>
+   <arch>x86_64</arch>
+-  <model>Broadwell-noTSX-IBRS</model>
++  <model>Skylake-Client-noTSX-IBRS</model>
+   <vendor>Intel</vendor>
+-  <feature name='vme'/>
+   <feature name='ds'/>
+   <feature name='acpi'/>
+   <feature name='ss'/>
+@@ -18,22 +17,14 @@
+   <feature name='xtpr'/>
+   <feature name='pdcm'/>
+   <feature name='osxsave'/>
+-  <feature name='f16c'/>
+-  <feature name='rdrand'/>
+-  <feature name='arat'/>
+   <feature name='tsc_adjust'/>
+-  <feature name='mpx'/>
+   <feature name='clflushopt'/>
+   <feature name='intel-pt'/>
+   <feature name='md-clear'/>
+   <feature name='stibp'/>
+   <feature name='ssbd'/>
+-  <feature name='xsaveopt'/>
+-  <feature name='xsavec'/>
+-  <feature name='xgetbv1'/>
+   <feature name='xsaves'/>
+   <feature name='pdpe1gb'/>
+-  <feature name='abm'/>
+   <feature name='invtsc'/>
+   <feature name='skip-l1dfl-vmentry'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+index 645c0934c2..3d8e6775bf 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Skylake-Client-IBRS</model>
++  <model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ss'/>
+   <feature policy='require' name='vmx'/>
+@@ -14,6 +14,4 @@
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='pdpe1gb'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+-  <feature policy='disable' name='hle'/>
+-  <feature policy='disable' name='rtm'/>
+ </cpu>
+diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+index c4c6bfb564..e257657981 100644
+--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+@@ -63,8 +63,10 @@
+       <model usable='no'>athlon</model>
+       <model usable='yes'>Westmere-IBRS</model>
+       <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Server-IBRS</model>
+       <model usable='no'>Skylake-Server</model>
++      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
+       <model usable='yes'>Skylake-Client-IBRS</model>
+       <model usable='yes'>Skylake-Client</model>
+       <model usable='yes'>SandyBridge-IBRS</model>
+@@ -79,7 +81,9 @@
+       <model usable='yes'>Nehalem</model>
+       <model usable='yes'>IvyBridge-IBRS</model>
+       <model usable='yes'>IvyBridge</model>
++      <model usable='no'>Icelake-Server-noTSX</model>
+       <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client-noTSX</model>
+       <model usable='no'>Icelake-Client</model>
+       <model usable='yes'>Haswell-noTSX-IBRS</model>
+       <model usable='yes'>Haswell-noTSX</model>
+@@ -89,6 +93,7 @@
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
+       <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+       <model usable='yes'>Broadwell-noTSX-IBRS</model>
+       <model usable='yes'>Broadwell-noTSX</model>
+diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+index a7f8d9c5ee..c762b0b600 100644
+--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+@@ -73,8 +73,10 @@
+       <model usable='yes'>athlon</model>
+       <model usable='no'>Westmere-IBRS</model>
+       <model usable='no'>Westmere</model>
++      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Server-IBRS</model>
+       <model usable='no'>Skylake-Server</model>
++      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Client-IBRS</model>
+       <model usable='no'>Skylake-Client</model>
+       <model usable='no'>SandyBridge-IBRS</model>
+@@ -89,7 +91,9 @@
+       <model usable='no'>Nehalem</model>
+       <model usable='no'>IvyBridge-IBRS</model>
+       <model usable='no'>IvyBridge</model>
++      <model usable='no'>Icelake-Server-noTSX</model>
+       <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client-noTSX</model>
+       <model usable='no'>Icelake-Client</model>
+       <model usable='no'>Haswell-noTSX-IBRS</model>
+       <model usable='no'>Haswell-noTSX</model>
+@@ -99,6 +103,7 @@
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
+       <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+       <model usable='no'>Broadwell-noTSX-IBRS</model>
+       <model usable='no'>Broadwell-noTSX</model>
+diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+index f0e0f182a4..2918ba9715 100644
+--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+@@ -62,8 +62,10 @@
+       <model usable='no'>athlon</model>
+       <model usable='yes'>Westmere-IBRS</model>
+       <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Server-IBRS</model>
+       <model usable='no'>Skylake-Server</model>
++      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
+       <model usable='yes'>Skylake-Client-IBRS</model>
+       <model usable='yes'>Skylake-Client</model>
+       <model usable='yes'>SandyBridge-IBRS</model>
+@@ -78,7 +80,9 @@
+       <model usable='yes'>Nehalem</model>
+       <model usable='yes'>IvyBridge-IBRS</model>
+       <model usable='yes'>IvyBridge</model>
++      <model usable='no'>Icelake-Server-noTSX</model>
+       <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client-noTSX</model>
+       <model usable='no'>Icelake-Client</model>
+       <model usable='yes'>Haswell-noTSX-IBRS</model>
+       <model usable='yes'>Haswell-noTSX</model>
+@@ -88,6 +92,7 @@
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
+       <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+       <model usable='yes'>Broadwell-noTSX-IBRS</model>
+       <model usable='yes'>Broadwell-noTSX</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+index b635d573ef..7b2a929738 100644
+--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+@@ -63,8 +63,10 @@
+       <model usable='no'>athlon</model>
+       <model usable='yes'>Westmere-IBRS</model>
+       <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Server-IBRS</model>
+       <model usable='no'>Skylake-Server</model>
++      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
+       <model usable='yes'>Skylake-Client-IBRS</model>
+       <model usable='yes'>Skylake-Client</model>
+       <model usable='yes'>SandyBridge-IBRS</model>
+@@ -79,7 +81,9 @@
+       <model usable='yes'>Nehalem</model>
+       <model usable='yes'>IvyBridge-IBRS</model>
+       <model usable='yes'>IvyBridge</model>
++      <model usable='no'>Icelake-Server-noTSX</model>
+       <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client-noTSX</model>
+       <model usable='no'>Icelake-Client</model>
+       <model usable='yes'>Haswell-noTSX-IBRS</model>
+       <model usable='yes'>Haswell-noTSX</model>
+@@ -89,6 +93,7 @@
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
+       <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+       <model usable='yes'>Broadwell-noTSX-IBRS</model>
+       <model usable='yes'>Broadwell-noTSX</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+index 0fbc632267..d634803b29 100644
+--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+@@ -72,8 +72,10 @@
+       <model usable='yes'>athlon</model>
+       <model usable='no'>Westmere-IBRS</model>
+       <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Server-IBRS</model>
+       <model usable='no'>Skylake-Server</model>
++      <model usable='no'>Skylake-Client-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Client-IBRS</model>
+       <model usable='no'>Skylake-Client</model>
+       <model usable='no'>SandyBridge-IBRS</model>
+@@ -88,7 +90,9 @@
+       <model usable='yes'>Nehalem</model>
+       <model usable='no'>IvyBridge-IBRS</model>
+       <model usable='no'>IvyBridge</model>
++      <model usable='no'>Icelake-Server-noTSX</model>
+       <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client-noTSX</model>
+       <model usable='no'>Icelake-Client</model>
+       <model usable='no'>Haswell-noTSX-IBRS</model>
+       <model usable='no'>Haswell-noTSX</model>
+@@ -98,6 +102,7 @@
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
+       <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+       <model usable='no'>Broadwell-noTSX-IBRS</model>
+       <model usable='no'>Broadwell-noTSX</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+index 27f76a8a5e..7609d49020 100644
+--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+@@ -62,8 +62,10 @@
+       <model usable='no'>athlon</model>
+       <model usable='yes'>Westmere-IBRS</model>
+       <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-noTSX-IBRS</model>
+       <model usable='no'>Skylake-Server-IBRS</model>
+       <model usable='no'>Skylake-Server</model>
++      <model usable='yes'>Skylake-Client-noTSX-IBRS</model>
+       <model usable='yes'>Skylake-Client-IBRS</model>
+       <model usable='yes'>Skylake-Client</model>
+       <model usable='yes'>SandyBridge-IBRS</model>
+@@ -78,7 +80,9 @@
+       <model usable='yes'>Nehalem</model>
+       <model usable='yes'>IvyBridge-IBRS</model>
+       <model usable='yes'>IvyBridge</model>
++      <model usable='no'>Icelake-Server-noTSX</model>
+       <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client-noTSX</model>
+       <model usable='no'>Icelake-Client</model>
+       <model usable='yes'>Haswell-noTSX-IBRS</model>
+       <model usable='yes'>Haswell-noTSX</model>
+@@ -88,6 +92,7 @@
+       <model usable='no'>EPYC</model>
+       <model usable='no'>Dhyana</model>
+       <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server-noTSX</model>
+       <model usable='no'>Cascadelake-Server</model>
+       <model usable='yes'>Broadwell-noTSX-IBRS</model>
+       <model usable='yes'>Broadwell-noTSX</model>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Broadwell-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Broadwell-CPU-models.patch
deleted file mode 100644
index 5a1e320..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Broadwell-CPU-models.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 77ad41e460c2e91f2c2e187c80581069654b741d Mon Sep 17 00:00:00 2001
-Message-Id: <77ad41e460c2e91f2c2e187c80581069654b741d@dist-git>
-From: Jiri Denemark <Jiri.Denemark@gmail.com>
-Date: Fri, 21 Jun 2019 09:25:16 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Broadwell CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes several CPUs which were incorrectly detected as
-Skylake-Client.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4ff74a806ad42820eef3877c8ec146770914d8df)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Broadwell-IBRS.xml
-	src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
-	src/cpu_map/x86_Broadwell-noTSX.xml
-	src/cpu_map/x86_Broadwell.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <543534b544d2d09470c218aeb6c7d945facaf2c8.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml                                  | 12 ++++++++++++
- .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml           | 11 +++++++----
- .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml            | 11 +++++++----
- .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml           | 11 +++++++----
- .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml            | 11 +++++++----
- .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml           | 11 +++++++----
- .../x86_64-cpuid-Xeon-E5-2650-v4-json.xml            | 11 +++++++----
- 7 files changed, 54 insertions(+), 24 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index ed6006643b..04369d1eda 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -1473,6 +1473,9 @@
- 
-     <model name='Broadwell-noTSX'>
-       <signature family='6' model='61'/> <!-- 0306d0 -->
-+      <signature family='6' model='71'/> <!-- 040670 -->
-+      <signature family='6' model='79'/> <!-- 0406f0 -->
-+      <signature family='6' model='86'/> <!-- 050660 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1530,6 +1533,9 @@
- 
-     <model name='Broadwell-noTSX-IBRS'>
-       <signature family='6' model='61'/> <!-- 0306d0 -->
-+      <signature family='6' model='71'/> <!-- 040670 -->
-+      <signature family='6' model='79'/> <!-- 0406f0 -->
-+      <signature family='6' model='86'/> <!-- 050660 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1588,6 +1594,9 @@
- 
-     <model name='Broadwell'>
-       <signature family='6' model='61'/> <!-- 0306d0 -->
-+      <signature family='6' model='71'/> <!-- 040670 -->
-+      <signature family='6' model='79'/> <!-- 0406f0 -->
-+      <signature family='6' model='86'/> <!-- 050660 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-@@ -1647,6 +1656,9 @@
- 
-     <model name='Broadwell-IBRS'>
-       <signature family='6' model='61'/> <!-- 0306d0 -->
-+      <signature family='6' model='71'/> <!-- 040670 -->
-+      <signature family='6' model='79'/> <!-- 0406f0 -->
-+      <signature family='6' model='86'/> <!-- 050660 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='adx'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-index 7718d7ca59..a5c6d9b471 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
-@@ -1,6 +1,7 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <model fallback='forbid'>Broadwell-IBRS</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ds'/>
-   <feature policy='require' name='acpi'/>
-   <feature policy='require' name='ss'/>
-@@ -18,15 +19,17 @@
-   <feature policy='require' name='pdcm'/>
-   <feature policy='require' name='dca'/>
-   <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='f16c'/>
-+  <feature policy='require' name='rdrand'/>
-+  <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-   <feature policy='require' name='intel-pt'/>
-   <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='abm'/>
-   <feature policy='require' name='invtsc'/>
--  <feature policy='disable' name='mpx'/>
--  <feature policy='disable' name='xsavec'/>
--  <feature policy='disable' name='xgetbv1'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
-index 167a9028ab..de082dbd93 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
-@@ -1,11 +1,14 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <model fallback='forbid'>Broadwell-IBRS</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ss'/>
-+  <feature policy='require' name='f16c'/>
-+  <feature policy='require' name='rdrand'/>
-   <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
--  <feature policy='disable' name='mpx'/>
--  <feature policy='disable' name='xsavec'/>
--  <feature policy='disable' name='xgetbv1'/>
-+  <feature policy='require' name='abm'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
-index cd7e25b52a..e2999db8e9 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
-@@ -1,6 +1,7 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Client</model>
-+  <model fallback='forbid'>Broadwell</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ds'/>
-   <feature policy='require' name='acpi'/>
-   <feature policy='require' name='ss'/>
-@@ -18,14 +19,16 @@
-   <feature policy='require' name='pdcm'/>
-   <feature policy='require' name='dca'/>
-   <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='f16c'/>
-+  <feature policy='require' name='rdrand'/>
-+  <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-   <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='abm'/>
-   <feature policy='require' name='invtsc'/>
--  <feature policy='disable' name='mpx'/>
--  <feature policy='disable' name='xsavec'/>
--  <feature policy='disable' name='xgetbv1'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
-index 5dfce947b2..5b8891093a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
-@@ -1,11 +1,14 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Client</model>
-+  <model fallback='forbid'>Broadwell</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ss'/>
-+  <feature policy='require' name='f16c'/>
-+  <feature policy='require' name='rdrand'/>
-   <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
--  <feature policy='disable' name='mpx'/>
--  <feature policy='disable' name='xsavec'/>
--  <feature policy='disable' name='xgetbv1'/>
-+  <feature policy='require' name='abm'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
-index cd7e25b52a..e2999db8e9 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
-@@ -1,6 +1,7 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Client</model>
-+  <model fallback='forbid'>Broadwell</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ds'/>
-   <feature policy='require' name='acpi'/>
-   <feature policy='require' name='ss'/>
-@@ -18,14 +19,16 @@
-   <feature policy='require' name='pdcm'/>
-   <feature policy='require' name='dca'/>
-   <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='f16c'/>
-+  <feature policy='require' name='rdrand'/>
-+  <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='cmt'/>
-   <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='abm'/>
-   <feature policy='require' name='invtsc'/>
--  <feature policy='disable' name='mpx'/>
--  <feature policy='disable' name='xsavec'/>
--  <feature policy='disable' name='xgetbv1'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
-index 5dfce947b2..5b8891093a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
-@@ -1,11 +1,14 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>Skylake-Client</model>
-+  <model fallback='forbid'>Broadwell</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ss'/>
-+  <feature policy='require' name='f16c'/>
-+  <feature policy='require' name='rdrand'/>
-   <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='xsaveopt'/>
-   <feature policy='require' name='pdpe1gb'/>
--  <feature policy='disable' name='mpx'/>
--  <feature policy='disable' name='xsavec'/>
--  <feature policy='disable' name='xgetbv1'/>
-+  <feature policy='require' name='abm'/>
- </cpu>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Conroe-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Conroe-CPU-model.patch
deleted file mode 100644
index 677455f..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Conroe-CPU-model.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 93520cb5f3b412c8cb4b5cf7098ff4a8c6c819ab Mon Sep 17 00:00:00 2001
-Message-Id: <93520cb5f3b412c8cb4b5cf7098ff4a8c6c819ab@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:09 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Conroe CPU model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c1f6a3269c595e7d3d0c9cf31ef7e6cf88291056)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Conroe.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <bdc4e7ff05e41cf66f69b61c0c622740f710d411.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index a5a5290a09..1699aec2cf 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -829,6 +829,7 @@
-     <!-- Intel CPU models -->
-     <model name='Conroe'>
-       <signature family='6' model='15'/> <!-- 0006f0 -->
-+      <signature family='6' model='22'/> <!-- 010660 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Haswell-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Haswell-CPU-models.patch
deleted file mode 100644
index a2782c6..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Haswell-CPU-models.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 41472ea4967eed29a41f619aca9c3d78504d0031 Mon Sep 17 00:00:00 2001
-Message-Id: <41472ea4967eed29a41f619aca9c3d78504d0031@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:15 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Haswell CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit e58ca588cc0deee36c8ae44f2ad75bf9b1680fc5)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Haswell-IBRS.xml
-	src/cpu_map/x86_Haswell-noTSX-IBRS.xml
-	src/cpu_map/x86_Haswell-noTSX.xml
-	src/cpu_map/x86_Haswell.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <f2154885afb3bb49b36ae3468b11251c7ebf896f.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 9bd8bbbfbb..ed6006643b 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -1243,6 +1243,9 @@
- 
-     <model name='Haswell-noTSX'>
-       <signature family='6' model='60'/> <!-- 0306c0 -->
-+      <signature family='6' model='63'/> <!-- 0306f0 -->
-+      <signature family='6' model='69'/> <!-- 040650 -->
-+      <signature family='6' model='70'/> <!-- 040660 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1296,6 +1299,9 @@
- 
-     <model name='Haswell-noTSX-IBRS'>
-       <signature family='6' model='60'/> <!-- 0306c0 -->
-+      <signature family='6' model='63'/> <!-- 0306f0 -->
-+      <signature family='6' model='69'/> <!-- 040650 -->
-+      <signature family='6' model='70'/> <!-- 040660 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1350,6 +1356,9 @@
- 
-     <model name='Haswell'>
-       <signature family='6' model='60'/> <!-- 0306c0 -->
-+      <signature family='6' model='63'/> <!-- 0306f0 -->
-+      <signature family='6' model='69'/> <!-- 040650 -->
-+      <signature family='6' model='70'/> <!-- 040660 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1405,6 +1414,9 @@
- 
-     <model name='Haswell-IBRS'>
-       <signature family='6' model='60'/> <!-- 0306c0 -->
-+      <signature family='6' model='63'/> <!-- 0306f0 -->
-+      <signature family='6' model='69'/> <!-- 040650 -->
-+      <signature family='6' model='70'/> <!-- 040660 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-IvyBridge-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-IvyBridge-CPU-models.patch
deleted file mode 100644
index 9f0f253..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-IvyBridge-CPU-models.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 182faff133a2a21d6ce9fb2d2f2a59c10bded7a4 Mon Sep 17 00:00:00 2001
-Message-Id: <182faff133a2a21d6ce9fb2d2f2a59c10bded7a4@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:14 +0200
-Subject: [PATCH] cpu_map: Add more signatures for IvyBridge CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 194105fef1a3a8645486df3323e460cc4a9b2d4c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_IvyBridge-IBRS.xml
-	src/cpu_map/x86_IvyBridge.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <07778daea0841ab2e211311adc90fd04967b2fb3.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 9eaba9572c..9bd8bbbfbb 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -1142,6 +1142,7 @@
- 
-     <model name='IvyBridge'>
-       <signature family='6' model='58'/> <!-- 0306a0 -->
-+      <signature family='6' model='62'/> <!-- 0306e0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1191,6 +1192,7 @@
- 
-     <model name='IvyBridge-IBRS'>
-       <signature family='6' model='58'/> <!-- 0306a0 -->
-+      <signature family='6' model='62'/> <!-- 0306e0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Nehalem-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Nehalem-CPU-models.patch
deleted file mode 100644
index ef1931e..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Nehalem-CPU-models.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 72bcfcf07c76288e943602995308d3e505aa1cff Mon Sep 17 00:00:00 2001
-Message-Id: <72bcfcf07c76288e943602995308d3e505aa1cff@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:11 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Nehalem CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f349f3c53f6427d9955ab7c57900c094f06dfd87)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Nehalem-IBRS.xml
-	src/cpu_map/x86_Nehalem.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <6351ae62d5ea091e831968cd1fc50176d1552a86.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index f42b2e629c..4f9c247f3e 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -897,6 +897,9 @@
- 
-     <model name='Nehalem'>
-       <signature family='6' model='26'/> <!-- 0106a0 -->
-+      <signature family='6' model='30'/> <!-- 0106e0 -->
-+      <signature family='6' model='31'/> <!-- 0106f0 -->
-+      <signature family='6' model='46'/> <!-- 0206e0 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
-@@ -933,6 +936,9 @@
- 
-     <model name='Nehalem-IBRS'>
-       <signature family='6' model='26'/> <!-- 0106a0 -->
-+      <signature family='6' model='30'/> <!-- 0106e0 -->
-+      <signature family='6' model='31'/> <!-- 0106f0 -->
-+      <signature family='6' model='46'/> <!-- 0206e0 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Penryn-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Penryn-CPU-model.patch
deleted file mode 100644
index ff07b98..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Penryn-CPU-model.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4042ef3cf2a0221d4c59a5adc9051ee9ae41aa7d Mon Sep 17 00:00:00 2001
-Message-Id: <4042ef3cf2a0221d4c59a5adc9051ee9ae41aa7d@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:10 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Penryn CPU model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0a09e59457f843b53c2702d1936bca6513868320)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Penryn.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <1604252f9ef65cfb55161a0f8329ee6868926814.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 1699aec2cf..f42b2e629c 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -862,6 +862,7 @@
- 
-     <model name='Penryn'>
-       <signature family='6' model='23'/> <!-- 010670 -->
-+      <signature family='6' model='29'/> <!-- 0106d0 -->
-       <vendor name='Intel'/>
-       <feature name='apic'/>
-       <feature name='clflush'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-SandyBridge-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-SandyBridge-CPU-models.patch
deleted file mode 100644
index 5685e1c..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-SandyBridge-CPU-models.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 250d216f3f9f033ec39b2116b30c93b37967484c Mon Sep 17 00:00:00 2001
-Message-Id: <250d216f3f9f033ec39b2116b30c93b37967484c@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:13 +0200
-Subject: [PATCH] cpu_map: Add more signatures for SandyBridge CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4a3c3682f3da4ae1e1036c67db7ddba3dcc66d68)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_SandyBridge-IBRS.xml
-	src/cpu_map/x86_SandyBridge.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <521680181b58a762b0d6b3668e0d162fbc5d3cf9.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index fed0f51934..9eaba9572c 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -1053,6 +1053,7 @@
- 
-     <model name='SandyBridge'>
-       <signature family='6' model='42'/> <!-- 0206a0 -->
-+      <signature family='6' model='45'/> <!-- 0206d0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-@@ -1096,6 +1097,7 @@
- 
-     <model name='SandyBridge-IBRS'>
-       <signature family='6' model='42'/> <!-- 0206a0 -->
-+      <signature family='6' model='45'/> <!-- 0206d0 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Skylake-Client-CPU-models.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Skylake-Client-CPU-models.patch
deleted file mode 100644
index 4672c57..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Skylake-Client-CPU-models.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f1a00c505aac83fe04f5385db5a9ed4768b0222b Mon Sep 17 00:00:00 2001
-Message-Id: <f1a00c505aac83fe04f5385db5a9ed4768b0222b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:17 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Skylake-Client CPU models
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 367d96a5d6b04bf25d025ed59a7079d71f843c56)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Skylake-Client-IBRS.xml
-	src/cpu_map/x86_Skylake-Client.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <d7ff83903e6d8ae1881afee54d3a248b9bb28678.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 04369d1eda..b2eb07b832 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -1719,6 +1719,11 @@
- 
-     <model name='Skylake-Client'>
-       <signature family='6' model='94'/> <!-- 0506e0 -->
-+      <signature family='6' model='78'/> <!-- 0406e0 -->
-+      <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
-+           but we don't have specific models for them. -->
-+      <signature family='6' model='142'/> <!-- 0806e0 -->
-+      <signature family='6' model='158'/> <!-- 0906e0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
-@@ -1787,6 +1792,11 @@
- 
-     <model name='Skylake-Client-IBRS'>
-       <signature family='6' model='94'/> <!-- 0506e0 -->
-+      <signature family='6' model='78'/> <!-- 0406e0 -->
-+      <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
-+           but we don't have specific models for them. -->
-+      <signature family='6' model='142'/> <!-- 0806e0 -->
-+      <signature family='6' model='158'/> <!-- 0906e0 -->
-       <vendor name='Intel'/>
-       <feature name='3dnowprefetch'/>
-       <feature name='abm'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Westmere-CPU-model.patch b/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Westmere-CPU-model.patch
deleted file mode 100644
index ab8878e..0000000
--- a/SOURCES/libvirt-cpu_map-Add-more-signatures-for-Westmere-CPU-model.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From d31a3ba6c9396f8ede2966d49030e9b4011be636 Mon Sep 17 00:00:00 2001
-Message-Id: <d31a3ba6c9396f8ede2966d49030e9b4011be636@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:12 +0200
-Subject: [PATCH] cpu_map: Add more signatures for Westmere CPU model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes several CPUs which were incorrectly detected as a different
-CPU model.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit e89f87721406f6ad6e811ff613a22dc804d69355)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Conflicts:
-	src/cpu_map/x86_Westmere.xml
-            - cpu_map split not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <facb5fd10ffe274e581e16db8362d0b8ee71424b.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml                                    |  2 ++
- tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml    |  9 +++++----
- tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml | 10 ++++++----
- tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml  |  8 ++++----
- tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml   |  8 +++++---
- tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml   |  9 +++++----
- 6 files changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 4f9c247f3e..fed0f51934 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -976,6 +976,8 @@
- 
-     <model name='Westmere'>
-       <signature family='6' model='44'/> <!-- 0206c0 -->
-+      <signature family='6' model='47'/> <!-- 0206f0 -->
-+      <signature family='6' model='37'/> <!-- 020650 -->
-       <vendor name='Intel'/>
-       <feature name='aes'/>
-       <feature name='apic'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
-index f5980f53e5..cb21e48a9f 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
-@@ -1,12 +1,13 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>SandyBridge</model>
-+  <model fallback='forbid'>Westmere</model>
-   <vendor>Intel</vendor>
-   <feature policy='require' name='vme'/>
-   <feature policy='require' name='ss'/>
-+  <feature policy='require' name='pclmuldq'/>
-+  <feature policy='require' name='x2apic'/>
-+  <feature policy='require' name='tsc-deadline'/>
-   <feature policy='require' name='hypervisor'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
--  <feature policy='disable' name='xsave'/>
--  <feature policy='disable' name='avx'/>
--  <feature policy='disable' name='xsaveopt'/>
-+  <feature policy='require' name='rdtscp'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
-index db5e0ae6af..20e2fa363a 100644
---- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
-@@ -1,6 +1,7 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>core2duo</model>
-+  <model fallback='forbid'>Westmere</model>
-   <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-   <feature policy='require' name='ds'/>
-   <feature policy='require' name='acpi'/>
-   <feature policy='require' name='ss'/>
-@@ -8,16 +9,17 @@
-   <feature policy='require' name='tm'/>
-   <feature policy='require' name='pbe'/>
-   <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-   <feature policy='require' name='ds_cpl'/>
-   <feature policy='require' name='est'/>
-   <feature policy='require' name='tm2'/>
--  <feature policy='require' name='cx16'/>
-   <feature policy='require' name='xtpr'/>
-   <feature policy='require' name='pdcm'/>
-   <feature policy='require' name='pcid'/>
--  <feature policy='require' name='popcnt'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='rdtscp'/>
--  <feature policy='require' name='lahf_lm'/>
-   <feature policy='require' name='invtsc'/>
-+  <feature policy='disable' name='sse4.1'/>
-+  <feature policy='disable' name='sse4.2'/>
-+  <feature policy='disable' name='aes'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
-index dbf8580a0e..659779687a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
-@@ -1,5 +1,5 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>SandyBridge</model>
-+  <model fallback='forbid'>Westmere</model>
-   <vendor>Intel</vendor>
-   <feature policy='require' name='vme'/>
-   <feature policy='require' name='ds'/>
-@@ -8,6 +8,7 @@
-   <feature policy='require' name='ht'/>
-   <feature policy='require' name='tm'/>
-   <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='pclmuldq'/>
-   <feature policy='require' name='dtes64'/>
-   <feature policy='require' name='monitor'/>
-   <feature policy='require' name='ds_cpl'/>
-@@ -19,10 +20,9 @@
-   <feature policy='require' name='pdcm'/>
-   <feature policy='require' name='pcid'/>
-   <feature policy='require' name='dca'/>
-+  <feature policy='require' name='x2apic'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='rdtscp'/>
-   <feature policy='require' name='invtsc'/>
--  <feature policy='disable' name='tsc-deadline'/>
--  <feature policy='disable' name='xsave'/>
--  <feature policy='disable' name='avx'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
-index d94a330f37..e8b74c5c30 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
-@@ -1,12 +1,14 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>SandyBridge</model>
-+  <model fallback='forbid'>Westmere</model>
-   <vendor>Intel</vendor>
-   <feature policy='require' name='vme'/>
-   <feature policy='require' name='ss'/>
-+  <feature policy='require' name='pclmuldq'/>
-   <feature policy='require' name='pcid'/>
-+  <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='pdpe1gb'/>
--  <feature policy='disable' name='xsave'/>
--  <feature policy='disable' name='avx'/>
-+  <feature policy='require' name='rdtscp'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
-index aae32bd7e2..da949ad25e 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
-@@ -1,14 +1,15 @@
- <cpu mode='custom' match='exact'>
--  <model fallback='forbid'>SandyBridge</model>
-+  <model fallback='forbid'>Westmere</model>
-   <vendor>Intel</vendor>
-   <feature policy='require' name='vme'/>
-   <feature policy='require' name='ss'/>
-+  <feature policy='require' name='pclmuldq'/>
-   <feature policy='require' name='pcid'/>
-+  <feature policy='require' name='x2apic'/>
-+  <feature policy='require' name='tsc-deadline'/>
-   <feature policy='require' name='hypervisor'/>
-   <feature policy='require' name='arat'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='pdpe1gb'/>
--  <feature policy='disable' name='xsave'/>
--  <feature policy='disable' name='avx'/>
--  <feature policy='disable' name='xsaveopt'/>
-+  <feature policy='require' name='rdtscp'/>
- </cpu>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILITIES-MSR.patch b/SOURCES/libvirt-cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILITIES-MSR.patch
new file mode 100644
index 0000000..82e7e94
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILITIES-MSR.patch
@@ -0,0 +1,212 @@
+From 7d0790fb5061cb956390ce5f7a2b92ac9702ada6 Mon Sep 17 00:00:00 2001
+Message-Id: <7d0790fb5061cb956390ce5f7a2b92ac9702ada6@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:39 +0200
+Subject: [PATCH] cpu_map: Add pschange-mc-no bit in IA32_ARCH_CAPABILITIES MSR
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 12eb0c9496e802bad9e5ec71cde888b8fdb1b0b4)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1781878
+
+Conflicts:
+	tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
+	tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+	tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+	tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
+	tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+	tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+            - test data files do not exist downstream
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <d106df21f8423a9acff9eb5bf75ab25611c1de1f.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu_map/x86_features.xml                                  | 3 +++
+ tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml           | 1 +
+ tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml            | 1 +
+ tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml            | 1 +
+ tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml      | 2 +-
+ tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml        | 1 +
+ tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml         | 1 +
+ tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml         | 1 +
+ tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 2 +-
+ tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml    | 1 +
+ tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml                | 1 +
+ tests/domaincapsdata/qemu_4.2.0.x86_64.xml                    | 1 +
+ tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml                | 1 +
+ tests/domaincapsdata/qemu_5.0.0.x86_64.xml                    | 1 +
+ 14 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index 2c4c29dc99..8525ae0fa5 100644
+--- a/src/cpu_map/x86_features.xml
++++ b/src/cpu_map/x86_features.xml
+@@ -509,6 +509,9 @@
+   <feature name='mds-no'>
+     <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
+   </feature>
++  <feature name='pschange-mc-no'>
++    <msr index='0x10a' edx='0x00000000' eax='0x00000040'/>
++  </feature>
+   <feature name='tsx-ctrl'>
+     <msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
+   </feature>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+index b5137e3c03..db5598740c 100644
+--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+@@ -35,6 +35,7 @@
+   <feature policy='require' name='ibrs-all'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+   <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='require' name='tsx-ctrl'/>
+   <feature policy='require' name='taa-no'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+index 52b352f4f1..6926b7c975 100644
+--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+@@ -36,6 +36,7 @@
+   <feature name='ibrs-all'/>
+   <feature name='skip-l1dfl-vmentry'/>
+   <feature name='mds-no'/>
++  <feature name='pschange-mc-no'/>
+   <feature name='tsx-ctrl'/>
+   <feature name='taa-no'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+index e323d6205e..fc52805b2f 100644
+--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+@@ -18,6 +18,7 @@
+   <feature policy='require' name='ibrs-all'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+   <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='require' name='tsx-ctrl'/>
+   <feature policy='require' name='taa-no'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+index 6c480eeacf..57f8ebabba 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+@@ -5,5 +5,5 @@
+   <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c47ab' ecx='0x00000004' edx='0xac000400'/>
+   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
+-  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
+ </cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+index 92404e4d03..ed06515e99 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+@@ -26,6 +26,7 @@
+   <feature policy='require' name='pdpe1gb'/>
+   <feature policy='require' name='invtsc'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='disable' name='hle'/>
+   <feature policy='disable' name='rtm'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+index 7f6fe2eac3..7681c94649 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+@@ -27,4 +27,5 @@
+   <feature name='pdpe1gb'/>
+   <feature name='invtsc'/>
+   <feature name='skip-l1dfl-vmentry'/>
++  <feature name='pschange-mc-no'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+index 645c0934c2..4774d39c7e 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+@@ -14,6 +14,7 @@
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='pdpe1gb'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='disable' name='hle'/>
+   <feature policy='disable' name='rtm'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+index 43c3a93a16..cd082feffe 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+@@ -6,5 +6,5 @@
+   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
+   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01001000' ecx='0x00000000' edx='0x00000000'/>
+-  <msr index='0x10a' edx='0x00000000' eax='0x000000ab'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x000000eb'/>
+ </cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+index 36e95029be..10c256ee1e 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+@@ -17,5 +17,6 @@
+   <feature policy='require' name='ibrs-all'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+   <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='require' name='tsx-ctrl'/>
+ </cpu>
+diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+index e257657981..4d9616cb69 100644
+--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+@@ -47,6 +47,7 @@
+       <feature policy='require' name='pdpe1gb'/>
+       <feature policy='require' name='invtsc'/>
+       <feature policy='require' name='skip-l1dfl-vmentry'/>
++      <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+       <model usable='yes'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+index 2918ba9715..5210c917aa 100644
+--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+@@ -46,6 +46,7 @@
+       <feature policy='require' name='pdpe1gb'/>
+       <feature policy='require' name='invtsc'/>
+       <feature policy='require' name='skip-l1dfl-vmentry'/>
++      <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+       <model usable='yes'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+index 7b2a929738..b7e2c8a4fe 100644
+--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+@@ -47,6 +47,7 @@
+       <feature policy='require' name='pdpe1gb'/>
+       <feature policy='require' name='invtsc'/>
+       <feature policy='require' name='skip-l1dfl-vmentry'/>
++      <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+       <model usable='yes'>qemu64</model>
+diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+index 7609d49020..d2741375b4 100644
+--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
++++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+@@ -46,6 +46,7 @@
+       <feature policy='require' name='pdpe1gb'/>
+       <feature policy='require' name='invtsc'/>
+       <feature policy='require' name='skip-l1dfl-vmentry'/>
++      <feature policy='require' name='pschange-mc-no'/>
+     </mode>
+     <mode name='custom' supported='yes'>
+       <model usable='yes'>qemu64</model>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Add-support-for-arch-capabilities-feature.patch b/SOURCES/libvirt-cpu_map-Add-support-for-arch-capabilities-feature.patch
deleted file mode 100644
index e84978d..0000000
--- a/SOURCES/libvirt-cpu_map-Add-support-for-arch-capabilities-feature.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From bd665085c2cd890f2249042f135b7a1735932d1b Mon Sep 17 00:00:00 2001
-Message-Id: <bd665085c2cd890f2249042f135b7a1735932d1b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:48 +0200
-Subject: [PATCH] cpu_map: Add support for arch-capabilities feature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The feature was added to QEMU in 3.1.0 and it is currently blocking
-migration, which is expected to change in the future. Luckily 3.1.0 is
-new enough to give us migratability hints on each feature via
-query-cpu-model-expension, which means we don't need to use the
-"migratable" attribute on the CPU map XML.
-
-The kernel calls this feature arch_capabilities and RHEL/CentOS 7.* use
-arch-facilities. Apparently some CPU test files were gathered with the
-RHEL version of QEMU. Let's update the test files to avoid possible
-confusion about the correct naming.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 511df17aec36385320dbcc088ba85968537d1d42)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1693433
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - cpu_map split was not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <fc8d72f3a2191ef85b537943aa1cc844f50b038d.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml                                        | 3 +++
- tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json        | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json        | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json         | 2 +-
- 5 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index ceee0ae489..a9f284fbbe 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -337,6 +337,9 @@
-     <feature name='stibp'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
-     </feature>
-+    <feature name='arch-capabilities'> <!-- arch_capabilities, arch-facilities -->
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
-+    </feature>
-     <feature name='ssbd'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
-     </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
-index 94a60fcc8f..1f53bb8bf3 100644
---- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
-+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json
-@@ -232,7 +232,7 @@
-         "avx512vbmi": false,
-         "kvm-asyncpf": true,
-         "spec-ctrl": false,
--        "arch-facilities": false,
-+        "arch-capabilities": false,
-         "model": 1,
-         "node-id": -1
-       }
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
-index 10c5434263..6bdaf6e83a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json
-@@ -232,7 +232,7 @@
-         "avx512vbmi": false,
-         "kvm-asyncpf": true,
-         "spec-ctrl": true,
--        "arch-facilities": false,
-+        "arch-capabilities": false,
-         "model": 63,
-         "node-id": -1
-       }
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
-index 0506dec0a7..2c6be20768 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json
-@@ -232,7 +232,7 @@
-         "avx512vbmi": false,
-         "kvm-asyncpf": true,
-         "spec-ctrl": true,
--        "arch-facilities": false,
-+        "arch-capabilities": false,
-         "model": 79,
-         "node-id": -1
-       }
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
-index 79f3580219..79b47a56fb 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json
-@@ -232,7 +232,7 @@
-         "avx512vbmi": false,
-         "kvm-asyncpf": true,
-         "spec-ctrl": true,
--        "arch-facilities": false,
-+        "arch-capabilities": false,
-         "model": 85,
-         "node-id": -1
-       }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-Add-support-for-cldemote-CPU-feature.patch b/SOURCES/libvirt-cpu_map-Add-support-for-cldemote-CPU-feature.patch
deleted file mode 100644
index 913e7e7..0000000
--- a/SOURCES/libvirt-cpu_map-Add-support-for-cldemote-CPU-feature.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e7f71788bb7c3534b97fe50b05212e64aa9d1412 Mon Sep 17 00:00:00 2001
-Message-Id: <e7f71788bb7c3534b97fe50b05212e64aa9d1412@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 25 Apr 2019 16:36:43 +0200
-Subject: [PATCH] cpu_map: Add support for cldemote CPU feature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Added in QEMU by v2.12.0-481-g0da0fb0628 (released in 3.0).
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8feeee9ee23f0500cc2585e1b11231c54de8e93d)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1537731
-https://bugzilla.redhat.com/show_bug.cgi?id=1537777
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - features are defined in src/cpu/cpu_map.xml downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <bb26b8e5c8323be651bae3d1c15aa04528f2c26d.1556202959.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 095d49a69a..79c40cff34 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -315,6 +315,9 @@
-     <feature name='la57'>
-       <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/>
-     </feature>
-+    <feature name='cldemote'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x02000000'/>
-+    </feature>
- 
-     <feature name='avx512-4vnniw'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000004'/>
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-cpu_map-Define-md-clear-CPUID-bit.patch b/SOURCES/libvirt-cpu_map-Define-md-clear-CPUID-bit.patch
deleted file mode 100644
index 61a7eec..0000000
--- a/SOURCES/libvirt-cpu_map-Define-md-clear-CPUID-bit.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 28c9a09d1f42513344c546ac344f90ae3280fd5b Mon Sep 17 00:00:00 2001
-Message-Id: <28c9a09d1f42513344c546ac344f90ae3280fd5b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 15:11:20 +0200
-Subject: [PATCH] cpu_map: Define md-clear CPUID bit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
-
-The bit is set when microcode provides the mechanism to invoke a flush
-of various exploitable CPU buffers by invoking the VERW instruction.
-
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 538d873571d7a682852dc1d70e5f4478f4d64e85)
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - no CPU map split downstream
-
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-            - test data missing downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu/cpu_map.xml                                        | 3 +++
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml   | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml    | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml    | 1 +
- 5 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 79c40cff34..ceee0ae489 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -325,6 +325,9 @@
-     <feature name='avx512-4fmaps'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
-     </feature>
-+    <feature name='md-clear'> <!-- md_clear -->
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
-+    </feature>
-     <feature name='pconfig'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
-     </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-index 0deca9fba6..74763a462b 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-@@ -2,7 +2,7 @@
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-   <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
--  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000400'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-index 70a0fc3286..867970d2c7 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -20,6 +20,7 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-index bbdfb6aa61..e7ced42797 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -21,6 +21,7 @@
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-   <feature name='intel-pt'/>
-+  <feature name='md-clear'/>
-   <feature name='stibp'/>
-   <feature name='ssbd'/>
-   <feature name='xsaves'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-index 1f321db273..a5591278df 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -5,6 +5,7 @@
-   <feature policy='require' name='hypervisor'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='pdpe1gb'/>
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-Server.patch b/SOURCES/libvirt-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-Server.patch
new file mode 100644
index 0000000..ff72f17
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-Server.patch
@@ -0,0 +1,154 @@
+From f1926a0cb9147ce54484858f5e0f7376ee9ac648 Mon Sep 17 00:00:00 2001
+Message-Id: <f1926a0cb9147ce54484858f5e0f7376ee9ac648@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:37 +0200
+Subject: [PATCH] cpu_map: Distinguish Cascadelake-Server from Skylake-Server
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The signatures of these two CPU model differ only in stepping as both
+report family 6 and model 85. Skylake-Server uses stepping 4 or less and
+Cascadelake-Server uses stepping 5..7.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1761678
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5d6059f8ec16d64f240dc5e6413ca55a3b46b3f7)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <8711c401083e2605e7d8734764a5fe1b092749b0.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu_map/x86_Cascadelake-Server-noTSX.xml            | 2 +-
+ src/cpu_map/x86_Cascadelake-Server.xml                  | 2 +-
+ src/cpu_map/x86_Skylake-Server-IBRS.xml                 | 2 +-
+ src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml           | 2 +-
+ src/cpu_map/x86_Skylake-Server.xml                      | 2 +-
+ tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml | 5 +++--
+ tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml  | 5 +++--
+ 7 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+index 459174a30d..bfd4629836 100644
+--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
++++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Cascadelake-Server-noTSX'>
+     <decode host='on' guest='off'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='5-7'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
+index d7ec42f57e..335e9cb584 100644
+--- a/src/cpu_map/x86_Cascadelake-Server.xml
++++ b/src/cpu_map/x86_Cascadelake-Server.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Cascadelake-Server'>
+     <decode host='on' guest='on'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='5-7'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
+index bd6b6457ad..9fb3488809 100644
+--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Skylake-Server-IBRS'>
+     <decode host='on' guest='on'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+index c2b7de40e8..c162c0acc3 100644
+--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Skylake-Server-noTSX-IBRS'>
+     <decode host='on' guest='off'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
+index f96875a85f..e022d94c84 100644
+--- a/src/cpu_map/x86_Skylake-Server.xml
++++ b/src/cpu_map/x86_Skylake-Server.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Skylake-Server'>
+     <decode host='on' guest='on'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+index cfb0eb982d..c21cb1e600 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Cascadelake-Server</model>
++  <model fallback='forbid'>Skylake-Server-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ds'/>
+   <feature policy='require' name='acpi'/>
+@@ -20,14 +20,15 @@
+   <feature policy='require' name='osxsave'/>
+   <feature policy='require' name='tsc_adjust'/>
+   <feature policy='require' name='cmt'/>
++  <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='intel-pt'/>
+   <feature policy='require' name='pku'/>
+   <feature policy='require' name='ospke'/>
+   <feature policy='require' name='md-clear'/>
+   <feature policy='require' name='stibp'/>
++  <feature policy='require' name='ssbd'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='mbm_total'/>
+   <feature policy='require' name='mbm_local'/>
+   <feature policy='require' name='invtsc'/>
+-  <feature policy='disable' name='avx512vnni'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+index 968d904557..b482043ccf 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+@@ -1,16 +1,17 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Cascadelake-Server</model>
++  <model fallback='forbid'>Skylake-Server-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ss'/>
+   <feature policy='require' name='vmx'/>
+   <feature policy='require' name='hypervisor'/>
+   <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='umip'/>
+   <feature policy='require' name='pku'/>
+   <feature policy='require' name='md-clear'/>
+   <feature policy='require' name='stibp'/>
+   <feature policy='require' name='arch-capabilities'/>
++  <feature policy='require' name='ssbd'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+-  <feature policy='disable' name='avx512vnni'/>
+ </cpu>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Distribute-x86_Cooperlake.xml.patch b/SOURCES/libvirt-cpu_map-Distribute-x86_Cooperlake.xml.patch
new file mode 100644
index 0000000..cdbabf5
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Distribute-x86_Cooperlake.xml.patch
@@ -0,0 +1,37 @@
+From a48703c3f77054ba1bdfa1adf3aa8277814874d1 Mon Sep 17 00:00:00 2001
+Message-Id: <a48703c3f77054ba1bdfa1adf3aa8277814874d1@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 28 May 2020 09:50:05 +0200
+Subject: [PATCH] cpu_map: Distribute x86_Cooperlake.xml
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 1c425857fb9f652c7811f075f3d31ff561b95632)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1781878
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <98b6a65536435b8130694e50adc9f39ff3110d90.1590652079.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu_map/Makefile.inc.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
+index be64c9a0d4..b949cb0bea 100644
+--- a/src/cpu_map/Makefile.inc.am
++++ b/src/cpu_map/Makefile.inc.am
+@@ -22,6 +22,7 @@ cpumap_DATA = \
+ 	cpu_map/x86_Cascadelake-Server.xml \
+ 	cpu_map/x86_Cascadelake-Server-noTSX.xml \
+ 	cpu_map/x86_Conroe.xml \
++	cpu_map/x86_Cooperlake.xml \
+ 	cpu_map/x86_core2duo.xml \
+ 	cpu_map/x86_coreduo.xml \
+ 	cpu_map/x86_cpu64-rhel5.xml \
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Don-t-use-new-noTSX-models-for-host-model-CPUs.patch b/SOURCES/libvirt-cpu_map-Don-t-use-new-noTSX-models-for-host-model-CPUs.patch
new file mode 100644
index 0000000..e14d208
--- /dev/null
+++ b/SOURCES/libvirt-cpu_map-Don-t-use-new-noTSX-models-for-host-model-CPUs.patch
@@ -0,0 +1,137 @@
+From 2268a9862c16c87007bfbae117d345268f8420e4 Mon Sep 17 00:00:00 2001
+Message-Id: <2268a9862c16c87007bfbae117d345268f8420e4@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:58 +0200
+Subject: [PATCH] cpu_map: Don't use new noTSX models for host-model CPUs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Host-model CPU definitions (and domain capabilities) will use the
+original CPU models (without noTSX in their name) and explicitly disable
+hle and rtm features. This way domains with host-model CPUs will be
+migratable even to older versions of libvirt which do not support the
+noTSX model variants.
+
+The new models will be advertised in host capabilities and they may
+be used explicitly with custom CPUs.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit 17cdefe5f197030c70a0d250f3c5387b41663516)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840008
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <d27a0adb8f142f053fbd830947f03bad04eff264.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu_map/x86_Cascadelake-Server-noTSX.xml           | 2 +-
+ src/cpu_map/x86_Icelake-Client-noTSX.xml               | 2 +-
+ src/cpu_map/x86_Icelake-Server-noTSX.xml               | 2 +-
+ src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml          | 2 +-
+ src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml          | 2 +-
+ tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml | 4 +++-
+ tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml  | 4 +++-
+ 7 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+index 5adea664e9..459174a30d 100644
+--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
++++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+@@ -1,6 +1,6 @@
+ <cpus>
+   <model name='Cascadelake-Server-noTSX'>
+-    <decode host='on' guest='on'/>
++    <decode host='on' guest='off'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Icelake-Client-noTSX.xml b/src/cpu_map/x86_Icelake-Client-noTSX.xml
+index 540732af6f..65e648ae21 100644
+--- a/src/cpu_map/x86_Icelake-Client-noTSX.xml
++++ b/src/cpu_map/x86_Icelake-Client-noTSX.xml
+@@ -1,6 +1,6 @@
+ <cpus>
+   <model name='Icelake-Client-noTSX'>
+-    <decode host='on' guest='on'/>
++    <decode host='on' guest='off'/>
+     <signature family='6' model='126'/> <!-- 0706e0 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
+index 5a53da23c7..2fd6906406 100644
+--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
++++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
+@@ -1,6 +1,6 @@
+ <cpus>
+   <model name='Icelake-Server-noTSX'>
+-    <decode host='on' guest='on'/>
++    <decode host='on' guest='off'/>
+     <signature family='6' model='134'/> <!-- 080660 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+index 0c2f1e6ac4..ffba34502a 100644
+--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+@@ -1,6 +1,6 @@
+ <cpus>
+   <model name='Skylake-Client-noTSX-IBRS'>
+-    <decode host='on' guest='on'/>
++    <decode host='on' guest='off'/>
+     <signature family='6' model='94'/> <!-- 0506e0 -->
+     <signature family='6' model='78'/> <!-- 0406e0 -->
+     <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
+diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+index 91a206f575..c2b7de40e8 100644
+--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+@@ -1,6 +1,6 @@
+ <cpus>
+   <model name='Skylake-Server-noTSX-IBRS'>
+-    <decode host='on' guest='on'/>
++    <decode host='on' guest='off'/>
+     <signature family='6' model='85'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+index e03c4a06ba..92404e4d03 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
++  <model fallback='forbid'>Skylake-Client-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ds'/>
+   <feature policy='require' name='acpi'/>
+@@ -26,4 +26,6 @@
+   <feature policy='require' name='pdpe1gb'/>
+   <feature policy='require' name='invtsc'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='disable' name='hle'/>
++  <feature policy='disable' name='rtm'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+index 3d8e6775bf..645c0934c2 100644
+--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
++  <model fallback='forbid'>Skylake-Client-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ss'/>
+   <feature policy='require' name='vmx'/>
+@@ -14,4 +14,6 @@
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='pdpe1gb'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='disable' name='hle'/>
++  <feature policy='disable' name='rtm'/>
+ </cpu>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_map-Drop-pconfig-from-Icelake-Server-CPU-model.patch b/SOURCES/libvirt-cpu_map-Drop-pconfig-from-Icelake-Server-CPU-model.patch
deleted file mode 100644
index 26d83d5..0000000
--- a/SOURCES/libvirt-cpu_map-Drop-pconfig-from-Icelake-Server-CPU-model.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 059091703401ef3029a1ffdbec8de97d5d5a1fd1 Mon Sep 17 00:00:00 2001
-Message-Id: <059091703401ef3029a1ffdbec8de97d5d5a1fd1@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Nov 2019 17:52:36 +0100
-Subject: [PATCH] cpu_map: Drop pconfig from Icelake-Server CPU model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The pconfig feature was enabled in QEMU by accident in 3.1.0. All other
-newer versions do not support it and it was removed from the
-Icelake-Server CPU model in QEMU.
-
-We don't normally change our CPU models even when QEMU does so to avoid
-breaking migrations between different versions of libvirt. But we can
-safely do so in this specific case. QEMU never supported enabling
-pconfig so any domain which was able to start has pconfig disabled.
-
-With a small compatibility hack which explicitly disables pconfig when
-CPU model equals Icelake-Server in migratable domain definition, only
-one migration scenario stays broken (and there's nothing we can do about
-it): from any host to a host with libvirt < 5.10.0 and QEMU > 3.1.0.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749672
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 9cd03f7957e114892ae54e7ccb3758b6fb440644)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1756156
-https://bugzilla.redhat.com/show_bug.cgi?id=1721608
-
-Conflicts:
-	src/cpu_map/x86_Icelake-Server.xml
-            - still monolithic cpu_map.xml downstream
-
-	src/qemu/qemu_domain.h
-            - context
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <6c06dac67da208e6ba8c07798c31405644acfb16.1573836581.git.jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/cpu/cpu_map.xml                           |  1 -
- src/qemu/qemu_domain.c                        | 23 +++++++++++++++++++
- src/qemu/qemu_domain.h                        |  3 +++
- src/qemu/qemu_migration_cookie.c              |  3 +++
- .../x86_64-cpuid-Ice-Lake-Server-guest.xml    |  1 -
- .../x86_64-cpuid-Ice-Lake-Server-host.xml     | 11 +--------
- .../x86_64-cpuid-Ice-Lake-Server-json.xml     |  1 -
- 7 files changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index acd9dad7dc..7b9f8bb452 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -2176,7 +2176,6 @@
-       <feature name='pat'/>
-       <feature name='pcid'/>
-       <feature name='pclmuldq'/>
--      <feature name='pconfig'/>
-       <feature name='pdpe1gb'/>
-       <feature name='pge'/>
-       <feature name='pku'/>
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index c9899b9e6d..f45d7d427e 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -7348,6 +7348,26 @@ qemuDomainDefCopy(virQEMUDriverPtr driver,
- }
- 
- 
-+int
-+qemuDomainMakeCPUMigratable(virCPUDefPtr cpu)
-+{
-+    if (cpu->mode == VIR_CPU_MODE_CUSTOM &&
-+        STREQ_NULLABLE(cpu->model, "Icelake-Server")) {
-+        /* Originally Icelake-Server CPU model contained pconfig CPU feature.
-+         * It was never actually enabled and thus it was removed. To enable
-+         * migration to QEMU 3.1.0 (with both new and old libvirt), we
-+         * explicitly disable pconfig in migration XML (otherwise old libvirt
-+         * would think it was implicitly enabled on the source). New libvirt
-+         * will drop it from the XML before starting the domain on new QEMU.
-+         */
-+        if (virCPUDefUpdateFeature(cpu, "pconfig", VIR_CPU_FEATURE_DISABLE) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
-                                virDomainDefPtr def,
-@@ -7522,6 +7542,9 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
-             if (!(def->cpu = virCPUDefCopy(origCPU)))
-                 goto cleanup;
-         }
-+
-+        if (qemuDomainMakeCPUMigratable(def->cpu) < 0)
-+            goto cleanup;
-     }
- 
-  format:
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 8463a8b706..a29a678771 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -1072,4 +1072,7 @@ char * qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv);
- virDomainEventResumedDetailType
- qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason);
- 
-+int
-+qemuDomainMakeCPUMigratable(virCPUDefPtr cpu);
-+
- #endif /* __QEMU_DOMAIN_H__ */
-diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
-index 60df449d53..c270896944 100644
---- a/src/qemu/qemu_migration_cookie.c
-+++ b/src/qemu/qemu_migration_cookie.c
-@@ -543,6 +543,9 @@ qemuMigrationCookieAddCPU(qemuMigrationCookiePtr mig,
-     if (!(mig->cpu = virCPUDefCopy(vm->def->cpu)))
-         return -1;
- 
-+    if (qemuDomainMakeCPUMigratable(mig->cpu) < 0)
-+        return -1;
-+
-     mig->flags |= QEMU_MIGRATION_COOKIE_CPU;
- 
-     return 0;
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
-index 6ca2099b33..4676f3aa7d 100644
---- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
-@@ -32,5 +32,4 @@
-   <feature policy='require' name='rdctl-no'/>
-   <feature policy='require' name='ibrs-all'/>
-   <feature policy='require' name='skip-l1dfl-vmentry'/>
--  <feature policy='disable' name='pconfig'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
-index 31af20bc85..35b9e39629 100644
---- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
-@@ -1,6 +1,6 @@
- <cpu>
-   <arch>x86_64</arch>
--  <model>Icelake-Client</model>
-+  <model>Icelake-Server</model>
-   <vendor>Intel</vendor>
-   <feature name='ds'/>
-   <feature name='acpi'/>
-@@ -21,23 +21,14 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='cmt'/>
--  <feature name='avx512f'/>
--  <feature name='avx512dq'/>
-   <feature name='avx512ifma'/>
--  <feature name='clflushopt'/>
--  <feature name='clwb'/>
--  <feature name='avx512cd'/>
-   <feature name='sha-ni'/>
--  <feature name='avx512bw'/>
--  <feature name='avx512vl'/>
-   <feature name='ospke'/>
--  <feature name='la57'/>
-   <feature name='stibp'/>
-   <feature name='arch-capabilities'/>
-   <feature name='xsaves'/>
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
--  <feature name='pdpe1gb'/>
-   <feature name='invtsc'/>
-   <feature name='rdctl-no'/>
-   <feature name='ibrs-all'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
-index b043db58d7..ada11d2608 100644
---- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
-@@ -13,5 +13,4 @@
-   <feature policy='require' name='ibrs-all'/>
-   <feature policy='require' name='skip-l1dfl-vmentry'/>
-   <feature policy='disable' name='intel-pt'/>
--  <feature policy='disable' name='pconfig'/>
- </cpu>
--- 
-2.24.0
-
diff --git a/SOURCES/libvirt-cpu_map-Introduce-IA32_ARCH_CAPABILITIES-MSR-features.patch b/SOURCES/libvirt-cpu_map-Introduce-IA32_ARCH_CAPABILITIES-MSR-features.patch
deleted file mode 100644
index 945e56f..0000000
--- a/SOURCES/libvirt-cpu_map-Introduce-IA32_ARCH_CAPABILITIES-MSR-features.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 0c781b84fe81ca2d4865e92d6c22dafcea62261c Mon Sep 17 00:00:00 2001
-Message-Id: <0c781b84fe81ca2d4865e92d6c22dafcea62261c@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:10 +0200
-Subject: [PATCH] cpu_map: Introduce IA32_ARCH_CAPABILITIES MSR features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c8ec678fd9d97189667c0121f48a220dd26856b7)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - cpu_map XML is not split downstream
-
-	tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
-	tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
-            - missing
-
-	tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-            - commit 4586b11bed9bc59ea749e28f522bf5e0b462c4c7 not
-              backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <acddba8b7464f063de46f04fc421319cc78ad86c.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_map.xml                           | 20 +++++++++++++++++++
- .../x86_64-cpuid-Core-i7-7600U-enabled.xml    |  1 +
- .../x86_64-cpuid-Core-i7-7600U-json.xml       |  1 +
- ...86_64-cpuid-Xeon-Platinum-8268-enabled.xml |  1 +
- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml |  4 ++++
- .../x86_64-cpuid-Xeon-Platinum-8268-host.xml  |  4 ++++
- .../x86_64-cpuid-Xeon-Platinum-8268-json.xml  |  3 +++
- .../qemu_4.1.0.x86_64.xml                     |  1 +
- 8 files changed, 35 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 9b289556e8..acd9dad7dc 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -482,6 +482,26 @@
-       <cpuid eax_in='0x80000008' ebx='0x02000000'/>
-     </feature>
- 
-+    <!-- IA32_ARCH_CAPABILITIES features -->
-+    <feature name='rdctl-no'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000001'/>
-+    </feature>
-+    <feature name='ibrs-all'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000002'/>
-+    </feature>
-+    <feature name='rsba'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000004'/>
-+    </feature>
-+    <feature name='skip-l1dfl-vmentry'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
-+    </feature>
-+    <feature name='ssb-no'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000010'/>
-+    </feature>
-+    <feature name='mds-no'>
-+      <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
-+    </feature>
-+
-     <!-- models -->
-     <model name='486'>
-       <feature name='fpu'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml
-index b1cdaa802a..58bc84577c 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml
-@@ -5,4 +5,5 @@
-   <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000004' edx='0x84000000'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
-index 48089c6003..690081493b 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
-@@ -10,4 +10,5 @@
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='skip-l1dfl-vmentry'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml
-index 434ac1956a..313009b156 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml
-@@ -5,4 +5,5 @@
-   <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000080c' edx='0x84000000'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <msr index='0x10a' edx='0x00000000' eax='0x0000000b'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-index c7e8a1fccf..988fb1dbdc 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-@@ -30,4 +30,8 @@
-   <feature policy='require' name='mbm_total'/>
-   <feature policy='require' name='mbm_local'/>
-   <feature policy='require' name='invtsc'/>
-+  <feature policy='require' name='rdctl-no'/>
-+  <feature policy='require' name='ibrs-all'/>
-+  <feature policy='require' name='skip-l1dfl-vmentry'/>
-+  <feature policy='require' name='mds-no'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-index d7482751b4..fdeafc4870 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-@@ -31,4 +31,8 @@
-   <feature name='mbm_total'/>
-   <feature name='mbm_local'/>
-   <feature name='invtsc'/>
-+  <feature name='rdctl-no'/>
-+  <feature name='ibrs-all'/>
-+  <feature name='skip-l1dfl-vmentry'/>
-+  <feature name='mds-no'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-index b7d12dced7..78863c61d1 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-@@ -7,4 +7,7 @@
-   <feature policy='require' name='umip'/>
-   <feature policy='require' name='pku'/>
-   <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='rdctl-no'/>
-+  <feature policy='require' name='ibrs-all'/>
-+  <feature policy='require' name='skip-l1dfl-vmentry'/>
- </cpu>
-diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-index 47aed6a43a..63ae7957c4 100644
---- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-+++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-@@ -34,6 +34,7 @@
-       <feature policy='require' name='arch-capabilities'/>
-       <feature policy='require' name='xsaves'/>
-       <feature policy='require' name='pdpe1gb'/>
-+      <feature policy='require' name='skip-l1dfl-vmentry'/>
-     </mode>
-     <mode name='custom' supported='yes'>
-       <model usable='yes'>qemu64</model>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_map-x86-Add-support-for-BFLOAT16-data-type.patch b/SOURCES/libvirt-cpu_map-x86-Add-support-for-BFLOAT16-data-type.patch
deleted file mode 100644
index 85e6137..0000000
--- a/SOURCES/libvirt-cpu_map-x86-Add-support-for-BFLOAT16-data-type.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a919b41c576e9619b14bcc599a2a0c844943f40b Mon Sep 17 00:00:00 2001
-Message-Id: <a919b41c576e9619b14bcc599a2a0c844943f40b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 10 Jan 2020 12:01:47 +0100
-Subject: [PATCH] cpu_map/x86: Add support for BFLOAT16 data type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduced in QEMU by commit v4.1.0-266-g80db491da4.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit b570139909fd5d11d82408218a8f1f590a6386b2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749516
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - features are defined in src/cpu/cpu_map.xml
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <dac9dd35ec9d467da7ffef82de38adb9c8385d0f.1578654092.git.jdenemar@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
----
- src/cpu/cpu_map.xml | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 9609ce71a7..c09c80a2e9 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -344,6 +344,10 @@
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
-     </feature>
- 
-+    <feature name='avx512-bf16'>
-+      <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000020'/>
-+    </feature>
-+
-     <!-- Processor Extended State Enumeration sub leaf 1 -->
-     <feature name='xsaveopt'>
-       <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/>
--- 
-2.24.1
-
diff --git a/SOURCES/libvirt-cpu_x86-Add-support-for-stepping-part-of-CPU-signature.patch b/SOURCES/libvirt-cpu_x86-Add-support-for-stepping-part-of-CPU-signature.patch
new file mode 100644
index 0000000..35c3988
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Add-support-for-stepping-part-of-CPU-signature.patch
@@ -0,0 +1,183 @@
+From 51290a9442c1b9347c43b2fec34b7aa979d26c77 Mon Sep 17 00:00:00 2001
+Message-Id: <51290a9442c1b9347c43b2fec34b7aa979d26c77@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:34 +0200
+Subject: [PATCH] cpu_x86: Add support for stepping part of CPU signature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CPU models defined in the cpu_map can use signature/@stepping attribute
+to match a limited set of stepping numbers. The value is a bitmap for
+bits 0..15 each corresponding to a single stepping value. For example,
+stepping='4-6,9' will match 4, 5, 6, and 9. Omitting the attribute is
+equivalent to stepping='0-15'.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c7a27949954d78dc95459758e329fb9c580361bb)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <20bd9df72a22a004bb665409ddba20ff89a5b66d.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 60 +++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 50 insertions(+), 10 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 45a073c1d0..0d81f3d2ae 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -125,6 +125,7 @@ typedef struct _virCPUx86Signature virCPUx86Signature;
+ struct _virCPUx86Signature {
+     unsigned int family;
+     unsigned int model;
++    virBitmapPtr stepping;
+ };
+ 
+ typedef struct _virCPUx86Signatures virCPUx86Signatures;
+@@ -732,7 +733,17 @@ x86MakeSignature(unsigned int family,
+ static uint32_t
+ virCPUx86SignatureToCPUID(virCPUx86Signature *sig)
+ {
+-    return x86MakeSignature(sig->family, sig->model, 0);
++    unsigned int stepping = 0;
++
++    if (sig->stepping) {
++        ssize_t firstBit;
++
++        firstBit = virBitmapNextSetBit(sig->stepping, -1);
++        if (firstBit >= 0)
++            stepping = firstBit;
++    }
++
++    return x86MakeSignature(sig->family, sig->model, stepping);
+ }
+ 
+ 
+@@ -767,8 +778,8 @@ x86DataToSignatureFull(const virCPUx86Data *data,
+ }
+ 
+ 
+-/* Mask out irrelevant bits (R and Step) from processor signature. */
+-#define SIGNATURE_MASK  0x0fff3ff0
++/* Mask out reserved bits from processor signature. */
++#define SIGNATURE_MASK  0x0fff3fff
+ 
+ static uint32_t
+ x86DataToSignature(const virCPUx86Data *data)
+@@ -1134,9 +1145,14 @@ virCPUx86SignaturesNew(size_t count)
+ static void
+ virCPUx86SignaturesFree(virCPUx86SignaturesPtr sigs)
+ {
++    size_t i;
++
+     if (!sigs)
+         return;
+ 
++    for (i = 0; i < sigs->count; i++)
++        virBitmapFree(sigs->items[i].stepping);
++
+     g_free(sigs->items);
+     g_free(sigs);
+ }
+@@ -1153,8 +1169,12 @@ virCPUx86SignaturesCopy(virCPUx86SignaturesPtr src)
+ 
+     dst = virCPUx86SignaturesNew(src->count);
+ 
+-    for (i = 0; i < src->count; i++)
+-        dst->items[i] = src->items[i];
++    for (i = 0; i < src->count; i++) {
++        dst->items[i].family = src->items[i].family;
++        dst->items[i].model = src->items[i].model;
++        if (src->items[i].stepping)
++            dst->items[i].stepping = virBitmapNewCopy(src->items[i].stepping);
++    }
+ 
+     return dst;
+ }
+@@ -1176,7 +1196,9 @@ virCPUx86SignaturesMatch(virCPUx86SignaturesPtr sigs,
+ 
+     for (i = 0; i < sigs->count; i++) {
+         if (sigs->items[i].family == family &&
+-            sigs->items[i].model == model)
++            sigs->items[i].model == model &&
++            (!sigs->items[i].stepping ||
++             virBitmapIsBitSet(sigs->items[i].stepping, stepping)))
+             return true;
+     }
+ 
+@@ -1194,9 +1216,15 @@ virCPUx86SignaturesFormat(virCPUx86SignaturesPtr sigs)
+         return virBufferContentAndReset(&buf);
+ 
+     for (i = 0; i < sigs->count; i++) {
+-        virBufferAsprintf(&buf, "(%u,%u,0), ",
++        g_autofree char *stepping = NULL;
++
++        if (sigs->items[i].stepping)
++            stepping = virBitmapFormat(sigs->items[i].stepping);
++
++        virBufferAsprintf(&buf, "(%u,%u,%s), ",
+                           sigs->items[i].family,
+-                          sigs->items[i].model);
++                          sigs->items[i].model,
++                          stepping ? stepping : "0-15");
+     }
+ 
+     virBufferTrim(&buf, ", ", -1);
+@@ -1473,6 +1501,7 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+ 
+     for (i = 0; i < n; i++) {
+         virCPUx86Signature *sig = &model->signatures->items[i];
++        g_autofree char *stepping = NULL;
+         int rc;
+ 
+         ctxt->node = nodes[i];
+@@ -1492,6 +1521,11 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+                            model->name);
+             return -1;
+         }
++
++        stepping = virXPathString("string(@stepping)", ctxt);
++        /* stepping corresponds to 4 bits in 32b signature, see above */
++        if (stepping && virBitmapParse(stepping, &sig->stepping, 16) < 0)
++            return -1;
+     }
+ 
+     ctxt->node = root;
+@@ -2090,6 +2124,9 @@ x86Decode(virCPUDefPtr cpu,
+     virDomainCapsCPUModelPtr hvModel = NULL;
+     g_autofree char *sigs = NULL;
+     uint32_t signature;
++    unsigned int sigFamily;
++    unsigned int sigModel;
++    unsigned int sigStepping;
+     ssize_t i;
+     int rc;
+ 
+@@ -2103,6 +2140,7 @@ x86Decode(virCPUDefPtr cpu,
+ 
+     vendor = x86DataToVendor(&data, map);
+     signature = x86DataToSignature(&data);
++    virCPUx86SignatureFromCPUID(signature, &sigFamily, &sigModel, &sigStepping);
+ 
+     x86DataFilterTSX(&data, vendor, map);
+ 
+@@ -2184,8 +2222,10 @@ x86Decode(virCPUDefPtr cpu,
+ 
+     sigs = virCPUx86SignaturesFormat(model->signatures);
+ 
+-    VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
+-              model->name, NULLSTR(sigs), (unsigned long)signature);
++    VIR_DEBUG("Using CPU model %s with signatures [%s] for "
++              "CPU with signature (%u,%u,%u)",
++              model->name, NULLSTR(sigs),
++              sigFamily, sigModel, sigStepping);
+ 
+     cpu->model = g_steal_pointer(&cpuModel->model);
+     cpu->features = g_steal_pointer(&cpuModel->features);
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Add-support-for-storing-MSR-features-in-CPU-map.patch b/SOURCES/libvirt-cpu_x86-Add-support-for-storing-MSR-features-in-CPU-map.patch
deleted file mode 100644
index 8f72765..0000000
--- a/SOURCES/libvirt-cpu_x86-Add-support-for-storing-MSR-features-in-CPU-map.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From 808b0c73134cd3c6a7fdd387fd9654dbd41356ac Mon Sep 17 00:00:00 2001
-Message-Id: <808b0c73134cd3c6a7fdd387fd9654dbd41356ac@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:39 +0200
-Subject: [PATCH] cpu_x86: Add support for storing MSR features in CPU map
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fcf4846a6bb902a5cd2230fff2a1e7591dcb7456)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/cputestdata/cpu-cpuid.py
-            - no need to update this script downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0c37dabaaa6c2559b48918ca55e170750fe34ea0.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c      | 127 +++++++++++++++++++++++++++++++++++++----
- src/cpu/cpu_x86_data.h |  10 ++++
- 2 files changed, 125 insertions(+), 12 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index e6da974b31..49562944c1 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -197,6 +197,8 @@ virCPUx86DataItemMatch(const virCPUx86DataItem *item1,
- {
-     const virCPUx86CPUID *cpuid1;
-     const virCPUx86CPUID *cpuid2;
-+    const virCPUx86MSR *msr1;
-+    const virCPUx86MSR *msr2;
- 
-     switch (item1->type) {
-     case VIR_CPU_X86_DATA_CPUID:
-@@ -207,6 +209,12 @@ virCPUx86DataItemMatch(const virCPUx86DataItem *item1,
-                 cpuid1->ecx == cpuid2->ecx &&
-                 cpuid1->edx == cpuid2->edx);
- 
-+    case VIR_CPU_X86_DATA_MSR:
-+        msr1 = &item1->data.msr;
-+        msr2 = &item2->data.msr;
-+        return (msr1->eax == msr2->eax &&
-+                msr1->edx == msr2->edx);
-+
-     case VIR_CPU_X86_DATA_NONE:
-     default:
-         return false;
-@@ -220,6 +228,8 @@ virCPUx86DataItemMatchMasked(const virCPUx86DataItem *item,
- {
-     const virCPUx86CPUID *cpuid;
-     const virCPUx86CPUID *cpuidMask;
-+    const virCPUx86MSR *msr;
-+    const virCPUx86MSR *msrMask;
- 
-     switch (item->type) {
-     case VIR_CPU_X86_DATA_CPUID:
-@@ -230,6 +240,12 @@ virCPUx86DataItemMatchMasked(const virCPUx86DataItem *item,
-                 (cpuid->ecx & cpuidMask->ecx) == cpuidMask->ecx &&
-                 (cpuid->edx & cpuidMask->edx) == cpuidMask->edx);
- 
-+    case VIR_CPU_X86_DATA_MSR:
-+        msr = &item->data.msr;
-+        msrMask = &mask->data.msr;
-+        return ((msr->eax & msrMask->eax) == msrMask->eax &&
-+                (msr->edx & msrMask->edx) == msrMask->edx);
-+
-     case VIR_CPU_X86_DATA_NONE:
-     default:
-         return false;
-@@ -243,6 +259,8 @@ virCPUx86DataItemSetBits(virCPUx86DataItemPtr item,
- {
-     virCPUx86CPUIDPtr cpuid;
-     const virCPUx86CPUID *cpuidMask;
-+    virCPUx86MSRPtr msr;
-+    const virCPUx86MSR *msrMask;
- 
-     if (!mask)
-         return;
-@@ -257,6 +275,13 @@ virCPUx86DataItemSetBits(virCPUx86DataItemPtr item,
-         cpuid->edx |= cpuidMask->edx;
-         break;
- 
-+    case VIR_CPU_X86_DATA_MSR:
-+        msr = &item->data.msr;
-+        msrMask = &mask->data.msr;
-+        msr->eax |= msrMask->eax;
-+        msr->edx |= msrMask->edx;
-+        break;
-+
-     case VIR_CPU_X86_DATA_NONE:
-     default:
-         break;
-@@ -270,6 +295,8 @@ virCPUx86DataItemClearBits(virCPUx86DataItemPtr item,
- {
-     virCPUx86CPUIDPtr cpuid;
-     const virCPUx86CPUID *cpuidMask;
-+    virCPUx86MSRPtr msr;
-+    const virCPUx86MSR *msrMask;
- 
-     if (!mask)
-         return;
-@@ -284,6 +311,13 @@ virCPUx86DataItemClearBits(virCPUx86DataItemPtr item,
-         cpuid->edx &= ~cpuidMask->edx;
-         break;
- 
-+    case VIR_CPU_X86_DATA_MSR:
-+        msr = &item->data.msr;
-+        msrMask = &mask->data.msr;
-+        msr->eax &= ~msrMask->eax;
-+        msr->edx &= ~msrMask->edx;
-+        break;
-+
-     case VIR_CPU_X86_DATA_NONE:
-     default:
-         break;
-@@ -297,6 +331,8 @@ virCPUx86DataItemAndBits(virCPUx86DataItemPtr item,
- {
-     virCPUx86CPUIDPtr cpuid;
-     const virCPUx86CPUID *cpuidMask;
-+    virCPUx86MSRPtr msr;
-+    const virCPUx86MSR *msrMask;
- 
-     if (!mask)
-         return;
-@@ -311,6 +347,13 @@ virCPUx86DataItemAndBits(virCPUx86DataItemPtr item,
-         cpuid->edx &= cpuidMask->edx;
-         break;
- 
-+    case VIR_CPU_X86_DATA_MSR:
-+        msr = &item->data.msr;
-+        msrMask = &mask->data.msr;
-+        msr->eax &= msrMask->eax;
-+        msr->edx &= msrMask->edx;
-+        break;
-+
-     case VIR_CPU_X86_DATA_NONE:
-     default:
-         break;
-@@ -373,6 +416,14 @@ virCPUx86DataSorter(const void *a, const void *b)
- 
-         break;
- 
-+    case VIR_CPU_X86_DATA_MSR:
-+        if (da->data.msr.index > db->data.msr.index)
-+            return 1;
-+        else if (da->data.msr.index < db->data.msr.index)
-+            return -1;
-+
-+        break;
-+
-     case VIR_CPU_X86_DATA_NONE:
-     default:
-         break;
-@@ -978,6 +1029,31 @@ x86ParseCPUID(xmlXPathContextPtr ctxt,
- }
- 
- 
-+static int
-+x86ParseMSR(xmlXPathContextPtr ctxt,
-+            virCPUx86DataItemPtr item)
-+{
-+    virCPUx86MSRPtr msr;
-+    unsigned long index;
-+    unsigned long eax;
-+    unsigned long edx;
-+
-+    memset(item, 0, sizeof(*item));
-+
-+    if (virXPathULongHex("string(@index)", ctxt, &index) < 0 ||
-+        virXPathULongHex("string(@eax)", ctxt, &eax) < 0 ||
-+        virXPathULongHex("string(@edx)", ctxt, &edx) < 0)
-+        return -1;
-+
-+    item->type = VIR_CPU_X86_DATA_MSR;
-+    msr = &item->data.msr;
-+    msr->index = index;
-+    msr->eax = eax;
-+    msr->edx = edx;
-+    return 0;
-+}
-+
-+
- static int
- x86FeatureParse(xmlXPathContextPtr ctxt,
-                 const char *name,
-@@ -1010,25 +1086,35 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-     if (STREQ_NULLABLE(str, "no"))
-         feature->migratable = false;
- 
--    n = virXPathNodeSet("./cpuid", ctxt, &nodes);
-+    n = virXPathNodeSet("./cpuid|./msr", ctxt, &nodes);
-     if (n < 0)
-         goto cleanup;
- 
-     if (n == 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Missing cpuid for feature %s"),
-+                       _("Missing cpuid or msr element in feature %s"),
-                        feature->name);
-         goto cleanup;
-     }
- 
-     for (i = 0; i < n; i++) {
-         ctxt->node = nodes[i];
--        if (x86ParseCPUID(ctxt, &item) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Invalid cpuid[%zu] in %s feature"),
--                           i, feature->name);
--            goto cleanup;
-+        if (virXMLNodeNameEqual(nodes[i], "cpuid")) {
-+            if (x86ParseCPUID(ctxt, &item) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Invalid cpuid[%zu] in %s feature"),
-+                               i, feature->name);
-+                goto cleanup;
-+            }
-+        } else {
-+            if (x86ParseMSR(ctxt, &item) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Invalid msr[%zu] in %s feature"),
-+                               i, feature->name);
-+                goto cleanup;
-+            }
-         }
-+
-         if (virCPUx86DataAddItem(&feature->data, &item))
-             goto cleanup;
-     }
-@@ -1544,6 +1630,7 @@ virCPUx86DataFormat(const virCPUData *data)
-     virBufferAddLit(&buf, "<cpudata arch='x86'>\n");
-     while ((item = virCPUx86DataNext(&iter))) {
-         virCPUx86CPUIDPtr cpuid;
-+        virCPUx86MSRPtr msr;
- 
-         switch (item->type) {
-         case VIR_CPU_X86_DATA_CPUID:
-@@ -1556,6 +1643,13 @@ virCPUx86DataFormat(const virCPUData *data)
-                               cpuid->eax, cpuid->ebx, cpuid->ecx, cpuid->edx);
-             break;
- 
-+        case VIR_CPU_X86_DATA_MSR:
-+            msr = &item->data.msr;
-+            virBufferAsprintf(&buf,
-+                              "  <msr index='0x%x' eax='0x%08x' edx='0x%08x'/>\n",
-+                              msr->index, msr->eax, msr->edx);
-+            break;
-+
-         case VIR_CPU_X86_DATA_NONE:
-         default:
-             break;
-@@ -1579,7 +1673,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
-     size_t i;
-     int n;
- 
--    n = virXPathNodeSet("/cpudata/cpuid", ctxt, &nodes);
-+    n = virXPathNodeSet("/cpudata/cpuid|/cpudata/msr", ctxt, &nodes);
-     if (n <= 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("no x86 CPU data found"));
-@@ -1591,11 +1685,20 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
- 
-     for (i = 0; i < n; i++) {
-         ctxt->node = nodes[i];
--        if (x86ParseCPUID(ctxt, &item) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("failed to parse cpuid[%zu]"), i);
--            goto error;
-+        if (virXMLNodeNameEqual(nodes[i], "cpuid")) {
-+            if (x86ParseCPUID(ctxt, &item) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("failed to parse cpuid[%zu]"), i);
-+                goto error;
-+            }
-+        } else {
-+            if (x86ParseMSR(ctxt, &item) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("failed to parse msr[%zu]"), i);
-+                goto error;
-+            }
-         }
-+
-         if (virCPUx86DataAdd(cpuData, &item) < 0)
-             goto error;
-     }
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index da8e91fe71..454345b688 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -37,6 +37,14 @@ struct _virCPUx86CPUID {
-     uint32_t edx;
- };
- 
-+typedef struct _virCPUx86MSR virCPUx86MSR;
-+typedef virCPUx86MSR *virCPUx86MSRPtr;
-+struct _virCPUx86MSR {
-+    uint32_t index;
-+    uint32_t eax;
-+    uint32_t edx;
-+};
-+
- # define CPUX86_BASIC    0x0
- # define CPUX86_KVM      0x40000000
- # define CPUX86_EXTENDED 0x80000000
-@@ -74,6 +82,7 @@ struct _virCPUx86CPUID {
- typedef enum {
-     VIR_CPU_X86_DATA_NONE = 0,
-     VIR_CPU_X86_DATA_CPUID,
-+    VIR_CPU_X86_DATA_MSR,
- } virCPUx86DataType;
- 
- typedef struct _virCPUx86DataItem virCPUx86DataItem;
-@@ -82,6 +91,7 @@ struct _virCPUx86DataItem {
-     virCPUx86DataType type;
-     union {
-         virCPUx86CPUID cpuid;
-+        virCPUx86MSR msr;
-     } data;
- };
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Add-virCPUx86DataGetSignature-for-tests.patch b/SOURCES/libvirt-cpu_x86-Add-virCPUx86DataGetSignature-for-tests.patch
deleted file mode 100644
index 034a778..0000000
--- a/SOURCES/libvirt-cpu_x86-Add-virCPUx86DataGetSignature-for-tests.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 459e059de518794d909c77b6c24fd6962558d362 Mon Sep 17 00:00:00 2001
-Message-Id: <459e059de518794d909c77b6c24fd6962558d362@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:06 +0200
-Subject: [PATCH] cpu_x86: Add virCPUx86DataGetSignature for tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function exports the functionality of x86DataToSignatureFull and
-x86MakeSignature to the test suite.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 661307b4b2e8597d889efddfac0ff5d324c9fa42)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <7964c9cc9ea47fdce4c2b07fda8efa2cb9f9f384.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c        | 12 ++++++++++++
- src/cpu/cpu_x86.h        |  5 +++++
- src/libvirt_private.syms |  1 +
- 3 files changed, 18 insertions(+)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index ba14a6097d..24569a90f3 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -3066,6 +3066,18 @@ virCPUx86DataSetSignature(virCPUDataPtr cpuData,
- }
- 
- 
-+uint32_t
-+virCPUx86DataGetSignature(virCPUDataPtr cpuData,
-+                          unsigned int *family,
-+                          unsigned int *model,
-+                          unsigned int *stepping)
-+{
-+    x86DataToSignatureFull(&cpuData->data.x86, family, model, stepping);
-+
-+    return x86MakeSignature(*family, *model, *stepping);
-+}
-+
-+
- int
- virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                        const char *vendor)
-diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
-index 5d14d83e1b..9d3c2b2cdd 100644
---- a/src/cpu/cpu_x86.h
-+++ b/src/cpu/cpu_x86.h
-@@ -37,6 +37,11 @@ int virCPUx86DataSetSignature(virCPUDataPtr cpuData,
-                               unsigned int model,
-                               unsigned int stepping);
- 
-+uint32_t virCPUx86DataGetSignature(virCPUDataPtr cpuData,
-+                                   unsigned int *family,
-+                                   unsigned int *model,
-+                                   unsigned int *stepping);
-+
- int virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                            const char *vendor);
- 
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 7c48908a54..a275fa9aa1 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1205,6 +1205,7 @@ virCPUValidateFeatures;
- # cpu/cpu_x86.h
- virCPUx86DataAddCPUID;
- virCPUx86DataAddFeature;
-+virCPUx86DataGetSignature;
- virCPUx86DataSetSignature;
- virCPUx86DataSetVendor;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Add-x86ModelCopySignatures-helper.patch b/SOURCES/libvirt-cpu_x86-Add-x86ModelCopySignatures-helper.patch
deleted file mode 100644
index 9d389e8..0000000
--- a/SOURCES/libvirt-cpu_x86-Add-x86ModelCopySignatures-helper.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 0b98a3d385f3d46949c5b2bc15c27c7c62739496 Mon Sep 17 00:00:00 2001
-Message-Id: <0b98a3d385f3d46949c5b2bc15c27c7c62739496@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:59 +0200
-Subject: [PATCH] cpu_x86: Add x86ModelCopySignatures helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce a helper for copying CPU signature between two CPU models.
-
-It's not very useful until the way we store signatures is changed in the
-next patch.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2254c1cfb854dfc52f3b4bfdfca2bd995b0a163c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <eb973566dab0f8d77ff536e4c56eb6bffd77928f.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 51cb9b7143..e25bc691ae 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -977,6 +977,16 @@ x86ModelFree(virCPUx86ModelPtr model)
- }
- 
- 
-+static int
-+x86ModelCopySignatures(virCPUx86ModelPtr dst,
-+                       virCPUx86ModelPtr src)
-+{
-+    dst->signature = src->signature;
-+
-+    return 0;
-+}
-+
-+
- static virCPUx86ModelPtr
- x86ModelCopy(virCPUx86ModelPtr model)
- {
-@@ -984,13 +994,13 @@ x86ModelCopy(virCPUx86ModelPtr model)
- 
-     if (VIR_ALLOC(copy) < 0 ||
-         VIR_STRDUP(copy->name, model->name) < 0 ||
-+        x86ModelCopySignatures(copy, model) < 0 ||
-         x86DataCopy(&copy->data, &model->data) < 0) {
-         x86ModelFree(copy);
-         return NULL;
-     }
- 
-     copy->vendor = model->vendor;
--    copy->signature = model->signature;
- 
-     return copy;
- }
-@@ -1176,8 +1186,8 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
-     }
- 
-     model->vendor = ancestor->vendor;
--    model->signature = ancestor->signature;
--    if (x86DataCopy(&model->data, &ancestor->data) < 0)
-+    if (x86ModelCopySignatures(model, ancestor) < 0 ||
-+        x86DataCopy(&model->data, &ancestor->data) < 0)
-         return -1;
- 
-     return 0;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Allow-multiple-signatures-for-a-CPU-model.patch b/SOURCES/libvirt-cpu_x86-Allow-multiple-signatures-for-a-CPU-model.patch
deleted file mode 100644
index faa8177..0000000
--- a/SOURCES/libvirt-cpu_x86-Allow-multiple-signatures-for-a-CPU-model.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 5196a4b5fad475a8489faa9b5542536a941bd9da Mon Sep 17 00:00:00 2001
-Message-Id: <5196a4b5fad475a8489faa9b5542536a941bd9da@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:01 +0200
-Subject: [PATCH] cpu_x86: Allow multiple signatures for a CPU model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CPU signatures in the cpu_map serve as a hint for CPUID to CPU model
-matching algorithm. If the CPU signatures matches any CPU model in the
-cpu_map, this model will be the preferred one.
-
-This works out well and solved several mismatches, but in real world
-CPUs which should match a single CPU model may be produced with several
-different signatures. For example, low voltage Broadwell CPUs for
-laptops and Broadwell CPUs for servers differ in CPU model numbers while
-we should detect them all as Broadwell CPU model.
-
-This patch adds support for storing several signatures for a single CPU
-model to make this hint useful for more CPUs. Later commits will provide
-additional signatures for existing CPU models, which will correct some
-results in our CPU test suite.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit dfeb3e598438a891a05487c34e6723d1d3ed9256)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <393649e6301769c297f2d09bcb88d6200882eb9d.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 31 +++++++++++++++++++++----------
- 1 file changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index f8b8d8a96b..7bd8119c23 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1204,22 +1204,32 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
- 
- 
- static int
--x86ModelParseSignature(virCPUx86ModelPtr model,
--                       xmlXPathContextPtr ctxt)
-+x86ModelParseSignatures(virCPUx86ModelPtr model,
-+                        xmlXPathContextPtr ctxt)
- {
-+    VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
-+    xmlNodePtr root = ctxt->node;
-+    size_t i;
-+    int n;
-+
-+    if ((n = virXPathNodeSet("./signature", ctxt, &nodes)) <= 0)
-+        return n;
-+
-     /* Remove inherited signatures. */
-     VIR_FREE(model->signatures);
- 
--    if (virXPathBoolean("boolean(./signature)", ctxt)) {
-+    model->nsignatures = n;
-+    if (VIR_ALLOC_N(model->signatures, n) < 0)
-+       return -1;
-+
-+    for (i = 0; i < n; i++) {
-         unsigned int sigFamily = 0;
-         unsigned int sigModel = 0;
-         int rc;
- 
--        model->nsignatures = 1;
--        if (VIR_ALLOC_N(model->signatures, 1) < 0)
--            return -1;
-+        ctxt->node = nodes[i];
- 
--        rc = virXPathUInt("string(./signature/@family)", ctxt, &sigFamily);
-+        rc = virXPathUInt("string(@family)", ctxt, &sigFamily);
-         if (rc < 0 || sigFamily == 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid CPU signature family in model %s"),
-@@ -1227,7 +1237,7 @@ x86ModelParseSignature(virCPUx86ModelPtr model,
-             return -1;
-         }
- 
--        rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
-+        rc = virXPathUInt("string(@model)", ctxt, &sigModel);
-         if (rc < 0 || sigModel == 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid CPU signature model in model %s"),
-@@ -1235,9 +1245,10 @@ x86ModelParseSignature(virCPUx86ModelPtr model,
-             return -1;
-         }
- 
--        model->signatures[0] = x86MakeSignature(sigFamily, sigModel, 0);
-+        model->signatures[i] = x86MakeSignature(sigFamily, sigModel, 0);
-     }
- 
-+    ctxt->node = root;
-     return 0;
- }
- 
-@@ -1334,7 +1345,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     if (x86ModelParseAncestor(model, ctxt, map) < 0)
-         goto cleanup;
- 
--    if (x86ModelParseSignature(model, ctxt) < 0)
-+    if (x86ModelParseSignatures(model, ctxt) < 0)
-         goto cleanup;
- 
-     if (x86ModelParseVendor(model, ctxt, map) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Do-not-cache-microcode-version.patch b/SOURCES/libvirt-cpu_x86-Do-not-cache-microcode-version.patch
deleted file mode 100644
index d6ba3b3..0000000
--- a/SOURCES/libvirt-cpu_x86-Do-not-cache-microcode-version.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f574d83a57b54248bc1f1c7fd3b25894d579c8e3 Mon Sep 17 00:00:00 2001
-Message-Id: <f574d83a57b54248bc1f1c7fd3b25894d579c8e3@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 11:33:32 +0200
-Subject: [PATCH] cpu_x86: Do not cache microcode version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The microcode version checks are used to invalidate cached CPU data we
-get from QEMU. To minimize /proc/cpuinfo parsing the microcode version
-was only read when libvirtd started and cached for the daemon's
-lifetime. However, the CPU microcode can change anytime (updating the
-microcode package can automatically upload it to the CPU) and we need to
-stop caching it to avoid using stale CPU model data.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit be46f613261d3b655a1f15afd635087e68a9c39b)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu/cpu_x86.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 7fa84f6014..89baf94d7d 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -163,7 +163,6 @@ struct _virCPUx86Map {
- };
- 
- static virCPUx86MapPtr cpuMap;
--static unsigned int microcodeVersion;
- 
- int virCPUx86DriverOnceInit(void);
- VIR_ONCE_GLOBAL_INIT(virCPUx86Driver);
-@@ -1422,8 +1421,6 @@ virCPUx86DriverOnceInit(void)
-     if (!(cpuMap = virCPUx86LoadMap()))
-         return -1;
- 
--    microcodeVersion = virHostCPUGetMicrocodeVersion();
--
-     return 0;
- }
- 
-@@ -2463,7 +2460,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
-         goto cleanup;
- 
-     ret = x86DecodeCPUData(cpu, cpuData, models);
--    cpu->microcodeVersion = microcodeVersion;
-+    cpu->microcodeVersion = virHostCPUGetMicrocodeVersion();
- 
-  cleanup:
-     virCPUx86DataFree(cpuData);
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch b/SOURCES/libvirt-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
new file mode 100644
index 0000000..208599b
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
@@ -0,0 +1,74 @@
+From 8a18e258633c347eb421904c63c2265ed59d61b5 Mon Sep 17 00:00:00 2001
+Message-Id: <8a18e258633c347eb421904c63c2265ed59d61b5@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:33 +0200
+Subject: [PATCH] cpu_x86: Don't check return value of x86ModelCopy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to glib allocation functions which abort on OOM the function
+cannot ever return NULL.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 70f3041d39802e53a19901bee040ff33850cd5e0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <3db9e891cf44e608a45504b120a5c276ead3ea8d.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index b87e3753da..45a073c1d0 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1287,9 +1287,6 @@ x86ModelFromCPU(const virCPUDef *cpu,
+         model = g_new0(virCPUx86Model, 1);
+     }
+ 
+-    if (!model)
+-        return NULL;
+-
+     for (i = 0; i < cpu->nfeatures; i++) {
+         virCPUx86FeaturePtr feature;
+         virCPUFeaturePolicy fpol;
+@@ -1869,9 +1866,7 @@ x86Compute(virCPUDefPtr host,
+         return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+-    if (!(diff = x86ModelCopy(host_model)))
+-        return VIR_CPU_COMPARE_ERROR;
+-
++    diff = x86ModelCopy(host_model);
+     x86DataSubtract(&diff->data, &cpu_optional->data);
+     x86DataSubtract(&diff->data, &cpu_require->data);
+     x86DataSubtract(&diff->data, &cpu_disable->data);
+@@ -1892,8 +1887,7 @@ x86Compute(virCPUDefPtr host,
+     }
+ 
+     if (guest) {
+-        if (!(guest_model = x86ModelCopy(host_model)))
+-            return VIR_CPU_COMPARE_ERROR;
++        guest_model = x86ModelCopy(host_model);
+ 
+         if (cpu->vendor && host_model->vendor &&
+             virCPUx86DataAddItem(&guest_model->data,
+@@ -3131,8 +3125,8 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+         return -1;
+     }
+ 
+-    if (!(model = x86ModelCopy(model)) ||
+-        x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
++    model = x86ModelCopy(model);
++    if (x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
+                              &model->data, map) < 0)
+         return -1;
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch b/SOURCES/libvirt-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
new file mode 100644
index 0000000..ff9b9b1
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
@@ -0,0 +1,102 @@
+From 882e0241f82b5bcbe239cf00134950e141de642a Mon Sep 17 00:00:00 2001
+Message-Id: <882e0241f82b5bcbe239cf00134950e141de642a@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:59 +0200
+Subject: [PATCH] cpu_x86: Drop noTSX hint for incompatible CPUs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hint was introduced a long time ago when broken TSX implementation
+was found in Haswell and Broadwell CPUs. Since then many more CPUs with
+TSX were introduced and and disabled due to TAA vulnerability.
+
+Thus the hint is not very useful and I think removing it is a better
+choice then updating it to cover all current noTSX models.
+
+This partially reverts:
+commit 7f127ded657b24e0e55cd5f3539ef5b2dc935908
+    cpu: Rework cpuCompare* APIs
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 8452779049ef785b1d2e373b4d42633d4a929a60)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1126fcc8a0e18f0eed38c182013429fd7266c274.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 44 ++++++--------------------------------------
+ 1 file changed, 6 insertions(+), 38 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index b4d5c795f7..1b388ec1b2 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1937,8 +1937,6 @@ virCPUx86Compare(virCPUDefPtr host,
+                  bool failIncompatible)
+ {
+     virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
+-    virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
+     char *message = NULL;
+ 
+     if (!host || !host->model) {
+@@ -1954,46 +1952,16 @@ virCPUx86Compare(virCPUDefPtr host,
+ 
+     ret = x86Compute(host, cpu, NULL, &message);
+ 
+-    if (ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
+-        bool noTSX = false;
+-
+-        if (STREQ_NULLABLE(cpu->model, "Haswell") ||
+-            STREQ_NULLABLE(cpu->model, "Broadwell")) {
+-            if (!(map = virCPUx86GetMap()))
+-                goto cleanup;
+-
+-            if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-                goto cleanup;
+-
+-            noTSX = !x86FeatureInData("hle", &model->data, map) ||
+-                    !x86FeatureInData("rtm", &model->data, map);
+-        }
+-
+-        if (failIncompatible) {
+-            ret = VIR_CPU_COMPARE_ERROR;
+-            if (message) {
+-                if (noTSX) {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE,
+-                                   _("%s; try using '%s-noTSX' CPU model"),
+-                                   message, cpu->model);
+-                } else {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
+-                }
+-            } else {
+-                if (noTSX) {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE,
+-                                   _("try using '%s-noTSX' CPU model"),
+-                                   cpu->model);
+-                } else {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
+-                }
+-            }
+-        }
++    if (ret == VIR_CPU_COMPARE_INCOMPATIBLE && failIncompatible) {
++        ret = VIR_CPU_COMPARE_ERROR;
++        if (message)
++            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
++        else
++            virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
+     }
+ 
+  cleanup:
+     VIR_FREE(message);
+-    x86ModelFree(model);
+     return ret;
+ }
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Fix-memory-leak-virCPUx86GetHost.patch b/SOURCES/libvirt-cpu_x86-Fix-memory-leak-virCPUx86GetHost.patch
deleted file mode 100644
index c8111f6..0000000
--- a/SOURCES/libvirt-cpu_x86-Fix-memory-leak-virCPUx86GetHost.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b63d4e603a3617bd0d68d8897afb5e1c13a75165 Mon Sep 17 00:00:00 2001
-Message-Id: <b63d4e603a3617bd0d68d8897afb5e1c13a75165@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Tue, 2 Jul 2019 12:57:21 +0200
-Subject: [PATCH] cpu_x86: Fix memory leak - virCPUx86GetHost
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 56b254dcc called virCPUx86DataAdd, but returned -1 directly
-without calling the virCPUx86DataFree.
-
-Found by Coverity.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 5acb4eede23bcd5bc75193ea21542e0fb04b6e45)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <96135f1275b80b251c83ca947333b1969380ef7b.1562064911.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 0a520f07ff..9104bdbf1e 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -2789,7 +2789,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
-             };
- 
-             if (virCPUx86DataAdd(cpuData, &item) < 0)
--                return -1;
-+                goto cleanup;
-         }
-     }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Fix-placement-of-CheckFeature-functions.patch b/SOURCES/libvirt-cpu_x86-Fix-placement-of-CheckFeature-functions.patch
deleted file mode 100644
index b99049d..0000000
--- a/SOURCES/libvirt-cpu_x86-Fix-placement-of-CheckFeature-functions.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From e0ea2a8c9fb17cbb0b48cb8a1548152e962b126b Mon Sep 17 00:00:00 2001
-Message-Id: <e0ea2a8c9fb17cbb0b48cb8a1548152e962b126b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:45 +0200
-Subject: [PATCH] cpu_x86: Fix placement of *CheckFeature functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 0a97486e09 moved them outside #ifdef, but after virCPUx86GetHost,
-which will start calling them in the following patch.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 32f577ab10aefda6c4666abd07814c5c39f57788)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/cpu/cpu_x86.c
-            - only the last patch moving these functions is backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <7bb25ee8ca5b743934fa2ae8249f5715a47aba06.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 70 +++++++++++++++++++++++------------------------
- 1 file changed, 35 insertions(+), 35 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index fdc2974a0d..3c1bd623db 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -2377,6 +2377,41 @@ x86Encode(virArch arch,
- }
- 
- 
-+static int
-+virCPUx86CheckFeature(const virCPUDef *cpu,
-+                      const char *name)
-+{
-+    int ret = -1;
-+    virCPUx86MapPtr map;
-+    virCPUx86ModelPtr model = NULL;
-+
-+    if (!(map = virCPUx86GetMap()))
-+        return -1;
-+
-+    if (!(model = x86ModelFromCPU(cpu, map, -1)))
-+        goto cleanup;
-+
-+    ret = x86FeatureInData(name, &model->data, map);
-+
-+ cleanup:
-+    x86ModelFree(model);
-+    return ret;
-+}
-+
-+
-+static int
-+virCPUx86DataCheckFeature(const virCPUData *data,
-+                          const char *name)
-+{
-+    virCPUx86MapPtr map;
-+
-+    if (!(map = virCPUx86GetMap()))
-+        return -1;
-+
-+    return x86FeatureInData(name, &data->data.x86, map);
-+}
-+
-+
- #if defined(__i386__) || defined(__x86_64__)
- static inline void
- cpuidCall(virCPUx86CPUID *cpuid)
-@@ -2706,41 +2741,6 @@ cpuidSet(uint32_t base, virCPUDataPtr data)
- }
- 
- 
--static int
--virCPUx86CheckFeature(const virCPUDef *cpu,
--                      const char *name)
--{
--    int ret = -1;
--    virCPUx86MapPtr map;
--    virCPUx86ModelPtr model = NULL;
--
--    if (!(map = virCPUx86GetMap()))
--        return -1;
--
--    if (!(model = x86ModelFromCPU(cpu, map, -1)))
--        goto cleanup;
--
--    ret = x86FeatureInData(name, &model->data, map);
--
-- cleanup:
--    x86ModelFree(model);
--    return ret;
--}
--
--
--static int
--virCPUx86DataCheckFeature(const virCPUData *data,
--                          const char *name)
--{
--    virCPUx86MapPtr map;
--
--    if (!(map = virCPUx86GetMap()))
--        return -1;
--
--    return x86FeatureInData(name, &data->data.x86, map);
--}
--
--
- static int
- virCPUx86GetHost(virCPUDefPtr cpu,
-                  virDomainCapsCPUModelsPtr models)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Honor-CPU-models-decode-element.patch b/SOURCES/libvirt-cpu_x86-Honor-CPU-models-decode-element.patch
new file mode 100644
index 0000000..3928482
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Honor-CPU-models-decode-element.patch
@@ -0,0 +1,67 @@
+From ba2f2a8c39f2e7fe5684d9b84a0a832be482a3ab Mon Sep 17 00:00:00 2001
+Message-Id: <ba2f2a8c39f2e7fe5684d9b84a0a832be482a3ab@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:57 +0200
+Subject: [PATCH] cpu_x86: Honor CPU models' <decode> element
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit 7cd896ef31d33f78d40df918a33fe3867e251509)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840008
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <15f1eedf2c0df29a3942b4b28bc4575fa51ca19a.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 7fbb4c9a6c..b4d5c795f7 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2044,10 +2044,23 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+                       virCPUx86ModelPtr candidate,
+                       virCPUDefPtr cpuCandidate,
+                       uint32_t signature,
+-                      const char *preferred,
+-                      bool checkPolicy)
++                      const char *preferred)
+ {
+-    if (checkPolicy) {
++    if (cpuCandidate->type == VIR_CPU_TYPE_HOST &&
++        !candidate->decodeHost) {
++        VIR_DEBUG("%s is not supposed to be used for host CPU definition",
++                  cpuCandidate->model);
++        return 0;
++    }
++
++    if (cpuCandidate->type == VIR_CPU_TYPE_GUEST &&
++        !candidate->decodeGuest) {
++        VIR_DEBUG("%s is not supposed to be used for guest CPU definition",
++                  cpuCandidate->model);
++        return 0;
++    }
++
++    if (cpuCandidate->type == VIR_CPU_TYPE_HOST) {
+         size_t i;
+         for (i = 0; i < cpuCandidate->nfeatures; i++) {
+             if (cpuCandidate->features[i].policy == VIR_CPU_FEATURE_DISABLE)
+@@ -2209,8 +2222,7 @@ x86Decode(virCPUDefPtr cpu,
+ 
+         if ((rc = x86DecodeUseCandidate(model, cpuModel,
+                                         candidate, cpuCandidate,
+-                                        signature, preferred,
+-                                        cpu->type == VIR_CPU_TYPE_HOST))) {
++                                        signature, preferred))) {
+             virCPUDefFree(cpuModel);
+             cpuModel = cpuCandidate;
+             model = candidate;
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataCmp.patch b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataCmp.patch
deleted file mode 100644
index 1138e87..0000000
--- a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataCmp.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5354c931f98f2d95d131bf4d490d0e5e057157fe Mon Sep 17 00:00:00 2001
-Message-Id: <5354c931f98f2d95d131bf4d490d0e5e057157fe@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:32 +0200
-Subject: [PATCH] cpu_x86: Introduce virCPUx86DataCmp
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-virCPUx86DataSorter already compares two virCPUx86DataItem structs.
-Let's add a tiny wrapper around it called virCPUx86DataCmp and use it
-instead of open coded comparisons.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 559ccd7815056af23de24b7a01e8f644d97b6a92)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <9623fdd20059ec6abc7f09c5e7f1e13927c56944.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 0582be63e2..5a09033d2a 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -304,6 +304,13 @@ virCPUx86DataSorter(const void *a, const void *b)
-     return 0;
- }
- 
-+static int
-+virCPUx86DataItemCmp(const virCPUx86DataItem *item1,
-+                     const virCPUx86DataItem *item2)
-+{
-+    return virCPUx86DataSorter(item1, item2);
-+}
-+
- 
- /* skips all zero CPUID leaves */
- static virCPUx86DataItemPtr
-@@ -332,9 +339,9 @@ virCPUx86DataGet(const virCPUx86Data *data,
-     size_t i;
- 
-     for (i = 0; i < data->len; i++) {
--        if (data->items[i].cpuid.eax_in == item->cpuid.eax_in &&
--            data->items[i].cpuid.ecx_in == item->cpuid.ecx_in)
--            return data->items + i;
-+        virCPUx86DataItemPtr di = data->items + i;
-+        if (virCPUx86DataItemCmp(di, item) == 0)
-+            return di;
-     }
- 
-     return NULL;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataItem-container-struct.patch b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataItem-container-struct.patch
deleted file mode 100644
index 6bdf1ff..0000000
--- a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86DataItem-container-struct.patch
+++ /dev/null
@@ -1,850 +0,0 @@
-From 891f6c594088c787c92279af08ba0ab037492bdd Mon Sep 17 00:00:00 2001
-Message-Id: <891f6c594088c787c92279af08ba0ab037492bdd@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:22 +0200
-Subject: [PATCH] cpu_x86: Introduce virCPUx86DataItem container struct
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The following patches introduce CPU features read from MSR in addition
-to those queried via CPUID instruction. Let's introduce a container
-struct which will be able to describe either feature type.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 3673269e3aa22566f87e06a2b10dbc3b20110f84)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <161419b9968304180f18b33e6dc29ba70d9174d0.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c              | 312 ++++++++++++++++++---------------
- src/cpu/cpu_x86.h              |   2 +-
- src/cpu/cpu_x86_data.h         |   9 +-
- src/libxl/libxl_capabilities.c |   8 +-
- src/qemu/qemu_monitor_json.c   |   6 +-
- 5 files changed, 183 insertions(+), 154 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 98e8d608d6..2e953eaa12 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -49,7 +49,7 @@ typedef struct _virCPUx86Vendor virCPUx86Vendor;
- typedef virCPUx86Vendor *virCPUx86VendorPtr;
- struct _virCPUx86Vendor {
-     char *name;
--    virCPUx86CPUID cpuid;
-+    virCPUx86DataItem cpuid;
- };
- 
- typedef struct _virCPUx86Feature virCPUx86Feature;
-@@ -61,17 +61,19 @@ struct _virCPUx86Feature {
- };
- 
- 
-+#define CPUID(...) { .cpuid = {__VA_ARGS__} }
-+
- #define KVM_FEATURE_DEF(Name, Eax_in, Eax) \
--    static virCPUx86CPUID Name ## _cpuid[] = { \
--        { .eax_in = Eax_in, .eax = Eax }, \
-+    static virCPUx86DataItem Name ## _data[] = { \
-+        CPUID(.eax_in = Eax_in, .eax = Eax), \
-     }
- 
- #define KVM_FEATURE(Name) \
-     { \
-         .name = (char *) Name, \
-         .data = { \
--            .len = ARRAY_CARDINALITY(Name ## _cpuid), \
--            .data = Name ## _cpuid \
-+            .len = ARRAY_CARDINALITY(Name ## _data), \
-+            .items = Name ## _data, \
-         } \
-     }
- 
-@@ -286,17 +288,17 @@ x86FeatureFindInternal(const char *name)
- static int
- virCPUx86CPUIDSorter(const void *a, const void *b)
- {
--    virCPUx86CPUID *da = (virCPUx86CPUID *) a;
--    virCPUx86CPUID *db = (virCPUx86CPUID *) b;
-+    virCPUx86DataItemPtr da = (virCPUx86DataItemPtr) a;
-+    virCPUx86DataItemPtr db = (virCPUx86DataItemPtr) b;
- 
--    if (da->eax_in > db->eax_in)
-+    if (da->cpuid.eax_in > db->cpuid.eax_in)
-         return 1;
--    else if (da->eax_in < db->eax_in)
-+    else if (da->cpuid.eax_in < db->cpuid.eax_in)
-         return -1;
- 
--    if (da->ecx_in > db->ecx_in)
-+    if (da->cpuid.ecx_in > db->cpuid.ecx_in)
-         return 1;
--    else if (da->ecx_in < db->ecx_in)
-+    else if (da->cpuid.ecx_in < db->cpuid.ecx_in)
-         return -1;
- 
-     return 0;
-@@ -304,7 +306,7 @@ virCPUx86CPUIDSorter(const void *a, const void *b)
- 
- 
- /* skips all zero CPUID leaves */
--static virCPUx86CPUID *
-+static virCPUx86DataItemPtr
- x86DataCpuidNext(virCPUx86DataIteratorPtr iterator)
- {
-     const virCPUx86Data *data = iterator->data;
-@@ -313,24 +315,26 @@ x86DataCpuidNext(virCPUx86DataIteratorPtr iterator)
-         return NULL;
- 
-     while (++iterator->pos < data->len) {
--        if (!x86cpuidMatch(data->data + iterator->pos, &cpuidNull))
--            return data->data + iterator->pos;
-+        virCPUx86DataItemPtr item = data->items + iterator->pos;
-+
-+        if (!x86cpuidMatch(&item->cpuid, &cpuidNull))
-+            return item;
-     }
- 
-     return NULL;
- }
- 
- 
--static virCPUx86CPUID *
-+static virCPUx86DataItemPtr
- x86DataCpuid(const virCPUx86Data *data,
--             const virCPUx86CPUID *cpuid)
-+             const virCPUx86DataItem *cpuid)
- {
-     size_t i;
- 
-     for (i = 0; i < data->len; i++) {
--        if (data->data[i].eax_in == cpuid->eax_in &&
--            data->data[i].ecx_in == cpuid->ecx_in)
--            return data->data + i;
-+        if (data->items[i].cpuid.eax_in == cpuid->cpuid.eax_in &&
-+            data->items[i].cpuid.ecx_in == cpuid->cpuid.ecx_in)
-+            return data->items + i;
-     }
- 
-     return NULL;
-@@ -342,7 +346,7 @@ virCPUx86DataClear(virCPUx86Data *data)
-     if (!data)
-         return;
- 
--    VIR_FREE(data->data);
-+    VIR_FREE(data->items);
- }
- 
- 
-@@ -362,12 +366,12 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
- {
-     size_t i;
- 
--    if (VIR_ALLOC_N(dst->data, src->len) < 0)
-+    if (VIR_ALLOC_N(dst->items, src->len) < 0)
-         return -1;
- 
-     dst->len = src->len;
-     for (i = 0; i < src->len; i++)
--        dst->data[i] = src->data[i];
-+        dst->items[i] = src->items[i];
- 
-     return 0;
- }
-@@ -375,19 +379,19 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
- 
- static int
- virCPUx86DataAddCPUIDInt(virCPUx86Data *data,
--                         const virCPUx86CPUID *cpuid)
-+                         const virCPUx86DataItem *cpuid)
- {
--    virCPUx86CPUID *existing;
-+    virCPUx86DataItemPtr existing;
- 
-     if ((existing = x86DataCpuid(data, cpuid))) {
--        x86cpuidSetBits(existing, cpuid);
-+        x86cpuidSetBits(&existing->cpuid, &cpuid->cpuid);
-     } else {
--        if (VIR_APPEND_ELEMENT_COPY(data->data, data->len,
--                                    *((virCPUx86CPUID *)cpuid)) < 0)
-+        if (VIR_APPEND_ELEMENT_COPY(data->items, data->len,
-+                                    *((virCPUx86DataItemPtr)cpuid)) < 0)
-             return -1;
- 
--        qsort(data->data, data->len,
--              sizeof(virCPUx86CPUID), virCPUx86CPUIDSorter);
-+        qsort(data->items, data->len,
-+              sizeof(virCPUx86DataItem), virCPUx86CPUIDSorter);
-     }
- 
-     return 0;
-@@ -399,14 +403,14 @@ x86DataAdd(virCPUx86Data *data1,
-            const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data2);
--    virCPUx86CPUID *cpuid1;
--    virCPUx86CPUID *cpuid2;
-+    virCPUx86DataItemPtr cpuid1;
-+    virCPUx86DataItemPtr cpuid2;
- 
-     while ((cpuid2 = x86DataCpuidNext(&iter))) {
-         cpuid1 = x86DataCpuid(data1, cpuid2);
- 
-         if (cpuid1) {
--            x86cpuidSetBits(cpuid1, cpuid2);
-+            x86cpuidSetBits(&cpuid1->cpuid, &cpuid2->cpuid);
-         } else {
-             if (virCPUx86DataAddCPUIDInt(data1, cpuid2) < 0)
-                 return -1;
-@@ -422,12 +426,12 @@ x86DataSubtract(virCPUx86Data *data1,
-                 const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data1);
--    virCPUx86CPUID *cpuid1;
--    virCPUx86CPUID *cpuid2;
-+    virCPUx86DataItemPtr cpuid1;
-+    virCPUx86DataItemPtr cpuid2;
- 
-     while ((cpuid1 = x86DataCpuidNext(&iter))) {
--        cpuid2 = x86DataCpuid(data2, cpuid1);
--        x86cpuidClearBits(cpuid1, cpuid2);
-+        if ((cpuid2 = x86DataCpuid(data2, cpuid1)))
-+            x86cpuidClearBits(&cpuid1->cpuid, &cpuid2->cpuid);
-     }
- }
- 
-@@ -437,15 +441,15 @@ x86DataIntersect(virCPUx86Data *data1,
-                  const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data1);
--    virCPUx86CPUID *cpuid1;
--    virCPUx86CPUID *cpuid2;
-+    virCPUx86DataItemPtr cpuid1;
-+    virCPUx86DataItemPtr cpuid2;
- 
-     while ((cpuid1 = x86DataCpuidNext(&iter))) {
-         cpuid2 = x86DataCpuid(data2, cpuid1);
-         if (cpuid2)
--            x86cpuidAndBits(cpuid1, cpuid2);
-+            x86cpuidAndBits(&cpuid1->cpuid, &cpuid2->cpuid);
-         else
--            x86cpuidClearBits(cpuid1, cpuid1);
-+            x86cpuidClearBits(&cpuid1->cpuid, &cpuid1->cpuid);
-     }
- }
- 
-@@ -465,12 +469,12 @@ x86DataIsSubset(const virCPUx86Data *data,
- {
- 
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit((virCPUx86Data *)subset);
--    const virCPUx86CPUID *cpuid;
--    const virCPUx86CPUID *cpuidSubset;
-+    const virCPUx86DataItem *cpuid;
-+    const virCPUx86DataItem *cpuidSubset;
- 
-     while ((cpuidSubset = x86DataCpuidNext(&iter))) {
-         if (!(cpuid = x86DataCpuid(data, cpuidSubset)) ||
--            !x86cpuidMatchMasked(cpuid, cpuidSubset))
-+            !x86cpuidMatchMasked(&cpuid->cpuid, &cpuidSubset->cpuid))
-             return false;
-     }
- 
-@@ -505,14 +509,14 @@ static virCPUx86VendorPtr
- x86DataToVendor(const virCPUx86Data *data,
-                 virCPUx86MapPtr map)
- {
--    virCPUx86CPUID *cpuid;
-+    virCPUx86DataItemPtr cpuid;
-     size_t i;
- 
-     for (i = 0; i < map->nvendors; i++) {
-         virCPUx86VendorPtr vendor = map->vendors[i];
-         if ((cpuid = x86DataCpuid(data, &vendor->cpuid)) &&
--            x86cpuidMatchMasked(cpuid, &vendor->cpuid)) {
--            x86cpuidClearBits(cpuid, &vendor->cpuid);
-+            x86cpuidMatchMasked(&cpuid->cpuid, &vendor->cpuid.cpuid)) {
-+            x86cpuidClearBits(&cpuid->cpuid, &vendor->cpuid.cpuid);
-             return vendor;
-         }
-     }
-@@ -523,8 +527,10 @@ x86DataToVendor(const virCPUx86Data *data,
- 
- static int
- virCPUx86VendorToCPUID(const char *vendor,
--                       virCPUx86CPUID *cpuid)
-+                       virCPUx86DataItemPtr data)
- {
-+    virCPUx86CPUIDPtr cpuid = &data->cpuid;
-+
-     if (strlen(vendor) != VENDOR_STRING_LENGTH) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Invalid CPU vendor string '%s'"), vendor);
-@@ -597,14 +603,16 @@ x86DataToSignatureFull(const virCPUx86Data *data,
-                        unsigned int *model,
-                        unsigned int *stepping)
- {
--    virCPUx86CPUID leaf1 = { .eax_in = 0x1 };
--    virCPUx86CPUID *cpuid;
-+    virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);
-+    virCPUx86DataItemPtr item;
-+    virCPUx86CPUIDPtr cpuid;
- 
-     *family = *model = *stepping = 0;
- 
--    if (!(cpuid = x86DataCpuid(data, &leaf1)))
-+    if (!(item = x86DataCpuid(data, &leaf1)))
-         return;
- 
-+    cpuid = &item->cpuid;
-     *family = ((cpuid->eax >> 20) & 0xff) + ((cpuid->eax >> 8) & 0xf);
-     *model = ((cpuid->eax >> 12) & 0xf0) + ((cpuid->eax >> 4) & 0xf);
-     *stepping = cpuid->eax & 0xf;
-@@ -617,13 +625,13 @@ x86DataToSignatureFull(const virCPUx86Data *data,
- static uint32_t
- x86DataToSignature(const virCPUx86Data *data)
- {
--    virCPUx86CPUID leaf1 = { .eax_in = 0x1 };
--    virCPUx86CPUID *cpuid;
-+    virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);
-+    virCPUx86DataItemPtr cpuid;
- 
-     if (!(cpuid = x86DataCpuid(data, &leaf1)))
-         return 0;
- 
--    return cpuid->eax & SIGNATURE_MASK;
-+    return cpuid->cpuid.eax & SIGNATURE_MASK;
- }
- 
- 
-@@ -631,7 +639,7 @@ static int
- x86DataAddSignature(virCPUx86Data *data,
-                     uint32_t signature)
- {
--    virCPUx86CPUID cpuid = { .eax_in = 0x1, .eax = signature };
-+    virCPUx86DataItem cpuid = CPUID(.eax_in = 0x1, .eax = signature);
- 
-     return virCPUx86DataAddCPUIDInt(data, &cpuid);
- }
-@@ -856,13 +864,14 @@ x86FeatureNames(virCPUx86MapPtr map,
- 
- static int
- x86ParseCPUID(xmlXPathContextPtr ctxt,
--              virCPUx86CPUID *cpuid)
-+              virCPUx86DataItemPtr item)
- {
-+    virCPUx86CPUIDPtr cpuid;
-     unsigned long eax_in, ecx_in;
-     unsigned long eax, ebx, ecx, edx;
-     int ret_eax_in, ret_ecx_in, ret_eax, ret_ebx, ret_ecx, ret_edx;
- 
--    memset(cpuid, 0, sizeof(*cpuid));
-+    memset(item, 0, sizeof(*item));
- 
-     eax_in = ecx_in = 0;
-     eax = ebx = ecx = edx = 0;
-@@ -877,6 +886,7 @@ x86ParseCPUID(xmlXPathContextPtr ctxt,
-         ret_eax == -2 || ret_ebx == -2 || ret_ecx == -2 || ret_edx == -2)
-         return -1;
- 
-+    cpuid = &item->cpuid;
-     cpuid->eax_in = eax_in;
-     cpuid->ecx_in = ecx_in;
-     cpuid->eax = eax;
-@@ -895,7 +905,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-     virCPUx86MapPtr map = data;
-     xmlNodePtr *nodes = NULL;
-     virCPUx86FeaturePtr feature;
--    virCPUx86CPUID cpuid;
-+    virCPUx86DataItem cpuid;
-     size_t i;
-     int n;
-     char *str = NULL;
-@@ -1138,16 +1148,16 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-     virCPUx86CompareResult result = EQUAL;
-     virCPUx86DataIterator iter1 = virCPUx86DataIteratorInit(&model1->data);
-     virCPUx86DataIterator iter2 = virCPUx86DataIteratorInit(&model2->data);
--    virCPUx86CPUID *cpuid1;
--    virCPUx86CPUID *cpuid2;
-+    virCPUx86DataItemPtr cpuid1;
-+    virCPUx86DataItemPtr cpuid2;
- 
-     while ((cpuid1 = x86DataCpuidNext(&iter1))) {
-         virCPUx86CompareResult match = SUPERSET;
- 
-         if ((cpuid2 = x86DataCpuid(&model2->data, cpuid1))) {
--            if (x86cpuidMatch(cpuid1, cpuid2))
-+            if (x86cpuidMatch(&cpuid1->cpuid, &cpuid2->cpuid))
-                 continue;
--            else if (!x86cpuidMatchMasked(cpuid1, cpuid2))
-+            else if (!x86cpuidMatchMasked(&cpuid1->cpuid, &cpuid2->cpuid))
-                 match = SUBSET;
-         }
- 
-@@ -1161,9 +1171,9 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-         virCPUx86CompareResult match = SUBSET;
- 
-         if ((cpuid1 = x86DataCpuid(&model1->data, cpuid2))) {
--            if (x86cpuidMatch(cpuid2, cpuid1))
-+            if (x86cpuidMatch(&cpuid2->cpuid, &cpuid1->cpuid))
-                 continue;
--            else if (!x86cpuidMatchMasked(cpuid2, cpuid1))
-+            else if (!x86cpuidMatchMasked(&cpuid2->cpuid, &cpuid1->cpuid))
-                 match = SUPERSET;
-         }
- 
-@@ -1447,11 +1457,12 @@ static char *
- virCPUx86DataFormat(const virCPUData *data)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(&data->data.x86);
--    virCPUx86CPUID *cpuid;
-+    virCPUx86DataItemPtr item;
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
- 
-     virBufferAddLit(&buf, "<cpudata arch='x86'>\n");
--    while ((cpuid = x86DataCpuidNext(&iter))) {
-+    while ((item = x86DataCpuidNext(&iter))) {
-+        virCPUx86CPUIDPtr cpuid = &item->cpuid;
-         virBufferAsprintf(&buf,
-                           "  <cpuid eax_in='0x%08x' ecx_in='0x%08x'"
-                           " eax='0x%08x' ebx='0x%08x'"
-@@ -1473,7 +1484,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
- {
-     xmlNodePtr *nodes = NULL;
-     virCPUDataPtr cpuData = NULL;
--    virCPUx86CPUID cpuid;
-+    virCPUx86DataItem cpuid;
-     size_t i;
-     int n;
- 
-@@ -2059,7 +2070,7 @@ x86EncodePolicy(virCPUx86Data *data,
- 
-     *data = model->data;
-     model->data.len = 0;
--    model->data.data = NULL;
-+    model->data.items = NULL;
-     x86ModelFree(model);
- 
-     return 0;
-@@ -2213,17 +2224,18 @@ cpuidCall(virCPUx86CPUID *cpuid)
-  */
- static int
- cpuidSetLeaf4(virCPUDataPtr data,
--              virCPUx86CPUID *subLeaf0)
-+              virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = *subLeaf0;
-+    virCPUx86DataItem item = *subLeaf0;
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-         return -1;
- 
--    while (cpuid.eax & 0x1f) {
--        cpuid.ecx_in++;
--        cpuidCall(&cpuid);
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    while (cpuid->eax & 0x1f) {
-+        cpuid->ecx_in++;
-+        cpuidCall(cpuid);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2236,18 +2248,19 @@ cpuidSetLeaf4(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeaf7(virCPUDataPtr data,
--              virCPUx86CPUID *subLeaf0)
-+              virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = { .eax_in = 0x7 };
-+    virCPUx86DataItem item = CPUID(.eax_in = 0x7);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-         return -1;
- 
--    for (sub = 1; sub <= subLeaf0->eax; sub++) {
--        cpuid.ecx_in = sub;
--        cpuidCall(&cpuid);
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-+        cpuid->ecx_in = sub;
-+        cpuidCall(cpuid);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2263,15 +2276,16 @@ cpuidSetLeaf7(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeafB(virCPUDataPtr data,
--              virCPUx86CPUID *subLeaf0)
-+              virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = *subLeaf0;
-+    virCPUx86DataItem item = *subLeaf0;
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
- 
--    while (cpuid.ecx & 0xff00) {
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    while (cpuid->ecx & 0xff00) {
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
--        cpuid.ecx_in++;
--        cpuidCall(&cpuid);
-+        cpuid->ecx_in++;
-+        cpuidCall(cpuid);
-     }
-     return 0;
- }
-@@ -2287,9 +2301,10 @@ cpuidSetLeafB(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeafD(virCPUDataPtr data,
--              virCPUx86CPUID *subLeaf0)
-+              virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = { .eax_in = 0xd };
-+    virCPUx86DataItem item = CPUID(.eax_in = 0xd);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     virCPUx86CPUID sub0;
-     virCPUx86CPUID sub1;
-     uint32_t sub;
-@@ -2297,13 +2312,13 @@ cpuidSetLeafD(virCPUDataPtr data,
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-         return -1;
- 
--    cpuid.ecx_in = 1;
--    cpuidCall(&cpuid);
--    if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    cpuid->ecx_in = 1;
-+    cpuidCall(cpuid);
-+    if (virCPUx86DataAddCPUID(data, &item) < 0)
-         return -1;
- 
--    sub0 = *subLeaf0;
--    sub1 = cpuid;
-+    sub0 = subLeaf0->cpuid;
-+    sub1 = *cpuid;
-     for (sub = 2; sub < 64; sub++) {
-         if (sub < 32 &&
-             !(sub0.eax & (1 << sub)) &&
-@@ -2314,9 +2329,9 @@ cpuidSetLeafD(virCPUDataPtr data,
-             !(sub1.edx & (1 << (sub - 32))))
-             continue;
- 
--        cpuid.ecx_in = sub;
--        cpuidCall(&cpuid);
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+        cpuid->ecx_in = sub;
-+        cpuidCall(cpuid);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2334,10 +2349,11 @@ cpuidSetLeafD(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeafResID(virCPUDataPtr data,
--                  virCPUx86CPUID *subLeaf0,
-+                  virCPUx86DataItemPtr subLeaf0,
-                   uint32_t res)
- {
--    virCPUx86CPUID cpuid = { .eax_in = subLeaf0->eax_in };
-+    virCPUx86DataItem item = CPUID(.eax_in = subLeaf0->cpuid.eax_in);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-@@ -2346,9 +2362,9 @@ cpuidSetLeafResID(virCPUDataPtr data,
-     for (sub = 1; sub < 32; sub++) {
-         if (!(res & (1 << sub)))
-             continue;
--        cpuid.ecx_in = sub;
--        cpuidCall(&cpuid);
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+        cpuid->ecx_in = sub;
-+        cpuidCall(cpuid);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2362,31 +2378,32 @@ cpuidSetLeafResID(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeaf12(virCPUDataPtr data,
--               virCPUx86CPUID *subLeaf0)
-+               virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = { .eax_in = 0x7 };
--    virCPUx86CPUID *cpuid7;
-+    virCPUx86DataItem item = CPUID(.eax_in = 0x7);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86DataItemPtr cpuid7;
- 
--    if (!(cpuid7 = x86DataCpuid(&data->data.x86, &cpuid)) ||
--        !(cpuid7->ebx & (1 << 2)))
-+    if (!(cpuid7 = x86DataCpuid(&data->data.x86, &item)) ||
-+        !(cpuid7->cpuid.ebx & (1 << 2)))
-         return 0;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-         return -1;
- 
--    cpuid.eax_in = 0x12;
--    cpuid.ecx_in = 1;
--    cpuidCall(&cpuid);
--    if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    cpuid->eax_in = 0x12;
-+    cpuid->ecx_in = 1;
-+    cpuidCall(cpuid);
-+    if (virCPUx86DataAddCPUID(data, &item) < 0)
-         return -1;
- 
--    cpuid.ecx_in = 2;
--    cpuidCall(&cpuid);
--    while (cpuid.eax & 0xf) {
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    cpuid->ecx_in = 2;
-+    cpuidCall(cpuid);
-+    while (cpuid->eax & 0xf) {
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
--        cpuid.ecx_in++;
--        cpuidCall(&cpuid);
-+        cpuid->ecx_in++;
-+        cpuidCall(cpuid);
-     }
-     return 0;
- }
-@@ -2398,18 +2415,19 @@ cpuidSetLeaf12(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeaf14(virCPUDataPtr data,
--               virCPUx86CPUID *subLeaf0)
-+               virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = { .eax_in = 0x14 };
-+    virCPUx86DataItem item = CPUID(.eax_in = 0x14);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-         return -1;
- 
--    for (sub = 1; sub <= subLeaf0->eax; sub++) {
--        cpuid.ecx_in = sub;
--        cpuidCall(&cpuid);
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-+        cpuid->ecx_in = sub;
-+        cpuidCall(cpuid);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2423,21 +2441,22 @@ cpuidSetLeaf14(virCPUDataPtr data,
-  */
- static int
- cpuidSetLeaf17(virCPUDataPtr data,
--               virCPUx86CPUID *subLeaf0)
-+               virCPUx86DataItemPtr subLeaf0)
- {
--    virCPUx86CPUID cpuid = { .eax_in = 0x17 };
-+    virCPUx86DataItem item = CPUID(.eax_in = 0x17);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
--    if (subLeaf0->eax < 3)
-+    if (subLeaf0->cpuid.eax < 3)
-         return 0;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-         return -1;
- 
--    for (sub = 1; sub <= subLeaf0->eax; sub++) {
--        cpuid.ecx_in = sub;
--        cpuidCall(&cpuid);
--        if (virCPUx86DataAddCPUID(data, &cpuid) < 0)
-+    for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-+        cpuid->ecx_in = sub;
-+        cpuidCall(cpuid);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2450,39 +2469,40 @@ cpuidSet(uint32_t base, virCPUDataPtr data)
-     int rc;
-     uint32_t max;
-     uint32_t leaf;
--    virCPUx86CPUID cpuid = { .eax_in = base };
-+    virCPUx86DataItem item = CPUID(.eax_in = base);
-+    virCPUx86CPUIDPtr cpuid = &item.cpuid;
- 
--    cpuidCall(&cpuid);
--    max = cpuid.eax;
-+    cpuidCall(cpuid);
-+    max = cpuid->eax;
- 
-     for (leaf = base; leaf <= max; leaf++) {
--        cpuid.eax_in = leaf;
--        cpuid.ecx_in = 0;
--        cpuidCall(&cpuid);
-+        cpuid->eax_in = leaf;
-+        cpuid->ecx_in = 0;
-+        cpuidCall(cpuid);
- 
-         /* Handle CPUID leaves that depend on previously queried bits or
-          * which provide additional sub leaves for ecx_in > 0
-          */
-         if (leaf == 0x4)
--            rc = cpuidSetLeaf4(data, &cpuid);
-+            rc = cpuidSetLeaf4(data, &item);
-         else if (leaf == 0x7)
--            rc = cpuidSetLeaf7(data, &cpuid);
-+            rc = cpuidSetLeaf7(data, &item);
-         else if (leaf == 0xb)
--            rc = cpuidSetLeafB(data, &cpuid);
-+            rc = cpuidSetLeafB(data, &item);
-         else if (leaf == 0xd)
--            rc = cpuidSetLeafD(data, &cpuid);
-+            rc = cpuidSetLeafD(data, &item);
-         else if (leaf == 0xf)
--            rc = cpuidSetLeafResID(data, &cpuid, cpuid.edx);
-+            rc = cpuidSetLeafResID(data, &item, cpuid->edx);
-         else if (leaf == 0x10)
--            rc = cpuidSetLeafResID(data, &cpuid, cpuid.ebx);
-+            rc = cpuidSetLeafResID(data, &item, cpuid->ebx);
-         else if (leaf == 0x12)
--            rc = cpuidSetLeaf12(data, &cpuid);
-+            rc = cpuidSetLeaf12(data, &item);
-         else if (leaf == 0x14)
--            rc = cpuidSetLeaf14(data, &cpuid);
-+            rc = cpuidSetLeaf14(data, &item);
-         else if (leaf == 0x17)
--            rc = cpuidSetLeaf17(data, &cpuid);
-+            rc = cpuidSetLeaf17(data, &item);
-         else
--            rc = virCPUx86DataAddCPUID(data, &cpuid);
-+            rc = virCPUx86DataAddCPUID(data, &item);
- 
-         if (rc < 0)
-             return -1;
-@@ -3058,7 +3078,7 @@ virCPUx86ValidateFeatures(virCPUDefPtr cpu)
- 
- int
- virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
--                      const virCPUx86CPUID *cpuid)
-+                      const virCPUx86DataItem *cpuid)
- {
-     return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, cpuid);
- }
-@@ -3092,7 +3112,7 @@ int
- virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                        const char *vendor)
- {
--    virCPUx86CPUID cpuid = { 0 };
-+    virCPUx86DataItem cpuid = CPUID(0);
- 
-     if (virCPUx86VendorToCPUID(vendor, &cpuid) < 0)
-         return -1;
-diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
-index 9d3c2b2cdd..94655746c6 100644
---- a/src/cpu/cpu_x86.h
-+++ b/src/cpu/cpu_x86.h
-@@ -30,7 +30,7 @@
- extern struct cpuArchDriver cpuDriverX86;
- 
- int virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
--                          const virCPUx86CPUID *cpuid);
-+                          const virCPUx86DataItem *cpuid);
- 
- int virCPUx86DataSetSignature(virCPUDataPtr cpuData,
-                               unsigned int family,
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index 090a21156f..e93b355cf0 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -27,6 +27,7 @@
- # include <stdint.h>
- 
- typedef struct _virCPUx86CPUID virCPUx86CPUID;
-+typedef virCPUx86CPUID *virCPUx86CPUIDPtr;
- struct _virCPUx86CPUID {
-     uint32_t eax_in;
-     uint32_t ecx_in;
-@@ -70,10 +71,16 @@ struct _virCPUx86CPUID {
- 
- # define VIR_CPU_X86_DATA_INIT { 0 }
- 
-+typedef struct _virCPUx86DataItem virCPUx86DataItem;
-+typedef virCPUx86DataItem *virCPUx86DataItemPtr;
-+struct _virCPUx86DataItem {
-+    virCPUx86CPUID cpuid;
-+};
-+
- typedef struct _virCPUx86Data virCPUx86Data;
- struct _virCPUx86Data {
-     size_t len;
--    virCPUx86CPUID *data;
-+    virCPUx86DataItem *items;
- };
- 
- #endif /* __VIR_CPU_X86_DATA_H__ */
-diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
-index 18596c7c72..231d72669f 100644
---- a/src/libxl/libxl_capabilities.c
-+++ b/src/libxl/libxl_capabilities.c
-@@ -67,13 +67,15 @@ struct guest_arch {
- static int
- libxlCapsAddCPUID(virCPUDataPtr data, virCPUx86CPUID *cpuid, ssize_t ncaps)
- {
-+    virCPUx86DataItem item = { 0 };
-     size_t i;
- 
-     for (i = 0; i < ncaps; i++) {
--        virCPUx86CPUID *c = &cpuid[i];
-+        item.cpuid = cpuid[i];
- 
--        if (virCPUx86DataAddCPUID(data, c) < 0) {
--            VIR_DEBUG("Failed to add CPUID(%x,%x)", c->eax_in, c->ecx_in);
-+        if (virCPUx86DataAddCPUID(data, &item) < 0) {
-+            VIR_DEBUG("Failed to add CPUID(%x,%x)",
-+                      cpuid[i].eax_in, cpuid[i].ecx_in);
-             return -1;
-         }
-     }
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index d6c11666c5..0b4dfd70c0 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -7043,7 +7043,7 @@ static virCPUDataPtr
- qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data)
- {
-     virCPUDataPtr cpudata = NULL;
--    virCPUx86CPUID cpuid;
-+    virCPUx86DataItem item = { 0 };
-     size_t i;
- 
-     if (!(cpudata = virCPUDataNew(VIR_ARCH_X86_64)))
-@@ -7051,8 +7051,8 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data)
- 
-     for (i = 0; i < virJSONValueArraySize(data); i++) {
-         if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(data, i),
--                                                  &cpuid) < 0 ||
--            virCPUx86DataAddCPUID(cpudata, &cpuid) < 0)
-+                                                  &item.cpuid) < 0 ||
-+            virCPUx86DataAddCPUID(cpudata, &item) < 0)
-             goto error;
-     }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86FeatureFilter-MSR.patch b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86FeatureFilter-MSR.patch
deleted file mode 100644
index 33dd149..0000000
--- a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86FeatureFilter-MSR.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 016b5348df8fc1007c08b0d0deec68d923be2e75 Mon Sep 17 00:00:00 2001
-Message-Id: <016b5348df8fc1007c08b0d0deec68d923be2e75@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:08 +0200
-Subject: [PATCH] cpu_x86: Introduce virCPUx86FeatureFilter*MSR
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This functions may be used as a virCPUDefFeatureFilter callbacks for
-virCPUDefCheckFeatures, virCPUDefFilerFeatures, and similar functions to
-select (virCPUx86FeatureFilterSelectMSR) or drop
-(virCPUx86FeatureFilterDropMSR) features reported via MSR.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit bcfed7f1c84cbff21d129a79cbd675b0cd51613c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/cpu/cpu_x86.h
-            - downstream did not switch to #pragma once
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <1a0fd2733f3aaec22e4ad598086baac0f086bb47.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c        | 57 ++++++++++++++++++++++++++++++++++++++++
- src/cpu/cpu_x86.h        |  6 +++++
- src/libvirt_private.syms |  3 ++-
- 3 files changed, 65 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 75527fd28f..ec0e408f98 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -3351,6 +3351,63 @@ virCPUx86DataAddFeature(virCPUDataPtr cpuData,
- }
- 
- 
-+static bool
-+virCPUx86FeatureIsMSR(const char *name)
-+{
-+    virCPUx86FeaturePtr feature;
-+    virCPUx86DataIterator iter;
-+    virCPUx86DataItemPtr item;
-+    virCPUx86MapPtr map;
-+
-+    if (!(map = virCPUx86GetMap()))
-+        return false;
-+
-+    if (!(feature = x86FeatureFind(map, name)) &&
-+        !(feature = x86FeatureFindInternal(name)))
-+        return false;
-+
-+    virCPUx86DataIteratorInit(&iter, &feature->data);
-+    while ((item = virCPUx86DataNext(&iter))) {
-+        if (item->type == VIR_CPU_X86_DATA_MSR)
-+            return true;
-+    }
-+
-+    return false;
-+}
-+
-+
-+/**
-+ * virCPUx86FeatureFilterSelectMSR:
-+ *
-+ * This is a callback for functions filtering features in virCPUDef. The result
-+ * will contain only MSR features.
-+ *
-+ * Returns true if @name is an MSR feature, false otherwise.
-+ */
-+bool
-+virCPUx86FeatureFilterSelectMSR(const char *name,
-+                                void *opaque ATTRIBUTE_UNUSED)
-+{
-+    return virCPUx86FeatureIsMSR(name);
-+}
-+
-+
-+/**
-+ * virCPUx86FeatureFilterDropMSR:
-+ *
-+ * This is a callback for functions filtering features in virCPUDef. The result
-+ * will not contain any MSR feature.
-+ *
-+ * Returns true if @name is not an MSR feature, false otherwise.
-+ */
-+bool
-+virCPUx86FeatureFilterDropMSR(const char *name,
-+                              void *opaque ATTRIBUTE_UNUSED)
-+{
-+    return !virCPUx86FeatureIsMSR(name);
-+}
-+
-+
- struct cpuArchDriver cpuDriverX86 = {
-     .name = "x86",
-     .arch = archs,
-diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
-index 519024b7c0..5126679985 100644
---- a/src/cpu/cpu_x86.h
-+++ b/src/cpu/cpu_x86.h
-@@ -45,4 +45,10 @@ uint32_t virCPUx86DataGetSignature(virCPUDataPtr cpuData,
- int virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                            const char *vendor);
- 
-+bool virCPUx86FeatureFilterSelectMSR(const char *name,
-+                                     void *opaque);
-+
-+bool virCPUx86FeatureFilterDropMSR(const char *name,
-+                                   void *opaque);
-+
- #endif /* __VIR_CPU_X86_H__ */
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 0290f960a0..f158a17b49 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1210,7 +1210,8 @@ virCPUx86DataAdd;
- virCPUx86DataGetSignature;
- virCPUx86DataSetSignature;
- virCPUx86DataSetVendor;
--
-+virCPUx86FeatureFilterDropMSR;
-+virCPUx86FeatureFilterSelectMSR;
- 
- # datatypes.h
- virConnectClass;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
new file mode 100644
index 0000000..2f1d44f
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
@@ -0,0 +1,71 @@
+From 48e546c1097a61c806412efe53e216fbc8beafca Mon Sep 17 00:00:00 2001
+Message-Id: <48e546c1097a61c806412efe53e216fbc8beafca@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:31 +0200
+Subject: [PATCH] cpu_x86: Introduce virCPUx86SignatureFromCPUID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It can be used for separating family, model, and stepping numbers from a
+single 32b integer as reported by CPUID.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3b474c1f8f3c1f124fab303625733ea79047660c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1fe352bfb7cf40b5b8e24eea3bf4e476269adb92.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index ed2090b0c6..dad3bceff0 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -717,6 +717,18 @@ x86MakeSignature(unsigned int family,
+ }
+ 
+ 
++static void
++virCPUx86SignatureFromCPUID(uint32_t sig,
++                            unsigned int *family,
++                            unsigned int *model,
++                            unsigned int *stepping)
++{
++    *family = ((sig >> 20) & 0xff) + ((sig >> 8) & 0xf);
++    *model = ((sig >> 12) & 0xf0) + ((sig >> 4) & 0xf);
++    *stepping = sig & 0xf;
++}
++
++
+ static void
+ x86DataToSignatureFull(const virCPUx86Data *data,
+                        unsigned int *family,
+@@ -725,17 +737,14 @@ x86DataToSignatureFull(const virCPUx86Data *data,
+ {
+     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);
+     virCPUx86DataItemPtr item;
+-    virCPUx86CPUIDPtr cpuid;
+ 
+     *family = *model = *stepping = 0;
+ 
+     if (!(item = virCPUx86DataGet(data, &leaf1)))
+         return;
+ 
+-    cpuid = &item->data.cpuid;
+-    *family = ((cpuid->eax >> 20) & 0xff) + ((cpuid->eax >> 8) & 0xf);
+-    *model = ((cpuid->eax >> 12) & 0xf0) + ((cpuid->eax >> 4) & 0xf);
+-    *stepping = cpuid->eax & 0xf;
++    virCPUx86SignatureFromCPUID(item->data.cpuid.eax,
++                                family, model, stepping);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignaturesFree.patch b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
new file mode 100644
index 0000000..a299de9
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
@@ -0,0 +1,64 @@
+From 75afc6d9dc443666e1207ef6f1c968abdfec712a Mon Sep 17 00:00:00 2001
+Message-Id: <75afc6d9dc443666e1207ef6f1c968abdfec712a@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:30 +0200
+Subject: [PATCH] cpu_x86: Introduce virCPUx86SignaturesFree
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function will be used for freeing virCPUx86Signatures structure
+introduced later in this series.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 372b2cf1ca3f4361546732a3f5f9c0c0be2591e9)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <163ef39d14ce5457272e7508172f64d58d22a56b.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 9248403eff..ed2090b0c6 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1090,6 +1090,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
++static void
++virCPUx86SignaturesFree(uint32_t *signatures)
++{
++    g_free(signatures);
++}
++
++
+ static int
+ virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
+                         virCPUx86ModelPtr src)
+@@ -1149,7 +1156,7 @@ x86ModelFree(virCPUx86ModelPtr model)
+         return;
+ 
+     g_free(model->name);
+-    g_free(model->signatures);
++    virCPUx86SignaturesFree(model->signatures);
+     virCPUx86DataClear(&model->data);
+     g_free(model);
+ }
+@@ -1414,7 +1421,7 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+         return n;
+ 
+     /* Remove inherited signatures. */
+-    VIR_FREE(model->signatures);
++    virCPUx86SignaturesFree(model->signatures);
+ 
+     model->nsignatures = n;
+     if (VIR_ALLOC_N(model->signatures, n) < 0)
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Log-decoded-CPU-model-and-signatures.patch b/SOURCES/libvirt-cpu_x86-Log-decoded-CPU-model-and-signatures.patch
deleted file mode 100644
index 2b67e02..0000000
--- a/SOURCES/libvirt-cpu_x86-Log-decoded-CPU-model-and-signatures.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 3335b5e0db21375053c5005be9f820f7ba945010 Mon Sep 17 00:00:00 2001
-Message-Id: <3335b5e0db21375053c5005be9f820f7ba945010@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:02 +0200
-Subject: [PATCH] cpu_x86: Log decoded CPU model and signatures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The log message may be useful when debugging why a specific CPU model
-was selected for a given set of CPUID data.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 5ced12decea42f1d588f2cb28b10ca7a5772098e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <cae19825427465e352de05433920c96dc44552ff.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 7bd8119c23..ba14a6097d 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1769,6 +1769,26 @@ x86ModelHasSignature(virCPUx86ModelPtr model,
- }
- 
- 
-+static char *
-+x86FormatSignatures(virCPUx86ModelPtr model)
-+{
-+    virBuffer buf = VIR_BUFFER_INITIALIZER;
-+    size_t i;
-+
-+    for (i = 0; i < model->nsignatures; i++) {
-+        virBufferAsprintf(&buf, "%06lx,",
-+                          (unsigned long)model->signatures[i]);
-+    }
-+
-+    virBufferTrim(&buf, ",", -1);
-+
-+    if (virBufferCheckError(&buf) < 0)
-+        return NULL;
-+
-+    return virBufferContentAndReset(&buf);
-+}
-+
-+
- /*
-  * Checks whether a candidate model is a better fit for the CPU data than the
-  * current model.
-@@ -1892,6 +1912,7 @@ x86Decode(virCPUDefPtr cpu,
-     virCPUx86Data features = VIR_CPU_X86_DATA_INIT;
-     virCPUx86VendorPtr vendor;
-     virDomainCapsCPUModelPtr hvModel = NULL;
-+    VIR_AUTOFREE(char *) sigs = NULL;
-     uint32_t signature;
-     ssize_t i;
-     int rc;
-@@ -1984,6 +2005,11 @@ x86Decode(virCPUDefPtr cpu,
-     if (vendor && VIR_STRDUP(cpu->vendor, vendor->name) < 0)
-         goto cleanup;
- 
-+    sigs = x86FormatSignatures(model);
-+
-+    VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
-+              model->name, NULLSTR(sigs), (unsigned long)signature);
-+
-     VIR_STEAL_PTR(cpu->model, cpuModel->model);
-     VIR_STEAL_PTR(cpu->features, cpuModel->features);
-     cpu->nfeatures = cpuModel->nfeatures;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Make-sure-CPU-model-names-are-unique-in-cpu_map.patch b/SOURCES/libvirt-cpu_x86-Make-sure-CPU-model-names-are-unique-in-cpu_map.patch
deleted file mode 100644
index fa962ba..0000000
--- a/SOURCES/libvirt-cpu_x86-Make-sure-CPU-model-names-are-unique-in-cpu_map.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 84ee95b9504d89236078952a44c1a8b7dba148ca Mon Sep 17 00:00:00 2001
-Message-Id: <84ee95b9504d89236078952a44c1a8b7dba148ca@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:58 +0200
-Subject: [PATCH] cpu_x86: Make sure CPU model names are unique in cpu_map
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Having multiple CPU model definitions with the same name could result in
-unexpected behavior.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8d7245441a473bc1f73005fd378d4a925870cce6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <c5dcc42f39009e8a659acb56b89cc18da1c3b7b8.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 91362198ab..51cb9b7143 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1291,9 +1291,15 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-               void *data)
- {
-     virCPUx86MapPtr map = data;
--    virCPUx86ModelPtr model;
-+    virCPUx86ModelPtr model = NULL;
-     int ret = -1;
- 
-+    if (x86ModelFind(map, name)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Multiple definitions of CPU model '%s'"), name);
-+        goto cleanup;
-+    }
-+
-     if (!(model = x86ModelNew()))
-         goto cleanup;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Make-x86cpuidAndBits-more-general.patch b/SOURCES/libvirt-cpu_x86-Make-x86cpuidAndBits-more-general.patch
deleted file mode 100644
index 5065e64..0000000
--- a/SOURCES/libvirt-cpu_x86-Make-x86cpuidAndBits-more-general.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From be1b7ab3f5a634de17359376d559d5c312f5623f Mon Sep 17 00:00:00 2001
-Message-Id: <be1b7ab3f5a634de17359376d559d5c312f5623f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:35 +0200
-Subject: [PATCH] cpu_x86: Make x86cpuidAndBits more general
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function now works on virCPUx86DataItem and it's renamed as
-virCPUx86DataItemAndBits.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit da1efddfa6606520fb5f16622bc522b231484b54)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <c265f1fcb4ab52f884dd9481a426978efa60b8c8.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 5fbf0294bb..54da9a985c 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -242,16 +242,16 @@ virCPUx86DataItemClearBits(virCPUx86DataItemPtr item,
- 
- 
- static void
--x86cpuidAndBits(virCPUx86CPUID *cpuid,
--                const virCPUx86CPUID *mask)
-+virCPUx86DataItemAndBits(virCPUx86DataItemPtr item,
-+                         const virCPUx86DataItem *mask)
- {
-     if (!mask)
-         return;
- 
--    cpuid->eax &= mask->eax;
--    cpuid->ebx &= mask->ebx;
--    cpuid->ecx &= mask->ecx;
--    cpuid->edx &= mask->edx;
-+    item->cpuid.eax &= mask->cpuid.eax;
-+    item->cpuid.ebx &= mask->cpuid.ebx;
-+    item->cpuid.ecx &= mask->cpuid.ecx;
-+    item->cpuid.edx &= mask->cpuid.edx;
- }
- 
- 
-@@ -447,7 +447,7 @@ x86DataIntersect(virCPUx86Data *data1,
-     while ((item1 = virCPUx86DataNext(&iter))) {
-         item2 = virCPUx86DataGet(data2, item1);
-         if (item2)
--            x86cpuidAndBits(&item1->cpuid, &item2->cpuid);
-+            virCPUx86DataItemAndBits(item1, item2);
-         else
-             virCPUx86DataItemClearBits(item1, item1);
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Make-x86cpuidClearBits-more-general.patch b/SOURCES/libvirt-cpu_x86-Make-x86cpuidClearBits-more-general.patch
deleted file mode 100644
index 4103fd0..0000000
--- a/SOURCES/libvirt-cpu_x86-Make-x86cpuidClearBits-more-general.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From e9bc4fcd2c16a80cf564879d154f3083a6766ff9 Mon Sep 17 00:00:00 2001
-Message-Id: <e9bc4fcd2c16a80cf564879d154f3083a6766ff9@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:34 +0200
-Subject: [PATCH] cpu_x86: Make x86cpuidClearBits more general
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The parameters changed from virCPUx86CPUID to virCPUx86DataItem and the
-function is now called virCPUx86DataItemClearBits.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4e3cab2d002d5f4cfdf81359467de8ffe4e18682)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <bdc0f6c7da3674ba988c2fd83525a60df9108864.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index e2951ed1b0..5fbf0294bb 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -228,16 +228,16 @@ virCPUx86DataItemSetBits(virCPUx86DataItemPtr item,
- 
- 
- static void
--x86cpuidClearBits(virCPUx86CPUID *cpuid,
--                  const virCPUx86CPUID *mask)
-+virCPUx86DataItemClearBits(virCPUx86DataItemPtr item,
-+                           const virCPUx86DataItem *mask)
- {
-     if (!mask)
-         return;
- 
--    cpuid->eax &= ~mask->eax;
--    cpuid->ebx &= ~mask->ebx;
--    cpuid->ecx &= ~mask->ecx;
--    cpuid->edx &= ~mask->edx;
-+    item->cpuid.eax &= ~mask->cpuid.eax;
-+    item->cpuid.ebx &= ~mask->cpuid.ebx;
-+    item->cpuid.ecx &= ~mask->cpuid.ecx;
-+    item->cpuid.edx &= ~mask->cpuid.edx;
- }
- 
- 
-@@ -430,8 +430,8 @@ x86DataSubtract(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item2;
- 
-     while ((item1 = virCPUx86DataNext(&iter))) {
--        if ((item2 = virCPUx86DataGet(data2, item1)))
--            x86cpuidClearBits(&item1->cpuid, &item2->cpuid);
-+        item2 = virCPUx86DataGet(data2, item1);
-+        virCPUx86DataItemClearBits(item1, item2);
-     }
- }
- 
-@@ -449,7 +449,7 @@ x86DataIntersect(virCPUx86Data *data1,
-         if (item2)
-             x86cpuidAndBits(&item1->cpuid, &item2->cpuid);
-         else
--            x86cpuidClearBits(&item1->cpuid, &item1->cpuid);
-+            virCPUx86DataItemClearBits(item1, item1);
-     }
- }
- 
-@@ -516,7 +516,7 @@ x86DataToVendor(const virCPUx86Data *data,
-         virCPUx86VendorPtr vendor = map->vendors[i];
-         if ((item = virCPUx86DataGet(data, &vendor->data)) &&
-             x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) {
--            x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid);
-+            virCPUx86DataItemClearBits(item, &vendor->data);
-             return vendor;
-         }
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Make-x86cpuidMatch-more-general.patch b/SOURCES/libvirt-cpu_x86-Make-x86cpuidMatch-more-general.patch
deleted file mode 100644
index f6fd0fd..0000000
--- a/SOURCES/libvirt-cpu_x86-Make-x86cpuidMatch-more-general.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 759fe35a1acdccf68577de62752c087aea4b8268 Mon Sep 17 00:00:00 2001
-Message-Id: <759fe35a1acdccf68577de62752c087aea4b8268@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:37 +0200
-Subject: [PATCH] cpu_x86: Make x86cpuidMatch more general
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function now works on virCPUx86DataItem and it's called
-virCPUx86DataItemMatch.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 10b80165dba31f99306f39e348e3a6335feec5ef)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0b829eb945561e54c1fc4d333c59af53759edf19.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 1bb35ec4e8..11c023ac31 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -41,8 +41,6 @@ VIR_LOG_INIT("cpu.cpu_x86");
- 
- #define VENDOR_STRING_LENGTH    12
- 
--static const virCPUx86CPUID cpuidNull = { 0 };
--
- static const virArch archs[] = { VIR_ARCH_I686, VIR_ARCH_X86_64 };
- 
- typedef struct _virCPUx86Vendor virCPUx86Vendor;
-@@ -192,13 +190,13 @@ struct _virCPUx86DataIterator {
- 
- 
- static bool
--x86cpuidMatch(const virCPUx86CPUID *cpuid1,
--              const virCPUx86CPUID *cpuid2)
-+virCPUx86DataItemMatch(const virCPUx86DataItem *item1,
-+                       const virCPUx86DataItem *item2)
- {
--    return (cpuid1->eax == cpuid2->eax &&
--            cpuid1->ebx == cpuid2->ebx &&
--            cpuid1->ecx == cpuid2->ecx &&
--            cpuid1->edx == cpuid2->edx);
-+    return (item1->cpuid.eax == item2->cpuid.eax &&
-+            item1->cpuid.ebx == item2->cpuid.ebx &&
-+            item1->cpuid.ecx == item2->cpuid.ecx &&
-+            item1->cpuid.edx == item2->cpuid.edx);
- }
- 
- 
-@@ -317,6 +315,7 @@ static virCPUx86DataItemPtr
- virCPUx86DataNext(virCPUx86DataIteratorPtr iterator)
- {
-     const virCPUx86Data *data = iterator->data;
-+    virCPUx86DataItem zero = { 0 };
- 
-     if (!data)
-         return NULL;
-@@ -324,7 +323,7 @@ virCPUx86DataNext(virCPUx86DataIteratorPtr iterator)
-     while (++iterator->pos < data->len) {
-         virCPUx86DataItemPtr item = data->items + iterator->pos;
- 
--        if (!x86cpuidMatch(&item->cpuid, &cpuidNull))
-+        if (!virCPUx86DataItemMatch(item, &zero))
-             return item;
-     }
- 
-@@ -1155,7 +1154,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-         virCPUx86CompareResult match = SUPERSET;
- 
-         if ((item2 = virCPUx86DataGet(&model2->data, item1))) {
--            if (x86cpuidMatch(&item1->cpuid, &item2->cpuid))
-+            if (virCPUx86DataItemMatch(item1, item2))
-                 continue;
-             else if (!virCPUx86DataItemMatchMasked(item1, item2))
-                 match = SUBSET;
-@@ -1171,7 +1170,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-         virCPUx86CompareResult match = SUBSET;
- 
-         if ((item1 = virCPUx86DataGet(&model1->data, item2))) {
--            if (x86cpuidMatch(&item2->cpuid, &item1->cpuid))
-+            if (virCPUx86DataItemMatch(item2, item1))
-                 continue;
-             else if (!virCPUx86DataItemMatchMasked(item2, item1))
-                 match = SUPERSET;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Make-x86cpuidMatchMasked-more-general.patch b/SOURCES/libvirt-cpu_x86-Make-x86cpuidMatchMasked-more-general.patch
deleted file mode 100644
index e1c1925..0000000
--- a/SOURCES/libvirt-cpu_x86-Make-x86cpuidMatchMasked-more-general.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 920ac610bc68ffd7de1ac14c401c7f8c37f3337e Mon Sep 17 00:00:00 2001
-Message-Id: <920ac610bc68ffd7de1ac14c401c7f8c37f3337e@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:36 +0200
-Subject: [PATCH] cpu_x86: Make x86cpuidMatchMasked more general
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function is renamed as virCPUx86DataItemMatchMasked to reflect the
-change in parameter types.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2eea67a98eab58b46dbf4275819c06c90bc4c5b6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <7c0a54c618d67d64663eb92d5eeb1d8a2270be16.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 54da9a985c..1bb35ec4e8 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -203,13 +203,13 @@ x86cpuidMatch(const virCPUx86CPUID *cpuid1,
- 
- 
- static bool
--x86cpuidMatchMasked(const virCPUx86CPUID *cpuid,
--                    const virCPUx86CPUID *mask)
-+virCPUx86DataItemMatchMasked(const virCPUx86DataItem *item,
-+                             const virCPUx86DataItem *mask)
- {
--    return ((cpuid->eax & mask->eax) == mask->eax &&
--            (cpuid->ebx & mask->ebx) == mask->ebx &&
--            (cpuid->ecx & mask->ecx) == mask->ecx &&
--            (cpuid->edx & mask->edx) == mask->edx);
-+    return ((item->cpuid.eax & mask->cpuid.eax) == mask->cpuid.eax &&
-+            (item->cpuid.ebx & mask->cpuid.ebx) == mask->cpuid.ebx &&
-+            (item->cpuid.ecx & mask->cpuid.ecx) == mask->cpuid.ecx &&
-+            (item->cpuid.edx & mask->cpuid.edx) == mask->cpuid.edx);
- }
- 
- 
-@@ -474,7 +474,7 @@ x86DataIsSubset(const virCPUx86Data *data,
- 
-     while ((itemSubset = virCPUx86DataNext(&iter))) {
-         if (!(item = virCPUx86DataGet(data, itemSubset)) ||
--            !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid))
-+            !virCPUx86DataItemMatchMasked(item, itemSubset))
-             return false;
-     }
- 
-@@ -515,7 +515,7 @@ x86DataToVendor(const virCPUx86Data *data,
-     for (i = 0; i < map->nvendors; i++) {
-         virCPUx86VendorPtr vendor = map->vendors[i];
-         if ((item = virCPUx86DataGet(data, &vendor->data)) &&
--            x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) {
-+            virCPUx86DataItemMatchMasked(item, &vendor->data)) {
-             virCPUx86DataItemClearBits(item, &vendor->data);
-             return vendor;
-         }
-@@ -1157,7 +1157,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-         if ((item2 = virCPUx86DataGet(&model2->data, item1))) {
-             if (x86cpuidMatch(&item1->cpuid, &item2->cpuid))
-                 continue;
--            else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid))
-+            else if (!virCPUx86DataItemMatchMasked(item1, item2))
-                 match = SUBSET;
-         }
- 
-@@ -1173,7 +1173,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-         if ((item1 = virCPUx86DataGet(&model1->data, item2))) {
-             if (x86cpuidMatch(&item2->cpuid, &item1->cpuid))
-                 continue;
--            else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid))
-+            else if (!virCPUx86DataItemMatchMasked(item2, item1))
-                 match = SUPERSET;
-         }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Make-x86cpuidSetBits-more-general.patch b/SOURCES/libvirt-cpu_x86-Make-x86cpuidSetBits-more-general.patch
deleted file mode 100644
index 642480d..0000000
--- a/SOURCES/libvirt-cpu_x86-Make-x86cpuidSetBits-more-general.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d32fbe55ad3ee1bbbfe2adc9ab47034c7a5cb884 Mon Sep 17 00:00:00 2001
-Message-Id: <d32fbe55ad3ee1bbbfe2adc9ab47034c7a5cb884@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:33 +0200
-Subject: [PATCH] cpu_x86: Make x86cpuidSetBits more general
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function is renamed as virCPUx86DataItemSetBits and it works on
-virCPUx86DataItem now.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 9c6f00fc3351800dc8b63472e71b398c180161d8)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <f2e1e24cb2be24ee66911f75384436c5c4513d3e.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 5a09033d2a..e2951ed1b0 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -214,16 +214,16 @@ x86cpuidMatchMasked(const virCPUx86CPUID *cpuid,
- 
- 
- static void
--x86cpuidSetBits(virCPUx86CPUID *cpuid,
--                const virCPUx86CPUID *mask)
-+virCPUx86DataItemSetBits(virCPUx86DataItemPtr item,
-+                         const virCPUx86DataItem *mask)
- {
-     if (!mask)
-         return;
- 
--    cpuid->eax |= mask->eax;
--    cpuid->ebx |= mask->ebx;
--    cpuid->ecx |= mask->ecx;
--    cpuid->edx |= mask->edx;
-+    item->cpuid.eax |= mask->cpuid.eax;
-+    item->cpuid.ebx |= mask->cpuid.ebx;
-+    item->cpuid.ecx |= mask->cpuid.ecx;
-+    item->cpuid.edx |= mask->cpuid.edx;
- }
- 
- 
-@@ -391,7 +391,7 @@ virCPUx86DataAddItem(virCPUx86Data *data,
-     virCPUx86DataItemPtr existing;
- 
-     if ((existing = virCPUx86DataGet(data, item))) {
--        x86cpuidSetBits(&existing->cpuid, &item->cpuid);
-+        virCPUx86DataItemSetBits(existing, item);
-     } else {
-         if (VIR_APPEND_ELEMENT_COPY(data->items, data->len,
-                                     *((virCPUx86DataItemPtr)item)) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Move-CheckFeature-functions.patch b/SOURCES/libvirt-cpu_x86-Move-CheckFeature-functions.patch
deleted file mode 100644
index e098b99..0000000
--- a/SOURCES/libvirt-cpu_x86-Move-CheckFeature-functions.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From dec2ce4345db0d13cff8c639c69afbf894ee593a Mon Sep 17 00:00:00 2001
-Message-Id: <dec2ce4345db0d13cff8c639c69afbf894ee593a@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:40 +0200
-Subject: [PATCH] cpu_x86: Move *CheckFeature functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-They are static and we will need to call them a little bit closer to the
-beginning of the file.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit e17d10386bd9abcfb37c7d8b151bbd1071a87fc4)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <41d2a36757ed83f70c9dc23e9b984e109e5a81ba.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 69 ++++++++++++++++++++++++-----------------------
- 1 file changed, 35 insertions(+), 34 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 49562944c1..fdc2974a0d 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -2706,6 +2706,41 @@ cpuidSet(uint32_t base, virCPUDataPtr data)
- }
- 
- 
-+static int
-+virCPUx86CheckFeature(const virCPUDef *cpu,
-+                      const char *name)
-+{
-+    int ret = -1;
-+    virCPUx86MapPtr map;
-+    virCPUx86ModelPtr model = NULL;
-+
-+    if (!(map = virCPUx86GetMap()))
-+        return -1;
-+
-+    if (!(model = x86ModelFromCPU(cpu, map, -1)))
-+        goto cleanup;
-+
-+    ret = x86FeatureInData(name, &model->data, map);
-+
-+ cleanup:
-+    x86ModelFree(model);
-+    return ret;
-+}
-+
-+
-+static int
-+virCPUx86DataCheckFeature(const virCPUData *data,
-+                          const char *name)
-+{
-+    virCPUx86MapPtr map;
-+
-+    if (!(map = virCPUx86GetMap()))
-+        return -1;
-+
-+    return x86FeatureInData(name, &data->data.x86, map);
-+}
-+
-+
- static int
- virCPUx86GetHost(virCPUDefPtr cpu,
-                  virDomainCapsCPUModelsPtr models)
-@@ -3062,40 +3097,6 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
- }
- 
- 
--static int
--virCPUx86CheckFeature(const virCPUDef *cpu,
--                      const char *name)
--{
--    int ret = -1;
--    virCPUx86MapPtr map;
--    virCPUx86ModelPtr model = NULL;
--
--    if (!(map = virCPUx86GetMap()))
--        return -1;
--
--    if (!(model = x86ModelFromCPU(cpu, map, -1)))
--        goto cleanup;
--
--    ret = x86FeatureInData(name, &model->data, map);
--
-- cleanup:
--    x86ModelFree(model);
--    return ret;
--}
--
--
--static int
--virCPUx86DataCheckFeature(const virCPUData *data,
--                          const char *name)
--{
--    virCPUx86MapPtr map;
--
--    if (!(map = virCPUx86GetMap()))
--        return -1;
--
--    return x86FeatureInData(name, &data->data.x86, map);
--}
--
- static int
- virCPUx86GetModels(char ***models)
- {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Move-and-rename-x86FormatSignatures.patch b/SOURCES/libvirt-cpu_x86-Move-and-rename-x86FormatSignatures.patch
new file mode 100644
index 0000000..ea7f7bd
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Move-and-rename-x86FormatSignatures.patch
@@ -0,0 +1,97 @@
+From 2b76e3009c224c0d03a4d951e0686aad6f6dc577 Mon Sep 17 00:00:00 2001
+Message-Id: <2b76e3009c224c0d03a4d951e0686aad6f6dc577@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:29 +0200
+Subject: [PATCH] cpu_x86: Move and rename x86FormatSignatures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Later in this series the function will work on a newly introduced
+virCPUx86Signatures structure. Let's move it to the place where all
+related functions will be added and rename the function as
+virCPUx86SignaturesFormat for easier review of the virCPUx86Signatures
+patch.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 7e0d351fa69c468906533b2ac9b24212df13a370)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Conflicts:
+	src/cpu/cpu_x86.c
+            - v6.0.0-264-g0a125c7144 which removes the third argument
+              from virBufferTrim was not backported
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <fd16284339dd71e9f99b57bb7682014065e5d0ec.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 65a99876a9..9248403eff 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1125,6 +1125,23 @@ virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
+ }
+ 
+ 
++static char *
++virCPUx86SignaturesFormat(virCPUx86ModelPtr model)
++{
++    virBuffer buf = VIR_BUFFER_INITIALIZER;
++    size_t i;
++
++    for (i = 0; i < model->nsignatures; i++) {
++        virBufferAsprintf(&buf, "%06lx,",
++                          (unsigned long)model->signatures[i]);
++    }
++
++    virBufferTrim(&buf, ",", -1);
++
++    return virBufferContentAndReset(&buf);
++}
++
++
+ static void
+ x86ModelFree(virCPUx86ModelPtr model)
+ {
+@@ -1890,23 +1907,6 @@ virCPUx86Compare(virCPUDefPtr host,
+ }
+ 
+ 
+-static char *
+-x86FormatSignatures(virCPUx86ModelPtr model)
+-{
+-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    size_t i;
+-
+-    for (i = 0; i < model->nsignatures; i++) {
+-        virBufferAsprintf(&buf, "%06lx,",
+-                          (unsigned long)model->signatures[i]);
+-    }
+-
+-    virBufferTrim(&buf, ",", -1);
+-
+-    return virBufferContentAndReset(&buf);
+-}
+-
+-
+ /*
+  * Checks whether a candidate model is a better fit for the CPU data than the
+  * current model.
+@@ -2134,7 +2134,7 @@ x86Decode(virCPUDefPtr cpu,
+     if (vendor)
+         cpu->vendor = g_strdup(vendor->name);
+ 
+-    sigs = x86FormatSignatures(model);
++    sigs = virCPUx86SignaturesFormat(model);
+ 
+     VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
+               model->name, NULLSTR(sigs), (unsigned long)signature);
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch b/SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
new file mode 100644
index 0000000..bda9331
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
@@ -0,0 +1,100 @@
+From 33cac9bcf27a885febf12e094cb2579f16a421b6 Mon Sep 17 00:00:00 2001
+Message-Id: <33cac9bcf27a885febf12e094cb2579f16a421b6@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:27 +0200
+Subject: [PATCH] cpu_x86: Move and rename x86ModelCopySignatures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Later in this series the function will work on a newly introduced
+virCPUx86Signatures structure. Let's move it to the place were all
+related functions will be added and rename the function as
+virCPUx86SignaturesCopy for easier review of the virCPUx86Signatures
+patch.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit a8ec1d746ed41ac76df2e28cbc5683b3e37b9a60)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <0d4f902805cd5534eadedd2ec61385e9798c8b40.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index b4b1b475d6..16e6aa73d2 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1090,23 +1090,9 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
+-static void
+-x86ModelFree(virCPUx86ModelPtr model)
+-{
+-    if (!model)
+-        return;
+-
+-    g_free(model->name);
+-    g_free(model->signatures);
+-    virCPUx86DataClear(&model->data);
+-    g_free(model);
+-}
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
+-
+-
+ static int
+-x86ModelCopySignatures(virCPUx86ModelPtr dst,
+-                       virCPUx86ModelPtr src)
++virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
++                        virCPUx86ModelPtr src)
+ {
+     size_t i;
+ 
+@@ -1124,6 +1110,20 @@ x86ModelCopySignatures(virCPUx86ModelPtr dst,
+ }
+ 
+ 
++static void
++x86ModelFree(virCPUx86ModelPtr model)
++{
++    if (!model)
++        return;
++
++    g_free(model->name);
++    g_free(model->signatures);
++    virCPUx86DataClear(&model->data);
++    g_free(model);
++}
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
++
++
+ static virCPUx86ModelPtr
+ x86ModelCopy(virCPUx86ModelPtr model)
+ {
+@@ -1132,7 +1132,7 @@ x86ModelCopy(virCPUx86ModelPtr model)
+     copy = g_new0(virCPUx86Model, 1);
+     copy->name = g_strdup(model->name);
+ 
+-    if (x86ModelCopySignatures(copy, model) < 0) {
++    if (virCPUx86SignaturesCopy(copy, model) < 0) {
+         x86ModelFree(copy);
+         return NULL;
+     }
+@@ -1360,7 +1360,7 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
+     }
+ 
+     model->vendor = ancestor->vendor;
+-    if (x86ModelCopySignatures(model, ancestor) < 0)
++    if (virCPUx86SignaturesCopy(model, ancestor) < 0)
+         return -1;
+ 
+     x86DataCopy(&model->data, &ancestor->data);
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelHasSignature.patch b/SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
new file mode 100644
index 0000000..5d87091
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
@@ -0,0 +1,101 @@
+From 693d01f00b9608a4f4cac3b91e38b5537eff754f Mon Sep 17 00:00:00 2001
+Message-Id: <693d01f00b9608a4f4cac3b91e38b5537eff754f@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:28 +0200
+Subject: [PATCH] cpu_x86: Move and rename x86ModelHasSignature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Later in this series the function will work on a newly introduced
+virCPUx86Signatures structure. Let's move it to the place were all
+related functions will be added and rename the function as
+virCPUx86SignaturesMatch for easier review of the virCPUx86Signatures
+patch.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 782be9f0af2e02e725fca45b7674e8b2f008dc6c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <7662ee03449ae588a5381c546eb7e8a3b64cadb3.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 16e6aa73d2..65a99876a9 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1110,6 +1110,21 @@ virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
+ }
+ 
+ 
++static bool
++virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
++                         uint32_t signature)
++{
++    size_t i;
++
++    for (i = 0; i < model->nsignatures; i++) {
++        if (model->signatures[i] == signature)
++            return true;
++    }
++
++    return false;
++}
++
++
+ static void
+ x86ModelFree(virCPUx86ModelPtr model)
+ {
+@@ -1875,21 +1890,6 @@ virCPUx86Compare(virCPUDefPtr host,
+ }
+ 
+ 
+-static bool
+-x86ModelHasSignature(virCPUx86ModelPtr model,
+-                     uint32_t signature)
+-{
+-    size_t i;
+-
+-    for (i = 0; i < model->nsignatures; i++) {
+-        if (model->signatures[i] == signature)
+-            return true;
+-    }
+-
+-    return false;
+-}
+-
+-
+ static char *
+ x86FormatSignatures(virCPUx86ModelPtr model)
+ {
+@@ -1961,8 +1961,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * consider candidates with matching family/model.
+      */
+     if (signature &&
+-        x86ModelHasSignature(current, signature) &&
+-        !x86ModelHasSignature(candidate, signature)) {
++        virCPUx86SignaturesMatch(current, signature) &&
++        !virCPUx86SignaturesMatch(candidate, signature)) {
+         VIR_DEBUG("%s differs in signature from matching %s",
+                   cpuCandidate->model, cpuCurrent->model);
+         return 0;
+@@ -1978,8 +1978,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * result in longer list of features.
+      */
+     if (signature &&
+-        x86ModelHasSignature(candidate, signature) &&
+-        !x86ModelHasSignature(current, signature)) {
++        virCPUx86SignaturesMatch(candidate, signature) &&
++        !virCPUx86SignaturesMatch(current, signature)) {
+         VIR_DEBUG("%s provides matching signature", cpuCandidate->model);
+         return 1;
+     }
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Prepare-virCPUx86UpdateLive-for-easier-extension.patch b/SOURCES/libvirt-cpu_x86-Prepare-virCPUx86UpdateLive-for-easier-extension.patch
new file mode 100644
index 0000000..621e1e4
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Prepare-virCPUx86UpdateLive-for-easier-extension.patch
@@ -0,0 +1,59 @@
+From 760e248164be819bebc03893ace58e0ddae7e440 Mon Sep 17 00:00:00 2001
+Message-Id: <760e248164be819bebc03893ace58e0ddae7e440@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:52 +0200
+Subject: [PATCH] cpu_x86: Prepare virCPUx86UpdateLive for easier extension
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Adding more checks into the existing if statements would turn them into
+an unreadable mess.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 8dc791b5d3b20552cc0b8d6c04e34dd0f3ebe2ff)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1839999
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <169ed0334144715b52575ca3f7e67ce3170ba91a.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 9b7981d574..9e686a86d2 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3036,9 +3036,15 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+ 
+     for (i = 0; i < map->nfeatures; i++) {
+         virCPUx86FeaturePtr feature = map->features[i];
++        virCPUFeaturePolicy expected = VIR_CPU_FEATURE_LAST;
+ 
+-        if (x86DataIsSubset(&enabled, &feature->data) &&
+-            !x86DataIsSubset(&model->data, &feature->data)) {
++        if (x86DataIsSubset(&model->data, &feature->data))
++            expected = VIR_CPU_FEATURE_REQUIRE;
++        else
++            expected = VIR_CPU_FEATURE_DISABLE;
++
++        if (expected == VIR_CPU_FEATURE_DISABLE &&
++            x86DataIsSubset(&enabled, &feature->data)) {
+             VIR_DEBUG("Feature '%s' enabled by the hypervisor", feature->name);
+             if (cpu->check == VIR_CPU_CHECK_FULL)
+                 virBufferAsprintf(&bufAdded, "%s,", feature->name);
+@@ -3048,7 +3054,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+         }
+ 
+         if (x86DataIsSubset(&disabled, &feature->data) ||
+-            (x86DataIsSubset(&model->data, &feature->data) &&
++            (expected == VIR_CPU_FEATURE_REQUIRE &&
+              !x86DataIsSubset(&enabled, &feature->data))) {
+             VIR_DEBUG("Feature '%s' disabled by the hypervisor", feature->name);
+             if (cpu->check == VIR_CPU_CHECK_FULL)
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Read-CPU-features-from-IA32_ARCH_CAPABILITIES-MSR.patch b/SOURCES/libvirt-cpu_x86-Read-CPU-features-from-IA32_ARCH_CAPABILITIES-MSR.patch
deleted file mode 100644
index d583e77..0000000
--- a/SOURCES/libvirt-cpu_x86-Read-CPU-features-from-IA32_ARCH_CAPABILITIES-MSR.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0004d2f3b0c3b21336415a967d70b7e9c2d08f54 Mon Sep 17 00:00:00 2001
-Message-Id: <0004d2f3b0c3b21336415a967d70b7e9c2d08f54@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:09 +0200
-Subject: [PATCH] cpu_x86: Read CPU features from IA32_ARCH_CAPABILITIES MSR
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is used by the host capabilities code to construct host CPU
-definition.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 56b254dccc96b7339494812c9df07ccf6af3da95)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <58ad207c48e0f2a6c44ff097b0881b649826ecd4.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index ec0e408f98..0a520f07ff 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -2771,6 +2771,28 @@ virCPUx86GetHost(virCPUDefPtr cpu,
-         cpuidSet(CPUX86_EXTENDED, cpuData) < 0)
-         goto cleanup;
- 
-+    /* Read the IA32_ARCH_CAPABILITIES MSR (0x10a) if supported.
-+     * This is best effort since there might be no way to read the MSR
-+     * when we are not running as root. */
-+    if (virCPUx86DataCheckFeature(cpuData, "arch-capabilities") == 1) {
-+        uint64_t msr;
-+        unsigned long index = 0x10a;
-+
-+        if (virHostCPUGetMSR(index, &msr) == 0) {
-+            virCPUx86DataItem item = {
-+                .type = VIR_CPU_X86_DATA_MSR,
-+                .data.msr = {
-+                    .index = index,
-+                    .eax = msr & 0xffffffff,
-+                    .edx = msr >> 32,
-+                },
-+            };
-+
-+            if (virCPUx86DataAdd(cpuData, &item) < 0)
-+                return -1;
-+        }
-+    }
-+
-     ret = x86DecodeCPUData(cpu, cpuData, models);
-     cpu->microcodeVersion = virHostCPUGetMicrocodeVersion();
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86CPUIDSorter.patch b/SOURCES/libvirt-cpu_x86-Rename-virCPUx86CPUIDSorter.patch
deleted file mode 100644
index c7e1099..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86CPUIDSorter.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ea8bf8889659145cbf53306e3d16357f40679e4e Mon Sep 17 00:00:00 2001
-Message-Id: <ea8bf8889659145cbf53306e3d16357f40679e4e@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:27 +0200
-Subject: [PATCH] cpu_x86: Rename virCPUx86CPUIDSorter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is called virCPUx86DataSorter since the function will work on any CPU
-data type.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 95accfa7fa15b21bf4824b55be666312d11c273a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <4661aa497f1b8d9b5ca1383a91affe24cd54caa9.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 52709f109e..efb2a3bb07 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -286,7 +286,7 @@ x86FeatureFindInternal(const char *name)
- 
- 
- static int
--virCPUx86CPUIDSorter(const void *a, const void *b)
-+virCPUx86DataSorter(const void *a, const void *b)
- {
-     virCPUx86DataItemPtr da = (virCPUx86DataItemPtr) a;
-     virCPUx86DataItemPtr db = (virCPUx86DataItemPtr) b;
-@@ -391,7 +391,7 @@ virCPUx86DataAddCPUIDInt(virCPUx86Data *data,
-             return -1;
- 
-         qsort(data->items, data->len,
--              sizeof(virCPUx86DataItem), virCPUx86CPUIDSorter);
-+              sizeof(virCPUx86DataItem), virCPUx86DataSorter);
-     }
- 
-     return 0;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUID.patch b/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUID.patch
deleted file mode 100644
index 8ad7f35..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUID.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From d4df159ee1e489c9afc238f39e6bb52d4f71bce7 Mon Sep 17 00:00:00 2001
-Message-Id: <d4df159ee1e489c9afc238f39e6bb52d4f71bce7@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:29 +0200
-Subject: [PATCH] cpu_x86: Rename virCPUx86DataAddCPUID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's called virCPUx86DataAdd now.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8f1a8ce397d7514bee9f370a1531d668e01ec923)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <1be869684ede8249c16fcab128fc6775edda08be.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c              | 46 +++++++++++++++++-----------------
- src/cpu/cpu_x86.h              |  4 +--
- src/libvirt_private.syms       |  2 +-
- src/libxl/libxl_capabilities.c |  2 +-
- src/qemu/qemu_monitor_json.c   |  2 +-
- 5 files changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 7e077577d3..6d48c9264c 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1505,7 +1505,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
-                            _("failed to parse cpuid[%zu]"), i);
-             goto error;
-         }
--        if (virCPUx86DataAddCPUID(cpuData, &item) < 0)
-+        if (virCPUx86DataAdd(cpuData, &item) < 0)
-             goto error;
-     }
- 
-@@ -2153,7 +2153,7 @@ x86Encode(virArch arch,
-         if (!(data_vendor = virCPUDataNew(arch)))
-             goto error;
- 
--        if (v && virCPUx86DataAddCPUID(data_vendor, &v->data) < 0)
-+        if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0)
-             goto error;
-     }
- 
-@@ -2229,13 +2229,13 @@ cpuidSetLeaf4(virCPUDataPtr data,
-     virCPUx86DataItem item = *subLeaf0;
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     while (cpuid->eax & 0x1f) {
-         cpuid->ecx_in++;
-         cpuidCall(cpuid);
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2254,13 +2254,13 @@ cpuidSetLeaf7(virCPUDataPtr data,
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2282,7 +2282,7 @@ cpuidSetLeafB(virCPUDataPtr data,
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
- 
-     while (cpuid->ecx & 0xff00) {
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-         cpuid->ecx_in++;
-         cpuidCall(cpuid);
-@@ -2309,12 +2309,12 @@ cpuidSetLeafD(virCPUDataPtr data,
-     virCPUx86CPUID sub1;
-     uint32_t sub;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     cpuid->ecx_in = 1;
-     cpuidCall(cpuid);
--    if (virCPUx86DataAddCPUID(data, &item) < 0)
-+    if (virCPUx86DataAdd(data, &item) < 0)
-         return -1;
- 
-     sub0 = subLeaf0->cpuid;
-@@ -2331,7 +2331,7 @@ cpuidSetLeafD(virCPUDataPtr data,
- 
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2356,7 +2356,7 @@ cpuidSetLeafResID(virCPUDataPtr data,
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     for (sub = 1; sub < 32; sub++) {
-@@ -2364,7 +2364,7 @@ cpuidSetLeafResID(virCPUDataPtr data,
-             continue;
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2388,19 +2388,19 @@ cpuidSetLeaf12(virCPUDataPtr data,
-         !(leaf7->cpuid.ebx & (1 << 2)))
-         return 0;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     cpuid->eax_in = 0x12;
-     cpuid->ecx_in = 1;
-     cpuidCall(cpuid);
--    if (virCPUx86DataAddCPUID(data, &item) < 0)
-+    if (virCPUx86DataAdd(data, &item) < 0)
-         return -1;
- 
-     cpuid->ecx_in = 2;
-     cpuidCall(cpuid);
-     while (cpuid->eax & 0xf) {
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-         cpuid->ecx_in++;
-         cpuidCall(cpuid);
-@@ -2421,13 +2421,13 @@ cpuidSetLeaf14(virCPUDataPtr data,
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     uint32_t sub;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2450,13 +2450,13 @@ cpuidSetLeaf17(virCPUDataPtr data,
-     if (subLeaf0->cpuid.eax < 3)
-         return 0;
- 
--    if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-+    if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
-     for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
--        if (virCPUx86DataAddCPUID(data, &item) < 0)
-+        if (virCPUx86DataAdd(data, &item) < 0)
-             return -1;
-     }
-     return 0;
-@@ -2502,7 +2502,7 @@ cpuidSet(uint32_t base, virCPUDataPtr data)
-         else if (leaf == 0x17)
-             rc = cpuidSetLeaf17(data, &item);
-         else
--            rc = virCPUx86DataAddCPUID(data, &item);
-+            rc = virCPUx86DataAdd(data, &item);
- 
-         if (rc < 0)
-             return -1;
-@@ -3077,8 +3077,8 @@ virCPUx86ValidateFeatures(virCPUDefPtr cpu)
- 
- 
- int
--virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
--                      const virCPUx86DataItem *item)
-+virCPUx86DataAdd(virCPUDataPtr cpuData,
-+                 const virCPUx86DataItem *item)
- {
-     return virCPUx86DataAddItem(&cpuData->data.x86, item);
- }
-@@ -3117,7 +3117,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-     if (virCPUx86VendorToCPUID(vendor, &item) < 0)
-         return -1;
- 
--    return virCPUx86DataAddCPUID(cpuData, &item);
-+    return virCPUx86DataAdd(cpuData, &item);
- }
- 
- 
-diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
-index 94655746c6..8b51cef9c1 100644
---- a/src/cpu/cpu_x86.h
-+++ b/src/cpu/cpu_x86.h
-@@ -29,8 +29,8 @@
- 
- extern struct cpuArchDriver cpuDriverX86;
- 
--int virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
--                          const virCPUx86DataItem *cpuid);
-+int virCPUx86DataAdd(virCPUDataPtr cpuData,
-+                     const virCPUx86DataItem *cpuid);
- 
- int virCPUx86DataSetSignature(virCPUDataPtr cpuData,
-                               unsigned int family,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index a275fa9aa1..347667b17c 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1203,7 +1203,7 @@ virCPUValidateFeatures;
- 
- 
- # cpu/cpu_x86.h
--virCPUx86DataAddCPUID;
-+virCPUx86DataAdd;
- virCPUx86DataAddFeature;
- virCPUx86DataGetSignature;
- virCPUx86DataSetSignature;
-diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
-index 231d72669f..2b351fbdde 100644
---- a/src/libxl/libxl_capabilities.c
-+++ b/src/libxl/libxl_capabilities.c
-@@ -73,7 +73,7 @@ libxlCapsAddCPUID(virCPUDataPtr data, virCPUx86CPUID *cpuid, ssize_t ncaps)
-     for (i = 0; i < ncaps; i++) {
-         item.cpuid = cpuid[i];
- 
--        if (virCPUx86DataAddCPUID(data, &item) < 0) {
-+        if (virCPUx86DataAdd(data, &item) < 0) {
-             VIR_DEBUG("Failed to add CPUID(%x,%x)",
-                       cpuid[i].eax_in, cpuid[i].ecx_in);
-             return -1;
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 0b4dfd70c0..abfaa6e68a 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -7052,7 +7052,7 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data)
-     for (i = 0; i < virJSONValueArraySize(data); i++) {
-         if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(data, i),
-                                                   &item.cpuid) < 0 ||
--            virCPUx86DataAddCPUID(cpudata, &item) < 0)
-+            virCPUx86DataAdd(cpudata, &item) < 0)
-             goto error;
-     }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUIDInt.patch b/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUIDInt.patch
deleted file mode 100644
index fda0cf9..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataAddCPUIDInt.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 39da1d7fe9d2bd12c10c40de62c36724556797be Mon Sep 17 00:00:00 2001
-Message-Id: <39da1d7fe9d2bd12c10c40de62c36724556797be@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:28 +0200
-Subject: [PATCH] cpu_x86: Rename virCPUx86DataAddCPUIDInt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The new name is virCPUx86DataAddItem.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit ce42042577ada2616a7b062f890677f9797c7bf9)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <631af83ec447522318e8169b0b9ef607b764befa.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index efb2a3bb07..7e077577d3 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -378,8 +378,8 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
- 
- 
- static int
--virCPUx86DataAddCPUIDInt(virCPUx86Data *data,
--                         const virCPUx86DataItem *item)
-+virCPUx86DataAddItem(virCPUx86Data *data,
-+                     const virCPUx86DataItem *item)
- {
-     virCPUx86DataItemPtr existing;
- 
-@@ -412,7 +412,7 @@ x86DataAdd(virCPUx86Data *data1,
-         if (item1) {
-             x86cpuidSetBits(&item1->cpuid, &item2->cpuid);
-         } else {
--            if (virCPUx86DataAddCPUIDInt(data1, item2) < 0)
-+            if (virCPUx86DataAddItem(data1, item2) < 0)
-                 return -1;
-         }
-     }
-@@ -641,7 +641,7 @@ x86DataAddSignature(virCPUx86Data *data,
- {
-     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1, .eax = signature);
- 
--    return virCPUx86DataAddCPUIDInt(data, &leaf1);
-+    return virCPUx86DataAddItem(data, &leaf1);
- }
- 
- 
-@@ -948,7 +948,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-                            i, feature->name);
-             goto cleanup;
-         }
--        if (virCPUx86DataAddCPUIDInt(&feature->data, &item))
-+        if (virCPUx86DataAddItem(&feature->data, &item))
-             goto cleanup;
-     }
- 
-@@ -1664,8 +1664,8 @@ x86Compute(virCPUDefPtr host,
-             goto error;
- 
-         if (cpu->vendor && host_model->vendor &&
--            virCPUx86DataAddCPUIDInt(&guest_model->data,
--                                     &host_model->vendor->data) < 0)
-+            virCPUx86DataAddItem(&guest_model->data,
-+                                 &host_model->vendor->data) < 0)
-             goto error;
- 
-         if (host_model->signatures &&
-@@ -2650,7 +2650,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
-     }
- 
-     if (vendor &&
--        virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->data) < 0)
-+        virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0)
-         goto error;
- 
-     if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0)
-@@ -2949,7 +2949,7 @@ virCPUx86Translate(virCPUDefPtr cpu,
-         goto cleanup;
- 
-     if (model->vendor &&
--        virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->data) < 0)
-+        virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0)
-         goto cleanup;
- 
-     if (model->signatures &&
-@@ -3080,7 +3080,7 @@ int
- virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
-                       const virCPUx86DataItem *item)
- {
--    return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, item);
-+    return virCPUx86DataAddItem(&cpuData->data.x86, item);
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataItem-variables.patch b/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataItem-variables.patch
deleted file mode 100644
index f2a826e..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86DataItem-variables.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From 74ecc2a0c728cf59279c61e1e9837423c72182e9 Mon Sep 17 00:00:00 2001
-Message-Id: <74ecc2a0c728cf59279c61e1e9837423c72182e9@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:24 +0200
-Subject: [PATCH] cpu_x86: Rename virCPUx86DataItem variables
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6c22b329d5bc592a390bd4d802c55a2a44af750e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <570635ac7fb5f7a6514072ee4b871eb4d08f65bc.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 128 +++++++++++++++++++++++-----------------------
- 1 file changed, 64 insertions(+), 64 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 6e1fb37d20..74f4083aac 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -327,13 +327,13 @@ x86DataCpuidNext(virCPUx86DataIteratorPtr iterator)
- 
- static virCPUx86DataItemPtr
- x86DataCpuid(const virCPUx86Data *data,
--             const virCPUx86DataItem *cpuid)
-+             const virCPUx86DataItem *item)
- {
-     size_t i;
- 
-     for (i = 0; i < data->len; i++) {
--        if (data->items[i].cpuid.eax_in == cpuid->cpuid.eax_in &&
--            data->items[i].cpuid.ecx_in == cpuid->cpuid.ecx_in)
-+        if (data->items[i].cpuid.eax_in == item->cpuid.eax_in &&
-+            data->items[i].cpuid.ecx_in == item->cpuid.ecx_in)
-             return data->items + i;
-     }
- 
-@@ -379,15 +379,15 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
- 
- static int
- virCPUx86DataAddCPUIDInt(virCPUx86Data *data,
--                         const virCPUx86DataItem *cpuid)
-+                         const virCPUx86DataItem *item)
- {
-     virCPUx86DataItemPtr existing;
- 
--    if ((existing = x86DataCpuid(data, cpuid))) {
--        x86cpuidSetBits(&existing->cpuid, &cpuid->cpuid);
-+    if ((existing = x86DataCpuid(data, item))) {
-+        x86cpuidSetBits(&existing->cpuid, &item->cpuid);
-     } else {
-         if (VIR_APPEND_ELEMENT_COPY(data->items, data->len,
--                                    *((virCPUx86DataItemPtr)cpuid)) < 0)
-+                                    *((virCPUx86DataItemPtr)item)) < 0)
-             return -1;
- 
-         qsort(data->items, data->len,
-@@ -403,16 +403,16 @@ x86DataAdd(virCPUx86Data *data1,
-            const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data2);
--    virCPUx86DataItemPtr cpuid1;
--    virCPUx86DataItemPtr cpuid2;
-+    virCPUx86DataItemPtr item1;
-+    virCPUx86DataItemPtr item2;
- 
--    while ((cpuid2 = x86DataCpuidNext(&iter))) {
--        cpuid1 = x86DataCpuid(data1, cpuid2);
-+    while ((item2 = x86DataCpuidNext(&iter))) {
-+        item1 = x86DataCpuid(data1, item2);
- 
--        if (cpuid1) {
--            x86cpuidSetBits(&cpuid1->cpuid, &cpuid2->cpuid);
-+        if (item1) {
-+            x86cpuidSetBits(&item1->cpuid, &item2->cpuid);
-         } else {
--            if (virCPUx86DataAddCPUIDInt(data1, cpuid2) < 0)
-+            if (virCPUx86DataAddCPUIDInt(data1, item2) < 0)
-                 return -1;
-         }
-     }
-@@ -426,12 +426,12 @@ x86DataSubtract(virCPUx86Data *data1,
-                 const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data1);
--    virCPUx86DataItemPtr cpuid1;
--    virCPUx86DataItemPtr cpuid2;
-+    virCPUx86DataItemPtr item1;
-+    virCPUx86DataItemPtr item2;
- 
--    while ((cpuid1 = x86DataCpuidNext(&iter))) {
--        if ((cpuid2 = x86DataCpuid(data2, cpuid1)))
--            x86cpuidClearBits(&cpuid1->cpuid, &cpuid2->cpuid);
-+    while ((item1 = x86DataCpuidNext(&iter))) {
-+        if ((item2 = x86DataCpuid(data2, item1)))
-+            x86cpuidClearBits(&item1->cpuid, &item2->cpuid);
-     }
- }
- 
-@@ -441,15 +441,15 @@ x86DataIntersect(virCPUx86Data *data1,
-                  const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data1);
--    virCPUx86DataItemPtr cpuid1;
--    virCPUx86DataItemPtr cpuid2;
-+    virCPUx86DataItemPtr item1;
-+    virCPUx86DataItemPtr item2;
- 
--    while ((cpuid1 = x86DataCpuidNext(&iter))) {
--        cpuid2 = x86DataCpuid(data2, cpuid1);
--        if (cpuid2)
--            x86cpuidAndBits(&cpuid1->cpuid, &cpuid2->cpuid);
-+    while ((item1 = x86DataCpuidNext(&iter))) {
-+        item2 = x86DataCpuid(data2, item1);
-+        if (item2)
-+            x86cpuidAndBits(&item1->cpuid, &item2->cpuid);
-         else
--            x86cpuidClearBits(&cpuid1->cpuid, &cpuid1->cpuid);
-+            x86cpuidClearBits(&item1->cpuid, &item1->cpuid);
-     }
- }
- 
-@@ -469,12 +469,12 @@ x86DataIsSubset(const virCPUx86Data *data,
- {
- 
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit((virCPUx86Data *)subset);
--    const virCPUx86DataItem *cpuid;
--    const virCPUx86DataItem *cpuidSubset;
-+    const virCPUx86DataItem *item;
-+    const virCPUx86DataItem *itemSubset;
- 
--    while ((cpuidSubset = x86DataCpuidNext(&iter))) {
--        if (!(cpuid = x86DataCpuid(data, cpuidSubset)) ||
--            !x86cpuidMatchMasked(&cpuid->cpuid, &cpuidSubset->cpuid))
-+    while ((itemSubset = x86DataCpuidNext(&iter))) {
-+        if (!(item = x86DataCpuid(data, itemSubset)) ||
-+            !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid))
-             return false;
-     }
- 
-@@ -509,14 +509,14 @@ static virCPUx86VendorPtr
- x86DataToVendor(const virCPUx86Data *data,
-                 virCPUx86MapPtr map)
- {
--    virCPUx86DataItemPtr cpuid;
-+    virCPUx86DataItemPtr item;
-     size_t i;
- 
-     for (i = 0; i < map->nvendors; i++) {
-         virCPUx86VendorPtr vendor = map->vendors[i];
--        if ((cpuid = x86DataCpuid(data, &vendor->data)) &&
--            x86cpuidMatchMasked(&cpuid->cpuid, &vendor->data.cpuid)) {
--            x86cpuidClearBits(&cpuid->cpuid, &vendor->data.cpuid);
-+        if ((item = x86DataCpuid(data, &vendor->data)) &&
-+            x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) {
-+            x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid);
-             return vendor;
-         }
-     }
-@@ -626,12 +626,12 @@ static uint32_t
- x86DataToSignature(const virCPUx86Data *data)
- {
-     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);
--    virCPUx86DataItemPtr cpuid;
-+    virCPUx86DataItemPtr item;
- 
--    if (!(cpuid = x86DataCpuid(data, &leaf1)))
-+    if (!(item = x86DataCpuid(data, &leaf1)))
-         return 0;
- 
--    return cpuid->cpuid.eax & SIGNATURE_MASK;
-+    return item->cpuid.eax & SIGNATURE_MASK;
- }
- 
- 
-@@ -639,9 +639,9 @@ static int
- x86DataAddSignature(virCPUx86Data *data,
-                     uint32_t signature)
- {
--    virCPUx86DataItem cpuid = CPUID(.eax_in = 0x1, .eax = signature);
-+    virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1, .eax = signature);
- 
--    return virCPUx86DataAddCPUIDInt(data, &cpuid);
-+    return virCPUx86DataAddCPUIDInt(data, &leaf1);
- }
- 
- 
-@@ -905,7 +905,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-     virCPUx86MapPtr map = data;
-     xmlNodePtr *nodes = NULL;
-     virCPUx86FeaturePtr feature;
--    virCPUx86DataItem cpuid;
-+    virCPUx86DataItem item;
-     size_t i;
-     int n;
-     char *str = NULL;
-@@ -942,13 +942,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
- 
-     for (i = 0; i < n; i++) {
-         ctxt->node = nodes[i];
--        if (x86ParseCPUID(ctxt, &cpuid) < 0) {
-+        if (x86ParseCPUID(ctxt, &item) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Invalid cpuid[%zu] in %s feature"),
-                            i, feature->name);
-             goto cleanup;
-         }
--        if (virCPUx86DataAddCPUIDInt(&feature->data, &cpuid))
-+        if (virCPUx86DataAddCPUIDInt(&feature->data, &item))
-             goto cleanup;
-     }
- 
-@@ -1148,16 +1148,16 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-     virCPUx86CompareResult result = EQUAL;
-     virCPUx86DataIterator iter1 = virCPUx86DataIteratorInit(&model1->data);
-     virCPUx86DataIterator iter2 = virCPUx86DataIteratorInit(&model2->data);
--    virCPUx86DataItemPtr cpuid1;
--    virCPUx86DataItemPtr cpuid2;
-+    virCPUx86DataItemPtr item1;
-+    virCPUx86DataItemPtr item2;
- 
--    while ((cpuid1 = x86DataCpuidNext(&iter1))) {
-+    while ((item1 = x86DataCpuidNext(&iter1))) {
-         virCPUx86CompareResult match = SUPERSET;
- 
--        if ((cpuid2 = x86DataCpuid(&model2->data, cpuid1))) {
--            if (x86cpuidMatch(&cpuid1->cpuid, &cpuid2->cpuid))
-+        if ((item2 = x86DataCpuid(&model2->data, item1))) {
-+            if (x86cpuidMatch(&item1->cpuid, &item2->cpuid))
-                 continue;
--            else if (!x86cpuidMatchMasked(&cpuid1->cpuid, &cpuid2->cpuid))
-+            else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid))
-                 match = SUBSET;
-         }
- 
-@@ -1167,13 +1167,13 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-             return UNRELATED;
-     }
- 
--    while ((cpuid2 = x86DataCpuidNext(&iter2))) {
-+    while ((item2 = x86DataCpuidNext(&iter2))) {
-         virCPUx86CompareResult match = SUBSET;
- 
--        if ((cpuid1 = x86DataCpuid(&model1->data, cpuid2))) {
--            if (x86cpuidMatch(&cpuid2->cpuid, &cpuid1->cpuid))
-+        if ((item1 = x86DataCpuid(&model1->data, item2))) {
-+            if (x86cpuidMatch(&item2->cpuid, &item1->cpuid))
-                 continue;
--            else if (!x86cpuidMatchMasked(&cpuid2->cpuid, &cpuid1->cpuid))
-+            else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid))
-                 match = SUPERSET;
-         }
- 
-@@ -1484,7 +1484,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
- {
-     xmlNodePtr *nodes = NULL;
-     virCPUDataPtr cpuData = NULL;
--    virCPUx86DataItem cpuid;
-+    virCPUx86DataItem item;
-     size_t i;
-     int n;
- 
-@@ -1500,12 +1500,12 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
- 
-     for (i = 0; i < n; i++) {
-         ctxt->node = nodes[i];
--        if (x86ParseCPUID(ctxt, &cpuid) < 0) {
-+        if (x86ParseCPUID(ctxt, &item) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("failed to parse cpuid[%zu]"), i);
-             goto error;
-         }
--        if (virCPUx86DataAddCPUID(cpuData, &cpuid) < 0)
-+        if (virCPUx86DataAddCPUID(cpuData, &item) < 0)
-             goto error;
-     }
- 
-@@ -2382,10 +2382,10 @@ cpuidSetLeaf12(virCPUDataPtr data,
- {
-     virCPUx86DataItem item = CPUID(.eax_in = 0x7);
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
--    virCPUx86DataItemPtr cpuid7;
-+    virCPUx86DataItemPtr leaf7;
- 
--    if (!(cpuid7 = x86DataCpuid(&data->data.x86, &item)) ||
--        !(cpuid7->cpuid.ebx & (1 << 2)))
-+    if (!(leaf7 = x86DataCpuid(&data->data.x86, &item)) ||
-+        !(leaf7->cpuid.ebx & (1 << 2)))
-         return 0;
- 
-     if (virCPUx86DataAddCPUID(data, subLeaf0) < 0)
-@@ -3078,9 +3078,9 @@ virCPUx86ValidateFeatures(virCPUDefPtr cpu)
- 
- int
- virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
--                      const virCPUx86DataItem *cpuid)
-+                      const virCPUx86DataItem *item)
- {
--    return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, cpuid);
-+    return virCPUx86DataAddCPUIDInt(&cpuData->data.x86, item);
- }
- 
- 
-@@ -3112,12 +3112,12 @@ int
- virCPUx86DataSetVendor(virCPUDataPtr cpuData,
-                        const char *vendor)
- {
--    virCPUx86DataItem cpuid = CPUID(0);
-+    virCPUx86DataItem item = CPUID(0);
- 
--    if (virCPUx86VendorToCPUID(vendor, &cpuid) < 0)
-+    if (virCPUx86VendorToCPUID(vendor, &item) < 0)
-         return -1;
- 
--    return virCPUx86DataAddCPUID(cpuData, &cpuid);
-+    return virCPUx86DataAddCPUID(cpuData, &item);
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86Vendor.cpuid.patch b/SOURCES/libvirt-cpu_x86-Rename-virCPUx86Vendor.cpuid.patch
deleted file mode 100644
index 70186dc..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86Vendor.cpuid.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 088d9da6e6c4f3edc0293f78ba7270941d2e7fd0 Mon Sep 17 00:00:00 2001
-Message-Id: <088d9da6e6c4f3edc0293f78ba7270941d2e7fd0@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:23 +0200
-Subject: [PATCH] cpu_x86: Rename virCPUx86Vendor.cpuid
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Although vendor string is always reported by CPUID, the container struct
-is used for consistency and thus "cpuid" name is not a good fit anymore.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c02d70d52efc4b7af09e68847ef72ad47a6bdcf1)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0b6fccb50f2ce2b5d926a75c90a8107a300c8d57.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 2e953eaa12..6e1fb37d20 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -49,7 +49,7 @@ typedef struct _virCPUx86Vendor virCPUx86Vendor;
- typedef virCPUx86Vendor *virCPUx86VendorPtr;
- struct _virCPUx86Vendor {
-     char *name;
--    virCPUx86DataItem cpuid;
-+    virCPUx86DataItem data;
- };
- 
- typedef struct _virCPUx86Feature virCPUx86Feature;
-@@ -514,9 +514,9 @@ x86DataToVendor(const virCPUx86Data *data,
- 
-     for (i = 0; i < map->nvendors; i++) {
-         virCPUx86VendorPtr vendor = map->vendors[i];
--        if ((cpuid = x86DataCpuid(data, &vendor->cpuid)) &&
--            x86cpuidMatchMasked(&cpuid->cpuid, &vendor->cpuid.cpuid)) {
--            x86cpuidClearBits(&cpuid->cpuid, &vendor->cpuid.cpuid);
-+        if ((cpuid = x86DataCpuid(data, &vendor->data)) &&
-+            x86cpuidMatchMasked(&cpuid->cpuid, &vendor->data.cpuid)) {
-+            x86cpuidClearBits(&cpuid->cpuid, &vendor->data.cpuid);
-             return vendor;
-         }
-     }
-@@ -759,7 +759,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
-         goto cleanup;
-     }
- 
--    if (virCPUx86VendorToCPUID(string, &vendor->cpuid) < 0)
-+    if (virCPUx86VendorToCPUID(string, &vendor->data) < 0)
-         goto cleanup;
- 
-     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
-@@ -1665,7 +1665,7 @@ x86Compute(virCPUDefPtr host,
- 
-         if (cpu->vendor && host_model->vendor &&
-             virCPUx86DataAddCPUIDInt(&guest_model->data,
--                                     &host_model->vendor->cpuid) < 0)
-+                                     &host_model->vendor->data) < 0)
-             goto error;
- 
-         if (host_model->signatures &&
-@@ -2153,7 +2153,7 @@ x86Encode(virArch arch,
-         if (!(data_vendor = virCPUDataNew(arch)))
-             goto error;
- 
--        if (v && virCPUx86DataAddCPUID(data_vendor, &v->cpuid) < 0)
-+        if (v && virCPUx86DataAddCPUID(data_vendor, &v->data) < 0)
-             goto error;
-     }
- 
-@@ -2650,7 +2650,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
-     }
- 
-     if (vendor &&
--        virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->cpuid) < 0)
-+        virCPUx86DataAddCPUIDInt(&base_model->data, &vendor->data) < 0)
-         goto error;
- 
-     if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0)
-@@ -2949,7 +2949,7 @@ virCPUx86Translate(virCPUDefPtr cpu,
-         goto cleanup;
- 
-     if (model->vendor &&
--        virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->cpuid) < 0)
-+        virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->data) < 0)
-         goto cleanup;
- 
-     if (model->signatures &&
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86VendorToCPUID.patch b/SOURCES/libvirt-cpu_x86-Rename-virCPUx86VendorToCPUID.patch
deleted file mode 100644
index 59fdc0c..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-virCPUx86VendorToCPUID.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c3573dbf60524401d06da6f6c5ce70a780494509 Mon Sep 17 00:00:00 2001
-Message-Id: <c3573dbf60524401d06da6f6c5ce70a780494509@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:30 +0200
-Subject: [PATCH] cpu_x86: Rename virCPUx86VendorToCPUID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Renamed as virCPUx86VendorToData.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 3eff71a2d5048b30ded73bc6e542cbbd3e5b6193)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <01af4e7922b394abeb1ea11856c188cb80ffb9a8.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 6d48c9264c..9c0f39e76d 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -526,8 +526,8 @@ x86DataToVendor(const virCPUx86Data *data,
- 
- 
- static int
--virCPUx86VendorToCPUID(const char *vendor,
--                       virCPUx86DataItemPtr data)
-+virCPUx86VendorToData(const char *vendor,
-+                      virCPUx86DataItemPtr data)
- {
-     virCPUx86CPUIDPtr cpuid = &data->cpuid;
- 
-@@ -759,7 +759,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
-         goto cleanup;
-     }
- 
--    if (virCPUx86VendorToCPUID(string, &vendor->data) < 0)
-+    if (virCPUx86VendorToData(string, &vendor->data) < 0)
-         goto cleanup;
- 
-     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
-@@ -3114,7 +3114,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpuData,
- {
-     virCPUx86DataItem item = CPUID(0);
- 
--    if (virCPUx86VendorToCPUID(vendor, &item) < 0)
-+    if (virCPUx86VendorToData(vendor, &item) < 0)
-         return -1;
- 
-     return virCPUx86DataAdd(cpuData, &item);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-x86DataCpuid.patch b/SOURCES/libvirt-cpu_x86-Rename-x86DataCpuid.patch
deleted file mode 100644
index 569167d..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-x86DataCpuid.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 99431463aaf37298bc90f82bc6b20b44f4853246 Mon Sep 17 00:00:00 2001
-Message-Id: <99431463aaf37298bc90f82bc6b20b44f4853246@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:26 +0200
-Subject: [PATCH] cpu_x86: Rename x86DataCpuid
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is now called virCPUx86DataGet.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 609f467f1377da3418dad23fdd9f7136e462ba5b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <427e52b2993356d0170e2f756526e9d523686a42.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index d9475e5b4a..52709f109e 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -326,8 +326,8 @@ virCPUx86DataNext(virCPUx86DataIteratorPtr iterator)
- 
- 
- static virCPUx86DataItemPtr
--x86DataCpuid(const virCPUx86Data *data,
--             const virCPUx86DataItem *item)
-+virCPUx86DataGet(const virCPUx86Data *data,
-+                 const virCPUx86DataItem *item)
- {
-     size_t i;
- 
-@@ -383,7 +383,7 @@ virCPUx86DataAddCPUIDInt(virCPUx86Data *data,
- {
-     virCPUx86DataItemPtr existing;
- 
--    if ((existing = x86DataCpuid(data, item))) {
-+    if ((existing = virCPUx86DataGet(data, item))) {
-         x86cpuidSetBits(&existing->cpuid, &item->cpuid);
-     } else {
-         if (VIR_APPEND_ELEMENT_COPY(data->items, data->len,
-@@ -407,7 +407,7 @@ x86DataAdd(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item2;
- 
-     while ((item2 = virCPUx86DataNext(&iter))) {
--        item1 = x86DataCpuid(data1, item2);
-+        item1 = virCPUx86DataGet(data1, item2);
- 
-         if (item1) {
-             x86cpuidSetBits(&item1->cpuid, &item2->cpuid);
-@@ -430,7 +430,7 @@ x86DataSubtract(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item2;
- 
-     while ((item1 = virCPUx86DataNext(&iter))) {
--        if ((item2 = x86DataCpuid(data2, item1)))
-+        if ((item2 = virCPUx86DataGet(data2, item1)))
-             x86cpuidClearBits(&item1->cpuid, &item2->cpuid);
-     }
- }
-@@ -445,7 +445,7 @@ x86DataIntersect(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item2;
- 
-     while ((item1 = virCPUx86DataNext(&iter))) {
--        item2 = x86DataCpuid(data2, item1);
-+        item2 = virCPUx86DataGet(data2, item1);
-         if (item2)
-             x86cpuidAndBits(&item1->cpuid, &item2->cpuid);
-         else
-@@ -473,7 +473,7 @@ x86DataIsSubset(const virCPUx86Data *data,
-     const virCPUx86DataItem *itemSubset;
- 
-     while ((itemSubset = virCPUx86DataNext(&iter))) {
--        if (!(item = x86DataCpuid(data, itemSubset)) ||
-+        if (!(item = virCPUx86DataGet(data, itemSubset)) ||
-             !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid))
-             return false;
-     }
-@@ -514,7 +514,7 @@ x86DataToVendor(const virCPUx86Data *data,
- 
-     for (i = 0; i < map->nvendors; i++) {
-         virCPUx86VendorPtr vendor = map->vendors[i];
--        if ((item = x86DataCpuid(data, &vendor->data)) &&
-+        if ((item = virCPUx86DataGet(data, &vendor->data)) &&
-             x86cpuidMatchMasked(&item->cpuid, &vendor->data.cpuid)) {
-             x86cpuidClearBits(&item->cpuid, &vendor->data.cpuid);
-             return vendor;
-@@ -609,7 +609,7 @@ x86DataToSignatureFull(const virCPUx86Data *data,
- 
-     *family = *model = *stepping = 0;
- 
--    if (!(item = x86DataCpuid(data, &leaf1)))
-+    if (!(item = virCPUx86DataGet(data, &leaf1)))
-         return;
- 
-     cpuid = &item->cpuid;
-@@ -628,7 +628,7 @@ x86DataToSignature(const virCPUx86Data *data)
-     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);
-     virCPUx86DataItemPtr item;
- 
--    if (!(item = x86DataCpuid(data, &leaf1)))
-+    if (!(item = virCPUx86DataGet(data, &leaf1)))
-         return 0;
- 
-     return item->cpuid.eax & SIGNATURE_MASK;
-@@ -1154,7 +1154,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-     while ((item1 = virCPUx86DataNext(&iter1))) {
-         virCPUx86CompareResult match = SUPERSET;
- 
--        if ((item2 = x86DataCpuid(&model2->data, item1))) {
-+        if ((item2 = virCPUx86DataGet(&model2->data, item1))) {
-             if (x86cpuidMatch(&item1->cpuid, &item2->cpuid))
-                 continue;
-             else if (!x86cpuidMatchMasked(&item1->cpuid, &item2->cpuid))
-@@ -1170,7 +1170,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-     while ((item2 = virCPUx86DataNext(&iter2))) {
-         virCPUx86CompareResult match = SUBSET;
- 
--        if ((item1 = x86DataCpuid(&model1->data, item2))) {
-+        if ((item1 = virCPUx86DataGet(&model1->data, item2))) {
-             if (x86cpuidMatch(&item2->cpuid, &item1->cpuid))
-                 continue;
-             else if (!x86cpuidMatchMasked(&item2->cpuid, &item1->cpuid))
-@@ -2384,7 +2384,7 @@ cpuidSetLeaf12(virCPUDataPtr data,
-     virCPUx86CPUIDPtr cpuid = &item.cpuid;
-     virCPUx86DataItemPtr leaf7;
- 
--    if (!(leaf7 = x86DataCpuid(&data->data.x86, &item)) ||
-+    if (!(leaf7 = virCPUx86DataGet(&data->data.x86, &item)) ||
-         !(leaf7->cpuid.ebx & (1 << 2)))
-         return 0;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Rename-x86DataCpuidNext-function.patch b/SOURCES/libvirt-cpu_x86-Rename-x86DataCpuidNext-function.patch
deleted file mode 100644
index 6dc883c..0000000
--- a/SOURCES/libvirt-cpu_x86-Rename-x86DataCpuidNext-function.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From ad4abf728510a5fed123d46a223f19f0b8178045 Mon Sep 17 00:00:00 2001
-Message-Id: <ad4abf728510a5fed123d46a223f19f0b8178045@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:25 +0200
-Subject: [PATCH] cpu_x86: Rename x86DataCpuidNext function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function is now called virCPUx86DataNext to reflect its purpose: it
-is an iterator over CPU data (both CPUID and MSR in the near future).
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 5655b83139e47b6c52d48a7d10640bf3508865eb)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <bcc496d392ff77d824f53460cacb0a7de0993785.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 74f4083aac..d9475e5b4a 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -307,7 +307,7 @@ virCPUx86CPUIDSorter(const void *a, const void *b)
- 
- /* skips all zero CPUID leaves */
- static virCPUx86DataItemPtr
--x86DataCpuidNext(virCPUx86DataIteratorPtr iterator)
-+virCPUx86DataNext(virCPUx86DataIteratorPtr iterator)
- {
-     const virCPUx86Data *data = iterator->data;
- 
-@@ -406,7 +406,7 @@ x86DataAdd(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
--    while ((item2 = x86DataCpuidNext(&iter))) {
-+    while ((item2 = virCPUx86DataNext(&iter))) {
-         item1 = x86DataCpuid(data1, item2);
- 
-         if (item1) {
-@@ -429,7 +429,7 @@ x86DataSubtract(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
--    while ((item1 = x86DataCpuidNext(&iter))) {
-+    while ((item1 = virCPUx86DataNext(&iter))) {
-         if ((item2 = x86DataCpuid(data2, item1)))
-             x86cpuidClearBits(&item1->cpuid, &item2->cpuid);
-     }
-@@ -444,7 +444,7 @@ x86DataIntersect(virCPUx86Data *data1,
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
--    while ((item1 = x86DataCpuidNext(&iter))) {
-+    while ((item1 = virCPUx86DataNext(&iter))) {
-         item2 = x86DataCpuid(data2, item1);
-         if (item2)
-             x86cpuidAndBits(&item1->cpuid, &item2->cpuid);
-@@ -459,7 +459,7 @@ x86DataIsEmpty(virCPUx86Data *data)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data);
- 
--    return !x86DataCpuidNext(&iter);
-+    return !virCPUx86DataNext(&iter);
- }
- 
- 
-@@ -472,7 +472,7 @@ x86DataIsSubset(const virCPUx86Data *data,
-     const virCPUx86DataItem *item;
-     const virCPUx86DataItem *itemSubset;
- 
--    while ((itemSubset = x86DataCpuidNext(&iter))) {
-+    while ((itemSubset = virCPUx86DataNext(&iter))) {
-         if (!(item = x86DataCpuid(data, itemSubset)) ||
-             !x86cpuidMatchMasked(&item->cpuid, &itemSubset->cpuid))
-             return false;
-@@ -1151,7 +1151,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
--    while ((item1 = x86DataCpuidNext(&iter1))) {
-+    while ((item1 = virCPUx86DataNext(&iter1))) {
-         virCPUx86CompareResult match = SUPERSET;
- 
-         if ((item2 = x86DataCpuid(&model2->data, item1))) {
-@@ -1167,7 +1167,7 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-             return UNRELATED;
-     }
- 
--    while ((item2 = x86DataCpuidNext(&iter2))) {
-+    while ((item2 = virCPUx86DataNext(&iter2))) {
-         virCPUx86CompareResult match = SUBSET;
- 
-         if ((item1 = x86DataCpuid(&model1->data, item2))) {
-@@ -1461,7 +1461,7 @@ virCPUx86DataFormat(const virCPUData *data)
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
- 
-     virBufferAddLit(&buf, "<cpudata arch='x86'>\n");
--    while ((item = x86DataCpuidNext(&iter))) {
-+    while ((item = virCPUx86DataNext(&iter))) {
-         virCPUx86CPUIDPtr cpuid = &item->cpuid;
-         virBufferAsprintf(&buf,
-                           "  <cpuid eax_in='0x%08x' ecx_in='0x%08x'"
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-with-a-struct.patch b/SOURCES/libvirt-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-with-a-struct.patch
new file mode 100644
index 0000000..203914b
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-with-a-struct.patch
@@ -0,0 +1,325 @@
+From 22fecd96659495908f37e1c33c1ed52be5fb2d44 Mon Sep 17 00:00:00 2001
+Message-Id: <22fecd96659495908f37e1c33c1ed52be5fb2d44@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:32 +0200
+Subject: [PATCH] cpu_x86: Replace 32b signatures in virCPUx86Model with a
+ struct
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The CPU models in our cpu_map define their signatures using separate
+family and model numbers. Let's store the signatures in the same way in
+our runtime representation of the cpu_map.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 22bded201ffc91661e44065203dcb987e51084ca)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Conflicts:
+	src/cpu/cpu_x86.c
+            - v6.0.0-264-g0a125c7144 which removes the third argument
+              from virBufferTrim was not backported
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <21c1eee9c7bb3811f43aa044bb97fa373a159e26.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 149 +++++++++++++++++++++++++++++-----------------
+ 1 file changed, 95 insertions(+), 54 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index dad3bceff0..b87e3753da 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -121,6 +121,19 @@ static virCPUx86Feature x86_kvm_features[] =
+     KVM_FEATURE(VIR_CPU_x86_HV_STIMER_DIRECT),
+ };
+ 
++typedef struct _virCPUx86Signature virCPUx86Signature;
++struct _virCPUx86Signature {
++    unsigned int family;
++    unsigned int model;
++};
++
++typedef struct _virCPUx86Signatures virCPUx86Signatures;
++typedef virCPUx86Signatures *virCPUx86SignaturesPtr;
++struct _virCPUx86Signatures {
++    size_t count;
++    virCPUx86Signature *items;
++};
++
+ typedef struct _virCPUx86Model virCPUx86Model;
+ typedef virCPUx86Model *virCPUx86ModelPtr;
+ struct _virCPUx86Model {
+@@ -128,8 +141,7 @@ struct _virCPUx86Model {
+     bool decodeHost;
+     bool decodeGuest;
+     virCPUx86VendorPtr vendor;
+-    size_t nsignatures;
+-    uint32_t *signatures;
++    virCPUx86SignaturesPtr signatures;
+     virCPUx86Data data;
+ };
+ 
+@@ -717,6 +729,13 @@ x86MakeSignature(unsigned int family,
+ }
+ 
+ 
++static uint32_t
++virCPUx86SignatureToCPUID(virCPUx86Signature *sig)
++{
++    return x86MakeSignature(sig->family, sig->model, 0);
++}
++
++
+ static void
+ virCPUx86SignatureFromCPUID(uint32_t sig,
+                             unsigned int *family,
+@@ -1099,41 +1118,65 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
++static virCPUx86SignaturesPtr
++virCPUx86SignaturesNew(size_t count)
++{
++    virCPUx86SignaturesPtr sigs;
++
++    sigs = g_new0(virCPUx86Signatures, 1);
++    sigs->items = g_new0(virCPUx86Signature, count);
++    sigs->count = count;
++
++    return sigs;
++}
++
++
+ static void
+-virCPUx86SignaturesFree(uint32_t *signatures)
++virCPUx86SignaturesFree(virCPUx86SignaturesPtr sigs)
+ {
+-    g_free(signatures);
++    if (!sigs)
++        return;
++
++    g_free(sigs->items);
++    g_free(sigs);
+ }
+ 
+ 
+-static int
+-virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
+-                        virCPUx86ModelPtr src)
++static virCPUx86SignaturesPtr
++virCPUx86SignaturesCopy(virCPUx86SignaturesPtr src)
+ {
++    virCPUx86SignaturesPtr dst;
+     size_t i;
+ 
+-    if (src->nsignatures == 0)
+-        return 0;
++    if (!src || src->count == 0)
++        return NULL;
+ 
+-    if (VIR_ALLOC_N(dst->signatures, src->nsignatures) < 0)
+-        return -1;
++    dst = virCPUx86SignaturesNew(src->count);
+ 
+-    dst->nsignatures = src->nsignatures;
+-    for (i = 0; i < src->nsignatures; i++)
+-        dst->signatures[i] = src->signatures[i];
++    for (i = 0; i < src->count; i++)
++        dst->items[i] = src->items[i];
+ 
+-    return 0;
++    return dst;
+ }
+ 
+ 
+ static bool
+-virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
++virCPUx86SignaturesMatch(virCPUx86SignaturesPtr sigs,
+                          uint32_t signature)
+ {
+     size_t i;
++    unsigned int family;
++    unsigned int model;
++    unsigned int stepping;
+ 
+-    for (i = 0; i < model->nsignatures; i++) {
+-        if (model->signatures[i] == signature)
++    if (!sigs)
++        return false;
++
++    virCPUx86SignatureFromCPUID(signature, &family, &model, &stepping);
++
++    for (i = 0; i < sigs->count; i++) {
++        if (sigs->items[i].family == family &&
++            sigs->items[i].model == model)
+             return true;
+     }
+ 
+@@ -1142,17 +1185,21 @@ virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
+ 
+ 
+ static char *
+-virCPUx86SignaturesFormat(virCPUx86ModelPtr model)
++virCPUx86SignaturesFormat(virCPUx86SignaturesPtr sigs)
+ {
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     size_t i;
+ 
+-    for (i = 0; i < model->nsignatures; i++) {
+-        virBufferAsprintf(&buf, "%06lx,",
+-                          (unsigned long)model->signatures[i]);
++    if (!sigs)
++        return virBufferContentAndReset(&buf);
++
++    for (i = 0; i < sigs->count; i++) {
++        virBufferAsprintf(&buf, "(%u,%u,0), ",
++                          sigs->items[i].family,
++                          sigs->items[i].model);
+     }
+ 
+-    virBufferTrim(&buf, ",", -1);
++    virBufferTrim(&buf, ", ", -1);
+ 
+     return virBufferContentAndReset(&buf);
+ }
+@@ -1179,16 +1226,11 @@ x86ModelCopy(virCPUx86ModelPtr model)
+ 
+     copy = g_new0(virCPUx86Model, 1);
+     copy->name = g_strdup(model->name);
+-
+-    if (virCPUx86SignaturesCopy(copy, model) < 0) {
+-        x86ModelFree(copy);
+-        return NULL;
+-    }
++    copy->signatures = virCPUx86SignaturesCopy(model->signatures);
+     x86DataCopy(&copy->data, &model->data);
+-
+     copy->vendor = model->vendor;
+ 
+-    return copy;
++    return g_steal_pointer(&copy);
+ }
+ 
+ 
+@@ -1408,9 +1450,7 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
+     }
+ 
+     model->vendor = ancestor->vendor;
+-    if (virCPUx86SignaturesCopy(model, ancestor) < 0)
+-        return -1;
+-
++    model->signatures = virCPUx86SignaturesCopy(ancestor->signatures);
+     x86DataCopy(&model->data, &ancestor->data);
+ 
+     return 0;
+@@ -1432,34 +1472,29 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+     /* Remove inherited signatures. */
+     virCPUx86SignaturesFree(model->signatures);
+ 
+-    model->nsignatures = n;
+-    if (VIR_ALLOC_N(model->signatures, n) < 0)
+-       return -1;
++    model->signatures = virCPUx86SignaturesNew(n);
+ 
+     for (i = 0; i < n; i++) {
+-        unsigned int sigFamily = 0;
+-        unsigned int sigModel = 0;
++        virCPUx86Signature *sig = &model->signatures->items[i];
+         int rc;
+ 
+         ctxt->node = nodes[i];
+ 
+-        rc = virXPathUInt("string(@family)", ctxt, &sigFamily);
+-        if (rc < 0 || sigFamily == 0) {
++        rc = virXPathUInt("string(@family)", ctxt, &sig->family);
++        if (rc < 0 || sig->family == 0) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid CPU signature family in model %s"),
+                            model->name);
+             return -1;
+         }
+ 
+-        rc = virXPathUInt("string(@model)", ctxt, &sigModel);
++        rc = virXPathUInt("string(@model)", ctxt, &sig->model);
+         if (rc < 0) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid CPU signature model in model %s"),
+                            model->name);
+             return -1;
+         }
+-
+-        model->signatures[i] = x86MakeSignature(sigFamily, sigModel, 0);
+     }
+ 
+     ctxt->node = root;
+@@ -1865,9 +1900,12 @@ x86Compute(virCPUDefPtr host,
+                                  &host_model->vendor->data) < 0)
+             return VIR_CPU_COMPARE_ERROR;
+ 
+-        if (host_model->signatures &&
+-            x86DataAddSignature(&guest_model->data, *host_model->signatures) < 0)
+-            return VIR_CPU_COMPARE_ERROR;
++        if (host_model->signatures && host_model->signatures->count > 0) {
++            virCPUx86Signature *sig = &host_model->signatures->items[0];
++            if (x86DataAddSignature(&guest_model->data,
++                                    virCPUx86SignatureToCPUID(sig)) < 0)
++                return VIR_CPU_COMPARE_ERROR;
++        }
+ 
+         if (cpu->type == VIR_CPU_TYPE_GUEST
+             && cpu->match == VIR_CPU_MATCH_EXACT)
+@@ -1977,8 +2015,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * consider candidates with matching family/model.
+      */
+     if (signature &&
+-        virCPUx86SignaturesMatch(current, signature) &&
+-        !virCPUx86SignaturesMatch(candidate, signature)) {
++        virCPUx86SignaturesMatch(current->signatures, signature) &&
++        !virCPUx86SignaturesMatch(candidate->signatures, signature)) {
+         VIR_DEBUG("%s differs in signature from matching %s",
+                   cpuCandidate->model, cpuCurrent->model);
+         return 0;
+@@ -1994,8 +2032,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * result in longer list of features.
+      */
+     if (signature &&
+-        virCPUx86SignaturesMatch(candidate, signature) &&
+-        !virCPUx86SignaturesMatch(current, signature)) {
++        virCPUx86SignaturesMatch(candidate->signatures, signature) &&
++        !virCPUx86SignaturesMatch(current->signatures, signature)) {
+         VIR_DEBUG("%s provides matching signature", cpuCandidate->model);
+         return 1;
+     }
+@@ -2150,7 +2188,7 @@ x86Decode(virCPUDefPtr cpu,
+     if (vendor)
+         cpu->vendor = g_strdup(vendor->name);
+ 
+-    sigs = virCPUx86SignaturesFormat(model);
++    sigs = virCPUx86SignaturesFormat(model->signatures);
+ 
+     VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
+               model->name, NULLSTR(sigs), (unsigned long)signature);
+@@ -3046,9 +3084,12 @@ virCPUx86Translate(virCPUDefPtr cpu,
+         virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0)
+         return -1;
+ 
+-    if (model->signatures &&
+-        x86DataAddSignature(&model->data, model->signatures[0]) < 0)
+-        return -1;
++    if (model->signatures && model->signatures->count > 0) {
++        virCPUx86Signature *sig = &model->signatures->items[0];
++        if (x86DataAddSignature(&model->data,
++                                virCPUx86SignatureToCPUID(sig)) < 0)
++            return -1;
++    }
+ 
+     if (!(translated = virCPUDefCopyWithoutModel(cpu)))
+         return -1;
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Require-cpuid-within-feature-in-CPU-map.patch b/SOURCES/libvirt-cpu_x86-Require-cpuid-within-feature-in-CPU-map.patch
deleted file mode 100644
index 4986884..0000000
--- a/SOURCES/libvirt-cpu_x86-Require-cpuid-within-feature-in-CPU-map.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c3148a408bd3c7ccf858bd5e0ac1139588847fc9 Mon Sep 17 00:00:00 2001
-Message-Id: <c3148a408bd3c7ccf858bd5e0ac1139588847fc9@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:19 +0200
-Subject: [PATCH] cpu_x86: Require <cpuid> within <feature> in CPU map
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A feature with no cpuid element is invalid and it should not be silently
-treated as a feature with all CPUID bits set to zero.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit dbc04114f3d14b53c999bd89db51276358b1aba3)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <ea3bbf9cb28709fe52f43ce312c0171e2a62c1e8.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 66aa5a612c..98e8d608d6 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -923,6 +923,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
-     if (n < 0)
-         goto cleanup;
- 
-+    if (n == 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing cpuid for feature %s"),
-+                       feature->name);
-+        goto cleanup;
-+    }
-+
-     for (i = 0; i < n; i++) {
-         ctxt->node = nodes[i];
-         if (x86ParseCPUID(ctxt, &cpuid) < 0) {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Separate-ancestor-model-parsing-from-x86ModelParse.patch b/SOURCES/libvirt-cpu_x86-Separate-ancestor-model-parsing-from-x86ModelParse.patch
deleted file mode 100644
index 0571af1..0000000
--- a/SOURCES/libvirt-cpu_x86-Separate-ancestor-model-parsing-from-x86ModelParse.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 4111804c77930ebcda4fa5fae751074f75da4f1c Mon Sep 17 00:00:00 2001
-Message-Id: <4111804c77930ebcda4fa5fae751074f75da4f1c@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:54 +0200
-Subject: [PATCH] cpu_x86: Separate ancestor model parsing from x86ModelParse
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code is separated into a new x86ModelParseAncestor function.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2e1e2b910c6a9d31f2fb6d388ed72dc8f561b845)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0e941dce0077eb7d7a31dffa60f7d647d66b95e6.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 65 +++++++++++++++++++++++++++--------------------
- 1 file changed, 38 insertions(+), 27 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index ce48ca6867..64788d60b3 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1148,6 +1148,42 @@ x86ModelCompare(virCPUx86ModelPtr model1,
- }
- 
- 
-+static int
-+x86ModelParseAncestor(virCPUx86ModelPtr model,
-+                      xmlXPathContextPtr ctxt,
-+                      virCPUx86MapPtr map)
-+{
-+    VIR_AUTOFREE(char *) name = NULL;
-+    virCPUx86ModelPtr ancestor;
-+    int rc;
-+
-+    if ((rc = virXPathBoolean("boolean(./model)", ctxt)) <= 0)
-+        return rc;
-+
-+    name = virXPathString("string(./model/@name)", ctxt);
-+    if (!name) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing ancestor's name in CPU model %s"),
-+                       model->name);
-+        return -1;
-+    }
-+
-+    if (!(ancestor = x86ModelFind(map, name))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Ancestor model %s not found for CPU model %s"),
-+                       name, model->name);
-+        return -1;
-+    }
-+
-+    model->vendor = ancestor->vendor;
-+    model->signature = ancestor->signature;
-+    if (x86DataCopy(&model->data, &ancestor->data) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- static int
- x86ModelParse(xmlXPathContextPtr ctxt,
-               const char *name,
-@@ -1167,33 +1203,8 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     if (VIR_STRDUP(model->name, name) < 0)
-         goto cleanup;
- 
--    if (virXPathNode("./model", ctxt)) {
--        virCPUx86ModelPtr ancestor;
--        char *anname;
--
--        anname = virXPathString("string(./model/@name)", ctxt);
--        if (!anname) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Missing ancestor's name in CPU model %s"),
--                           model->name);
--            goto cleanup;
--        }
--
--        if (!(ancestor = x86ModelFind(map, anname))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Ancestor model %s not found for CPU model %s"),
--                           anname, model->name);
--            VIR_FREE(anname);
--            goto cleanup;
--        }
--
--        VIR_FREE(anname);
--
--        model->vendor = ancestor->vendor;
--        model->signature = ancestor->signature;
--        if (x86DataCopy(&model->data, &ancestor->data) < 0)
--            goto cleanup;
--    }
-+    if (x86ModelParseAncestor(model, ctxt, map) < 0)
-+        goto cleanup;
- 
-     if (virXPathBoolean("boolean(./signature)", ctxt)) {
-         unsigned int sigFamily = 0;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Separate-feature-list-parsing-from-x86ModelParse.patch b/SOURCES/libvirt-cpu_x86-Separate-feature-list-parsing-from-x86ModelParse.patch
deleted file mode 100644
index 9c70ab3..0000000
--- a/SOURCES/libvirt-cpu_x86-Separate-feature-list-parsing-from-x86ModelParse.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 8d2f5155be8834db501930716e2cd2e1be14785c Mon Sep 17 00:00:00 2001
-Message-Id: <8d2f5155be8834db501930716e2cd2e1be14785c@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:57 +0200
-Subject: [PATCH] cpu_x86: Separate feature list parsing from x86ModelParse
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code is separated into a new x86ModelParseFeatures function.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8d249df9c917040d180202343e5cf7f70c3e4fe1)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5a741350b39394a93aee99a3b98142548936bc2d.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 68 +++++++++++++++++++++++++++--------------------
- 1 file changed, 39 insertions(+), 29 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 62894cae9b..91362198ab 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1247,16 +1247,51 @@ x86ModelParseVendor(virCPUx86ModelPtr model,
- }
- 
- 
-+static int
-+x86ModelParseFeatures(virCPUx86ModelPtr model,
-+                      xmlXPathContextPtr ctxt,
-+                      virCPUx86MapPtr map)
-+{
-+    VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
-+    size_t i;
-+    int n;
-+
-+    if ((n = virXPathNodeSet("./feature", ctxt, &nodes)) <= 0)
-+        return n;
-+
-+    for (i = 0; i < n; i++) {
-+        VIR_AUTOFREE(char *) ftname = NULL;
-+        virCPUx86FeaturePtr feature;
-+
-+        if (!(ftname = virXMLPropString(nodes[i], "name"))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Missing feature name for CPU model %s"),
-+                           model->name);
-+            return -1;
-+        }
-+
-+        if (!(feature = x86FeatureFind(map, ftname))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Feature %s required by CPU model %s not found"),
-+                           ftname, model->name);
-+            return -1;
-+        }
-+
-+        if (x86DataAdd(&model->data, &feature->data))
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- x86ModelParse(xmlXPathContextPtr ctxt,
-               const char *name,
-               void *data)
- {
-     virCPUx86MapPtr map = data;
--    xmlNodePtr *nodes = NULL;
-     virCPUx86ModelPtr model;
--    size_t i;
--    int n;
-     int ret = -1;
- 
-     if (!(model = x86ModelNew()))
-@@ -1274,33 +1309,9 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     if (x86ModelParseVendor(model, ctxt, map) < 0)
-         goto cleanup;
- 
--    n = virXPathNodeSet("./feature", ctxt, &nodes);
--    if (n < 0)
-+    if (x86ModelParseFeatures(model, ctxt, map) < 0)
-         goto cleanup;
- 
--    for (i = 0; i < n; i++) {
--        virCPUx86FeaturePtr feature;
--        char *ftname;
--
--        if (!(ftname = virXMLPropString(nodes[i], "name"))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Missing feature name for CPU model %s"), model->name);
--            goto cleanup;
--        }
--
--        if (!(feature = x86FeatureFind(map, ftname))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Feature %s required by CPU model %s not found"),
--                           ftname, model->name);
--            VIR_FREE(ftname);
--            goto cleanup;
--        }
--        VIR_FREE(ftname);
--
--        if (x86DataAdd(&model->data, &feature->data))
--            goto cleanup;
--    }
--
-     if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
-         goto cleanup;
- 
-@@ -1308,7 +1319,6 @@ x86ModelParse(xmlXPathContextPtr ctxt,
- 
-  cleanup:
-     x86ModelFree(model);
--    VIR_FREE(nodes);
-     return ret;
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Separate-signature-parsing-from-x86ModelParse.patch b/SOURCES/libvirt-cpu_x86-Separate-signature-parsing-from-x86ModelParse.patch
deleted file mode 100644
index e149723..0000000
--- a/SOURCES/libvirt-cpu_x86-Separate-signature-parsing-from-x86ModelParse.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From e7b8b38fe1fe7e7d8eb9fab6cb3ded16652f60f8 Mon Sep 17 00:00:00 2001
-Message-Id: <e7b8b38fe1fe7e7d8eb9fab6cb3ded16652f60f8@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:55 +0200
-Subject: [PATCH] cpu_x86: Separate signature parsing from x86ModelParse
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code is separated into a new x86ModelParseSignature function.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fe78d2fda9f2dd67eb9daa98e48fbffa468d271e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <616b60991bfdaa735804b839e258f6f1fa409a7b.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 58 ++++++++++++++++++++++++++++-------------------
- 1 file changed, 35 insertions(+), 23 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 64788d60b3..119ece4758 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1184,6 +1184,39 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
- }
- 
- 
-+static int
-+x86ModelParseSignature(virCPUx86ModelPtr model,
-+                       xmlXPathContextPtr ctxt)
-+{
-+
-+    if (virXPathBoolean("boolean(./signature)", ctxt)) {
-+        unsigned int sigFamily = 0;
-+        unsigned int sigModel = 0;
-+        int rc;
-+
-+        rc = virXPathUInt("string(./signature/@family)", ctxt, &sigFamily);
-+        if (rc < 0 || sigFamily == 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Invalid CPU signature family in model %s"),
-+                           model->name);
-+            return -1;
-+        }
-+
-+        rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
-+        if (rc < 0 || sigModel == 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Invalid CPU signature model in model %s"),
-+                           model->name);
-+            return -1;
-+        }
-+
-+        model->signature = x86MakeSignature(sigFamily, sigModel, 0);
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- x86ModelParse(xmlXPathContextPtr ctxt,
-               const char *name,
-@@ -1206,29 +1239,8 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     if (x86ModelParseAncestor(model, ctxt, map) < 0)
-         goto cleanup;
- 
--    if (virXPathBoolean("boolean(./signature)", ctxt)) {
--        unsigned int sigFamily = 0;
--        unsigned int sigModel = 0;
--        int rc;
--
--        rc = virXPathUInt("string(./signature/@family)", ctxt, &sigFamily);
--        if (rc < 0 || sigFamily == 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Invalid CPU signature family in model %s"),
--                           model->name);
--            goto cleanup;
--        }
--
--        rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
--        if (rc < 0 || sigModel == 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Invalid CPU signature model in model %s"),
--                           model->name);
--            goto cleanup;
--        }
--
--        model->signature = x86MakeSignature(sigFamily, sigModel, 0);
--    }
-+    if (x86ModelParseSignature(model, ctxt) < 0)
-+        goto cleanup;
- 
-     if (virXPathBoolean("boolean(./vendor)", ctxt)) {
-         vendor = virXPathString("string(./vendor/@name)", ctxt);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Separate-vendor-parsing-from-x86ModelParse.patch b/SOURCES/libvirt-cpu_x86-Separate-vendor-parsing-from-x86ModelParse.patch
deleted file mode 100644
index 5e06bc9..0000000
--- a/SOURCES/libvirt-cpu_x86-Separate-vendor-parsing-from-x86ModelParse.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From e1b42297bc41c8f356693f2756e806a8c7275f4f Mon Sep 17 00:00:00 2001
-Message-Id: <e1b42297bc41c8f356693f2756e806a8c7275f4f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:56 +0200
-Subject: [PATCH] cpu_x86: Separate vendor parsing from x86ModelParse
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code is separated into a new x86ModelParseVendor function.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 232266839c994dcf2958f1efdfe74cfb7973a749)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <aaa0e5fac04ccd7b267e6912ceb3308249d9217e.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 50 ++++++++++++++++++++++++++++++-----------------
- 1 file changed, 32 insertions(+), 18 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 119ece4758..62894cae9b 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -1217,6 +1217,36 @@ x86ModelParseSignature(virCPUx86ModelPtr model,
- }
- 
- 
-+static int
-+x86ModelParseVendor(virCPUx86ModelPtr model,
-+                    xmlXPathContextPtr ctxt,
-+                    virCPUx86MapPtr map)
-+{
-+    VIR_AUTOFREE(char *) vendor = NULL;
-+    int rc;
-+
-+    if ((rc = virXPathBoolean("boolean(./vendor)", ctxt)) <= 0)
-+        return rc;
-+
-+    vendor = virXPathString("string(./vendor/@name)", ctxt);
-+    if (!vendor) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Invalid vendor element in CPU model %s"),
-+                       model->name);
-+        return -1;
-+    }
-+
-+    if (!(model->vendor = x86VendorFind(map, vendor))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unknown vendor %s referenced by CPU model %s"),
-+                       vendor, model->name);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- x86ModelParse(xmlXPathContextPtr ctxt,
-               const char *name,
-@@ -1225,7 +1255,6 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     virCPUx86MapPtr map = data;
-     xmlNodePtr *nodes = NULL;
-     virCPUx86ModelPtr model;
--    char *vendor = NULL;
-     size_t i;
-     int n;
-     int ret = -1;
-@@ -1242,22 +1271,8 @@ x86ModelParse(xmlXPathContextPtr ctxt,
-     if (x86ModelParseSignature(model, ctxt) < 0)
-         goto cleanup;
- 
--    if (virXPathBoolean("boolean(./vendor)", ctxt)) {
--        vendor = virXPathString("string(./vendor/@name)", ctxt);
--        if (!vendor) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Invalid vendor element in CPU model %s"),
--                           model->name);
--            goto cleanup;
--        }
--
--        if (!(model->vendor = x86VendorFind(map, vendor))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Unknown vendor %s referenced by CPU model %s"),
--                           vendor, model->name);
--            goto cleanup;
--        }
--    }
-+    if (x86ModelParseVendor(model, ctxt, map) < 0)
-+        goto cleanup;
- 
-     n = virXPathNodeSet("./feature", ctxt, &nodes);
-     if (n < 0)
-@@ -1293,7 +1308,6 @@ x86ModelParse(xmlXPathContextPtr ctxt,
- 
-  cleanup:
-     x86ModelFree(model);
--    VIR_FREE(vendor);
-     VIR_FREE(nodes);
-     return ret;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Simplify-x86DataAdd.patch b/SOURCES/libvirt-cpu_x86-Simplify-x86DataAdd.patch
deleted file mode 100644
index dea6e6d..0000000
--- a/SOURCES/libvirt-cpu_x86-Simplify-x86DataAdd.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ed7c9cb6444ec9344ebb253eac417703c5371c2d Mon Sep 17 00:00:00 2001
-Message-Id: <ed7c9cb6444ec9344ebb253eac417703c5371c2d@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:31 +0200
-Subject: [PATCH] cpu_x86: Simplify x86DataAdd
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The while loop just copied half of virCPUx86DataAddItem.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0fdc0ad84c7ea27480f6f4edb82389d414584ada)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <8ffc18c0ee7c61e5e1ce1af023ee7e6c62726f5a.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 9c0f39e76d..0582be63e2 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -403,18 +403,11 @@ x86DataAdd(virCPUx86Data *data1,
-            const virCPUx86Data *data2)
- {
-     virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data2);
--    virCPUx86DataItemPtr item1;
--    virCPUx86DataItemPtr item2;
-+    virCPUx86DataItemPtr item;
- 
--    while ((item2 = virCPUx86DataNext(&iter))) {
--        item1 = virCPUx86DataGet(data1, item2);
--
--        if (item1) {
--            x86cpuidSetBits(&item1->cpuid, &item2->cpuid);
--        } else {
--            if (virCPUx86DataAddItem(data1, item2) < 0)
--                return -1;
--        }
-+    while ((item = virCPUx86DataNext(&iter))) {
-+        if (virCPUx86DataAddItem(data1, item) < 0)
-+            return -1;
-     }
- 
-     return 0;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Store-CPU-signature-in-an-array.patch b/SOURCES/libvirt-cpu_x86-Store-CPU-signature-in-an-array.patch
deleted file mode 100644
index 4b951ef..0000000
--- a/SOURCES/libvirt-cpu_x86-Store-CPU-signature-in-an-array.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From c7a8133cbe9d0612db2889038079d260c3a8334f Mon Sep 17 00:00:00 2001
-Message-Id: <c7a8133cbe9d0612db2889038079d260c3a8334f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:00 +0200
-Subject: [PATCH] cpu_x86: Store CPU signature in an array
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In preparation for storing several CPU signatures in a single CPU model,
-we need to turn virCPUx86Model's signature into an array of signatures.
-
-The parser still hardcodes the number of signatures to 1, but the
-following patch will drop this limit.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit b07b8b7750c6a505d4b00bd272e79ea0305cb610)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <1d24aad1c6b9aa8142a2e882511f52a41fbaff67.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 50 ++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 41 insertions(+), 9 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index e25bc691ae..f8b8d8a96b 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -145,7 +145,8 @@ typedef virCPUx86Model *virCPUx86ModelPtr;
- struct _virCPUx86Model {
-     char *name;
-     virCPUx86VendorPtr vendor;
--    uint32_t signature;
-+    size_t nsignatures;
-+    uint32_t *signatures;
-     virCPUx86Data data;
- };
- 
-@@ -972,6 +973,7 @@ x86ModelFree(virCPUx86ModelPtr model)
-         return;
- 
-     VIR_FREE(model->name);
-+    VIR_FREE(model->signatures);
-     virCPUx86DataClear(&model->data);
-     VIR_FREE(model);
- }
-@@ -981,7 +983,14 @@ static int
- x86ModelCopySignatures(virCPUx86ModelPtr dst,
-                        virCPUx86ModelPtr src)
- {
--    dst->signature = src->signature;
-+    size_t i;
-+
-+    if (VIR_ALLOC_N(dst->signatures, src->nsignatures) < 0)
-+        return -1;
-+
-+    dst->nsignatures = src->nsignatures;
-+    for (i = 0; i < src->nsignatures; i++)
-+        dst->signatures[i] = src->signatures[i];
- 
-     return 0;
- }
-@@ -1198,12 +1207,18 @@ static int
- x86ModelParseSignature(virCPUx86ModelPtr model,
-                        xmlXPathContextPtr ctxt)
- {
-+    /* Remove inherited signatures. */
-+    VIR_FREE(model->signatures);
- 
-     if (virXPathBoolean("boolean(./signature)", ctxt)) {
-         unsigned int sigFamily = 0;
-         unsigned int sigModel = 0;
-         int rc;
- 
-+        model->nsignatures = 1;
-+        if (VIR_ALLOC_N(model->signatures, 1) < 0)
-+            return -1;
-+
-         rc = virXPathUInt("string(./signature/@family)", ctxt, &sigFamily);
-         if (rc < 0 || sigFamily == 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -1220,7 +1235,7 @@ x86ModelParseSignature(virCPUx86ModelPtr model,
-             return -1;
-         }
- 
--        model->signature = x86MakeSignature(sigFamily, sigModel, 0);
-+        model->signatures[0] = x86MakeSignature(sigFamily, sigModel, 0);
-     }
- 
-     return 0;
-@@ -1621,7 +1636,8 @@ x86Compute(virCPUDefPtr host,
-                                      &host_model->vendor->cpuid) < 0)
-             goto error;
- 
--        if (x86DataAddSignature(&guest_model->data, host_model->signature) < 0)
-+        if (host_model->signatures &&
-+            x86DataAddSignature(&guest_model->data, *host_model->signatures) < 0)
-             goto error;
- 
-         if (cpu->type == VIR_CPU_TYPE_GUEST
-@@ -1727,6 +1743,21 @@ virCPUx86Compare(virCPUDefPtr host,
- }
- 
- 
-+static bool
-+x86ModelHasSignature(virCPUx86ModelPtr model,
-+                     uint32_t signature)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < model->nsignatures; i++) {
-+        if (model->signatures[i] == signature)
-+            return true;
-+    }
-+
-+    return false;
-+}
-+
-+
- /*
-  * Checks whether a candidate model is a better fit for the CPU data than the
-  * current model.
-@@ -1768,8 +1799,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
-      * consider candidates with matching family/model.
-      */
-     if (signature &&
--        current->signature == signature &&
--        candidate->signature != signature) {
-+        x86ModelHasSignature(current, signature) &&
-+        !x86ModelHasSignature(candidate, signature)) {
-         VIR_DEBUG("%s differs in signature from matching %s",
-                   cpuCandidate->model, cpuCurrent->model);
-         return 0;
-@@ -1785,8 +1816,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
-      * result in longer list of features.
-      */
-     if (signature &&
--        candidate->signature == signature &&
--        current->signature != signature) {
-+        x86ModelHasSignature(candidate, signature) &&
-+        !x86ModelHasSignature(current, signature)) {
-         VIR_DEBUG("%s provides matching signature", cpuCandidate->model);
-         return 1;
-     }
-@@ -2854,7 +2885,8 @@ virCPUx86Translate(virCPUDefPtr cpu,
-         virCPUx86DataAddCPUIDInt(&model->data, &model->vendor->cpuid) < 0)
-         goto cleanup;
- 
--    if (x86DataAddSignature(&model->data, model->signature) < 0)
-+    if (model->signatures &&
-+        x86DataAddSignature(&model->data, model->signatures[0]) < 0)
-         goto cleanup;
- 
-     if (!(translated = virCPUDefCopyWithoutModel(cpu)))
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Store-virCPUx86DataItem-content-in-union.patch b/SOURCES/libvirt-cpu_x86-Store-virCPUx86DataItem-content-in-union.patch
deleted file mode 100644
index e6a0f2f..0000000
--- a/SOURCES/libvirt-cpu_x86-Store-virCPUx86DataItem-content-in-union.patch
+++ /dev/null
@@ -1,487 +0,0 @@
-From c465e315637d0b2cf01d2957de3d816186e0fd0f Mon Sep 17 00:00:00 2001
-Message-Id: <c465e315637d0b2cf01d2957de3d816186e0fd0f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:38 +0200
-Subject: [PATCH] cpu_x86: Store virCPUx86DataItem content in union
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The structure can only be used for CPUID data now. Adding a type
-indicator and moving the data into a union will let us store alternative
-data types.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 370177e2f6784319b2fc86d8fe7a271248a5982e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <00cf7daca0cde66e9a90f64435182ef430983b2e.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c              | 202 ++++++++++++++++++++++++---------
- src/cpu/cpu_x86_data.h         |  10 +-
- src/libxl/libxl_capabilities.c |   3 +-
- src/qemu/qemu_monitor_json.c   |   3 +-
- 4 files changed, 160 insertions(+), 58 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 11c023ac31..e6da974b31 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -59,7 +59,9 @@ struct _virCPUx86Feature {
- };
- 
- 
--#define CPUID(...) { .cpuid = {__VA_ARGS__} }
-+#define CPUID(...) \
-+    { .type = VIR_CPU_X86_DATA_CPUID, \
-+      .data = { .cpuid = {__VA_ARGS__} } }
- 
- #define KVM_FEATURE_DEF(Name, Eax_in, Eax) \
-     static virCPUx86DataItem Name ## _data[] = { \
-@@ -193,10 +195,22 @@ static bool
- virCPUx86DataItemMatch(const virCPUx86DataItem *item1,
-                        const virCPUx86DataItem *item2)
- {
--    return (item1->cpuid.eax == item2->cpuid.eax &&
--            item1->cpuid.ebx == item2->cpuid.ebx &&
--            item1->cpuid.ecx == item2->cpuid.ecx &&
--            item1->cpuid.edx == item2->cpuid.edx);
-+    const virCPUx86CPUID *cpuid1;
-+    const virCPUx86CPUID *cpuid2;
-+
-+    switch (item1->type) {
-+    case VIR_CPU_X86_DATA_CPUID:
-+        cpuid1 = &item1->data.cpuid;
-+        cpuid2 = &item2->data.cpuid;
-+        return (cpuid1->eax == cpuid2->eax &&
-+                cpuid1->ebx == cpuid2->ebx &&
-+                cpuid1->ecx == cpuid2->ecx &&
-+                cpuid1->edx == cpuid2->edx);
-+
-+    case VIR_CPU_X86_DATA_NONE:
-+    default:
-+        return false;
-+    }
- }
- 
- 
-@@ -204,10 +218,22 @@ static bool
- virCPUx86DataItemMatchMasked(const virCPUx86DataItem *item,
-                              const virCPUx86DataItem *mask)
- {
--    return ((item->cpuid.eax & mask->cpuid.eax) == mask->cpuid.eax &&
--            (item->cpuid.ebx & mask->cpuid.ebx) == mask->cpuid.ebx &&
--            (item->cpuid.ecx & mask->cpuid.ecx) == mask->cpuid.ecx &&
--            (item->cpuid.edx & mask->cpuid.edx) == mask->cpuid.edx);
-+    const virCPUx86CPUID *cpuid;
-+    const virCPUx86CPUID *cpuidMask;
-+
-+    switch (item->type) {
-+    case VIR_CPU_X86_DATA_CPUID:
-+        cpuid = &item->data.cpuid;
-+        cpuidMask = &mask->data.cpuid;
-+        return ((cpuid->eax & cpuidMask->eax) == cpuidMask->eax &&
-+                (cpuid->ebx & cpuidMask->ebx) == cpuidMask->ebx &&
-+                (cpuid->ecx & cpuidMask->ecx) == cpuidMask->ecx &&
-+                (cpuid->edx & cpuidMask->edx) == cpuidMask->edx);
-+
-+    case VIR_CPU_X86_DATA_NONE:
-+    default:
-+        return false;
-+    }
- }
- 
- 
-@@ -215,13 +241,26 @@ static void
- virCPUx86DataItemSetBits(virCPUx86DataItemPtr item,
-                          const virCPUx86DataItem *mask)
- {
-+    virCPUx86CPUIDPtr cpuid;
-+    const virCPUx86CPUID *cpuidMask;
-+
-     if (!mask)
-         return;
- 
--    item->cpuid.eax |= mask->cpuid.eax;
--    item->cpuid.ebx |= mask->cpuid.ebx;
--    item->cpuid.ecx |= mask->cpuid.ecx;
--    item->cpuid.edx |= mask->cpuid.edx;
-+    switch (item->type) {
-+    case VIR_CPU_X86_DATA_CPUID:
-+        cpuid = &item->data.cpuid;
-+        cpuidMask = &mask->data.cpuid;
-+        cpuid->eax |= cpuidMask->eax;
-+        cpuid->ebx |= cpuidMask->ebx;
-+        cpuid->ecx |= cpuidMask->ecx;
-+        cpuid->edx |= cpuidMask->edx;
-+        break;
-+
-+    case VIR_CPU_X86_DATA_NONE:
-+    default:
-+        break;
-+    }
- }
- 
- 
-@@ -229,13 +268,26 @@ static void
- virCPUx86DataItemClearBits(virCPUx86DataItemPtr item,
-                            const virCPUx86DataItem *mask)
- {
-+    virCPUx86CPUIDPtr cpuid;
-+    const virCPUx86CPUID *cpuidMask;
-+
-     if (!mask)
-         return;
- 
--    item->cpuid.eax &= ~mask->cpuid.eax;
--    item->cpuid.ebx &= ~mask->cpuid.ebx;
--    item->cpuid.ecx &= ~mask->cpuid.ecx;
--    item->cpuid.edx &= ~mask->cpuid.edx;
-+    switch (item->type) {
-+    case VIR_CPU_X86_DATA_CPUID:
-+        cpuid = &item->data.cpuid;
-+        cpuidMask = &mask->data.cpuid;
-+        cpuid->eax &= ~cpuidMask->eax;
-+        cpuid->ebx &= ~cpuidMask->ebx;
-+        cpuid->ecx &= ~cpuidMask->ecx;
-+        cpuid->edx &= ~cpuidMask->edx;
-+        break;
-+
-+    case VIR_CPU_X86_DATA_NONE:
-+    default:
-+        break;
-+    }
- }
- 
- 
-@@ -243,13 +295,26 @@ static void
- virCPUx86DataItemAndBits(virCPUx86DataItemPtr item,
-                          const virCPUx86DataItem *mask)
- {
-+    virCPUx86CPUIDPtr cpuid;
-+    const virCPUx86CPUID *cpuidMask;
-+
-     if (!mask)
-         return;
- 
--    item->cpuid.eax &= mask->cpuid.eax;
--    item->cpuid.ebx &= mask->cpuid.ebx;
--    item->cpuid.ecx &= mask->cpuid.ecx;
--    item->cpuid.edx &= mask->cpuid.edx;
-+    switch (item->type) {
-+    case VIR_CPU_X86_DATA_CPUID:
-+        cpuid = &item->data.cpuid;
-+        cpuidMask = &mask->data.cpuid;
-+        cpuid->eax &= cpuidMask->eax;
-+        cpuid->ebx &= cpuidMask->ebx;
-+        cpuid->ecx &= cpuidMask->ecx;
-+        cpuid->edx &= cpuidMask->edx;
-+        break;
-+
-+    case VIR_CPU_X86_DATA_NONE:
-+    default:
-+        break;
-+    }
- }
- 
- 
-@@ -289,15 +354,29 @@ virCPUx86DataSorter(const void *a, const void *b)
-     virCPUx86DataItemPtr da = (virCPUx86DataItemPtr) a;
-     virCPUx86DataItemPtr db = (virCPUx86DataItemPtr) b;
- 
--    if (da->cpuid.eax_in > db->cpuid.eax_in)
-+    if (da->type > db->type)
-         return 1;
--    else if (da->cpuid.eax_in < db->cpuid.eax_in)
-+    else if (da->type < db->type)
-         return -1;
- 
--    if (da->cpuid.ecx_in > db->cpuid.ecx_in)
--        return 1;
--    else if (da->cpuid.ecx_in < db->cpuid.ecx_in)
--        return -1;
-+    switch (da->type) {
-+    case VIR_CPU_X86_DATA_CPUID:
-+        if (da->data.cpuid.eax_in > db->data.cpuid.eax_in)
-+            return 1;
-+        else if (da->data.cpuid.eax_in < db->data.cpuid.eax_in)
-+            return -1;
-+
-+        if (da->data.cpuid.ecx_in > db->data.cpuid.ecx_in)
-+            return 1;
-+        else if (da->data.cpuid.ecx_in < db->data.cpuid.ecx_in)
-+            return -1;
-+
-+        break;
-+
-+    case VIR_CPU_X86_DATA_NONE:
-+    default:
-+        break;
-+    }
- 
-     return 0;
- }
-@@ -526,9 +605,9 @@ x86DataToVendor(const virCPUx86Data *data,
- 
- static int
- virCPUx86VendorToData(const char *vendor,
--                      virCPUx86DataItemPtr data)
-+                      virCPUx86DataItemPtr item)
- {
--    virCPUx86CPUIDPtr cpuid = &data->cpuid;
-+    virCPUx86CPUIDPtr cpuid;
- 
-     if (strlen(vendor) != VENDOR_STRING_LENGTH) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -536,6 +615,8 @@ virCPUx86VendorToData(const char *vendor,
-         return -1;
-     }
- 
-+    item->type = VIR_CPU_X86_DATA_CPUID;
-+    cpuid = &item->data.cpuid;
-     cpuid->eax_in = 0;
-     cpuid->ecx_in = 0;
-     cpuid->ebx = virReadBufInt32LE(vendor);
-@@ -611,7 +692,7 @@ x86DataToSignatureFull(const virCPUx86Data *data,
-     if (!(item = virCPUx86DataGet(data, &leaf1)))
-         return;
- 
--    cpuid = &item->cpuid;
-+    cpuid = &item->data.cpuid;
-     *family = ((cpuid->eax >> 20) & 0xff) + ((cpuid->eax >> 8) & 0xf);
-     *model = ((cpuid->eax >> 12) & 0xf0) + ((cpuid->eax >> 4) & 0xf);
-     *stepping = cpuid->eax & 0xf;
-@@ -630,7 +711,7 @@ x86DataToSignature(const virCPUx86Data *data)
-     if (!(item = virCPUx86DataGet(data, &leaf1)))
-         return 0;
- 
--    return item->cpuid.eax & SIGNATURE_MASK;
-+    return item->data.cpuid.eax & SIGNATURE_MASK;
- }
- 
- 
-@@ -885,7 +966,8 @@ x86ParseCPUID(xmlXPathContextPtr ctxt,
-         ret_eax == -2 || ret_ebx == -2 || ret_ecx == -2 || ret_edx == -2)
-         return -1;
- 
--    cpuid = &item->cpuid;
-+    item->type = VIR_CPU_X86_DATA_CPUID;
-+    cpuid = &item->data.cpuid;
-     cpuid->eax_in = eax_in;
-     cpuid->ecx_in = ecx_in;
-     cpuid->eax = eax;
-@@ -1461,13 +1543,23 @@ virCPUx86DataFormat(const virCPUData *data)
- 
-     virBufferAddLit(&buf, "<cpudata arch='x86'>\n");
-     while ((item = virCPUx86DataNext(&iter))) {
--        virCPUx86CPUIDPtr cpuid = &item->cpuid;
--        virBufferAsprintf(&buf,
--                          "  <cpuid eax_in='0x%08x' ecx_in='0x%08x'"
--                          " eax='0x%08x' ebx='0x%08x'"
--                          " ecx='0x%08x' edx='0x%08x'/>\n",
--                          cpuid->eax_in, cpuid->ecx_in,
--                          cpuid->eax, cpuid->ebx, cpuid->ecx, cpuid->edx);
-+        virCPUx86CPUIDPtr cpuid;
-+
-+        switch (item->type) {
-+        case VIR_CPU_X86_DATA_CPUID:
-+            cpuid = &item->data.cpuid;
-+            virBufferAsprintf(&buf,
-+                              "  <cpuid eax_in='0x%08x' ecx_in='0x%08x'"
-+                              " eax='0x%08x' ebx='0x%08x'"
-+                              " ecx='0x%08x' edx='0x%08x'/>\n",
-+                              cpuid->eax_in, cpuid->ecx_in,
-+                              cpuid->eax, cpuid->ebx, cpuid->ecx, cpuid->edx);
-+            break;
-+
-+        case VIR_CPU_X86_DATA_NONE:
-+        default:
-+            break;
-+        }
-     }
-     virBufferAddLit(&buf, "</cpudata>\n");
- 
-@@ -2226,7 +2318,7 @@ cpuidSetLeaf4(virCPUDataPtr data,
-               virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = *subLeaf0;
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
- 
-     if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
-@@ -2250,13 +2342,13 @@ cpuidSetLeaf7(virCPUDataPtr data,
-               virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = CPUID(.eax_in = 0x7);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
-     uint32_t sub;
- 
-     if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
--    for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-+    for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) {
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
-         if (virCPUx86DataAdd(data, &item) < 0)
-@@ -2278,7 +2370,7 @@ cpuidSetLeafB(virCPUDataPtr data,
-               virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = *subLeaf0;
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
- 
-     while (cpuid->ecx & 0xff00) {
-         if (virCPUx86DataAdd(data, &item) < 0)
-@@ -2303,7 +2395,7 @@ cpuidSetLeafD(virCPUDataPtr data,
-               virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = CPUID(.eax_in = 0xd);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
-     virCPUx86CPUID sub0;
-     virCPUx86CPUID sub1;
-     uint32_t sub;
-@@ -2316,7 +2408,7 @@ cpuidSetLeafD(virCPUDataPtr data,
-     if (virCPUx86DataAdd(data, &item) < 0)
-         return -1;
- 
--    sub0 = subLeaf0->cpuid;
-+    sub0 = subLeaf0->data.cpuid;
-     sub1 = *cpuid;
-     for (sub = 2; sub < 64; sub++) {
-         if (sub < 32 &&
-@@ -2351,8 +2443,8 @@ cpuidSetLeafResID(virCPUDataPtr data,
-                   virCPUx86DataItemPtr subLeaf0,
-                   uint32_t res)
- {
--    virCPUx86DataItem item = CPUID(.eax_in = subLeaf0->cpuid.eax_in);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86DataItem item = CPUID(.eax_in = subLeaf0->data.cpuid.eax_in);
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
-     uint32_t sub;
- 
-     if (virCPUx86DataAdd(data, subLeaf0) < 0)
-@@ -2380,11 +2472,11 @@ cpuidSetLeaf12(virCPUDataPtr data,
-                virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = CPUID(.eax_in = 0x7);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
-     virCPUx86DataItemPtr leaf7;
- 
-     if (!(leaf7 = virCPUx86DataGet(&data->data.x86, &item)) ||
--        !(leaf7->cpuid.ebx & (1 << 2)))
-+        !(leaf7->data.cpuid.ebx & (1 << 2)))
-         return 0;
- 
-     if (virCPUx86DataAdd(data, subLeaf0) < 0)
-@@ -2417,13 +2509,13 @@ cpuidSetLeaf14(virCPUDataPtr data,
-                virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = CPUID(.eax_in = 0x14);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
-     uint32_t sub;
- 
-     if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
--    for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-+    for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) {
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
-         if (virCPUx86DataAdd(data, &item) < 0)
-@@ -2443,16 +2535,16 @@ cpuidSetLeaf17(virCPUDataPtr data,
-                virCPUx86DataItemPtr subLeaf0)
- {
-     virCPUx86DataItem item = CPUID(.eax_in = 0x17);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
-     uint32_t sub;
- 
--    if (subLeaf0->cpuid.eax < 3)
-+    if (subLeaf0->data.cpuid.eax < 3)
-         return 0;
- 
-     if (virCPUx86DataAdd(data, subLeaf0) < 0)
-         return -1;
- 
--    for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) {
-+    for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) {
-         cpuid->ecx_in = sub;
-         cpuidCall(cpuid);
-         if (virCPUx86DataAdd(data, &item) < 0)
-@@ -2469,7 +2561,7 @@ cpuidSet(uint32_t base, virCPUDataPtr data)
-     uint32_t max;
-     uint32_t leaf;
-     virCPUx86DataItem item = CPUID(.eax_in = base);
--    virCPUx86CPUIDPtr cpuid = &item.cpuid;
-+    virCPUx86CPUIDPtr cpuid = &item.data.cpuid;
- 
-     cpuidCall(cpuid);
-     max = cpuid->eax;
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index e93b355cf0..da8e91fe71 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -71,10 +71,18 @@ struct _virCPUx86CPUID {
- 
- # define VIR_CPU_X86_DATA_INIT { 0 }
- 
-+typedef enum {
-+    VIR_CPU_X86_DATA_NONE = 0,
-+    VIR_CPU_X86_DATA_CPUID,
-+} virCPUx86DataType;
-+
- typedef struct _virCPUx86DataItem virCPUx86DataItem;
- typedef virCPUx86DataItem *virCPUx86DataItemPtr;
- struct _virCPUx86DataItem {
--    virCPUx86CPUID cpuid;
-+    virCPUx86DataType type;
-+    union {
-+        virCPUx86CPUID cpuid;
-+    } data;
- };
- 
- typedef struct _virCPUx86Data virCPUx86Data;
-diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
-index 2b351fbdde..6630aa2c0b 100644
---- a/src/libxl/libxl_capabilities.c
-+++ b/src/libxl/libxl_capabilities.c
-@@ -70,8 +70,9 @@ libxlCapsAddCPUID(virCPUDataPtr data, virCPUx86CPUID *cpuid, ssize_t ncaps)
-     virCPUx86DataItem item = { 0 };
-     size_t i;
- 
-+    item.type = VIR_CPU_X86_DATA_CPUID;
-     for (i = 0; i < ncaps; i++) {
--        item.cpuid = cpuid[i];
-+        item.data.cpuid = cpuid[i];
- 
-         if (virCPUx86DataAdd(data, &item) < 0) {
-             VIR_DEBUG("Failed to add CPUID(%x,%x)",
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index abfaa6e68a..e6ac82e96b 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -7049,9 +7049,10 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data)
-     if (!(cpudata = virCPUDataNew(VIR_ARCH_X86_64)))
-         goto error;
- 
-+    item.type = VIR_CPU_X86_DATA_CPUID;
-     for (i = 0; i < virJSONValueArraySize(data); i++) {
-         if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(data, i),
--                                                  &item.cpuid) < 0 ||
-+                                                  &item.data.cpuid) < 0 ||
-             virCPUx86DataAdd(cpudata, &item) < 0)
-             goto error;
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Turn-virCPUx86DataIteratorInit-into-a-function.patch b/SOURCES/libvirt-cpu_x86-Turn-virCPUx86DataIteratorInit-into-a-function.patch
deleted file mode 100644
index 95ba70d..0000000
--- a/SOURCES/libvirt-cpu_x86-Turn-virCPUx86DataIteratorInit-into-a-function.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 14c5258d4227930fdadcd0bc9de3cae547b56b70 Mon Sep 17 00:00:00 2001
-Message-Id: <14c5258d4227930fdadcd0bc9de3cae547b56b70@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:07 +0200
-Subject: [PATCH] cpu_x86: Turn virCPUx86DataIteratorInit into a function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Until now, this was a macro usable for direct initialization when a
-variable is defined. Turning the macro into a function makes it more
-general.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit b8e086a570b14b1f83fc07e25df6da758abe7706)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/cpu/cpu_x86.c
-            - commit c9ed87a6103fd4f09e0714f3a2b94c4c975477cd was not
-              backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <eb52120d5047b6581f645dc334a327530261f5ed.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86.c | 35 ++++++++++++++++++++++++-----------
- 1 file changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index ead962ae06..75527fd28f 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -187,8 +187,13 @@ struct _virCPUx86DataIterator {
- };
- 
- 
--#define virCPUx86DataIteratorInit(data) \
--    { data, -1 }
-+static void
-+virCPUx86DataIteratorInit(virCPUx86DataIteratorPtr iterator,
-+                          const virCPUx86Data *data)
-+{
-+    virCPUx86DataIterator iter = { data, -1 };
-+    *iterator = iter;
-+}
- 
- 
- static bool
-@@ -538,9 +543,10 @@ static int
- x86DataAdd(virCPUx86Data *data1,
-            const virCPUx86Data *data2)
- {
--    virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data2);
-+    virCPUx86DataIterator iter;
-     virCPUx86DataItemPtr item;
- 
-+    virCPUx86DataIteratorInit(&iter, data2);
-     while ((item = virCPUx86DataNext(&iter))) {
-         if (virCPUx86DataAddItem(data1, item) < 0)
-             return -1;
-@@ -554,10 +560,11 @@ static void
- x86DataSubtract(virCPUx86Data *data1,
-                 const virCPUx86Data *data2)
- {
--    virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data1);
-+    virCPUx86DataIterator iter;
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
-+    virCPUx86DataIteratorInit(&iter, data1);
-     while ((item1 = virCPUx86DataNext(&iter))) {
-         item2 = virCPUx86DataGet(data2, item1);
-         virCPUx86DataItemClearBits(item1, item2);
-@@ -569,10 +576,11 @@ static void
- x86DataIntersect(virCPUx86Data *data1,
-                  const virCPUx86Data *data2)
- {
--    virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data1);
-+    virCPUx86DataIterator iter;
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
-+    virCPUx86DataIteratorInit(&iter, data1);
-     while ((item1 = virCPUx86DataNext(&iter))) {
-         item2 = virCPUx86DataGet(data2, item1);
-         if (item2)
-@@ -586,8 +594,9 @@ x86DataIntersect(virCPUx86Data *data1,
- static bool
- x86DataIsEmpty(virCPUx86Data *data)
- {
--    virCPUx86DataIterator iter = virCPUx86DataIteratorInit(data);
-+    virCPUx86DataIterator iter;
- 
-+    virCPUx86DataIteratorInit(&iter, data);
-     return !virCPUx86DataNext(&iter);
- }
- 
-@@ -596,11 +605,11 @@ static bool
- x86DataIsSubset(const virCPUx86Data *data,
-                 const virCPUx86Data *subset)
- {
--
--    virCPUx86DataIterator iter = virCPUx86DataIteratorInit((virCPUx86Data *)subset);
-+    virCPUx86DataIterator iter;
-     const virCPUx86DataItem *item;
-     const virCPUx86DataItem *itemSubset;
- 
-+    virCPUx86DataIteratorInit(&iter, subset);
-     while ((itemSubset = virCPUx86DataNext(&iter))) {
-         if (!(item = virCPUx86DataGet(data, itemSubset)) ||
-             !virCPUx86DataItemMatchMasked(item, itemSubset))
-@@ -1313,11 +1322,13 @@ x86ModelCompare(virCPUx86ModelPtr model1,
-                 virCPUx86ModelPtr model2)
- {
-     virCPUx86CompareResult result = EQUAL;
--    virCPUx86DataIterator iter1 = virCPUx86DataIteratorInit(&model1->data);
--    virCPUx86DataIterator iter2 = virCPUx86DataIteratorInit(&model2->data);
-+    virCPUx86DataIterator iter1;
-+    virCPUx86DataIterator iter2;
-     virCPUx86DataItemPtr item1;
-     virCPUx86DataItemPtr item2;
- 
-+    virCPUx86DataIteratorInit(&iter1, &model1->data);
-+    virCPUx86DataIteratorInit(&iter2, &model2->data);
-     while ((item1 = virCPUx86DataNext(&iter1))) {
-         virCPUx86CompareResult match = SUPERSET;
- 
-@@ -1623,10 +1634,12 @@ virCPUx86GetMap(void)
- static char *
- virCPUx86DataFormat(const virCPUData *data)
- {
--    virCPUx86DataIterator iter = virCPUx86DataIteratorInit(&data->data.x86);
-+    virCPUx86DataIterator iter;
-     virCPUx86DataItemPtr item;
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
- 
-+    virCPUx86DataIteratorInit(&iter, &data->data.x86);
-+
-     virBufferAddLit(&buf, "<cpudata arch='x86'>\n");
-     while ((item = virCPUx86DataNext(&iter))) {
-         virCPUx86CPUIDPtr cpuid;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
new file mode 100644
index 0000000..7eed7c0
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
@@ -0,0 +1,160 @@
+From da1511d57b10d2cc1cb14d78c6911815ec7d9f64 Mon Sep 17 00:00:00 2001
+Message-Id: <da1511d57b10d2cc1cb14d78c6911815ec7d9f64@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:20 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Baseline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5efefe7d7eb129b72bcbbebfbba2d5750ffeeeff)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <d93fb6757fd9ecd9ffe8634c422cc613c8d03e84.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 46 +++++++++++++++++-----------------------------
+ 1 file changed, 17 insertions(+), 29 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 1ade53a4a8..6e7311694d 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2697,21 +2697,20 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+                   bool migratable)
+ {
+     virCPUx86MapPtr map = NULL;
+-    virCPUx86ModelPtr base_model = NULL;
+-    virCPUDefPtr cpu = NULL;
++    g_autoptr(virCPUx86Model) base_model = NULL;
++    g_autoptr(virCPUDef) cpu = NULL;
+     size_t i;
+     virCPUx86VendorPtr vendor = NULL;
+-    virCPUx86ModelPtr model = NULL;
+     bool outputVendor = true;
+     const char *modelName;
+     bool matchingNames = true;
+-    virCPUDataPtr featData = NULL;
++    g_autoptr(virCPUData) featData = NULL;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto error;
++        return NULL;
+ 
+     if (!(base_model = x86ModelFromCPU(cpus[0], map, -1)))
+-        goto error;
++        return NULL;
+ 
+     cpu = virCPUDefNew();
+ 
+@@ -2723,11 +2722,12 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+     } else if (!(vendor = x86VendorFind(map, cpus[0]->vendor))) {
+         virReportError(VIR_ERR_OPERATION_FAILED,
+                        _("Unknown CPU vendor %s"), cpus[0]->vendor);
+-        goto error;
++        return NULL;
+     }
+ 
+     modelName = cpus[0]->model;
+     for (i = 1; i < ncpus; i++) {
++        g_autoptr(virCPUx86Model) model = NULL;
+         const char *vn = NULL;
+ 
+         if (matchingNames && cpus[i]->model) {
+@@ -2740,14 +2740,14 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+         }
+ 
+         if (!(model = x86ModelFromCPU(cpus[i], map, -1)))
+-            goto error;
++            return NULL;
+ 
+         if (cpus[i]->vendor && model->vendor &&
+             STRNEQ(cpus[i]->vendor, model->vendor->name)) {
+             virReportError(VIR_ERR_OPERATION_FAILED,
+                            _("CPU vendor %s of model %s differs from vendor %s"),
+                            model->vendor->name, model->name, cpus[i]->vendor);
+-            goto error;
++            return NULL;
+         }
+ 
+         if (cpus[i]->vendor) {
+@@ -2763,30 +2763,28 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+                 if (!(vendor = x86VendorFind(map, vn))) {
+                     virReportError(VIR_ERR_OPERATION_FAILED,
+                                    _("Unknown CPU vendor %s"), vn);
+-                    goto error;
++                    return NULL;
+                 }
+             } else if (STRNEQ(vendor->name, vn)) {
+                 virReportError(VIR_ERR_OPERATION_FAILED,
+                                "%s", _("CPU vendors do not match"));
+-                goto error;
++                return NULL;
+             }
+         }
+ 
+         x86DataIntersect(&base_model->data, &model->data);
+-        x86ModelFree(model);
+-        model = NULL;
+     }
+ 
+     if (features) {
+         virCPUx86FeaturePtr feat;
+ 
+         if (!(featData = virCPUDataNew(archs[0])))
+-            goto cleanup;
++            return NULL;
+ 
+         for (i = 0; features[i]; i++) {
+             if ((feat = x86FeatureFind(map, features[i])) &&
+                 x86DataAdd(&featData->data.x86, &feat->data) < 0)
+-                goto cleanup;
++                return NULL;
+         }
+ 
+         x86DataIntersect(&base_model->data, &featData->data.x86);
+@@ -2795,15 +2793,15 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+     if (x86DataIsEmpty(&base_model->data)) {
+         virReportError(VIR_ERR_OPERATION_FAILED,
+                        "%s", _("CPUs are incompatible"));
+-        goto error;
++        return NULL;
+     }
+ 
+     if (vendor &&
+         virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0)
+-        goto error;
++        return NULL;
+ 
+     if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0)
+-        goto error;
++        return NULL;
+ 
+     if (STREQ_NULLABLE(cpu->model, modelName))
+         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
+@@ -2811,17 +2809,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+     if (!outputVendor)
+         VIR_FREE(cpu->vendor);
+ 
+- cleanup:
+-    x86ModelFree(base_model);
+-    virCPUx86DataFree(featData);
+-
+-    return cpu;
+-
+- error:
+-    x86ModelFree(model);
+-    virCPUDefFree(cpu);
+-    cpu = NULL;
+-    goto cleanup;
++    return g_steal_pointer(&cpu);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
new file mode 100644
index 0000000..e10e3a4
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
@@ -0,0 +1,54 @@
+From 22d4493fd34661f4b93c8d4c885e627d561f2e70 Mon Sep 17 00:00:00 2001
+Message-Id: <22d4493fd34661f4b93c8d4c885e627d561f2e70@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:18 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86CheckFeature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3b5f1ca58e8f12bc7b768206cb9c7c2ef237e3ff)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <0834c0debe689b9b8a5f694738edc149856a08fa.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 56081145c0..0aebe534e6 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2278,21 +2278,16 @@ static int
+ virCPUx86CheckFeature(const virCPUDef *cpu,
+                       const char *name)
+ {
+-    int ret = -1;
+     virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+ 
+     if (!(map = virCPUx86GetMap()))
+         return -1;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-        goto cleanup;
+-
+-    ret = x86FeatureInData(name, &model->data, map);
++        return -1;
+ 
+- cleanup:
+-    x86ModelFree(model);
+-    return ret;
++    return x86FeatureInData(name, &model->data, map);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
new file mode 100644
index 0000000..1d15db0
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
@@ -0,0 +1,69 @@
+From 2abd91246d3967f62473a9034f5d11f8e8ea8980 Mon Sep 17 00:00:00 2001
+Message-Id: <2abd91246d3967f62473a9034f5d11f8e8ea8980@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:14 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Compare
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bc62d7a49141d745b19d066c07599f228020a0b3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <548eeddbf9eabf5e4a872390189bb0adf746c75f.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 1a1c846383..c111ff45d4 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1847,32 +1847,30 @@ virCPUx86Compare(virCPUDefPtr host,
+                  virCPUDefPtr cpu,
+                  bool failIncompatible)
+ {
+-    virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
+-    char *message = NULL;
++    virCPUCompareResult ret;
++    g_autofree char *message = NULL;
+ 
+     if (!host || !host->model) {
+         if (failIncompatible) {
+             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
+                            _("unknown host CPU"));
+-        } else {
+-            VIR_WARN("unknown host CPU");
+-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
++            return VIR_CPU_COMPARE_ERROR;
+         }
+-        goto cleanup;
++
++        VIR_WARN("unknown host CPU");
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+     ret = x86Compute(host, cpu, NULL, &message);
+ 
+     if (ret == VIR_CPU_COMPARE_INCOMPATIBLE && failIncompatible) {
+-        ret = VIR_CPU_COMPARE_ERROR;
+         if (message)
+             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
+         else
+             virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
++        return VIR_CPU_COMPARE_ERROR;
+     }
+ 
+- cleanup:
+-    VIR_FREE(message);
+     return ret;
+ }
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
new file mode 100644
index 0000000..cd2562e
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
@@ -0,0 +1,54 @@
+From a96d5bdc7d2d2de7b35820530f0665dda3c66c68 Mon Sep 17 00:00:00 2001
+Message-Id: <a96d5bdc7d2d2de7b35820530f0665dda3c66c68@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:26 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86CopyMigratable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit a32a3e934f5e7769dc9d12a221f344319200b435)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <240a340d63d1c8612e58c2d5c52970291f3e7b6d.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 917cf857a6..b4b1b475d6 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3109,7 +3109,7 @@ x86FeatureFilterMigratable(const char *name,
+ static virCPUDefPtr
+ virCPUx86CopyMigratable(virCPUDefPtr cpu)
+ {
+-    virCPUDefPtr copy;
++    g_autoptr(virCPUDef) copy = NULL;
+     virCPUx86MapPtr map;
+ 
+     if (!(map = virCPUx86GetMap()))
+@@ -3120,13 +3120,9 @@ virCPUx86CopyMigratable(virCPUDefPtr cpu)
+ 
+     if (virCPUDefCopyModelFilter(copy, cpu, false,
+                                  x86FeatureFilterMigratable, map) < 0)
+-        goto error;
+-
+-    return copy;
++        return NULL;
+ 
+- error:
+-    virCPUDefFree(copy);
+-    return NULL;
++    return g_steal_pointer(&copy);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
new file mode 100644
index 0000000..f9b1904
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
@@ -0,0 +1,87 @@
+From 45226d208c57719b50152dbec99a75969989208b Mon Sep 17 00:00:00 2001
+Message-Id: <45226d208c57719b50152dbec99a75969989208b@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:12 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86DataParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c1532711dda6db27c7f6fa7d86ab5ec5d2ab2224)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <e98c6869043aa0b7d0cc3adffe879f5d7d3c39f2.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index cb5a2f941e..107fd9227d 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1636,8 +1636,8 @@ virCPUx86DataFormat(const virCPUData *data)
+ static virCPUDataPtr
+ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+ {
+-    xmlNodePtr *nodes = NULL;
+-    virCPUDataPtr cpuData = NULL;
++    g_autofree xmlNodePtr *nodes = NULL;
++    g_autoptr(virCPUData) cpuData = NULL;
+     virCPUx86DataItem item;
+     size_t i;
+     int n;
+@@ -1646,11 +1646,11 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+     if (n <= 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("no x86 CPU data found"));
+-        goto error;
++        return NULL;
+     }
+ 
+     if (!(cpuData = virCPUDataNew(VIR_ARCH_X86_64)))
+-        goto error;
++        return NULL;
+ 
+     for (i = 0; i < n; i++) {
+         ctxt->node = nodes[i];
+@@ -1658,28 +1658,21 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+             if (x86ParseCPUID(ctxt, &item) < 0) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("failed to parse cpuid[%zu]"), i);
+-                goto error;
++                return NULL;
+             }
+         } else {
+             if (x86ParseMSR(ctxt, &item) < 0) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("failed to parse msr[%zu]"), i);
+-                goto error;
++                return NULL;
+             }
+         }
+ 
+         if (virCPUx86DataAdd(cpuData, &item) < 0)
+-            goto error;
++            return NULL;
+     }
+ 
+- cleanup:
+-    VIR_FREE(nodes);
+-    return cpuData;
+-
+- error:
+-    virCPUx86DataFree(cpuData);
+-    cpuData = NULL;
+-    goto cleanup;
++    return g_steal_pointer(&cpuData);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
new file mode 100644
index 0000000..21fe489
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
@@ -0,0 +1,86 @@
+From 5f9b035adcf2813beb6cc82200b745f5e34acd8d Mon Sep 17 00:00:00 2001
+Message-Id: <5f9b035adcf2813beb6cc82200b745f5e34acd8d@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:25 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86ExpandFeatures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit ff6897c84504a3e663759d710968ad1f72bc9208)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <d82daa166403fda2bcd89c68478162b45d8b9711.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index c4654c8d4c..917cf857a6 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3055,30 +3055,29 @@ static int
+ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+ {
+     virCPUx86MapPtr map;
+-    virCPUDefPtr expanded = NULL;
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUDef) expanded = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     bool host = cpu->type == VIR_CPU_TYPE_HOST;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto cleanup;
++        return -1;
+ 
+     if (!(expanded = virCPUDefCopy(cpu)))
+-        goto cleanup;
++        return -1;
+ 
+     virCPUDefFreeFeatures(expanded);
+ 
+     if (!(model = x86ModelFind(map, cpu->model))) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("unknown CPU model %s"), cpu->model);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (!(model = x86ModelCopy(model)) ||
+         x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
+                              &model->data, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < cpu->nfeatures; i++) {
+         virCPUFeatureDefPtr f = cpu->features + i;
+@@ -3089,17 +3088,12 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+             continue;
+ 
+         if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     virCPUDefFreeModel(cpu);
+ 
+-    ret = virCPUDefCopyModel(cpu, expanded, false);
+-
+- cleanup:
+-    virCPUDefFree(expanded);
+-    x86ModelFree(model);
+-    return ret;
++    return virCPUDefCopyModel(cpu, expanded, false);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
new file mode 100644
index 0000000..41ebaa9
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
@@ -0,0 +1,71 @@
+From 0b64dac1a3a9ef9cdfe3446ebbe114da1ae86e97 Mon Sep 17 00:00:00 2001
+Message-Id: <0b64dac1a3a9ef9cdfe3446ebbe114da1ae86e97@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:19 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86GetHost
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4a7f6f43a2a6144780d7ab74b8a6f6b008a7aa9d)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <94056710375d491c42d12a46b20f670453c2a1c8.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 0aebe534e6..1ade53a4a8 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2637,18 +2637,18 @@ static int
+ virCPUx86GetHost(virCPUDefPtr cpu,
+                  virDomainCapsCPUModelsPtr models)
+ {
+-    virCPUDataPtr cpuData = NULL;
+-    int ret = -1;
++    g_autoptr(virCPUData) cpuData = NULL;
++    int ret;
+ 
+     if (virCPUx86DriverInitialize() < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (!(cpuData = virCPUDataNew(archs[0])))
+-        goto cleanup;
++        return -1;
+ 
+     if (cpuidSet(CPUX86_BASIC, cpuData) < 0 ||
+         cpuidSet(CPUX86_EXTENDED, cpuData) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     /* Read the IA32_ARCH_CAPABILITIES MSR (0x10a) if supported.
+      * This is best effort since there might be no way to read the MSR
+@@ -2668,7 +2668,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
+             };
+ 
+             if (virCPUx86DataAdd(cpuData, &item) < 0)
+-                goto cleanup;
++                return -1;
+         }
+     }
+ 
+@@ -2684,8 +2684,6 @@ virCPUx86GetHost(virCPUDefPtr cpu,
+         VIR_DEBUG("Host CPU does not support invariant TSC");
+     }
+ 
+- cleanup:
+-    virCPUx86DataFree(cpuData);
+     return ret;
+ }
+ #endif
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
new file mode 100644
index 0000000..d07a62e
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
@@ -0,0 +1,51 @@
+From 91a87dbe3a25e405ea5fbd87e4444ca77d04a34c Mon Sep 17 00:00:00 2001
+Message-Id: <91a87dbe3a25e405ea5fbd87e4444ca77d04a34c@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:11 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86LoadMap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3c650a8f7a89046b925fb5ddc78c4b6669ed76ef)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <63da1b86ef1c4f174234ff34e43d502afe326a2b.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 20cdd24390..cb5a2f941e 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1559,18 +1559,14 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree);
+ static virCPUx86MapPtr
+ virCPUx86LoadMap(void)
+ {
+-    virCPUx86MapPtr map;
++    g_autoptr(virCPUx86Map) map = NULL;
+ 
+     map = g_new0(virCPUx86Map, 1);
+ 
+     if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0)
+-        goto error;
+-
+-    return map;
++        return NULL;
+ 
+- error:
+-    x86MapFree(map);
+-    return NULL;
++    return g_steal_pointer(&map);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
new file mode 100644
index 0000000..e174de7
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
@@ -0,0 +1,85 @@
+From 13d45a3f07d1639250101b037bb65c20aed60763 Mon Sep 17 00:00:00 2001
+Message-Id: <13d45a3f07d1639250101b037bb65c20aed60763@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:24 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Translate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit dff59020187c34e3f814c2aa24f3832d1d5b34f9)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <574920457f9fec4bc1938615016278eddd46ba90.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index e3a83061d0..c4654c8d4c 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3015,45 +3015,39 @@ static int
+ virCPUx86Translate(virCPUDefPtr cpu,
+                    virDomainCapsCPUModelsPtr models)
+ {
+-    virCPUDefPtr translated = NULL;
++    g_autoptr(virCPUDef) translated = NULL;
+     virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto cleanup;
++        return -1;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-        goto cleanup;
++        return -1;
+ 
+     if (model->vendor &&
+         virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (model->signatures &&
+         x86DataAddSignature(&model->data, model->signatures[0]) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (!(translated = virCPUDefCopyWithoutModel(cpu)))
+-        goto cleanup;
++        return -1;
+ 
+     if (x86Decode(translated, &model->data, models, NULL, false) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < cpu->nfeatures; i++) {
+         virCPUFeatureDefPtr f = cpu->features + i;
+         if (virCPUDefUpdateFeature(translated, f->name, f->policy) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     virCPUDefStealModel(cpu, translated, true);
+-    ret = 0;
+-
+- cleanup:
+-    virCPUDefFree(translated);
+-    x86ModelFree(model);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Update.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
new file mode 100644
index 0000000..be42132
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
@@ -0,0 +1,73 @@
+From 2631931d1dc94aeab384d92bd00866de912c9b7d Mon Sep 17 00:00:00 2001
+Message-Id: <2631931d1dc94aeab384d92bd00866de912c9b7d@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:22 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Update
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit e0244a786db265647ab6c1c37ca3852876e4b0a3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1d8ad3e099081c35a41e1013458fa52d8fb4fae0.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 98f7863b6f..1f7a8802f6 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2853,9 +2853,8 @@ static int
+ virCPUx86Update(virCPUDefPtr guest,
+                 const virCPUDef *host)
+ {
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     virCPUx86MapPtr map;
+-    int ret = -1;
+     size_t i;
+ 
+     if (!host) {
+@@ -2868,14 +2867,14 @@ virCPUx86Update(virCPUDefPtr guest,
+         return -1;
+ 
+     if (!(model = x86ModelFromCPU(host, map, -1)))
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < guest->nfeatures; i++) {
+         if (guest->features[i].policy == VIR_CPU_FEATURE_OPTIONAL) {
+             int supported = x86FeatureInData(guest->features[i].name,
+                                              &model->data, map);
+             if (supported < 0)
+-                goto cleanup;
++                return -1;
+             else if (supported)
+                 guest->features[i].policy = VIR_CPU_FEATURE_REQUIRE;
+             else
+@@ -2885,13 +2884,9 @@ virCPUx86Update(virCPUDefPtr guest,
+ 
+     if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
+         guest->match == VIR_CPU_MATCH_MINIMUM)
+-        ret = x86UpdateHostModel(guest, host);
+-    else
+-        ret = 0;
++        return x86UpdateHostModel(guest, host);
+ 
+- cleanup:
+-    x86ModelFree(model);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
new file mode 100644
index 0000000..33aba20
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
@@ -0,0 +1,116 @@
+From 7a293db132130fdda7b550d701fdb426de5257e3 Mon Sep 17 00:00:00 2001
+Message-Id: <7a293db132130fdda7b550d701fdb426de5257e3@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:23 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86UpdateLive
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2748e91c548cbc48a5ea499e06e62de528c10d20)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <5c29b10ead2332033087fc6ed487c9ca53b7e3a4.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 42 +++++++++++++++---------------------------
+ 1 file changed, 15 insertions(+), 27 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 1f7a8802f6..e3a83061d0 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2897,26 +2897,25 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+ {
+     bool hostPassthrough = cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH;
+     virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
+-    virCPUx86ModelPtr modelDisabled = NULL;
+-    virCPUx86Data enabled = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data disabled = VIR_CPU_X86_DATA_INIT;
+-    virBuffer bufAdded = VIR_BUFFER_INITIALIZER;
+-    virBuffer bufRemoved = VIR_BUFFER_INITIALIZER;
+-    char *added = NULL;
+-    char *removed = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
++    g_autoptr(virCPUx86Model) modelDisabled = NULL;
++    g_auto(virCPUx86Data) enabled = VIR_CPU_X86_DATA_INIT;
++    g_auto(virCPUx86Data) disabled = VIR_CPU_X86_DATA_INIT;
++    g_auto(virBuffer) bufAdded = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) bufRemoved = VIR_BUFFER_INITIALIZER;
++    g_autofree char *added = NULL;
++    g_autofree char *removed = NULL;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(map = virCPUx86GetMap()))
+         return -1;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-        goto cleanup;
++        return -1;
+ 
+     if (hostPassthrough &&
+         !(modelDisabled = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)))
+-        goto cleanup;
++        return -1;
+ 
+     if (dataEnabled)
+         x86DataCopy(&enabled, &dataEnabled->data.x86);
+@@ -2941,7 +2940,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                 virBufferAsprintf(&bufAdded, "%s,", feature->name);
+             else if (virCPUDefUpdateFeature(cpu, feature->name,
+                                             VIR_CPU_FEATURE_REQUIRE) < 0)
+-                goto cleanup;
++                return -1;
+         }
+ 
+         if (x86DataIsSubset(&disabled, &feature->data) ||
+@@ -2952,7 +2951,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                 virBufferAsprintf(&bufRemoved, "%s,", feature->name);
+             else if (virCPUDefUpdateFeature(cpu, feature->name,
+                                             VIR_CPU_FEATURE_DISABLE) < 0)
+-                goto cleanup;
++                return -1;
+         }
+     }
+ 
+@@ -2978,28 +2977,17 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                            _("guest CPU doesn't match specification: "
+                              "missing features: %s"),
+                            removed);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (cpu->check == VIR_CPU_CHECK_FULL &&
+         !x86DataIsEmpty(&disabled)) {
+         virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                        _("guest CPU doesn't match specification"));
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    x86ModelFree(model);
+-    x86ModelFree(modelDisabled);
+-    virCPUx86DataClear(&enabled);
+-    virCPUx86DataClear(&disabled);
+-    VIR_FREE(added);
+-    VIR_FREE(removed);
+-    virBufferFreeAndReset(&bufAdded);
+-    virBufferFreeAndReset(&bufRemoved);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Compute.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Compute.patch
new file mode 100644
index 0000000..ed0548d
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Compute.patch
@@ -0,0 +1,181 @@
+From b8162d4174443babbd260b36ea4645469eca7d67 Mon Sep 17 00:00:00 2001
+Message-Id: <b8162d4174443babbd260b36ea4645469eca7d67@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:13 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86Compute
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit edf3c9045f1742d6c132066e4ba2da25c9ad7b26)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <6022f3717ce7ab0df25d31f2aaa08cac1c5f82de.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 65 +++++++++++++++++------------------------------
+ 1 file changed, 24 insertions(+), 41 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 107fd9227d..1a1c846383 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1680,7 +1680,6 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+  * redundant code:
+  * MSG: error message
+  * CPU_DEF: a virCPUx86Data pointer with flags that are conflicting
+- * RET: return code to set
+  *
+  * This macro generates the error string outputs it into logs.
+  */
+@@ -1689,13 +1688,12 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+             char *flagsStr = NULL; \
+             if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) { \
+                 virReportOOMError(); \
+-                goto error; \
++                return VIR_CPU_COMPARE_ERROR; \
+             } \
+             if (message) \
+                 *message = g_strdup_printf("%s: %s", _(MSG), flagsStr); \
+             VIR_DEBUG("%s: %s", MSG, flagsStr); \
+             VIR_FREE(flagsStr); \
+-            ret = VIR_CPU_COMPARE_INCOMPATIBLE; \
+         } while (0)
+ 
+ 
+@@ -1706,15 +1704,15 @@ x86Compute(virCPUDefPtr host,
+            char **message)
+ {
+     virCPUx86MapPtr map = NULL;
+-    virCPUx86ModelPtr host_model = NULL;
+-    virCPUx86ModelPtr cpu_force = NULL;
+-    virCPUx86ModelPtr cpu_require = NULL;
+-    virCPUx86ModelPtr cpu_optional = NULL;
+-    virCPUx86ModelPtr cpu_disable = NULL;
+-    virCPUx86ModelPtr cpu_forbid = NULL;
+-    virCPUx86ModelPtr diff = NULL;
+-    virCPUx86ModelPtr guest_model = NULL;
+-    virCPUDataPtr guestData = NULL;
++    g_autoptr(virCPUx86Model) host_model = NULL;
++    g_autoptr(virCPUx86Model) cpu_force = NULL;
++    g_autoptr(virCPUx86Model) cpu_require = NULL;
++    g_autoptr(virCPUx86Model) cpu_optional = NULL;
++    g_autoptr(virCPUx86Model) cpu_disable = NULL;
++    g_autoptr(virCPUx86Model) cpu_forbid = NULL;
++    g_autoptr(virCPUx86Model) diff = NULL;
++    g_autoptr(virCPUx86Model) guest_model = NULL;
++    g_autoptr(virCPUData) guestData = NULL;
+     virCPUCompareResult ret;
+     virCPUx86CompareResult result;
+     virArch arch;
+@@ -1764,13 +1762,13 @@ x86Compute(virCPUDefPtr host,
+         !(cpu_optional = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_OPTIONAL)) ||
+         !(cpu_disable = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)) ||
+         !(cpu_forbid = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORBID)))
+-        goto error;
++        return VIR_CPU_COMPARE_ERROR;
+ 
+     x86DataIntersect(&cpu_forbid->data, &host_model->data);
+     if (!x86DataIsEmpty(&cpu_forbid->data)) {
+         virX86CpuIncompatible(N_("Host CPU provides forbidden features"),
+                               &cpu_forbid->data);
+-        goto cleanup;
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+     /* first remove features that were inherited from the CPU model and were
+@@ -1785,20 +1783,20 @@ x86Compute(virCPUDefPtr host,
+         virX86CpuIncompatible(N_("Host CPU does not provide required "
+                                  "features"),
+                               &cpu_require->data);
+-        goto cleanup;
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+-    ret = VIR_CPU_COMPARE_IDENTICAL;
+-
+     if (!(diff = x86ModelCopy(host_model)))
+-        goto error;
++        return VIR_CPU_COMPARE_ERROR;
+ 
+     x86DataSubtract(&diff->data, &cpu_optional->data);
+     x86DataSubtract(&diff->data, &cpu_require->data);
+     x86DataSubtract(&diff->data, &cpu_disable->data);
+     x86DataSubtract(&diff->data, &cpu_force->data);
+ 
+-    if (!x86DataIsEmpty(&diff->data))
++    if (x86DataIsEmpty(&diff->data))
++        ret = VIR_CPU_COMPARE_IDENTICAL;
++    else
+         ret = VIR_CPU_COMPARE_SUPERSET;
+ 
+     if (ret == VIR_CPU_COMPARE_SUPERSET
+@@ -1807,54 +1805,39 @@ x86Compute(virCPUDefPtr host,
+         virX86CpuIncompatible(N_("Host CPU does not strictly match guest CPU: "
+                                  "Extra features"),
+                               &diff->data);
+-        goto cleanup;
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+     if (guest) {
+         if (!(guest_model = x86ModelCopy(host_model)))
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         if (cpu->vendor && host_model->vendor &&
+             virCPUx86DataAddItem(&guest_model->data,
+                                  &host_model->vendor->data) < 0)
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         if (host_model->signatures &&
+             x86DataAddSignature(&guest_model->data, *host_model->signatures) < 0)
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         if (cpu->type == VIR_CPU_TYPE_GUEST
+             && cpu->match == VIR_CPU_MATCH_EXACT)
+             x86DataSubtract(&guest_model->data, &diff->data);
+ 
+         if (x86DataAdd(&guest_model->data, &cpu_force->data))
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         x86DataSubtract(&guest_model->data, &cpu_disable->data);
+ 
+         if (!(guestData = virCPUDataNew(arch)))
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+         x86DataCopy(&guestData->data.x86, &guest_model->data);
+ 
+-        *guest = guestData;
++        *guest = g_steal_pointer(&guestData);
+     }
+ 
+- cleanup:
+-    x86ModelFree(host_model);
+-    x86ModelFree(diff);
+-    x86ModelFree(cpu_force);
+-    x86ModelFree(cpu_require);
+-    x86ModelFree(cpu_optional);
+-    x86ModelFree(cpu_disable);
+-    x86ModelFree(cpu_forbid);
+-    x86ModelFree(guest_model);
+-
+     return ret;
+-
+- error:
+-    virCPUx86DataFree(guestData);
+-    ret = VIR_CPU_COMPARE_ERROR;
+-    goto cleanup;
+ }
+ #undef virX86CpuIncompatible
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86DataToCPU.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
new file mode 100644
index 0000000..563a3f0
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
@@ -0,0 +1,71 @@
+From caedf791f3486b5b3ed1ef54e9c25e7c97b3a39a Mon Sep 17 00:00:00 2001
+Message-Id: <caedf791f3486b5b3ed1ef54e9c25e7c97b3a39a@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:06 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86DataToCPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4f2fdad36db2da1aa139470846b3f60f65da8424)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <6f88b9d54c70352f9e4aeadd515cd9f4a599545a.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 20 ++++++--------------
+ 1 file changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 48f36c2bfc..310dfcbcb3 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -771,9 +771,9 @@ x86DataToCPU(const virCPUx86Data *data,
+              virCPUx86MapPtr map,
+              virDomainCapsCPUModelPtr hvModel)
+ {
+-    virCPUDefPtr cpu;
+-    virCPUx86Data copy = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data modelData = VIR_CPU_X86_DATA_INIT;
++    g_autoptr(virCPUDef) cpu = NULL;
++    g_auto(virCPUx86Data) copy = VIR_CPU_X86_DATA_INIT;
++    g_auto(virCPUx86Data) modelData = VIR_CPU_X86_DATA_INIT;
+     virCPUx86VendorPtr vendor;
+ 
+     cpu = virCPUDefNew();
+@@ -801,7 +801,7 @@ x86DataToCPU(const virCPUx86Data *data,
+             if ((feature = x86FeatureFind(map, *blocker)) &&
+                 !x86DataIsSubset(&copy, &feature->data))
+                 if (x86DataAdd(&modelData, &feature->data) < 0)
+-                    goto error;
++                    return NULL;
+         }
+     }
+ 
+@@ -810,17 +810,9 @@ x86DataToCPU(const virCPUx86Data *data,
+ 
+     if (x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_REQUIRE, &copy, map) ||
+         x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, &modelData, map))
+-        goto error;
+-
+- cleanup:
+-    virCPUx86DataClear(&modelData);
+-    virCPUx86DataClear(&copy);
+-    return cpu;
++        return NULL;
+ 
+- error:
+-    virCPUDefFree(cpu);
+-    cpu = NULL;
+-    goto cleanup;
++    return g_steal_pointer(&cpu);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Decode.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Decode.patch
new file mode 100644
index 0000000..a98d3e4
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Decode.patch
@@ -0,0 +1,99 @@
+From e9b93240af4c391414b301c7a4a20837bc09b109 Mon Sep 17 00:00:00 2001
+Message-Id: <e9b93240af4c391414b301c7a4a20837bc09b109@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:15 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86Decode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9bb9cbf6761ecf985fe9cf8a18030a8aff9b448b)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1414d86a79eb63d5600cf494455411814cbf10f7.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 24 +++++++-----------------
+ 1 file changed, 7 insertions(+), 17 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index c111ff45d4..dba4165527 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2032,15 +2032,12 @@ x86Decode(virCPUDefPtr cpu,
+           const char *preferred,
+           bool migratable)
+ {
+-    int ret = -1;
+     virCPUx86MapPtr map;
+     virCPUx86ModelPtr candidate;
+     virCPUDefPtr cpuCandidate;
+     virCPUx86ModelPtr model = NULL;
+-    virCPUDefPtr cpuModel = NULL;
+-    virCPUx86Data data = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data copy = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data features = VIR_CPU_X86_DATA_INIT;
++    g_autoptr(virCPUDef) cpuModel = NULL;
++    g_auto(virCPUx86Data) data = VIR_CPU_X86_DATA_INIT;
+     virCPUx86VendorPtr vendor;
+     virDomainCapsCPUModelPtr hvModel = NULL;
+     g_autofree char *sigs = NULL;
+@@ -2054,7 +2051,7 @@ x86Decode(virCPUDefPtr cpu,
+     x86DataCopy(&data, cpuData);
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto cleanup;
++        return -1;
+ 
+     vendor = x86DataToVendor(&data, map);
+     signature = x86DataToSignature(&data);
+@@ -2073,7 +2070,7 @@ x86Decode(virCPUDefPtr cpu,
+                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                    _("CPU model %s is not supported by hypervisor"),
+                                    preferred);
+-                    goto cleanup;
++                    return -1;
+                 } else {
+                     VIR_WARN("Preferred CPU model %s not allowed by"
+                              " hypervisor; closest supported model will be"
+@@ -2096,7 +2093,7 @@ x86Decode(virCPUDefPtr cpu,
+         }
+ 
+         if (!(cpuCandidate = x86DataToCPU(&data, candidate, map, hvModel)))
+-            goto cleanup;
++            return -1;
+         cpuCandidate->type = cpu->type;
+ 
+         if ((rc = x86DecodeUseCandidate(model, cpuModel,
+@@ -2115,7 +2112,7 @@ x86Decode(virCPUDefPtr cpu,
+     if (!cpuModel) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        "%s", _("Cannot find suitable CPU model for given data"));
+-        goto cleanup;
++        return -1;
+     }
+ 
+     /* Remove non-migratable features if requested
+@@ -2149,14 +2146,7 @@ x86Decode(virCPUDefPtr cpu,
+     cpu->nfeatures_max = cpuModel->nfeatures_max;
+     cpuModel->nfeatures_max = 0;
+ 
+-    ret = 0;
+-
+- cleanup:
+-    virCPUDefFree(cpuModel);
+-    virCPUx86DataClear(&data);
+-    virCPUx86DataClear(&copy);
+-    virCPUx86DataClear(&features);
+-    return ret;
++    return 0;
+ }
+ 
+ static int
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Encode.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Encode.patch
new file mode 100644
index 0000000..bd2ed7e
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86Encode.patch
@@ -0,0 +1,141 @@
+From fc8f77c828ada1bfd3ac4957410f9b4efc659ce1 Mon Sep 17 00:00:00 2001
+Message-Id: <fc8f77c828ada1bfd3ac4957410f9b4efc659ce1@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:17 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86Encode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit e6e54fcebe99f1c07fe905c419cbe5d12f6844b1)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <4729842dcc538cca58a2ccd18fe2bcf9be410bbb.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 51 +++++++++++++++++++----------------------------
+ 1 file changed, 21 insertions(+), 30 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index fd410aeafb..56081145c0 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2188,12 +2188,12 @@ x86Encode(virArch arch,
+           virCPUDataPtr *vendor)
+ {
+     virCPUx86MapPtr map = NULL;
+-    virCPUDataPtr data_forced = NULL;
+-    virCPUDataPtr data_required = NULL;
+-    virCPUDataPtr data_optional = NULL;
+-    virCPUDataPtr data_disabled = NULL;
+-    virCPUDataPtr data_forbidden = NULL;
+-    virCPUDataPtr data_vendor = NULL;
++    g_autoptr(virCPUData) data_forced = NULL;
++    g_autoptr(virCPUData) data_required = NULL;
++    g_autoptr(virCPUData) data_optional = NULL;
++    g_autoptr(virCPUData) data_disabled = NULL;
++    g_autoptr(virCPUData) data_forbidden = NULL;
++    g_autoptr(virCPUData) data_vendor = NULL;
+ 
+     if (forced)
+         *forced = NULL;
+@@ -2209,37 +2209,37 @@ x86Encode(virArch arch,
+         *vendor = NULL;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto error;
++        return -1;
+ 
+     if (forced &&
+         (!(data_forced = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_forced->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_FORCE) < 0))
+-        goto error;
++        return -1;
+ 
+     if (required &&
+         (!(data_required = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_required->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_REQUIRE) < 0))
+-        goto error;
++        return -1;
+ 
+     if (optional &&
+         (!(data_optional = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_optional->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_OPTIONAL) < 0))
+-        goto error;
++        return -1;
+ 
+     if (disabled &&
+         (!(data_disabled = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_disabled->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_DISABLE) < 0))
+-        goto error;
++        return -1;
+ 
+     if (forbidden &&
+         (!(data_forbidden = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_forbidden->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_FORBID) < 0))
+-        goto error;
++        return -1;
+ 
+     if (vendor) {
+         virCPUx86VendorPtr v = NULL;
+@@ -2247,39 +2247,30 @@ x86Encode(virArch arch,
+         if (cpu->vendor && !(v = x86VendorFind(map, cpu->vendor))) {
+             virReportError(VIR_ERR_OPERATION_FAILED,
+                            _("CPU vendor %s not found"), cpu->vendor);
+-            goto error;
++            return -1;
+         }
+ 
+         if (!(data_vendor = virCPUDataNew(arch)))
+-            goto error;
++            return -1;
+ 
+         if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0)
+-            goto error;
++            return -1;
+     }
+ 
+     if (forced)
+-        *forced = data_forced;
++        *forced = g_steal_pointer(&data_forced);
+     if (required)
+-        *required = data_required;
++        *required = g_steal_pointer(&data_required);
+     if (optional)
+-        *optional = data_optional;
++        *optional = g_steal_pointer(&data_optional);
+     if (disabled)
+-        *disabled = data_disabled;
++        *disabled = g_steal_pointer(&data_disabled);
+     if (forbidden)
+-        *forbidden = data_forbidden;
++        *forbidden = g_steal_pointer(&data_forbidden);
+     if (vendor)
+-        *vendor = data_vendor;
++        *vendor = g_steal_pointer(&data_vendor);
+ 
+     return 0;
+-
+- error:
+-    virCPUx86DataFree(data_forced);
+-    virCPUx86DataFree(data_required);
+-    virCPUx86DataFree(data_optional);
+-    virCPUx86DataFree(data_disabled);
+-    virCPUx86DataFree(data_forbidden);
+-    virCPUx86DataFree(data_vendor);
+-    return -1;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
new file mode 100644
index 0000000..ccdbf31
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
@@ -0,0 +1,46 @@
+From b91ae8a08c0906011e9ff2ed4f8c8fce908603b5 Mon Sep 17 00:00:00 2001
+Message-Id: <b91ae8a08c0906011e9ff2ed4f8c8fce908603b5@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:16 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86EncodePolicy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5b45d2cf1ff0d2d972f103a678c01bc0eb7c1e18)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <cf057cf29d8f8f2369eab3afb5202a6466c0dc2e.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index dba4165527..fd410aeafb 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2164,7 +2164,7 @@ x86EncodePolicy(virCPUx86Data *data,
+                 virCPUx86MapPtr map,
+                 virCPUFeaturePolicy policy)
+ {
+-    virCPUx86ModelPtr model;
++    g_autoptr(virCPUx86Model) model = NULL;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, policy)))
+         return -1;
+@@ -2172,7 +2172,6 @@ x86EncodePolicy(virCPUx86Data *data,
+     *data = model->data;
+     model->data.len = 0;
+     model->data.items = NULL;
+-    x86ModelFree(model);
+ 
+     return 0;
+ }
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86FeatureParse.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
new file mode 100644
index 0000000..9f24a7b
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
@@ -0,0 +1,115 @@
+From 39dea7f80de53e9f7fb8f298d1f9f7f32f20fc29 Mon Sep 17 00:00:00 2001
+Message-Id: <39dea7f80de53e9f7fb8f298d1f9f7f32f20fc29@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:08 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86FeatureParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3125688f78f6289e51bfdaa196addb230b0de4e1)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <14cf6ca6816ee8bda3e195aa5218162b280715b5.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 31 ++++++++++++-------------------
+ 1 file changed, 12 insertions(+), 19 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 3ffddf0342..10c5fbacf7 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1023,13 +1023,12 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+                 void *data)
+ {
+     virCPUx86MapPtr map = data;
+-    xmlNodePtr *nodes = NULL;
+-    virCPUx86FeaturePtr feature;
++    g_autofree xmlNodePtr *nodes = NULL;
++    g_autoptr(virCPUx86Feature) feature = NULL;
+     virCPUx86DataItem item;
+     size_t i;
+     int n;
+-    char *str = NULL;
+-    int ret = -1;
++    g_autofree char *str = NULL;
+ 
+     feature = g_new0(virCPUx86Feature, 1);
+     feature->migratable = true;
+@@ -1038,7 +1037,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+     if (x86FeatureFind(map, feature->name)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("CPU feature %s already defined"), feature->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     str = virXPathString("string(@migratable)", ctxt);
+@@ -1047,13 +1046,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ 
+     n = virXPathNodeSet("./cpuid|./msr", ctxt, &nodes);
+     if (n < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (n == 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Missing cpuid or msr element in feature %s"),
+                        feature->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     for (i = 0; i < n; i++) {
+@@ -1063,37 +1062,31 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("Invalid cpuid[%zu] in %s feature"),
+                                i, feature->name);
+-                goto cleanup;
++                return -1;
+             }
+         } else {
+             if (x86ParseMSR(ctxt, &item) < 0) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("Invalid msr[%zu] in %s feature"),
+                                i, feature->name);
+-                goto cleanup;
++                return -1;
+             }
+         }
+ 
+         if (virCPUx86DataAddItem(&feature->data, &item))
+-            goto cleanup;
++            return -1;
+     }
+ 
+     if (!feature->migratable &&
+         VIR_APPEND_ELEMENT_COPY(map->migrate_blockers,
+                                 map->nblockers,
+                                 feature) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        return -1;
+ 
+- cleanup:
+-    x86FeatureFree(feature);
+-    VIR_FREE(nodes);
+-    VIR_FREE(str);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
new file mode 100644
index 0000000..c152310
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
@@ -0,0 +1,74 @@
+From db7c7611aa3f80aca75e557795a12354f6fde82c Mon Sep 17 00:00:00 2001
+Message-Id: <db7c7611aa3f80aca75e557795a12354f6fde82c@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:09 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86ModelFromCPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 93f173adbecee92f9973745a2aca65a27c4aa8a6)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <f205d9dfe07f4009faaeb702cf6be1726306747b.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 10c5fbacf7..5215405755 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1173,7 +1173,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+                 virCPUx86MapPtr map,
+                 int policy)
+ {
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     size_t i;
+ 
+     /* host CPU only contains required features; requesting other features
+@@ -1216,7 +1216,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+         if (!(feature = x86FeatureFind(map, cpu->features[i].name))) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Unknown CPU feature %s"), cpu->features[i].name);
+-            goto error;
++            return NULL;
+         }
+ 
+         if (policy == -1) {
+@@ -1224,7 +1224,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+             case VIR_CPU_FEATURE_FORCE:
+             case VIR_CPU_FEATURE_REQUIRE:
+                 if (x86DataAdd(&model->data, &feature->data) < 0)
+-                    goto error;
++                    return NULL;
+                 break;
+ 
+             case VIR_CPU_FEATURE_DISABLE:
+@@ -1238,15 +1238,11 @@ x86ModelFromCPU(const virCPUDef *cpu,
+                 break;
+             }
+         } else if (x86DataAdd(&model->data, &feature->data) < 0) {
+-            goto error;
++            return NULL;
+         }
+     }
+ 
+-    return model;
+-
+- error:
+-    x86ModelFree(model);
+-    return NULL;
++    return g_steal_pointer(&model);
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelParse.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelParse.patch
new file mode 100644
index 0000000..53b7217
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86ModelParse.patch
@@ -0,0 +1,80 @@
+From 3400f296861c822d2b0e6d3b31e878c69187f40e Mon Sep 17 00:00:00 2001
+Message-Id: <3400f296861c822d2b0e6d3b31e878c69187f40e@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:10 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86ModelParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b239a60967cc2979f01e4521d6582b7d6acedd72)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <ed4ff8e858f5f735a3a6e013188aca08e8a9a94a.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 23 +++++++++--------------
+ 1 file changed, 9 insertions(+), 14 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 5215405755..20cdd24390 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1493,41 +1493,36 @@ x86ModelParse(xmlXPathContextPtr ctxt,
+               void *data)
+ {
+     virCPUx86MapPtr map = data;
+-    virCPUx86ModelPtr model = NULL;
+-    int ret = -1;
++    g_autoptr(virCPUx86Model) model = NULL;
+ 
+     if (x86ModelFind(map, name)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Multiple definitions of CPU model '%s'"), name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     model = g_new0(virCPUx86Model, 1);
+     model->name = g_strdup(name);
+ 
+     if (x86ModelParseDecode(model, ctxt) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseAncestor(model, ctxt, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseSignatures(model, ctxt) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseVendor(model, ctxt, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseFeatures(model, ctxt, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        return -1;
+ 
+- cleanup:
+-    x86ModelFree(model);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
new file mode 100644
index 0000000..d9f2fa0
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
@@ -0,0 +1,71 @@
+From 2545e373c4a5b08836742742960244ece2586545 Mon Sep 17 00:00:00 2001
+Message-Id: <2545e373c4a5b08836742742960244ece2586545@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:21 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86UpdateHostModel
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2f9d15b495efdd9e63c07cd6fda611701e71ee46)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <f39c8eb1774d8c9af13a8af47689f8759ce57cb3.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 6e7311694d..98f7863b6f 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2817,17 +2817,16 @@ static int
+ x86UpdateHostModel(virCPUDefPtr guest,
+                    const virCPUDef *host)
+ {
+-    virCPUDefPtr updated = NULL;
++    g_autoptr(virCPUDef) updated = NULL;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(updated = virCPUDefCopyWithoutModel(host)))
+-        goto cleanup;
++        return -1;
+ 
+     updated->type = VIR_CPU_TYPE_GUEST;
+     updated->mode = VIR_CPU_MODE_CUSTOM;
+     if (virCPUDefCopyModel(updated, host, true) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (guest->vendor_id) {
+         VIR_FREE(updated->vendor_id);
+@@ -2838,18 +2837,15 @@ x86UpdateHostModel(virCPUDefPtr guest,
+         if (virCPUDefUpdateFeature(updated,
+                                    guest->features[i].name,
+                                    guest->features[i].policy) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     virCPUDefStealModel(guest, updated,
+                         guest->mode == VIR_CPU_MODE_CUSTOM);
+     guest->mode = VIR_CPU_MODE_CUSTOM;
+     guest->match = VIR_CPU_MATCH_EXACT;
+-    ret = 0;
+ 
+- cleanup:
+-    virCPUDefFree(updated);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86VendorParse.patch b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86VendorParse.patch
new file mode 100644
index 0000000..05031ea
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-g_auto-in-x86VendorParse.patch
@@ -0,0 +1,76 @@
+From 6a7bb46df53af5c1213e3a53a530c8745eb1aa0e Mon Sep 17 00:00:00 2001
+Message-Id: <6a7bb46df53af5c1213e3a53a530c8745eb1aa0e@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:07 +0200
+Subject: [PATCH] cpu_x86: Use g_auto* in x86VendorParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 6a0a7db9041cb1d8d92919bb4adf0d19bdd5dd68)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <3d21717ab7a594e301afc7f33ddbb32b57a8c56e.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 20 +++++++-------------
+ 1 file changed, 7 insertions(+), 13 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 310dfcbcb3..3ffddf0342 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -849,9 +849,8 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+                void *data)
+ {
+     virCPUx86MapPtr map = data;
+-    virCPUx86VendorPtr vendor = NULL;
+-    char *string = NULL;
+-    int ret = -1;
++    g_autoptr(virCPUx86Vendor) vendor = NULL;
++    g_autofree char *string = NULL;
+ 
+     vendor = g_new0(virCPUx86Vendor, 1);
+     vendor->name = g_strdup(name);
+@@ -859,7 +858,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+     if (x86VendorFind(map, vendor->name)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("CPU vendor %s already defined"), vendor->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     string = virXPathString("string(@string)", ctxt);
+@@ -867,21 +866,16 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Missing vendor string for CPU vendor %s"),
+                        vendor->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (virCPUx86VendorToData(string, &vendor->data) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        return -1;
+ 
+- cleanup:
+-    x86VendorFree(vendor);
+-    VIR_FREE(string);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
new file mode 100644
index 0000000..5e65254
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
@@ -0,0 +1,149 @@
+From 6fa7baf5345b053e8215b34f721316f6f72f1cf3 Mon Sep 17 00:00:00 2001
+Message-Id: <6fa7baf5345b053e8215b34f721316f6f72f1cf3@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:00 +0200
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPU{, x86}Data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 800868583012e20fb60eb4be9fb1ccc018677006)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <dbb07df3c1ad3f47f21caa1b9555bd37db037694.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 45 ++++++++++++++++++++++-----------------------
+ 1 file changed, 22 insertions(+), 23 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 1b388ec1b2..4d82d85746 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -468,8 +468,9 @@ virCPUx86DataClear(virCPUx86Data *data)
+     if (!data)
+         return;
+ 
+-    VIR_FREE(data->items);
++    g_free(data->items);
+ }
++G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virCPUx86Data, virCPUx86DataClear);
+ 
+ 
+ static void
+@@ -481,21 +482,19 @@ virCPUx86DataFree(virCPUDataPtr data)
+     virCPUx86DataClear(&data->data.x86);
+     VIR_FREE(data);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUData, virCPUx86DataFree);
+ 
+ 
+-static int
++static void
+ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
+ {
+     size_t i;
+ 
+-    if (VIR_ALLOC_N(dst->items, src->len) < 0)
+-        return -1;
+-
++    dst->items = g_new0(virCPUx86DataItem, src->len);
+     dst->len = src->len;
++
+     for (i = 0; i < src->len; i++)
+         dst->items[i] = src->items[i];
+-
+-    return 0;
+ }
+ 
+ 
+@@ -781,9 +780,8 @@ x86DataToCPU(const virCPUx86Data *data,
+ 
+     cpu->model = g_strdup(model->name);
+ 
+-    if (x86DataCopy(&copy, data) < 0 ||
+-        x86DataCopy(&modelData, &model->data) < 0)
+-        goto error;
++    x86DataCopy(&copy, data);
++    x86DataCopy(&modelData, &model->data);
+ 
+     if ((vendor = x86DataToVendor(&copy, map)))
+         cpu->vendor = g_strdup(vendor->name);
+@@ -1183,11 +1181,11 @@ x86ModelCopy(virCPUx86ModelPtr model)
+ 
+     copy->name = g_strdup(model->name);
+ 
+-    if (x86ModelCopySignatures(copy, model) < 0 ||
+-        x86DataCopy(&copy->data, &model->data) < 0) {
++    if (x86ModelCopySignatures(copy, model) < 0) {
+         x86ModelFree(copy);
+         return NULL;
+     }
++    x86DataCopy(&copy->data, &model->data);
+ 
+     copy->vendor = model->vendor;
+ 
+@@ -1415,10 +1413,11 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
+     }
+ 
+     model->vendor = ancestor->vendor;
+-    if (x86ModelCopySignatures(model, ancestor) < 0 ||
+-        x86DataCopy(&model->data, &ancestor->data) < 0)
++    if (x86ModelCopySignatures(model, ancestor) < 0)
+         return -1;
+ 
++    x86DataCopy(&model->data, &ancestor->data);
++
+     return 0;
+ }
+ 
+@@ -1904,9 +1903,9 @@ x86Compute(virCPUDefPtr host,
+ 
+         x86DataSubtract(&guest_model->data, &cpu_disable->data);
+ 
+-        if (!(guestData = virCPUDataNew(arch)) ||
+-            x86DataCopy(&guestData->data.x86, &guest_model->data) < 0)
++        if (!(guestData = virCPUDataNew(arch)))
+             goto error;
++        x86DataCopy(&guestData->data.x86, &guest_model->data);
+ 
+         *guest = guestData;
+     }
+@@ -2139,9 +2138,11 @@ x86Decode(virCPUDefPtr cpu,
+     ssize_t i;
+     int rc;
+ 
+-    if (!cpuData || x86DataCopy(&data, cpuData) < 0)
++    if (!cpuData)
+         return -1;
+ 
++    x86DataCopy(&data, cpuData);
++
+     if (!(map = virCPUx86GetMap()))
+         goto cleanup;
+ 
+@@ -3055,13 +3056,11 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+         !(modelDisabled = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)))
+         goto cleanup;
+ 
+-    if (dataEnabled &&
+-        x86DataCopy(&enabled, &dataEnabled->data.x86) < 0)
+-        goto cleanup;
++    if (dataEnabled)
++        x86DataCopy(&enabled, &dataEnabled->data.x86);
+ 
+-    if (dataDisabled &&
+-        x86DataCopy(&disabled, &dataDisabled->data.x86) < 0)
+-        goto cleanup;
++    if (dataDisabled)
++        x86DataCopy(&disabled, &dataDisabled->data.x86);
+ 
+     for (i = 0; i < map->nfeatures; i++) {
+         virCPUx86FeaturePtr feature = map->features[i];
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
new file mode 100644
index 0000000..5b84dd1
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
@@ -0,0 +1,74 @@
+From 9810efd43b52070c20fe41b41175b0afff6710aa Mon Sep 17 00:00:00 2001
+Message-Id: <9810efd43b52070c20fe41b41175b0afff6710aa@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:02 +0200
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Feature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 51b6e9c1000151cc515804134a00ccb0d7b3e44a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <4c4090765c01f7359c521cb09d247b1694afbe9c.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 22 ++++------------------
+ 1 file changed, 4 insertions(+), 18 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index aa66309b21..3a598e35d2 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -893,28 +893,17 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
+-static virCPUx86FeaturePtr
+-x86FeatureNew(void)
+-{
+-    virCPUx86FeaturePtr feature;
+-
+-    if (VIR_ALLOC(feature) < 0)
+-        return NULL;
+-
+-    return feature;
+-}
+-
+-
+ static void
+ x86FeatureFree(virCPUx86FeaturePtr feature)
+ {
+     if (!feature)
+         return;
+ 
+-    VIR_FREE(feature->name);
++    g_free(feature->name);
+     virCPUx86DataClear(&feature->data);
+-    VIR_FREE(feature);
++    g_free(feature);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Feature, x86FeatureFree);
+ 
+ 
+ static int
+@@ -1056,11 +1045,8 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+     char *str = NULL;
+     int ret = -1;
+ 
+-    if (!(feature = x86FeatureNew()))
+-        goto cleanup;
+-
++    feature = g_new0(virCPUx86Feature, 1);
+     feature->migratable = true;
+-
+     feature->name = g_strdup(name);
+ 
+     if (x86FeatureFind(map, feature->name)) {
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
new file mode 100644
index 0000000..4f33301
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
@@ -0,0 +1,69 @@
+From 9adc6c8a4450e5eab78d7a8abd14b0e460d23a08 Mon Sep 17 00:00:00 2001
+Message-Id: <9adc6c8a4450e5eab78d7a8abd14b0e460d23a08@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:04 +0200
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Map
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 247e115e2753bde7957cc07a20d5a48a8a6632b0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <0e3dc412e6e755f75e39a9ec22b2b5549c82930e.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 373c34a834..3711e03b3f 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1566,23 +1566,24 @@ x86MapFree(virCPUx86MapPtr map)
+ 
+     for (i = 0; i < map->nfeatures; i++)
+         x86FeatureFree(map->features[i]);
+-    VIR_FREE(map->features);
++    g_free(map->features);
+ 
+     for (i = 0; i < map->nmodels; i++)
+         x86ModelFree(map->models[i]);
+-    VIR_FREE(map->models);
++    g_free(map->models);
+ 
+     for (i = 0; i < map->nvendors; i++)
+         x86VendorFree(map->vendors[i]);
+-    VIR_FREE(map->vendors);
++    g_free(map->vendors);
+ 
+     /* migrate_blockers only points to the features from map->features list,
+      * which were already freed above
+      */
+-    VIR_FREE(map->migrate_blockers);
++    g_free(map->migrate_blockers);
+ 
+-    VIR_FREE(map);
++    g_free(map);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree);
+ 
+ 
+ static virCPUx86MapPtr
+@@ -1590,8 +1591,7 @@ virCPUx86LoadMap(void)
+ {
+     virCPUx86MapPtr map;
+ 
+-    if (VIR_ALLOC(map) < 0)
+-        return NULL;
++    map = g_new0(virCPUx86Map, 1);
+ 
+     if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0)
+         goto error;
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
new file mode 100644
index 0000000..5d8ca7a
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
@@ -0,0 +1,103 @@
+From 18b41d5bb489080b8be3c78d7f8436c9fb13087a Mon Sep 17 00:00:00 2001
+Message-Id: <18b41d5bb489080b8be3c78d7f8436c9fb13087a@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:03 +0200
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Model
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit ccc0c2e4de58d62308e224076a7aa979ae97b520)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <db624beaa5c879842c45b90269fb58a8f2fcfff2.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 31 ++++++++-----------------------
+ 1 file changed, 8 insertions(+), 23 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 3a598e35d2..373c34a834 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1111,29 +1111,18 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
+-static virCPUx86ModelPtr
+-x86ModelNew(void)
+-{
+-    virCPUx86ModelPtr model;
+-
+-    if (VIR_ALLOC(model) < 0)
+-        return NULL;
+-
+-    return model;
+-}
+-
+-
+ static void
+ x86ModelFree(virCPUx86ModelPtr model)
+ {
+     if (!model)
+         return;
+ 
+-    VIR_FREE(model->name);
+-    VIR_FREE(model->signatures);
++    g_free(model->name);
++    g_free(model->signatures);
+     virCPUx86DataClear(&model->data);
+-    VIR_FREE(model);
++    g_free(model);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
+ 
+ 
+ static int
+@@ -1161,9 +1150,7 @@ x86ModelCopy(virCPUx86ModelPtr model)
+ {
+     virCPUx86ModelPtr copy;
+ 
+-    if (VIR_ALLOC(copy) < 0)
+-        return NULL;
+-
++    copy = g_new0(virCPUx86Model, 1);
+     copy->name = g_strdup(model->name);
+ 
+     if (x86ModelCopySignatures(copy, model) < 0) {
+@@ -1216,7 +1203,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+     if (cpu->type == VIR_CPU_TYPE_HOST &&
+         policy != VIR_CPU_FEATURE_REQUIRE &&
+         policy != -1)
+-        return x86ModelNew();
++        return g_new0(virCPUx86Model, 1);
+ 
+     if (cpu->model &&
+         (policy == VIR_CPU_FEATURE_REQUIRE || policy == -1)) {
+@@ -1228,7 +1215,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+ 
+         model = x86ModelCopy(model);
+     } else {
+-        model = x86ModelNew();
++        model = g_new0(virCPUx86Model, 1);
+     }
+ 
+     if (!model)
+@@ -1540,9 +1527,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
+         goto cleanup;
+     }
+ 
+-    if (!(model = x86ModelNew()))
+-        goto cleanup;
+-
++    model = g_new0(virCPUx86Model, 1);
+     model->name = g_strdup(name);
+ 
+     if (x86ModelParseDecode(model, ctxt) < 0)
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
new file mode 100644
index 0000000..31bdeee
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
@@ -0,0 +1,53 @@
+From d151191af331a2127aa6b2126d15e2afd19e548d Mon Sep 17 00:00:00 2001
+Message-Id: <d151191af331a2127aa6b2126d15e2afd19e548d@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:01 +0200
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Vendor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 8a41417b23dda97eb09bcd2921c1ab0d5fbce1b6)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <f5811f02d9c0cce74d007f5986454b8d89b2f548.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 4d82d85746..aa66309b21 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -830,9 +830,10 @@ x86VendorFree(virCPUx86VendorPtr vendor)
+     if (!vendor)
+         return;
+ 
+-    VIR_FREE(vendor->name);
+-    VIR_FREE(vendor);
++    g_free(vendor->name);
++    g_free(vendor);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Vendor, x86VendorFree);
+ 
+ 
+ static virCPUx86VendorPtr
+@@ -860,9 +861,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+     char *string = NULL;
+     int ret = -1;
+ 
+-    if (VIR_ALLOC(vendor) < 0)
+-        goto cleanup;
+-
++    vendor = g_new0(virCPUx86Vendor, 1);
+     vendor->name = g_strdup(name);
+ 
+     if (x86VendorFind(map, vendor->name)) {
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
new file mode 100644
index 0000000..ab20050
--- /dev/null
+++ b/SOURCES/libvirt-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
@@ -0,0 +1,52 @@
+From a271a6a71073253a7dde518a63d5ee4965ee53d8 Mon Sep 17 00:00:00 2001
+Message-Id: <a271a6a71073253a7dde518a63d5ee4965ee53d8@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:05 +0200
+Subject: [PATCH] cpu_x86: Use glib allocation in virCPUx86GetModels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit e43e2ff7f5b629f979e56387c4be46f2be251b75)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1d1d9c9b60f1ea44a2252cb2fbfbf3886ecd245f.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/cpu/cpu_x86.c | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 3711e03b3f..48f36c2bfc 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3121,21 +3121,13 @@ virCPUx86GetModels(char ***models)
+         return -1;
+ 
+     if (models) {
+-        if (VIR_ALLOC_N(*models, map->nmodels + 1) < 0)
+-            goto error;
++        *models = g_new0(char *, map->nmodels + 1);
+ 
+         for (i = 0; i < map->nmodels; i++)
+             (*models)[i] = g_strdup(map->models[i]->name);
+     }
+ 
+     return map->nmodels;
+-
+- error:
+-    if (models) {
+-        virStringListFree(*models);
+-        *models = NULL;
+-    }
+-    return -1;
+ }
+ 
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Cooperlake-CPU.patch b/SOURCES/libvirt-cputest-Add-data-for-Cooperlake-CPU.patch
new file mode 100644
index 0000000..1ed7790
--- /dev/null
+++ b/SOURCES/libvirt-cputest-Add-data-for-Cooperlake-CPU.patch
@@ -0,0 +1,1869 @@
+From 8efc803f2180f53f935275a88f5709b80022c1b2 Mon Sep 17 00:00:00 2001
+Message-Id: <8efc803f2180f53f935275a88f5709b80022c1b2@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:59:38 +0200
+Subject: [PATCH] cputest: Add data for Cooperlake CPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 58691208e2063285d981a620873d48ddf8df8be5)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1781878
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <c74a7ac270b786983feaff1712fc49629b461fdc.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/cputest.c                               |    1 +
+ .../x86_64-cpuid-Cooperlake-disabled.xml      |    7 +
+ .../x86_64-cpuid-Cooperlake-enabled.xml       |   11 +
+ .../x86_64-cpuid-Cooperlake-guest.xml         |   40 +
+ .../x86_64-cpuid-Cooperlake-host.xml          |   41 +
+ .../x86_64-cpuid-Cooperlake-json.xml          |   23 +
+ .../cputestdata/x86_64-cpuid-Cooperlake.json  | 1574 +++++++++++++++++
+ tests/cputestdata/x86_64-cpuid-Cooperlake.sig |    4 +
+ tests/cputestdata/x86_64-cpuid-Cooperlake.xml |   68 +
+ 9 files changed, 1769 insertions(+)
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake.json
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake.sig
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Cooperlake.xml
+
+diff --git a/tests/cputest.c b/tests/cputest.c
+index 869d016ffc..68e8eb0290 100644
+--- a/tests/cputest.c
++++ b/tests/cputest.c
+@@ -1272,6 +1272,7 @@ mymain(void)
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ice-Lake-Server", JSON_MODELS);
++    DO_TEST_CPUID(VIR_ARCH_X86_64, "Cooperlake", JSON_MODELS);
+ 
+  cleanup:
+ #if WITH_QEMU
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
+new file mode 100644
+index 0000000000..e7c59cef1e
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
+@@ -0,0 +1,7 @@
++<!-- Features disabled by QEMU -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
++  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
++</cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+new file mode 100644
+index 0000000000..2d7f83c80f
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+@@ -0,0 +1,11 @@
++<!-- Features enabled by QEMU -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000080c' edx='0xac000400'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x01' eax='0x00000020' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
++  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01001000' ecx='0x00000000' edx='0x00000000'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x000001eb'/>
++</cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+new file mode 100644
+index 0000000000..b5137e3c03
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+@@ -0,0 +1,40 @@
++<cpu mode='custom' match='exact'>
++  <model fallback='forbid'>Cascadelake-Server</model>
++  <vendor>Intel</vendor>
++  <feature policy='require' name='ds'/>
++  <feature policy='require' name='acpi'/>
++  <feature policy='require' name='ss'/>
++  <feature policy='require' name='ht'/>
++  <feature policy='require' name='tm'/>
++  <feature policy='require' name='pbe'/>
++  <feature policy='require' name='dtes64'/>
++  <feature policy='require' name='monitor'/>
++  <feature policy='require' name='ds_cpl'/>
++  <feature policy='require' name='vmx'/>
++  <feature policy='require' name='smx'/>
++  <feature policy='require' name='est'/>
++  <feature policy='require' name='tm2'/>
++  <feature policy='require' name='xtpr'/>
++  <feature policy='require' name='pdcm'/>
++  <feature policy='require' name='dca'/>
++  <feature policy='require' name='osxsave'/>
++  <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='cmt'/>
++  <feature policy='require' name='intel-pt'/>
++  <feature policy='require' name='pku'/>
++  <feature policy='require' name='ospke'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='arch-capabilities'/>
++  <feature policy='require' name='avx512-bf16'/>
++  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='mbm_total'/>
++  <feature policy='require' name='mbm_local'/>
++  <feature policy='require' name='invtsc'/>
++  <feature policy='require' name='rdctl-no'/>
++  <feature policy='require' name='ibrs-all'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='tsx-ctrl'/>
++  <feature policy='require' name='taa-no'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+new file mode 100644
+index 0000000000..52b352f4f1
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+@@ -0,0 +1,41 @@
++<cpu>
++  <arch>x86_64</arch>
++  <model>Cascadelake-Server</model>
++  <vendor>Intel</vendor>
++  <feature name='ds'/>
++  <feature name='acpi'/>
++  <feature name='ss'/>
++  <feature name='ht'/>
++  <feature name='tm'/>
++  <feature name='pbe'/>
++  <feature name='dtes64'/>
++  <feature name='monitor'/>
++  <feature name='ds_cpl'/>
++  <feature name='vmx'/>
++  <feature name='smx'/>
++  <feature name='est'/>
++  <feature name='tm2'/>
++  <feature name='xtpr'/>
++  <feature name='pdcm'/>
++  <feature name='dca'/>
++  <feature name='osxsave'/>
++  <feature name='tsc_adjust'/>
++  <feature name='cmt'/>
++  <feature name='intel-pt'/>
++  <feature name='pku'/>
++  <feature name='ospke'/>
++  <feature name='md-clear'/>
++  <feature name='stibp'/>
++  <feature name='arch-capabilities'/>
++  <feature name='avx512-bf16'/>
++  <feature name='xsaves'/>
++  <feature name='mbm_total'/>
++  <feature name='mbm_local'/>
++  <feature name='invtsc'/>
++  <feature name='rdctl-no'/>
++  <feature name='ibrs-all'/>
++  <feature name='skip-l1dfl-vmentry'/>
++  <feature name='mds-no'/>
++  <feature name='tsx-ctrl'/>
++  <feature name='taa-no'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+new file mode 100644
+index 0000000000..e323d6205e
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+@@ -0,0 +1,23 @@
++<cpu mode='custom' match='exact'>
++  <model fallback='forbid'>Cascadelake-Server</model>
++  <vendor>Intel</vendor>
++  <feature policy='require' name='ss'/>
++  <feature policy='require' name='vmx'/>
++  <feature policy='require' name='hypervisor'/>
++  <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='umip'/>
++  <feature policy='require' name='pku'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='arch-capabilities'/>
++  <feature policy='require' name='avx512-bf16'/>
++  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='ibpb'/>
++  <feature policy='require' name='amd-ssbd'/>
++  <feature policy='require' name='rdctl-no'/>
++  <feature policy='require' name='ibrs-all'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='tsx-ctrl'/>
++  <feature policy='require' name='taa-no'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake.json b/tests/cputestdata/x86_64-cpuid-Cooperlake.json
+new file mode 100644
+index 0000000000..fd407affb6
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake.json
+@@ -0,0 +1,1574 @@
++{
++  "return": {
++    "model": {
++      "name": "base",
++      "props": {
++        "phys-bits": 0,
++        "vmx-entry-load-rtit-ctl": false,
++        "core-id": -1,
++        "xlevel": 2147483656,
++        "cmov": true,
++        "ia64": false,
++        "ssb-no": false,
++        "aes": true,
++        "vmx-apicv-xapic": true,
++        "mmx": true,
++        "rdpid": false,
++        "vmx-page-walk-5": false,
++        "vmx-page-walk-4": true,
++        "arat": true,
++        "gfni": false,
++        "vmx-desc-exit": true,
++        "ibrs-all": true,
++        "pause-filter": false,
++        "xsavec": true,
++        "intel-pt": false,
++        "vmx-cr8-store-exit": true,
++        "hv-frequencies": false,
++        "tsc-frequency": 0,
++        "vmx-rdseed-exit": true,
++        "xd": true,
++        "x-intel-pt-auto-level": true,
++        "hv-vendor-id": "",
++        "vmx-eptp-switching": true,
++        "kvm-asyncpf": true,
++        "kvm_asyncpf": true,
++        "perfctr_core": false,
++        "perfctr-core": false,
++        "mpx": true,
++        "pbe": false,
++        "decodeassists": false,
++        "avx512cd": true,
++        "vmx-exit-load-efer": true,
++        "vmx-exit-clear-bndcfgs": false,
++        "sse4_1": true,
++        "sse4.1": true,
++        "sse4-1": true,
++        "legacy-cache": true,
++        "family": 6,
++        "vmx-vmwrite-vmexit-fields": true,
++        "vmx-vnmi": true,
++        "vmx-true-ctls": true,
++        "host-phys-bits-limit": 0,
++        "vmx-ept-execonly": true,
++        "vmx-exit-save-efer": true,
++        "vmx-invept-all-context": true,
++        "vmware-cpuid-freq": true,
++        "wbnoinvd": false,
++        "avx512f": true,
++        "hv-runtime": false,
++        "hv-stimer-direct": false,
++        "msr": true,
++        "mce": true,
++        "mca": true,
++        "xcrypt": false,
++        "thread-id": -1,
++        "vmx-exit-load-pat": true,
++        "vmx-intr-exit": true,
++        "min-level": 31,
++        "vmx-flexpriority": true,
++        "xgetbv1": true,
++        "cid": false,
++        "hv-relaxed": false,
++        "hv-crash": false,
++        "ds": false,
++        "fxsr": true,
++        "avx512-bf16": true,
++        "vmx-cr8-load-exit": true,
++        "xsaveopt": true,
++        "vmx-apicv-vid": true,
++        "vmx-exit-save-pat": true,
++        "xtpr": false,
++        "tsx-ctrl": true,
++        "vmx-ple": false,
++        "hv-evmcs": false,
++        "avx512vl": true,
++        "avx512-vpopcntdq": false,
++        "phe": false,
++        "extapic": false,
++        "3dnowprefetch": true,
++        "vmx-vmfunc": true,
++        "vmx-activity-shutdown": false,
++        "avx512vbmi2": false,
++        "vmx-encls-exit": false,
++        "cr8legacy": false,
++        "vmx-msr-bitmap": true,
++        "stibp": true,
++        "cpuid-0xb": true,
++        "xcrypt-en": false,
++        "vmx-mwait-exit": true,
++        "kvm_pv_eoi": true,
++        "vmx-pml": true,
++        "apic-id": 4294967295,
++        "vmx-nmi-exit": true,
++        "vmx-invept-single-context-noglobals": true,
++        "rsba": false,
++        "pn": false,
++        "dca": false,
++        "hv-ipi": false,
++        "vendor": "GenuineIntel",
++        "vmx-unrestricted-guest": true,
++        "vmx-cr3-store-noexit": true,
++        "pku": true,
++        "smx": false,
++        "cmp_legacy": false,
++        "cmp-legacy": false,
++        "node-id": -1,
++        "avx512-4fmaps": false,
++        "vmcb_clean": false,
++        "vmcb-clean": false,
++        "3dnowext": false,
++        "amd-no-ssb": false,
++        "hle": true,
++        "npt": false,
++        "rdctl-no": true,
++        "vmx-invvpid": true,
++        "memory": "/machine/unattached/system[0]",
++        "clwb": true,
++        "lbrv": false,
++        "adx": true,
++        "ss": true,
++        "pni": true,
++        "svm_lock": false,
++        "svm-lock": false,
++        "pfthreshold": false,
++        "smep": true,
++        "smap": true,
++        "vmx-invpcid-exit": true,
++        "x2apic": true,
++        "avx512vbmi": false,
++        "avx512vnni": true,
++        "vmx-apicv-x2apic": true,
++        "hv-stimer": false,
++        "kvm-pv-sched-yield": true,
++        "x-hv-synic-kvm-only": false,
++        "vmx-invlpg-exit": true,
++        "vmx-invvpid-all-context": true,
++        "i64": true,
++        "vmx-activity-hlt": true,
++        "flushbyasid": false,
++        "f16c": true,
++        "vmx-exit-ack-intr": true,
++        "ace2-en": false,
++        "pat": true,
++        "pae": true,
++        "sse": true,
++        "die-id": -1,
++        "vmx-tsc-offset": true,
++        "phe-en": false,
++        "kvm_nopiodelay": true,
++        "kvm-nopiodelay": true,
++        "tm": false,
++        "kvmclock-stable-bit": true,
++        "vmx-rdtsc-exit": true,
++        "hypervisor": true,
++        "vmx-rdtscp-exit": true,
++        "socket-id": -1,
++        "mds-no": true,
++        "pcommit": false,
++        "vmx-vpid": true,
++        "syscall": true,
++        "level": 31,
++        "x-migrate-smi-count": true,
++        "avx512dq": true,
++        "svm": false,
++        "full-cpuid-auto-level": true,
++        "hv-reset": false,
++        "invtsc": false,
++        "vmx-monitor-exit": true,
++        "sse3": true,
++        "sse2": true,
++        "vmx-wbinvd-exit": true,
++        "ssbd": true,
++        "est": false,
++        "kvm-poll-control": true,
++        "kvm_poll_control": true,
++        "avx512ifma": false,
++        "tm2": false,
++        "kvm-pv-ipi": true,
++        "kvm-pv-eoi": true,
++        "cx8": true,
++        "vmx-invvpid-single-addr": true,
++        "waitpkg": false,
++        "cldemote": false,
++        "vmx-ept": true,
++        "hv-reenlightenment": false,
++        "kvm_mmu": false,
++        "kvm-mmu": false,
++        "sse4_2": true,
++        "sse4.2": true,
++        "sse4-2": true,
++        "pge": true,
++        "fill-mtrr-mask": true,
++        "avx512bitalg": false,
++        "nodeid_msr": false,
++        "vmx-entry-load-bndcfgs": false,
++        "pdcm": false,
++        "vmx-exit-clear-rtit-ctl": false,
++        "movbe": true,
++        "model": 85,
++        "nrip_save": false,
++        "nrip-save": false,
++        "kvm_pv_unhalt": true,
++        "ssse3": true,
++        "sse4a": false,
++        "vmx-pause-exit": true,
++        "invpcid": true,
++        "pdpe1gb": true,
++        "tsc-deadline": true,
++        "skip-l1dfl-vmentry": true,
++        "vmx-exit-load-perf-global-ctrl": false,
++        "fma": true,
++        "cx16": true,
++        "de": true,
++        "enforce": false,
++        "stepping": 11,
++        "xsave": true,
++        "clflush": true,
++        "skinit": false,
++        "tce": false,
++        "tsc": true,
++        "fpu": true,
++        "ibs": false,
++        "ds_cpl": false,
++        "ds-cpl": false,
++        "host-phys-bits": false,
++        "vmx-exit-nosave-debugctl": true,
++        "fma4": false,
++        "vmx-invept": true,
++        "la57": false,
++        "osvw": false,
++        "check": true,
++        "hv-spinlocks": 4294967295,
++        "pmu": false,
++        "vmx-eptad": true,
++        "pmm": false,
++        "apic": true,
++        "vmx-entry-noload-debugctl": true,
++        "spec-ctrl": true,
++        "vmx-posted-intr": true,
++        "vmx-apicv-register": true,
++        "min-xlevel2": 0,
++        "tsc-adjust": true,
++        "tsc_adjust": true,
++        "kvm-steal-time": true,
++        "kvm_steal_time": true,
++        "vmx-zero-len-inject": false,
++        "kvmclock": true,
++        "l3-cache": true,
++        "pschange-mc-no": true,
++        "vmx-rdrand-exit": true,
++        "lwp": false,
++        "hv-passthrough": false,
++        "amd-ssbd": true,
++        "ibpb": true,
++        "xop": false,
++        "avx": true,
++        "core-capability": false,
++        "vmx-invept-single-context": true,
++        "movdiri": false,
++        "ace2": false,
++        "avx512bw": true,
++        "acpi": false,
++        "hv-vapic": false,
++        "fsgsbase": true,
++        "vmx-ept-1gb": true,
++        "vmx-ept-2mb": true,
++        "ht": false,
++        "vmx-io-exit": true,
++        "nx": true,
++        "pclmulqdq": true,
++        "mmxext": false,
++        "vaes": false,
++        "popcnt": true,
++        "xsaves": true,
++        "movdir64b": false,
++        "tcg-cpuid": true,
++        "vmx-shadow-vmcs": true,
++        "lm": true,
++        "vmx-exit-save-preemption-timer": true,
++        "vmx-entry-load-pat": true,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": true,
++        "umip": true,
++        "vmx-store-lma": true,
++        "vmx-movdr-exit": true,
++        "pse": true,
++        "avx2": true,
++        "sep": true,
++        "pclmuldq": true,
++        "virt-ssbd": false,
++        "vmx-cr3-load-noexit": true,
++        "x-hv-max-vps": -1,
++        "nodeid-msr": false,
++        "md-clear": true,
++        "kvm": true,
++        "split-lock-detect": false,
++        "misalignsse": false,
++        "min-xlevel": 2147483656,
++        "realized": false,
++        "kvm-pv-unhalt": true,
++        "bmi2": true,
++        "bmi1": true,
++        "tsc_scale": false,
++        "tsc-scale": false,
++        "topoext": false,
++        "hv-no-nonarch-coresharing": "off",
++        "hv-vpindex": false,
++        "amd-stibp": true,
++        "ucode-rev": 0,
++        "vmx-preemption-timer": true,
++        "xlevel2": 0,
++        "clflushopt": true,
++        "vmx-vnmi-pending": true,
++        "kvm-no-smi-migration": false,
++        "monitor": false,
++        "vmx-vintr-pending": true,
++        "avx512er": false,
++        "pmm-en": false,
++        "pcid": true,
++        "taa-no": true,
++        "vmx-secondary-ctls": true,
++        "arch-capabilities": true,
++        "vmx-xsaves": true,
++        "clzero": false,
++        "3dnow": false,
++        "erms": true,
++        "x-force-features": false,
++        "vmx-entry-ia32e-mode": true,
++        "lahf-lm": true,
++        "lahf_lm": true,
++        "vpclmulqdq": false,
++        "vmx-ins-outs": true,
++        "hv-synic": false,
++        "fxsr-opt": false,
++        "xstore": false,
++        "fxsr_opt": false,
++        "kvm-hint-dedicated": false,
++        "rtm": true,
++        "lmce": true,
++        "hv-time": false,
++        "perfctr-nb": false,
++        "perfctr_nb": false,
++        "hv-tlbflush": false,
++        "ffxsr": false,
++        "rdrand": true,
++        "rdseed": true,
++        "avx512-4vnniw": false,
++        "vmx": true,
++        "vme": true,
++        "dtes64": false,
++        "mtrr": true,
++        "rdtscp": true,
++        "xsaveerptr": false,
++        "pse36": true,
++        "kvm-pv-tlb-flush": true,
++        "vmx-activity-wait-sipi": false,
++        "tbm": false,
++        "wdt": false,
++        "vmx-rdpmc-exit": true,
++        "level-func7": 1,
++        "vmx-entry-load-efer": true,
++        "vmx-mtf": true,
++        "pause_filter": false,
++        "sha-ni": false,
++        "model-id": "Genuine Intel(R) CPU 0000%@",
++        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
++        "avx512pf": false,
++        "vmx-hlt-exit": true,
++        "xstore-en": false
++      }
++    }
++  },
++  "id": "model-expansion"
++}
++
++{
++  "return": [
++    {
++      "name": "max",
++      "typename": "max-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": false
++    },
++    {
++      "name": "host",
++      "typename": "host-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": false
++    },
++    {
++      "name": "base",
++      "typename": "base-x86_64-cpu",
++      "unavailable-features": [],
++      "static": true,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu64-v1",
++      "typename": "qemu64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu64",
++      "typename": "qemu64-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "qemu64-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32-v1",
++      "typename": "qemu32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32",
++      "typename": "qemu32-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "qemu32-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom-v1",
++      "typename": "phenom-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "sse4a",
++        "npt"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom",
++      "typename": "phenom-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "sse4a",
++        "npt"
++      ],
++      "alias-of": "phenom-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3-v1",
++      "typename": "pentium3-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3",
++      "typename": "pentium3-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "pentium3-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2-v1",
++      "typename": "pentium2-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2",
++      "typename": "pentium2-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "pentium2-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium-v1",
++      "typename": "pentium-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium",
++      "typename": "pentium-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "pentium-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270-v1",
++      "typename": "n270-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270",
++      "typename": "n270-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "n270-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64-v1",
++      "typename": "kvm64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64",
++      "typename": "kvm64-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "kvm64-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32-v1",
++      "typename": "kvm32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32",
++      "typename": "kvm32-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "kvm32-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo-v1",
++      "typename": "coreduo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo",
++      "typename": "coreduo-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "coreduo-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo-v1",
++      "typename": "core2duo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo",
++      "typename": "core2duo-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "core2duo-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon-v1",
++      "typename": "athlon-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon",
++      "typename": "athlon-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "alias-of": "athlon-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v2",
++      "typename": "Westmere-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v1",
++      "typename": "Westmere-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-IBRS",
++      "typename": "Westmere-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Westmere-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere",
++      "typename": "Westmere-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Westmere-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v2",
++      "typename": "Snowridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v1",
++      "typename": "Snowridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge",
++      "typename": "Snowridge-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "alias-of": "Snowridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v3",
++      "typename": "Skylake-Server-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v2",
++      "typename": "Skylake-Server-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v1",
++      "typename": "Skylake-Server-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-noTSX-IBRS",
++      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Skylake-Server-v3",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-IBRS",
++      "typename": "Skylake-Server-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Skylake-Server-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server",
++      "typename": "Skylake-Server-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Skylake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v3",
++      "typename": "Skylake-Client-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v2",
++      "typename": "Skylake-Client-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v1",
++      "typename": "Skylake-Client-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-noTSX-IBRS",
++      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Skylake-Client-v3",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-IBRS",
++      "typename": "Skylake-Client-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Skylake-Client-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client",
++      "typename": "Skylake-Client-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Skylake-Client-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v2",
++      "typename": "SandyBridge-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v1",
++      "typename": "SandyBridge-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-IBRS",
++      "typename": "SandyBridge-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "SandyBridge-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge",
++      "typename": "SandyBridge-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "SandyBridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Penryn-v1",
++      "typename": "Penryn-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Penryn",
++      "typename": "Penryn-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Penryn-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G5-v1",
++      "typename": "Opteron_G5-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "tbm",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G5",
++      "typename": "Opteron_G5-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "tbm",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "Opteron_G5-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G4-v1",
++      "typename": "Opteron_G4-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G4",
++      "typename": "Opteron_G4-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "Opteron_G4-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G3-v1",
++      "typename": "Opteron_G3-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G3",
++      "typename": "Opteron_G3-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse"
++      ],
++      "alias-of": "Opteron_G3-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G2-v1",
++      "typename": "Opteron_G2-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G2",
++      "typename": "Opteron_G2-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Opteron_G2-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G1-v1",
++      "typename": "Opteron_G1-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G1",
++      "typename": "Opteron_G1-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Opteron_G1-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v2",
++      "typename": "Nehalem-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v1",
++      "typename": "Nehalem-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-IBRS",
++      "typename": "Nehalem-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Nehalem-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem",
++      "typename": "Nehalem-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Nehalem-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "KnightsMill-v1",
++      "typename": "KnightsMill-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512pf",
++        "avx512er",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "KnightsMill",
++      "typename": "KnightsMill-x86_64-cpu",
++      "unavailable-features": [
++        "avx512pf",
++        "avx512er",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps"
++      ],
++      "alias-of": "KnightsMill-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v2",
++      "typename": "IvyBridge-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v1",
++      "typename": "IvyBridge-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-IBRS",
++      "typename": "IvyBridge-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "IvyBridge-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge",
++      "typename": "IvyBridge-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "IvyBridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v3",
++      "typename": "Icelake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v2",
++      "typename": "Icelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v1",
++      "typename": "Icelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-noTSX",
++      "typename": "Icelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "alias-of": "Icelake-Server-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server",
++      "typename": "Icelake-Server-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "alias-of": "Icelake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v2",
++      "typename": "Icelake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v1",
++      "typename": "Icelake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-noTSX",
++      "typename": "Icelake-Client-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "alias-of": "Icelake-Client-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client",
++      "typename": "Icelake-Client-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "alias-of": "Icelake-Client-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v4",
++      "typename": "Haswell-v4-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v3",
++      "typename": "Haswell-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v2",
++      "typename": "Haswell-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v1",
++      "typename": "Haswell-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-noTSX-IBRS",
++      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Haswell-v4",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-noTSX",
++      "typename": "Haswell-noTSX-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Haswell-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-IBRS",
++      "typename": "Haswell-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Haswell-v3",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell",
++      "typename": "Haswell-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Haswell-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v3",
++      "typename": "EPYC-v3-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v2",
++      "typename": "EPYC-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v1",
++      "typename": "EPYC-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-Rome-v1",
++      "typename": "EPYC-Rome-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdpid",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "wbnoinvd",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-Rome",
++      "typename": "EPYC-Rome-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdpid",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "wbnoinvd",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "EPYC-Rome-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-IBPB",
++      "typename": "EPYC-IBPB-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "EPYC-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC",
++      "typename": "EPYC-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "EPYC-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana-v1",
++      "typename": "Dhyana-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana",
++      "typename": "Dhyana-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "Dhyana-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v2",
++      "typename": "Denverton-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v1",
++      "typename": "Denverton-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton",
++      "typename": "Denverton-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni"
++      ],
++      "alias-of": "Denverton-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake-v1",
++      "typename": "Cooperlake-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake",
++      "typename": "Cooperlake-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Cooperlake-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe-v1",
++      "typename": "Conroe-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe",
++      "typename": "Conroe-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Conroe-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v3",
++      "typename": "Cascadelake-Server-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v2",
++      "typename": "Cascadelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v1",
++      "typename": "Cascadelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-noTSX",
++      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Cascadelake-Server-v3",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server",
++      "typename": "Cascadelake-Server-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Cascadelake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v4",
++      "typename": "Broadwell-v4-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v3",
++      "typename": "Broadwell-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v2",
++      "typename": "Broadwell-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v1",
++      "typename": "Broadwell-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-noTSX-IBRS",
++      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Broadwell-v4",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-noTSX",
++      "typename": "Broadwell-noTSX-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Broadwell-v2",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-IBRS",
++      "typename": "Broadwell-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Broadwell-v3",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell",
++      "typename": "Broadwell-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "Broadwell-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "486-v1",
++      "typename": "486-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "486",
++      "typename": "486-x86_64-cpu",
++      "unavailable-features": [],
++      "alias-of": "486-v1",
++      "static": false,
++      "migration-safe": true
++    }
++  ],
++  "id": "definitions"
++}
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake.sig b/tests/cputestdata/x86_64-cpuid-Cooperlake.sig
+new file mode 100644
+index 0000000000..72a8da4132
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake.sig
+@@ -0,0 +1,4 @@
++05065b
++family:     6 (0x06)
++model:     85 (0x55)
++stepping:  11 (0x0b)
+diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake.xml
+new file mode 100644
+index 0000000000..96d364b303
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Cooperlake.xml
+@@ -0,0 +1,68 @@
++<!-- Cooperlake -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000001f' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x0005065b' ebx='0x73400800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
++  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
++  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x7c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x7c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x7c004143' ebx='0x03c0003f' ecx='0x000003ff' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x7c0fc163' ebx='0x0280003f' ecx='0x00008fff' edx='0x00000005'/>
++  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002020'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000ef7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000001' ebx='0xd39ffffb' ecx='0x00000818' edx='0xbc000400'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x01' eax='0x00000020' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000073'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000006' ebx='0x00000024' ecx='0x00000201' edx='0x00000073'/>
++  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x000002ff' ebx='0x00000a88' ecx='0x00000a88' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000a08' ecx='0x00000100' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x05' eax='0x00000040' ebx='0x00000440' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x06' eax='0x00000200' ebx='0x00000480' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x07' eax='0x00000400' ebx='0x00000680' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x09' eax='0x00000008' ebx='0x00000a80' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000008f' ecx='0x00000000' edx='0x00000002'/>
++  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00012000' ecx='0x0000008f' edx='0x00000007'/>
++  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x0000000a' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x0000000a' ebx='0x00000600' ecx='0x00000004' edx='0x0000000f'/>
++  <cpuid eax_in='0x00000010' ecx_in='0x03' eax='0x00000059' ebx='0x00000000' ecx='0x00000004' edx='0x00000007'/>
++  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
++  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000c8' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x000009c4' ebx='0x00000ed8' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0x00000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000019' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000073'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x01' eax='0x00000006' ebx='0x00000024' ecx='0x00000201' edx='0x00000073'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x02' eax='0x00000000' ebx='0x00000000' ecx='0x00000002' edx='0x00000073'/>
++  <cpuid eax_in='0x20000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000073'/>
++  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
++  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x756e6547' ebx='0x20656e69' ecx='0x65746e49' edx='0x2952286c'/>
++  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x30303020' ecx='0x00402530' edx='0x00000000'/>
++  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
++  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
++  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000073'/>
++  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000073'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x000001eb'/>
++</cpudata>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-7600U.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-7600U.patch
deleted file mode 100644
index fdfd363..0000000
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-7600U.patch
+++ /dev/null
@@ -1,979 +0,0 @@
-From 7ea297f4cff68e0f5f44f91e1ba1283fce05de6f Mon Sep 17 00:00:00 2001
-Message-Id: <7ea297f4cff68e0f5f44f91e1ba1283fce05de6f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:50 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Core(TM) i7-7600U
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit cd11ea73d01b256437e25bc635c51d08518c8c77)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <6a76550993bbc3e13f59daeea8e03ab0a0891997.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Core-i7-7600U-disabled.xml   |   6 +
- .../x86_64-cpuid-Core-i7-7600U-enabled.xml    |   8 +
- .../x86_64-cpuid-Core-i7-7600U-guest.xml      |  28 +
- .../x86_64-cpuid-Core-i7-7600U-host.xml       |  29 +
- .../x86_64-cpuid-Core-i7-7600U-json.xml       |  13 +
- .../x86_64-cpuid-Core-i7-7600U.json           | 755 ++++++++++++++++++
- .../x86_64-cpuid-Core-i7-7600U.xml            |  47 ++
- 8 files changed, 887 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index f43144edc9..28d575a784 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1176,6 +1176,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-arat", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-ibrs", JSON_HOST);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7600U", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7700", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", JSON_NONE);
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
-new file mode 100644
-index 0000000000..0a567bbfae
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
-@@ -0,0 +1,6 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x08000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml
-new file mode 100644
-index 0000000000..b1cdaa802a
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000004' edx='0x84000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
-new file mode 100644
-index 0000000000..70a0fc3286
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
-@@ -0,0 +1,28 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
-new file mode 100644
-index 0000000000..bbdfb6aa61
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
-@@ -0,0 +1,29 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='osxsave'/>
-+  <feature name='tsc_adjust'/>
-+  <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='xsaves'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
-new file mode 100644
-index 0000000000..48089c6003
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
-@@ -0,0 +1,13 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='umip'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.json
-new file mode 100644
-index 0000000000..9a258e6be3
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.json
-@@ -0,0 +1,755 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "hv-evmcs": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "rsba": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "hv-ipi": false,
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "hle": true,
-+        "npt": false,
-+        "rdctl-no": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "x-hv-synic-kvm-only": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "x-migrate-smi-count": true,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-ipi": true,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 142,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "pconfig": false,
-+        "enforce": false,
-+        "stepping": 9,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "arch-capabilities": false,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": true,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Core(TM) i7-7600U CPU @ 2.80GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f",
-+        "pku"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f",
-+        "pku"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "KnightsMill",
-+      "typename": "KnightsMill-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Icelake-Server",
-+      "typename": "Icelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "intel-pt",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512vbmi",
-+        "pku",
-+        "",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "la57",
-+        "pconfig",
-+        "wbnoinvd",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f",
-+        "pku"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Icelake-Client",
-+      "typename": "Icelake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "intel-pt",
-+        "avx512vbmi",
-+        "pku",
-+        "",
-+        "avx512vbmi2",
-+        "gfni",
-+        "vaes",
-+        "vpclmulqdq",
-+        "avx512vnni",
-+        "avx512bitalg",
-+        "avx512-vpopcntdq",
-+        "wbnoinvd",
-+        "pku"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw",
-+        "ibpb"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Cascadelake-Server",
-+      "typename": "Cascadelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "intel-pt",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pku",
-+        "",
-+        "avx512vnni",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f",
-+        "pku"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.xml
-new file mode 100644
-index 0000000000..d46811e3d3
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.xml
-@@ -0,0 +1,47 @@
-+<!-- Intel(R) Core(TM) i7-7600U CPU @ 2.80GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000806e9' ebx='0x03100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x9c000000'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000003'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000003'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000f2' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036372d' ecx='0x43205530' edx='0x40205550'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x382e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-+</cpudata>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8550U-CPU-without-TSX.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8550U-CPU-without-TSX.patch
new file mode 100644
index 0000000..024e53b
--- /dev/null
+++ b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8550U-CPU-without-TSX.patch
@@ -0,0 +1,2028 @@
+From 1f609088740213d7972a64cab6f7404996a43bf1 Mon Sep 17 00:00:00 2001
+Message-Id: <1f609088740213d7972a64cab6f7404996a43bf1@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 26 May 2020 10:58:54 +0200
+Subject: [PATCH] cputest: Add data for Intel(R) Core(TM) i7-8550U CPU without
+ TSX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit 62a50628ff34cf4c2c95e82bc645a4648b8f0422)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840008
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <e7362282d6a62fb5f631d2bdadb5e87e507b02cc.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/cputest.c                               |    1 +
+ .../x86_64-cpuid-Core-i7-8550U-disabled.xml   |    6 +
+ .../x86_64-cpuid-Core-i7-8550U-enabled.xml    |    9 +
+ .../x86_64-cpuid-Core-i7-8550U-guest.xml      |   31 +
+ .../x86_64-cpuid-Core-i7-8550U-host.xml       |   39 +
+ .../x86_64-cpuid-Core-i7-8550U-json.xml       |   19 +
+ .../x86_64-cpuid-Core-i7-8550U.json           | 1769 +++++++++++++++++
+ .../x86_64-cpuid-Core-i7-8550U.sig            |    4 +
+ .../x86_64-cpuid-Core-i7-8550U.xml            |   49 +
+ 9 files changed, 1927 insertions(+)
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U.json
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U.sig
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8550U.xml
+
+diff --git a/tests/cputest.c b/tests/cputest.c
+index 279f788162..1f59f0d3a9 100644
+--- a/tests/cputest.c
++++ b/tests/cputest.c
+@@ -1235,6 +1235,7 @@ mymain(void)
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-ibrs", JSON_HOST);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7600U", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7700", JSON_MODELS);
++    DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-8550U", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-8700", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", JSON_HOST);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", JSON_NONE);
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
+new file mode 100644
+index 0000000000..436ded22eb
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
+@@ -0,0 +1,6 @@
++<!-- Features disabled by QEMU -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c19c' edx='0xb0600000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
++</cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+new file mode 100644
+index 0000000000..6c480eeacf
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+@@ -0,0 +1,9 @@
++<!-- Features enabled by QEMU -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c47ab' ecx='0x00000004' edx='0xac000400'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
++</cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+new file mode 100644
+index 0000000000..92404e4d03
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+@@ -0,0 +1,31 @@
++<cpu mode='custom' match='exact'>
++  <model fallback='forbid'>Skylake-Client-IBRS</model>
++  <vendor>Intel</vendor>
++  <feature policy='require' name='ds'/>
++  <feature policy='require' name='acpi'/>
++  <feature policy='require' name='ss'/>
++  <feature policy='require' name='ht'/>
++  <feature policy='require' name='tm'/>
++  <feature policy='require' name='pbe'/>
++  <feature policy='require' name='dtes64'/>
++  <feature policy='require' name='monitor'/>
++  <feature policy='require' name='ds_cpl'/>
++  <feature policy='require' name='vmx'/>
++  <feature policy='require' name='est'/>
++  <feature policy='require' name='tm2'/>
++  <feature policy='require' name='xtpr'/>
++  <feature policy='require' name='pdcm'/>
++  <feature policy='require' name='osxsave'/>
++  <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='clflushopt'/>
++  <feature policy='require' name='intel-pt'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='ssbd'/>
++  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='pdpe1gb'/>
++  <feature policy='require' name='invtsc'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='disable' name='hle'/>
++  <feature policy='disable' name='rtm'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+new file mode 100644
+index 0000000000..808a8ff969
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+@@ -0,0 +1,39 @@
++<cpu>
++  <arch>x86_64</arch>
++  <model>Broadwell-noTSX-IBRS</model>
++  <vendor>Intel</vendor>
++  <feature name='vme'/>
++  <feature name='ds'/>
++  <feature name='acpi'/>
++  <feature name='ss'/>
++  <feature name='ht'/>
++  <feature name='tm'/>
++  <feature name='pbe'/>
++  <feature name='dtes64'/>
++  <feature name='monitor'/>
++  <feature name='ds_cpl'/>
++  <feature name='vmx'/>
++  <feature name='est'/>
++  <feature name='tm2'/>
++  <feature name='xtpr'/>
++  <feature name='pdcm'/>
++  <feature name='osxsave'/>
++  <feature name='f16c'/>
++  <feature name='rdrand'/>
++  <feature name='arat'/>
++  <feature name='tsc_adjust'/>
++  <feature name='mpx'/>
++  <feature name='clflushopt'/>
++  <feature name='intel-pt'/>
++  <feature name='md-clear'/>
++  <feature name='stibp'/>
++  <feature name='ssbd'/>
++  <feature name='xsaveopt'/>
++  <feature name='xsavec'/>
++  <feature name='xgetbv1'/>
++  <feature name='xsaves'/>
++  <feature name='pdpe1gb'/>
++  <feature name='abm'/>
++  <feature name='invtsc'/>
++  <feature name='skip-l1dfl-vmentry'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+new file mode 100644
+index 0000000000..645c0934c2
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+@@ -0,0 +1,19 @@
++<cpu mode='custom' match='exact'>
++  <model fallback='forbid'>Skylake-Client-IBRS</model>
++  <vendor>Intel</vendor>
++  <feature policy='require' name='ss'/>
++  <feature policy='require' name='vmx'/>
++  <feature policy='require' name='hypervisor'/>
++  <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='clflushopt'/>
++  <feature policy='require' name='umip'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='arch-capabilities'/>
++  <feature policy='require' name='ssbd'/>
++  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='pdpe1gb'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='disable' name='hle'/>
++  <feature policy='disable' name='rtm'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.json
+new file mode 100644
+index 0000000000..484931896a
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.json
+@@ -0,0 +1,1769 @@
++{
++  "return": {
++    "model": {
++      "name": "base",
++      "props": {
++        "vmx-entry-load-rtit-ctl": false,
++        "phys-bits": 0,
++        "core-id": -1,
++        "xlevel": 2147483656,
++        "cmov": true,
++        "ia64": false,
++        "ssb-no": false,
++        "aes": true,
++        "vmx-apicv-xapic": true,
++        "mmx": true,
++        "arat": true,
++        "rdpid": false,
++        "vmx-page-walk-5": false,
++        "vmx-page-walk-4": true,
++        "vmx-desc-exit": true,
++        "gfni": false,
++        "ibrs-all": false,
++        "pause-filter": false,
++        "xsavec": true,
++        "intel-pt": false,
++        "vmx-cr8-store-exit": true,
++        "hv-frequencies": false,
++        "tsc-frequency": 0,
++        "vmx-rdseed-exit": true,
++        "xd": true,
++        "x-intel-pt-auto-level": true,
++        "hv-vendor-id": "",
++        "vmx-eptp-switching": true,
++        "kvm_asyncpf": true,
++        "kvm-asyncpf": true,
++        "perfctr_core": false,
++        "perfctr-core": false,
++        "mpx": true,
++        "avx512cd": false,
++        "pbe": false,
++        "decodeassists": false,
++        "vmx-exit-clear-bndcfgs": false,
++        "vmx-exit-load-efer": true,
++        "sse4_1": true,
++        "sse4-1": true,
++        "sse4.1": true,
++        "family": 6,
++        "legacy-cache": true,
++        "vmx-vmwrite-vmexit-fields": true,
++        "vmx-vnmi": true,
++        "vmx-true-ctls": true,
++        "host-phys-bits-limit": 0,
++        "vmx-ept-execonly": true,
++        "vmx-exit-save-efer": true,
++        "vmx-invept-all-context": true,
++        "vmware-cpuid-freq": true,
++        "wbnoinvd": false,
++        "avx512f": false,
++        "xcrypt": false,
++        "hv-runtime": false,
++        "hv-stimer-direct": false,
++        "mce": true,
++        "mca": true,
++        "msr": true,
++        "thread-id": -1,
++        "vmx-exit-load-pat": true,
++        "vmx-intr-exit": true,
++        "min-level": 22,
++        "vmx-flexpriority": true,
++        "xgetbv1": true,
++        "cid": false,
++        "hv-relaxed": false,
++        "avx512-bf16": false,
++        "ds": false,
++        "hv-crash": false,
++        "fxsr": true,
++        "vmx-cr8-load-exit": true,
++        "xsaveopt": true,
++        "vmx-apicv-vid": false,
++        "vmx-exit-save-pat": true,
++        "tsx-ctrl": false,
++        "xtpr": false,
++        "vmx-ple": false,
++        "hv-evmcs": false,
++        "avx512-vpopcntdq": false,
++        "phe": false,
++        "avx512vl": false,
++        "extapic": false,
++        "vmx-vmfunc": true,
++        "3dnowprefetch": true,
++        "vmx-activity-shutdown": false,
++        "avx512vbmi2": false,
++        "cr8legacy": false,
++        "vmx-encls-exit": false,
++        "stibp": true,
++        "vmx-msr-bitmap": true,
++        "cpuid-0xb": true,
++        "xcrypt-en": false,
++        "vmx-mwait-exit": true,
++        "kvm_pv_eoi": true,
++        "vmx-pml": true,
++        "apic-id": 4294967295,
++        "vmx-nmi-exit": true,
++        "vmx-invept-single-context-noglobals": true,
++        "pn": false,
++        "rsba": false,
++        "dca": false,
++        "vmx-unrestricted-guest": true,
++        "vendor": "GenuineIntel",
++        "hv-ipi": false,
++        "vmx-cr3-store-noexit": true,
++        "pku": false,
++        "smx": false,
++        "cmp-legacy": false,
++        "cmp_legacy": false,
++        "node-id": -1,
++        "avx512-4fmaps": false,
++        "vmcb_clean": false,
++        "vmcb-clean": false,
++        "hle": false,
++        "amd-no-ssb": false,
++        "3dnowext": false,
++        "npt": false,
++        "rdctl-no": false,
++        "vmx-invvpid": true,
++        "memory": "/machine/unattached/system[0]",
++        "clwb": false,
++        "lbrv": false,
++        "adx": true,
++        "ss": true,
++        "pni": true,
++        "svm_lock": false,
++        "svm-lock": false,
++        "pfthreshold": false,
++        "smap": true,
++        "smep": true,
++        "vmx-invpcid-exit": true,
++        "x2apic": true,
++        "avx512vnni": false,
++        "avx512vbmi": false,
++        "vmx-apicv-x2apic": true,
++        "hv-stimer": false,
++        "kvm-pv-sched-yield": true,
++        "vmx-invlpg-exit": true,
++        "x-hv-synic-kvm-only": false,
++        "vmx-invvpid-all-context": true,
++        "i64": true,
++        "vmx-activity-hlt": true,
++        "flushbyasid": false,
++        "f16c": true,
++        "vmx-exit-ack-intr": true,
++        "ace2-en": false,
++        "pae": true,
++        "pat": true,
++        "sse": true,
++        "die-id": -1,
++        "vmx-tsc-offset": true,
++        "phe-en": false,
++        "kvm_nopiodelay": true,
++        "kvm-nopiodelay": true,
++        "tm": false,
++        "kvmclock-stable-bit": true,
++        "vmx-rdtsc-exit": true,
++        "hypervisor": true,
++        "vmx-rdtscp-exit": true,
++        "socket-id": -1,
++        "mds-no": false,
++        "pcommit": false,
++        "vmx-vpid": true,
++        "syscall": true,
++        "level": 22,
++        "avx512dq": false,
++        "x-migrate-smi-count": true,
++        "svm": false,
++        "full-cpuid-auto-level": true,
++        "hv-reset": false,
++        "invtsc": false,
++        "vmx-monitor-exit": true,
++        "sse3": true,
++        "sse2": true,
++        "ssbd": true,
++        "vmx-wbinvd-exit": true,
++        "est": false,
++        "kvm-poll-control": true,
++        "kvm_poll_control": true,
++        "avx512ifma": false,
++        "tm2": false,
++        "kvm-pv-eoi": true,
++        "kvm-pv-ipi": true,
++        "cx8": true,
++        "vmx-invvpid-single-addr": true,
++        "waitpkg": false,
++        "cldemote": false,
++        "vmx-ept": true,
++        "hv-reenlightenment": false,
++        "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,
++        "nodeid_msr": false,
++        "pdcm": false,
++        "vmx-exit-clear-rtit-ctl": false,
++        "model": 142,
++        "movbe": true,
++        "nrip_save": false,
++        "nrip-save": false,
++        "vmx-pause-exit": true,
++        "ssse3": true,
++        "kvm_pv_unhalt": true,
++        "sse4a": false,
++        "invpcid": true,
++        "pdpe1gb": true,
++        "tsc-deadline": true,
++        "skip-l1dfl-vmentry": true,
++        "vmx-exit-load-perf-global-ctrl": false,
++        "fma": true,
++        "cx16": true,
++        "de": true,
++        "enforce": false,
++        "stepping": 10,
++        "xsave": true,
++        "clflush": true,
++        "skinit": false,
++        "tsc": true,
++        "tce": false,
++        "fpu": true,
++        "ds-cpl": false,
++        "ds_cpl": false,
++        "ibs": false,
++        "fma4": false,
++        "host-phys-bits": false,
++        "vmx-exit-nosave-debugctl": true,
++        "vmx-invept": true,
++        "la57": false,
++        "osvw": false,
++        "check": true,
++        "hv-spinlocks": 4294967295,
++        "vmx-eptad": true,
++        "pmu": false,
++        "vmx-entry-noload-debugctl": true,
++        "pmm": false,
++        "apic": true,
++        "spec-ctrl": true,
++        "vmx-posted-intr": false,
++        "vmx-apicv-register": false,
++        "min-xlevel2": 0,
++        "tsc-adjust": true,
++        "tsc_adjust": true,
++        "kvm-steal-time": true,
++        "kvm_steal_time": true,
++        "kvmclock": true,
++        "vmx-zero-len-inject": false,
++        "l3-cache": true,
++        "pschange-mc-no": true,
++        "vmx-rdrand-exit": true,
++        "lwp": false,
++        "hv-passthrough": false,
++        "amd-ssbd": false,
++        "ibpb": false,
++        "xop": false,
++        "core-capability": false,
++        "avx": true,
++        "vmx-invept-single-context": true,
++        "movdiri": false,
++        "avx512bw": false,
++        "acpi": false,
++        "ace2": false,
++        "fsgsbase": true,
++        "hv-vapic": false,
++        "vmx-ept-1gb": true,
++        "vmx-ept-2mb": true,
++        "ht": false,
++        "vmx-io-exit": true,
++        "nx": true,
++        "pclmulqdq": true,
++        "mmxext": false,
++        "popcnt": true,
++        "vaes": false,
++        "xsaves": true,
++        "movdir64b": false,
++        "vmx-shadow-vmcs": true,
++        "tcg-cpuid": true,
++        "lm": true,
++        "vmx-exit-save-preemption-timer": true,
++        "vmx-entry-load-pat": true,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": true,
++        "vmx-store-lma": true,
++        "umip": true,
++        "vmx-movdr-exit": true,
++        "avx2": true,
++        "pse": true,
++        "pclmuldq": true,
++        "sep": true,
++        "vmx-cr3-load-noexit": true,
++        "virt-ssbd": false,
++        "x-hv-max-vps": -1,
++        "nodeid-msr": false,
++        "md-clear": true,
++        "split-lock-detect": false,
++        "kvm": true,
++        "misalignsse": false,
++        "min-xlevel": 2147483656,
++        "realized": false,
++        "kvm-pv-unhalt": true,
++        "bmi2": true,
++        "bmi1": true,
++        "tsc_scale": false,
++        "tsc-scale": false,
++        "topoext": false,
++        "hv-vpindex": false,
++        "hv-no-nonarch-coresharing": "off",
++        "vmx-preemption-timer": true,
++        "xlevel2": 0,
++        "clflushopt": true,
++        "vmx-vnmi-pending": true,
++        "kvm-no-smi-migration": false,
++        "monitor": false,
++        "vmx-vintr-pending": true,
++        "avx512er": false,
++        "pmm-en": false,
++        "taa-no": false,
++        "pcid": true,
++        "vmx-secondary-ctls": true,
++        "arch-capabilities": true,
++        "vmx-xsaves": true,
++        "clzero": false,
++        "3dnow": false,
++        "erms": true,
++        "x-force-features": false,
++        "vmx-entry-ia32e-mode": true,
++        "lahf-lm": true,
++        "lahf_lm": true,
++        "vmx-ins-outs": true,
++        "vpclmulqdq": false,
++        "xstore": false,
++        "fxsr-opt": false,
++        "fxsr_opt": false,
++        "hv-synic": false,
++        "rtm": false,
++        "kvm-hint-dedicated": false,
++        "lmce": true,
++        "hv-time": false,
++        "perfctr_nb": false,
++        "perfctr-nb": false,
++        "hv-tlbflush": false,
++        "ffxsr": false,
++        "rdrand": true,
++        "rdseed": true,
++        "avx512-4vnniw": false,
++        "vme": true,
++        "vmx": true,
++        "dtes64": false,
++        "mtrr": true,
++        "rdtscp": true,
++        "xsaveerptr": false,
++        "pse36": true,
++        "kvm-pv-tlb-flush": true,
++        "vmx-activity-wait-sipi": false,
++        "tbm": false,
++        "vmx-rdpmc-exit": true,
++        "wdt": false,
++        "vmx-entry-load-efer": true,
++        "level-func7": 0,
++        "vmx-mtf": true,
++        "pause_filter": false,
++        "model-id": "Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz",
++        "sha-ni": false,
++        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
++        "avx512pf": false,
++        "vmx-hlt-exit": true,
++        "xstore-en": false
++      }
++    }
++  },
++  "id": "model-expansion"
++}
++
++{
++  "return": [
++    {
++      "name": "max",
++      "typename": "max-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": false
++    },
++    {
++      "name": "host",
++      "typename": "host-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": false
++    },
++    {
++      "name": "base",
++      "typename": "base-x86_64-cpu",
++      "unavailable-features": [],
++      "static": true,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu64-v1",
++      "typename": "qemu64-v1-x86_64-cpu",
++      "unavailable-features": [
++        "svm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu64",
++      "typename": "qemu64-x86_64-cpu",
++      "unavailable-features": [
++        "svm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32-v1",
++      "typename": "qemu32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32",
++      "typename": "qemu32-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom-v1",
++      "typename": "phenom-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "svm",
++        "sse4a",
++        "npt"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom",
++      "typename": "phenom-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "svm",
++        "sse4a",
++        "npt"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3-v1",
++      "typename": "pentium3-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3",
++      "typename": "pentium3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2-v1",
++      "typename": "pentium2-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2",
++      "typename": "pentium2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium-v1",
++      "typename": "pentium-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium",
++      "typename": "pentium-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270-v1",
++      "typename": "n270-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270",
++      "typename": "n270-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64-v1",
++      "typename": "kvm64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64",
++      "typename": "kvm64-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32-v1",
++      "typename": "kvm32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32",
++      "typename": "kvm32-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo-v1",
++      "typename": "coreduo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo",
++      "typename": "coreduo-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo-v1",
++      "typename": "core2duo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo",
++      "typename": "core2duo-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon-v1",
++      "typename": "athlon-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon",
++      "typename": "athlon-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v2",
++      "typename": "Westmere-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v1",
++      "typename": "Westmere-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-IBRS",
++      "typename": "Westmere-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere",
++      "typename": "Westmere-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v2",
++      "typename": "Snowridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v1",
++      "typename": "Snowridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge",
++      "typename": "Snowridge-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v3",
++      "typename": "Skylake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v2",
++      "typename": "Skylake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v1",
++      "typename": "Skylake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-noTSX-IBRS",
++      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-IBRS",
++      "typename": "Skylake-Server-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server",
++      "typename": "Skylake-Server-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v3",
++      "typename": "Skylake-Client-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v2",
++      "typename": "Skylake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v1",
++      "typename": "Skylake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-noTSX-IBRS",
++      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-IBRS",
++      "typename": "Skylake-Client-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client",
++      "typename": "Skylake-Client-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v2",
++      "typename": "SandyBridge-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v1",
++      "typename": "SandyBridge-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-IBRS",
++      "typename": "SandyBridge-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge",
++      "typename": "SandyBridge-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Penryn-v1",
++      "typename": "Penryn-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Penryn",
++      "typename": "Penryn-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G5-v1",
++      "typename": "Opteron_G5-v1-x86_64-cpu",
++      "unavailable-features": [
++        "svm",
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "tbm",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G5",
++      "typename": "Opteron_G5-x86_64-cpu",
++      "unavailable-features": [
++        "svm",
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "tbm",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G4-v1",
++      "typename": "Opteron_G4-v1-x86_64-cpu",
++      "unavailable-features": [
++        "svm",
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G4",
++      "typename": "Opteron_G4-x86_64-cpu",
++      "unavailable-features": [
++        "svm",
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G3-v1",
++      "typename": "Opteron_G3-v1-x86_64-cpu",
++      "unavailable-features": [
++        "svm",
++        "sse4a",
++        "misalignsse"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G3",
++      "typename": "Opteron_G3-x86_64-cpu",
++      "unavailable-features": [
++        "svm",
++        "sse4a",
++        "misalignsse"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G2-v1",
++      "typename": "Opteron_G2-v1-x86_64-cpu",
++      "unavailable-features": [
++        "svm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G2",
++      "typename": "Opteron_G2-x86_64-cpu",
++      "unavailable-features": [
++        "svm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G1-v1",
++      "typename": "Opteron_G1-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G1",
++      "typename": "Opteron_G1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v2",
++      "typename": "Nehalem-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v1",
++      "typename": "Nehalem-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-IBRS",
++      "typename": "Nehalem-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem",
++      "typename": "Nehalem-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "KnightsMill-v1",
++      "typename": "KnightsMill-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512pf",
++        "avx512er",
++        "avx512cd",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps",
++        "avx512f",
++        "avx512f",
++        "avx512f"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "KnightsMill",
++      "typename": "KnightsMill-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512pf",
++        "avx512er",
++        "avx512cd",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps",
++        "avx512f",
++        "avx512f",
++        "avx512f"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v2",
++      "typename": "IvyBridge-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v1",
++      "typename": "IvyBridge-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-IBRS",
++      "typename": "IvyBridge-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge",
++      "typename": "IvyBridge-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v2",
++      "typename": "Icelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v1",
++      "typename": "Icelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-noTSX",
++      "typename": "Icelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server",
++      "typename": "Icelake-Server-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v2",
++      "typename": "Icelake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v1",
++      "typename": "Icelake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-noTSX",
++      "typename": "Icelake-Client-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client",
++      "typename": "Icelake-Client-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v4",
++      "typename": "Haswell-v4-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v3",
++      "typename": "Haswell-v3-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v2",
++      "typename": "Haswell-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v1",
++      "typename": "Haswell-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-noTSX-IBRS",
++      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-noTSX",
++      "typename": "Haswell-noTSX-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-IBRS",
++      "typename": "Haswell-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell",
++      "typename": "Haswell-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v2",
++      "typename": "EPYC-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "svm",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v1",
++      "typename": "EPYC-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "svm",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-IBPB",
++      "typename": "EPYC-IBPB-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "svm",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC",
++      "typename": "EPYC-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "svm",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana-v1",
++      "typename": "Dhyana-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "svm",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana",
++      "typename": "Dhyana-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "svm",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v1",
++      "typename": "Denverton-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdctl-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton",
++      "typename": "Denverton-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdctl-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake-v1",
++      "typename": "Cooperlake-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512-bf16",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake",
++      "typename": "Cooperlake-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512-bf16",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe-v1",
++      "typename": "Conroe-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe",
++      "typename": "Conroe-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v3",
++      "typename": "Cascadelake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v2",
++      "typename": "Cascadelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v1",
++      "typename": "Cascadelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-noTSX",
++      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server",
++      "typename": "Cascadelake-Server-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v4",
++      "typename": "Broadwell-v4-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v3",
++      "typename": "Broadwell-v3-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v2",
++      "typename": "Broadwell-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v1",
++      "typename": "Broadwell-v1-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-noTSX-IBRS",
++      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-noTSX",
++      "typename": "Broadwell-noTSX-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-IBRS",
++      "typename": "Broadwell-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell",
++      "typename": "Broadwell-x86_64-cpu",
++      "unavailable-features": [
++        "hle",
++        "rtm"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "486-v1",
++      "typename": "486-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "486",
++      "typename": "486-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    }
++  ],
++  "id": "definitions"
++}
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.sig
+new file mode 100644
+index 0000000000..410d0e230c
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.sig
+@@ -0,0 +1,4 @@
++0806ea
++family:     6 (0x06)
++model:    142 (0x8e)
++stepping:  10 (0x0a)
+diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.xml
+new file mode 100644
+index 0000000000..d4564b2543
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U.xml
+@@ -0,0 +1,49 @@
++<!-- Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000806ea' ebx='0x00100800' ecx='0x7ffafbbf' edx='0xbfebfbff'/>
++  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
++  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
++  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c67af' ecx='0x00000000' edx='0x9c002400'/>
++  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000008' ecx='0x00000201' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
++  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000a6' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x000007d0' ebx='0x00000fa0' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0x20000000' ecx_in='0x00' eax='0x000007d0' ebx='0x00000fa0' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
++  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
++  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3535382d' ecx='0x43205530' edx='0x40205550'/>
++  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x382e3120' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
++  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
++  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x000007d0' ebx='0x00000fa0' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x000007d0' ebx='0x00000fa0' ecx='0x00000064' edx='0x00000000'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
++</cpudata>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8700.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8700.patch
deleted file mode 100644
index 96b2ce2..0000000
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8700.patch
+++ /dev/null
@@ -1,873 +0,0 @@
-From 697bcb394816e4880cdbdb211527f057f4aea564 Mon Sep 17 00:00:00 2001
-Message-Id: <697bcb394816e4880cdbdb211527f057f4aea564@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:53 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Core(TM) i7-8700
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 87a46f5d8f8b67b22eab8b25cd30a6b9901d6857)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <2d5616ba4b88ef12435b52cfd7c90ce3360a83ef.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Core-i7-8700-disabled.xml    |   6 +
- .../x86_64-cpuid-Core-i7-8700-enabled.xml     |   8 +
- .../x86_64-cpuid-Core-i7-8700-guest.xml       |  28 +
- .../x86_64-cpuid-Core-i7-8700-host.xml        |  29 +
- .../x86_64-cpuid-Core-i7-8700-json.xml        |  12 +
- .../x86_64-cpuid-Core-i7-8700.json            | 650 ++++++++++++++++++
- .../cputestdata/x86_64-cpuid-Core-i7-8700.xml |  47 ++
- 8 files changed, 781 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index bcbfe2d08a..9e5f807823 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1178,6 +1178,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-ibrs", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7600U", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-7700", JSON_MODELS);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-8700", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", JSON_NONE);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "EPYC-7601-32-Core", JSON_HOST);
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
-new file mode 100644
-index 0000000000..6a7de576f1
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
-@@ -0,0 +1,6 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x08000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml
-new file mode 100644
-index 0000000000..f0727d497b
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000004' edx='0x84000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
-new file mode 100644
-index 0000000000..70a0fc3286
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
-@@ -0,0 +1,28 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
-new file mode 100644
-index 0000000000..bbdfb6aa61
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
-@@ -0,0 +1,29 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='osxsave'/>
-+  <feature name='tsc_adjust'/>
-+  <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='xsaves'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
-new file mode 100644
-index 0000000000..fd7539f7ce
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
-@@ -0,0 +1,12 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='umip'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700.json b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.json
-new file mode 100644
-index 0000000000..122a1b2985
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.json
-@@ -0,0 +1,650 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "osxsave": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 158,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 10,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw",
-+        "ibpb"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml
-new file mode 100644
-index 0000000000..03ba0a3925
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.xml
-@@ -0,0 +1,47 @@
-+<!-- Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000906ea' ebx='0x01100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00002fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x40000000' edx='0x9c000000'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000001'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x0000000c' ecx='0x00000201' edx='0x00000001'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x0000010a' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000c80' ebx='0x000011f8' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3037382d' ecx='0x50432030' edx='0x20402055'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30322e33' ebx='0x007a4847' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000c80' ebx='0x000011f8' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000c80' ebx='0x000011f8' ecx='0x00000064' edx='0x00000000'/>
-+</cpudata>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch
deleted file mode 100644
index d0b011b..0000000
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch
+++ /dev/null
@@ -1,885 +0,0 @@
-From cd7339269704e58b78c1033d46a336448256b4e7 Mon Sep 17 00:00:00 2001
-Message-Id: <cd7339269704e58b78c1033d46a336448256b4e7@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 11:19:30 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) CPU E3-1225 v5
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 5cd9db3ac11e88846cbcf95fad9f6fae9d880dee)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml |   7 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml  |   8 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  28 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  29 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |  11 +
- .../x86_64-cpuid-Xeon-E3-1225-v5.json         | 652 ++++++++++++++++++
- .../x86_64-cpuid-Xeon-E3-1225-v5.sig          |   4 +
- .../x86_64-cpuid-Xeon-E3-1225-v5.xml          |  47 ++
- 9 files changed, 787 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index baf2b3c648..fbb2a86af8 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1190,6 +1190,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2609-v3", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
-new file mode 100644
-index 0000000000..ce51903e53
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
-@@ -0,0 +1,7 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-new file mode 100644
-index 0000000000..0deca9fba6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-new file mode 100644
-index 0000000000..70a0fc3286
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -0,0 +1,28 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-new file mode 100644
-index 0000000000..bbdfb6aa61
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -0,0 +1,29 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='osxsave'/>
-+  <feature name='tsc_adjust'/>
-+  <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='xsaves'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-new file mode 100644
-index 0000000000..1f321db273
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -0,0 +1,11 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
-new file mode 100644
-index 0000000000..084747556b
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
-@@ -0,0 +1,652 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "osxsave": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": true,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw",
-+        "ibpb"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
-new file mode 100644
-index 0000000000..7e57c2ded6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
-@@ -0,0 +1,4 @@
-+0506e3
-+family:     6 (0x06)
-+model:     94 (0x5e)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-new file mode 100644
-index 0000000000..437429d61d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-@@ -0,0 +1,47 @@
-+<!-- Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x9c002400'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000006'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000006'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000114' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d334520' ecx='0x35323231' edx='0x20357620'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e332040' ebx='0x48473033' ecx='0x0000007a' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+</cpudata>
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2630-v4.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2630-v4.patch
deleted file mode 100644
index 63e259a..0000000
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2630-v4.patch
+++ /dev/null
@@ -1,824 +0,0 @@
-From 4e22f6ec928e62811db06cd717fc286dd1dfba8e Mon Sep 17 00:00:00 2001
-Message-Id: <4e22f6ec928e62811db06cd717fc286dd1dfba8e@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:49 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) CPU E5-2630 v4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8d068f360183ecd55e3213dbe9ba12f7d6470751)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5bc8830efc48a09ace38df33a83152ae0cf3a5fe.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml |   7 +
- .../x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml  |   8 +
- .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml    |  31 +
- .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml     |  35 +
- .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml     |  11 +
- .../x86_64-cpuid-Xeon-E5-2630-v4.json         | 596 ++++++++++++++++++
- .../x86_64-cpuid-Xeon-E5-2630-v4.xml          |  43 ++
- 8 files changed, 732 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index fbb2a86af8..f43144edc9 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1195,6 +1195,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2609-v3", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v3", JSON_HOST);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v4", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v3", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v4", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST);
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
-new file mode 100644
-index 0000000000..3ffb246167
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
-@@ -0,0 +1,7 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml
-new file mode 100644
-index 0000000000..f2d4f2826d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x001c0fbb' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
-new file mode 100644
-index 0000000000..cd7e25b52a
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
-@@ -0,0 +1,31 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='dca'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='cmt'/>
-+  <feature policy='require' name='intel-pt'/>
-+  <feature policy='require' name='mbm_total'/>
-+  <feature policy='require' name='mbm_local'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+  <feature policy='disable' name='mpx'/>
-+  <feature policy='disable' name='xsavec'/>
-+  <feature policy='disable' name='xgetbv1'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
-new file mode 100644
-index 0000000000..5dd8d749de
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
-@@ -0,0 +1,35 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Broadwell</model>
-+  <vendor>Intel</vendor>
-+  <feature name='vme'/>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='dca'/>
-+  <feature name='osxsave'/>
-+  <feature name='f16c'/>
-+  <feature name='rdrand'/>
-+  <feature name='arat'/>
-+  <feature name='tsc_adjust'/>
-+  <feature name='cmt'/>
-+  <feature name='intel-pt'/>
-+  <feature name='xsaveopt'/>
-+  <feature name='mbm_total'/>
-+  <feature name='mbm_local'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='abm'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
-new file mode 100644
-index 0000000000..5dfce947b2
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
-@@ -0,0 +1,11 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='disable' name='mpx'/>
-+  <feature policy='disable' name='xsavec'/>
-+  <feature policy='disable' name='xgetbv1'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json
-new file mode 100644
-index 0000000000..ee09950fce
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json
-@@ -0,0 +1,596 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "arat": true,
-+        "rdpid": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "pbe": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "xcrypt": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": false,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "fxsr": true,
-+        "ds": false,
-+        "hv-crash": false,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "avx512vl": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "stibp": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "cmp_legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "vmcb_clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "smep": true,
-+        "pfthreshold": false,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "kvm_nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "kvm_mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "pdcm": false,
-+        "nodeid_msr": false,
-+        "model": 79,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "nrip_save": false,
-+        "sse4a": false,
-+        "ssse3": true,
-+        "kvm_pv_unhalt": true,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 1,
-+        "xsave": true,
-+        "clflush": true,
-+        "arch-facilities": false,
-+        "skinit": false,
-+        "tce": false,
-+        "tsc": true,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ds_cpl": false,
-+        "ibs": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmm": false,
-+        "apic": true,
-+        "pmu": false,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "avx2": true,
-+        "pse": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "kvm-pv-unhalt": true,
-+        "realized": false,
-+        "tsc-scale": false,
-+        "tsc_scale": false,
-+        "topoext": false,
-+        "xlevel2": 0,
-+        "clflushopt": false,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "xstore": false,
-+        "fxsr-opt": false,
-+        "fxsr_opt": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "mpx",
-+        "xsavec",
-+        "xgetbv1",
-+        "mpx",
-+        "mpx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "mpx",
-+        "spec-ctrl",
-+        "xsavec",
-+        "xgetbv1",
-+        "mpx",
-+        "mpx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml
-new file mode 100644
-index 0000000000..d74c207104
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml
-@@ -0,0 +1,43 @@
-+<!-- Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000014' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000406f1' ebx='0x01200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x04c0003f' ecx='0x00004fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x021cbfbb' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000001'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000014' ecx='0x00000201' edx='0x00000001'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000004f' ecx='0x00000000' edx='0x00000002'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x0000a000' ecx='0x0000004f' edx='0x00000007'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x00000013' ebx='0x000c0000' ecx='0x00000004' edx='0x0000000f'/>
-+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d354520' ecx='0x30333632' edx='0x20347620'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e322040' ebx='0x48473032' ecx='0x0000007a' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-+</cpudata>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2650.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2650.patch
deleted file mode 100644
index eb8dcdb..0000000
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2650.patch
+++ /dev/null
@@ -1,1144 +0,0 @@
-From 2afffd01a71c3b2efeeaefed4829a87d46956c8b Mon Sep 17 00:00:00 2001
-Message-Id: <2afffd01a71c3b2efeeaefed4829a87d46956c8b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:52 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) CPU E5-2650
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 483679d48f6b5fb731bdedca3b5d3b33c011d6a3)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <944ffeee03d77b02d000ea6c70d98307d850eaad.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Xeon-E5-2650-disabled.xml    |   5 +
- .../x86_64-cpuid-Xeon-E5-2650-enabled.xml     |   8 +
- .../x86_64-cpuid-Xeon-E5-2650-guest.xml       |  29 +
- .../x86_64-cpuid-Xeon-E5-2650-host.xml        |  30 +
- .../x86_64-cpuid-Xeon-E5-2650-json.xml        |  14 +
- .../x86_64-cpuid-Xeon-E5-2650.json            | 931 ++++++++++++++++++
- .../cputestdata/x86_64-cpuid-Xeon-E5-2650.xml |  34 +
- 8 files changed, 1052 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index e2c7860f3f..bcbfe2d08a 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1197,6 +1197,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v3", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v4", JSON_MODELS);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v3", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v4", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST);
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml
-new file mode 100644
-index 0000000000..d9538892eb
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml
-@@ -0,0 +1,5 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml
-new file mode 100644
-index 0000000000..fcc1e84686
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x97ba2203' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
-new file mode 100644
-index 0000000000..e507642df1
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
-@@ -0,0 +1,29 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>SandyBridge-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='pcid'/>
-+  <feature policy='require' name='dca'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='arat'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaveopt'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
-new file mode 100644
-index 0000000000..80ca6c343f
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
-@@ -0,0 +1,30 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>SandyBridge-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='vme'/>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='pcid'/>
-+  <feature name='dca'/>
-+  <feature name='osxsave'/>
-+  <feature name='arat'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='xsaveopt'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
-new file mode 100644
-index 0000000000..bf587d3ffc
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
-@@ -0,0 +1,14 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>SandyBridge-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='pcid'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='arat'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaveopt'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
-new file mode 100644
-index 0000000000..a7a8542203
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
-@@ -0,0 +1,931 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "osxsave": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": false,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": false,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": false,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": false,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": false,
-+        "smap": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": false,
-+        "model": 45,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 7,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": false,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": false,
-+        "bmi1": false,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": false,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": false,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": false,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "       Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz",
-+        "abm": false,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "abm",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+        "movbe"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "abm",
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clflushopt",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsavec",
-+        "xgetbv1",
-+        "mpx",
-+        "mpx",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsavec",
-+        "xgetbv1",
-+        "mpx",
-+        "mpx",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsavec",
-+        "xgetbv1",
-+        "mpx",
-+        "mpx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsavec",
-+        "xgetbv1",
-+        "mpx",
-+        "mpx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "f16c",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "abm",
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "smep",
-+        "erms"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "smep",
-+        "erms"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "abm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "abm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "abm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "abm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clflushopt",
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "xsavec",
-+        "xgetbv1"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clflushopt",
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "ibpb",
-+        "xsavec",
-+        "xgetbv1"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "movbe",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
-new file mode 100644
-index 0000000000..b7ce0631ca
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
-@@ -0,0 +1,34 @@
-+<!-- Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206d7' ebx='0x05200800' ecx='0x1fbee3ff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76035a01' ebx='0x00f0b2ff' ecx='0x00000000' edx='0x00ca0000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x04c0003f' ecx='0x00003fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00021120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x9c000000'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000010' ecx='0x00000201' edx='0x00000005'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20202020' ebx='0x49202020' ecx='0x6c65746e' edx='0x20295228'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6e6f6558' ebx='0x20295228' ecx='0x20555043' edx='0x322d3545'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20303536' ebx='0x20402030' ecx='0x30302e32' edx='0x007a4847'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/>
-+</cpudata>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E7540.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E7540.patch
deleted file mode 100644
index cf8ab88..0000000
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E7540.patch
+++ /dev/null
@@ -1,1317 +0,0 @@
-From 50d3fe22f84e93fec523ae24302deac54db1dcfd Mon Sep 17 00:00:00 2001
-Message-Id: <50d3fe22f84e93fec523ae24302deac54db1dcfd@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:24:51 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) CPU E7540
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 60046a236583a2f19c0ba6e7ab3a2823d20f177e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <7d56c795395ebb6b92d8650f5f956f7ddbb98947.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputest.c                               |    1 +
- .../x86_64-cpuid-Xeon-E7540-disabled.xml      |    5 +
- .../x86_64-cpuid-Xeon-E7540-enabled.xml       |    7 +
- .../x86_64-cpuid-Xeon-E7540-guest.xml         |   25 +
- .../x86_64-cpuid-Xeon-E7540-host.xml          |   26 +
- .../x86_64-cpuid-Xeon-E7540-json.xml          |   14 +
- .../cputestdata/x86_64-cpuid-Xeon-E7540.json  | 1117 +++++++++++++++++
- tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml |   30 +
- 8 files changed, 1225 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 28d575a784..e2c7860f3f 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1202,6 +1202,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_MODELS_REQUIRED);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7540", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-5115", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST);
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml
-new file mode 100644
-index 0000000000..49737fbdb1
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml
-@@ -0,0 +1,5 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0004c1bc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-enabled.xml
-new file mode 100644
-index 0000000000..8149ac04f0
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-enabled.xml
-@@ -0,0 +1,7 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x81b82201' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
-new file mode 100644
-index 0000000000..fc3e95253b
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
-@@ -0,0 +1,25 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Nehalem-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='dca'/>
-+  <feature policy='require' name='x2apic'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='rdtscp'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
-new file mode 100644
-index 0000000000..42b43116bd
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
-@@ -0,0 +1,26 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Nehalem-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='vme'/>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='dca'/>
-+  <feature name='x2apic'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='rdtscp'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
-new file mode 100644
-index 0000000000..32cd1000c8
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
-@@ -0,0 +1,14 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Nehalem-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='vme'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='x2apic'/>
-+  <feature policy='require' name='tsc-deadline'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='arat'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='rdtscp'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540.json b/tests/cputestdata/x86_64-cpuid-Xeon-E7540.json
-new file mode 100644
-index 0000000000..ac8452509d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540.json
-@@ -0,0 +1,1117 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": false,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "osxsave": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": false,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 11,
-+        "xgetbv1": false,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": false,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": false,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": false,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": false,
-+        "smap": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 11,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": false,
-+        "model": 46,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": false,
-+        "pdpe1gb": false,
-+        "tsc-deadline": true,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 6,
-+        "xsave": false,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": false,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": false,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": false,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": false,
-+        "bmi1": false,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": false,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": false,
-+        "erms": false,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": false,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU           E7540  @ 2.00GHz",
-+        "abm": false,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "pdpe1gb",
-+        "3dnowext",
-+        "3dnow",
-+        "abm",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+        "movbe"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "abm",
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clflushopt",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pdpe1gb",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsavec",
-+        "xgetbv1",
-+        "xsave",
-+        "xsave",
-+        "avx",
-+        "mpx",
-+        "mpx",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "pdpe1gb",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsavec",
-+        "xgetbv1",
-+        "xsave",
-+        "xsave",
-+        "avx",
-+        "mpx",
-+        "mpx",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsavec",
-+        "xgetbv1",
-+        "xsave",
-+        "xsave",
-+        "avx",
-+        "mpx",
-+        "mpx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "mpx",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsavec",
-+        "xgetbv1",
-+        "xsave",
-+        "xsave",
-+        "avx",
-+        "mpx",
-+        "mpx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "pdpe1gb",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4",
-+        "tbm",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "pdpe1gb",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "abm",
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "smep",
-+        "erms",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "smep",
-+        "erms",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "abm",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "abm",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "abm",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "abm",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clflushopt",
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "pdpe1gb",
-+        "cr8legacy",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "xsaveopt",
-+        "xsavec",
-+        "xgetbv1",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "clflushopt",
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "pdpe1gb",
-+        "cr8legacy",
-+        "abm",
-+        "sse4a",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "ibpb",
-+        "xsaveopt",
-+        "xsavec",
-+        "xgetbv1",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "pclmulqdq",
-+        "fma",
-+        "pcid",
-+        "movbe",
-+        "aes",
-+        "xsave",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "fsgsbase",
-+        "bmi1",
-+        "hle",
-+        "avx2",
-+        "smep",
-+        "bmi2",
-+        "erms",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "adx",
-+        "smap",
-+        "abm",
-+        "3dnowprefetch",
-+        "xsaveopt",
-+        "xsave",
-+        "xsave",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml
-new file mode 100644
-index 0000000000..e80694b5e0
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml
-@@ -0,0 +1,30 @@
-+<!-- Intel(R) Xeon(R) CPU           E7540  @ 2.00GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000206e6' ebx='0x05200800' ecx='0x00bce3bd' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x55035a01' ebx='0x00f0b2eb' ecx='0x00000000' edx='0x09ca212c'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x00c0003f' ecx='0x0000007f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x05c0003f' ecx='0x00002fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000003' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x9c000000'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000044' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x0000000c' ecx='0x00000201' edx='0x00000005'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000001' edx='0x28100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x20202020' ecx='0x20202020' edx='0x45202020'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30343537' ebx='0x20402020' ecx='0x30302e32' edx='0x007a4847'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302c' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000005'/>
-+</cpudata>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Ice-Lake-Server-CPU.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
similarity index 78%
rename from SOURCES/libvirt-cputest-Add-data-for-Ice-Lake-Server-CPU.patch
rename to SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
index 355b28c..60fd572 100644
--- a/SOURCES/libvirt-cputest-Add-data-for-Ice-Lake-Server-CPU.patch
+++ b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
@@ -1,92 +1,92 @@
-From 3e331cfb6a38d49feb4a7e2ae93fa5b351f802e9 Mon Sep 17 00:00:00 2001
-Message-Id: <3e331cfb6a38d49feb4a7e2ae93fa5b351f802e9@dist-git>
+From 6d67e39ed491074df0ff8829278d119f4cd7a77d Mon Sep 17 00:00:00 2001
+Message-Id: <6d67e39ed491074df0ff8829278d119f4cd7a77d@dist-git>
 From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Nov 2019 17:52:35 +0100
-Subject: [PATCH] cputest: Add data for Ice Lake Server CPU
+Date: Tue, 26 May 2020 10:59:36 +0200
+Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) Gold 6130 CPU
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 6b4cc15730e5b2330eaba2b211f16547dccd665c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749672
-https://bugzilla.redhat.com/show_bug.cgi?id=1756156
-https://bugzilla.redhat.com/show_bug.cgi?id=1721608
+Skylake-Server with family 6, model 85, stepping 4, which is currently
+mis-detected as Cascadelake-Server CPU model.
 
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <33821ff30d36f29cd88e7e9d6ac08ad98710b8f0.1573836581.git.jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3714779b15e594a14de4e6fe49c2e3eafe39b161)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <b78268d7c67fc7fd7e8ff3e0a441c37d5d80f600.1590483392.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
 ---
  tests/cputest.c                               |    1 +
- .../x86_64-cpuid-Ice-Lake-Server-disabled.xml |    7 +
- .../x86_64-cpuid-Ice-Lake-Server-enabled.xml  |   10 +
- .../x86_64-cpuid-Ice-Lake-Server-guest.xml    |   36 +
- .../x86_64-cpuid-Ice-Lake-Server-host.xml     |   45 +
- .../x86_64-cpuid-Ice-Lake-Server-json.xml     |   17 +
- .../x86_64-cpuid-Ice-Lake-Server.json         | 1142 +++++++++++++++++
- .../x86_64-cpuid-Ice-Lake-Server.sig          |    4 +
- .../x86_64-cpuid-Ice-Lake-Server.xml          |   65 +
- 9 files changed, 1327 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml
+ .../x86_64-cpuid-Xeon-Gold-6130-disabled.xml  |    7 +
+ .../x86_64-cpuid-Xeon-Gold-6130-enabled.xml   |    9 +
+ .../x86_64-cpuid-Xeon-Gold-6130-guest.xml     |   33 +
+ .../x86_64-cpuid-Xeon-Gold-6130-host.xml      |   35 +
+ .../x86_64-cpuid-Xeon-Gold-6130-json.xml      |   16 +
+ .../x86_64-cpuid-Xeon-Gold-6130.json          | 1201 +++++++++++++++++
+ .../x86_64-cpuid-Xeon-Gold-6130.sig           |    4 +
+ .../x86_64-cpuid-Xeon-Gold-6130.xml           |   54 +
+ 9 files changed, 1360 insertions(+)
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
 
 diff --git a/tests/cputest.c b/tests/cputest.c
-index 1ce50caccd..f0616c6ec9 100644
+index f9f1ca74ff..869d016ffc 100644
 --- a/tests/cputest.c
 +++ b/tests/cputest.c
-@@ -1296,6 +1296,7 @@ mymain(void)
+@@ -1265,6 +1265,7 @@ mymain(void)
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7540", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-5115", JSON_MODELS);
++    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6130", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
      DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-8268", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Ice-Lake-Server", JSON_MODELS);
- 
-  cleanup:
- #if WITH_QEMU && WITH_YAJL
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-9242", JSON_MODELS);
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
 new file mode 100644
-index 0000000000..62c6bad612
+index 0000000000..e7c59cef1e
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
 @@ -0,0 +1,7 @@
 +<!-- Features disabled by QEMU -->
 +<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
 +  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
 +  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
 +</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
 new file mode 100644
-index 0000000000..4a2c37a2ce
+index 0000000000..8610577479
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml
-@@ -0,0 +1,10 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
+@@ -0,0 +1,9 @@
 +<!-- Features enabled by QEMU -->
 +<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
 +  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xf1bf4fbb' ecx='0x00015f4e' edx='0xac000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000000c' edx='0xac000400'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000200' ecx='0x00000000' edx='0x00000000'/>
-+  <msr index='0x10a' edx='0x00000000' eax='0x0000000b'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
 +</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
 new file mode 100644
-index 0000000000..6ca2099b33
+index 0000000000..cfb0eb982d
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
-@@ -0,0 +1,36 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+@@ -0,0 +1,33 @@
 +<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Icelake-Server</model>
++  <model fallback='forbid'>Cascadelake-Server</model>
 +  <vendor>Intel</vendor>
 +  <feature policy='require' name='ds'/>
 +  <feature policy='require' name='acpi'/>
@@ -107,29 +107,26 @@ index 0000000000..6ca2099b33
 +  <feature policy='require' name='osxsave'/>
 +  <feature policy='require' name='tsc_adjust'/>
 +  <feature policy='require' name='cmt'/>
-+  <feature policy='require' name='avx512ifma'/>
-+  <feature policy='require' name='sha-ni'/>
++  <feature policy='require' name='intel-pt'/>
++  <feature policy='require' name='pku'/>
 +  <feature policy='require' name='ospke'/>
++  <feature policy='require' name='md-clear'/>
 +  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='arch-capabilities'/>
 +  <feature policy='require' name='xsaves'/>
 +  <feature policy='require' name='mbm_total'/>
 +  <feature policy='require' name='mbm_local'/>
 +  <feature policy='require' name='invtsc'/>
-+  <feature policy='require' name='rdctl-no'/>
-+  <feature policy='require' name='ibrs-all'/>
-+  <feature policy='require' name='skip-l1dfl-vmentry'/>
-+  <feature policy='disable' name='pconfig'/>
++  <feature policy='disable' name='avx512vnni'/>
 +</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
 new file mode 100644
-index 0000000000..31af20bc85
+index 0000000000..207e9e0ee4
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
-@@ -0,0 +1,45 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+@@ -0,0 +1,35 @@
 +<cpu>
 +  <arch>x86_64</arch>
-+  <model>Icelake-Client</model>
++  <model>Skylake-Server-IBRS</model>
 +  <vendor>Intel</vendor>
 +  <feature name='ds'/>
 +  <feature name='acpi'/>
@@ -150,57 +147,46 @@ index 0000000000..31af20bc85
 +  <feature name='osxsave'/>
 +  <feature name='tsc_adjust'/>
 +  <feature name='cmt'/>
-+  <feature name='avx512f'/>
-+  <feature name='avx512dq'/>
-+  <feature name='avx512ifma'/>
 +  <feature name='clflushopt'/>
-+  <feature name='clwb'/>
-+  <feature name='avx512cd'/>
-+  <feature name='sha-ni'/>
-+  <feature name='avx512bw'/>
-+  <feature name='avx512vl'/>
++  <feature name='intel-pt'/>
++  <feature name='pku'/>
 +  <feature name='ospke'/>
-+  <feature name='la57'/>
++  <feature name='md-clear'/>
 +  <feature name='stibp'/>
-+  <feature name='arch-capabilities'/>
++  <feature name='ssbd'/>
 +  <feature name='xsaves'/>
 +  <feature name='mbm_total'/>
 +  <feature name='mbm_local'/>
-+  <feature name='pdpe1gb'/>
 +  <feature name='invtsc'/>
-+  <feature name='rdctl-no'/>
-+  <feature name='ibrs-all'/>
-+  <feature name='skip-l1dfl-vmentry'/>
 +</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
 new file mode 100644
-index 0000000000..b043db58d7
+index 0000000000..968d904557
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
-@@ -0,0 +1,17 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+@@ -0,0 +1,16 @@
 +<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Icelake-Server</model>
++  <model fallback='forbid'>Cascadelake-Server</model>
 +  <vendor>Intel</vendor>
 +  <feature policy='require' name='ss'/>
++  <feature policy='require' name='vmx'/>
 +  <feature policy='require' name='hypervisor'/>
 +  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='avx512ifma'/>
-+  <feature policy='require' name='sha-ni'/>
++  <feature policy='require' name='umip'/>
++  <feature policy='require' name='pku'/>
++  <feature policy='require' name='md-clear'/>
 +  <feature policy='require' name='stibp'/>
 +  <feature policy='require' name='arch-capabilities'/>
 +  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='rdctl-no'/>
-+  <feature policy='require' name='ibrs-all'/>
 +  <feature policy='require' name='skip-l1dfl-vmentry'/>
-+  <feature policy='disable' name='intel-pt'/>
-+  <feature policy='disable' name='pconfig'/>
++  <feature policy='disable' name='avx512vnni'/>
 +</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
 new file mode 100644
-index 0000000000..6c7ea3f687
+index 0000000000..1a22387617
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json
-@@ -0,0 +1,1142 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
+@@ -0,0 +1,1201 @@
 +{
 +  "return": {
 +    "model": {
@@ -216,8 +202,8 @@ index 0000000000..6c7ea3f687
 +        "mmx": true,
 +        "rdpid": false,
 +        "arat": true,
-+        "gfni": true,
-+        "ibrs-all": true,
++        "gfni": false,
++        "ibrs-all": false,
 +        "pause-filter": false,
 +        "xsavec": true,
 +        "intel-pt": false,
@@ -241,7 +227,7 @@ index 0000000000..6c7ea3f687
 +        "legacy-cache": true,
 +        "host-phys-bits-limit": 48,
 +        "vmware-cpuid-freq": true,
-+        "wbnoinvd": true,
++        "wbnoinvd": false,
 +        "avx512f": true,
 +        "hv-stimer-direct": false,
 +        "msr": true,
@@ -261,11 +247,11 @@ index 0000000000..6c7ea3f687
 +        "xtpr": false,
 +        "hv-evmcs": false,
 +        "avx512vl": true,
-+        "avx512-vpopcntdq": true,
++        "avx512-vpopcntdq": false,
 +        "phe": false,
 +        "extapic": false,
 +        "3dnowprefetch": true,
-+        "avx512vbmi2": true,
++        "avx512vbmi2": false,
 +        "cr8legacy": false,
 +        "stibp": true,
 +        "cpuid-0xb": true,
@@ -289,7 +275,7 @@ index 0000000000..6c7ea3f687
 +        "amd-no-ssb": false,
 +        "hle": true,
 +        "npt": false,
-+        "rdctl-no": true,
++        "rdctl-no": false,
 +        "memory": "/machine/unattached/system[0]",
 +        "clwb": true,
 +        "lbrv": false,
@@ -302,8 +288,8 @@ index 0000000000..6c7ea3f687
 +        "smep": true,
 +        "smap": true,
 +        "x2apic": true,
-+        "avx512vbmi": true,
-+        "avx512vnni": true,
++        "avx512vbmi": false,
++        "avx512vnni": false,
 +        "hv-stimer": false,
 +        "x-hv-synic-kvm-only": true,
 +        "i64": true,
@@ -335,7 +321,7 @@ index 0000000000..6c7ea3f687
 +        "sse2": true,
 +        "ssbd": true,
 +        "est": false,
-+        "avx512ifma": true,
++        "avx512ifma": false,
 +        "tm2": false,
 +        "kvm-pv-ipi": true,
 +        "kvm-pv-eoi": true,
@@ -349,11 +335,11 @@ index 0000000000..6c7ea3f687
 +        "sse4-2": true,
 +        "pge": true,
 +        "fill-mtrr-mask": true,
-+        "avx512bitalg": true,
++        "avx512bitalg": false,
 +        "nodeid_msr": false,
 +        "pdcm": false,
 +        "movbe": true,
-+        "model": 106,
++        "model": 85,
 +        "nrip_save": false,
 +        "nrip-save": false,
 +        "kvm_pv_unhalt": true,
@@ -367,7 +353,7 @@ index 0000000000..6c7ea3f687
 +        "cx16": true,
 +        "de": true,
 +        "enforce": false,
-+        "stepping": 0,
++        "stepping": 4,
 +        "xsave": true,
 +        "clflush": true,
 +        "skinit": false,
@@ -379,7 +365,7 @@ index 0000000000..6c7ea3f687
 +        "ds-cpl": false,
 +        "host-phys-bits": true,
 +        "fma4": false,
-+        "la57": true,
++        "la57": false,
 +        "osvw": false,
 +        "check": true,
 +        "hv-spinlocks": 4294967295,
@@ -411,7 +397,7 @@ index 0000000000..6c7ea3f687
 +        "nx": true,
 +        "pclmulqdq": true,
 +        "mmxext": false,
-+        "vaes": true,
++        "vaes": false,
 +        "popcnt": true,
 +        "xsaves": true,
 +        "movdir64b": false,
@@ -425,7 +411,7 @@ index 0000000000..6c7ea3f687
 +        "virt-ssbd": false,
 +        "x-hv-max-vps": -1,
 +        "nodeid-msr": false,
-+        "md-clear": false,
++        "md-clear": true,
 +        "split-lock-detect": false,
 +        "kvm": true,
 +        "misalignsse": false,
@@ -451,7 +437,7 @@ index 0000000000..6c7ea3f687
 +        "x-force-features": false,
 +        "lahf-lm": true,
 +        "lahf_lm": true,
-+        "vpclmulqdq": true,
++        "vpclmulqdq": false,
 +        "fxsr-opt": false,
 +        "hv-synic": false,
 +        "xstore": false,
@@ -467,7 +453,7 @@ index 0000000000..6c7ea3f687
 +        "rdrand": true,
 +        "rdseed": true,
 +        "avx512-4vnniw": false,
-+        "vmx": false,
++        "vmx": true,
 +        "vme": true,
 +        "dtes64": false,
 +        "mtrr": true,
@@ -477,8 +463,8 @@ index 0000000000..6c7ea3f687
 +        "tbm": false,
 +        "wdt": false,
 +        "pause_filter": false,
-+        "sha-ni": true,
-+        "model-id": "",
++        "sha-ni": false,
++        "model-id": "Intel(R) Xeon(R) Gold 6130 CPU @ 2.10GHz",
 +        "abm": true,
 +        "avx512pf": false,
 +        "xstore-en": false
@@ -751,6 +737,8 @@ index 0000000000..6c7ea3f687
 +      "name": "Snowridge-v1",
 +      "typename": "Snowridge-v1-x86_64-cpu",
 +      "unavailable-features": [
++        "sha-ni",
++        "gfni",
 +        "cldemote",
 +        "movdiri",
 +        "movdir64b",
@@ -764,6 +752,8 @@ index 0000000000..6c7ea3f687
 +      "name": "Snowridge",
 +      "typename": "Snowridge-x86_64-cpu",
 +      "unavailable-features": [
++        "sha-ni",
++        "gfni",
 +        "cldemote",
 +        "movdiri",
 +        "movdir64b",
@@ -1007,6 +997,7 @@ index 0000000000..6c7ea3f687
 +      "unavailable-features": [
 +        "avx512pf",
 +        "avx512er",
++        "avx512-vpopcntdq",
 +        "avx512-4vnniw",
 +        "avx512-4fmaps"
 +      ],
@@ -1019,6 +1010,7 @@ index 0000000000..6c7ea3f687
 +      "unavailable-features": [
 +        "avx512pf",
 +        "avx512er",
++        "avx512-vpopcntdq",
 +        "avx512-4vnniw",
 +        "avx512-4fmaps"
 +      ],
@@ -1056,28 +1048,70 @@ index 0000000000..6c7ea3f687
 +    {
 +      "name": "Icelake-Server-v1",
 +      "typename": "Icelake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [],
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
 +    {
 +      "name": "Icelake-Server",
 +      "typename": "Icelake-Server-x86_64-cpu",
-+      "unavailable-features": [],
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
 +    {
 +      "name": "Icelake-Client-v1",
 +      "typename": "Icelake-Client-v1-x86_64-cpu",
-+      "unavailable-features": [],
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
 +    {
 +      "name": "Icelake-Client",
 +      "typename": "Icelake-Client-x86_64-cpu",
-+      "unavailable-features": [],
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -1141,6 +1175,7 @@ index 0000000000..6c7ea3f687
 +      "name": "EPYC-v2",
 +      "typename": "EPYC-v2-x86_64-cpu",
 +      "unavailable-features": [
++        "sha-ni",
 +        "mmxext",
 +        "fxsr-opt",
 +        "cr8legacy",
@@ -1158,6 +1193,7 @@ index 0000000000..6c7ea3f687
 +      "name": "EPYC-v1",
 +      "typename": "EPYC-v1-x86_64-cpu",
 +      "unavailable-features": [
++        "sha-ni",
 +        "mmxext",
 +        "fxsr-opt",
 +        "cr8legacy",
@@ -1174,6 +1210,7 @@ index 0000000000..6c7ea3f687
 +      "name": "EPYC-IBPB",
 +      "typename": "EPYC-IBPB-x86_64-cpu",
 +      "unavailable-features": [
++        "sha-ni",
 +        "mmxext",
 +        "fxsr-opt",
 +        "cr8legacy",
@@ -1189,6 +1226,7 @@ index 0000000000..6c7ea3f687
 +      "name": "EPYC",
 +      "typename": "EPYC-x86_64-cpu",
 +      "unavailable-features": [
++        "sha-ni",
 +        "mmxext",
 +        "fxsr-opt",
 +        "cr8legacy",
@@ -1251,6 +1289,9 @@ index 0000000000..6c7ea3f687
 +      "name": "Cascadelake-Server-v2",
 +      "typename": "Cascadelake-Server-v2-x86_64-cpu",
 +      "unavailable-features": [
++        "avx512vnni",
++        "rdctl-no",
++        "ibrs-all",
 +        "mds-no"
 +      ],
 +      "static": false,
@@ -1259,14 +1300,18 @@ index 0000000000..6c7ea3f687
 +    {
 +      "name": "Cascadelake-Server-v1",
 +      "typename": "Cascadelake-Server-v1-x86_64-cpu",
-+      "unavailable-features": [],
++      "unavailable-features": [
++        "avx512vnni"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
 +    {
 +      "name": "Cascadelake-Server",
 +      "typename": "Cascadelake-Server-x86_64-cpu",
-+      "unavailable-features": [],
++      "unavailable-features": [
++        "avx512vnni"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -1343,87 +1388,76 @@ index 0000000000..6c7ea3f687
 +  ],
 +  "id": "definitions"
 +}
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
 new file mode 100644
-index 0000000000..c6492ff310
+index 0000000000..1a3f3449f0
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
 @@ -0,0 +1,4 @@
-+0606a0
++050654
 +family:     6 (0x06)
-+model:    106 (0x6a)
-+stepping:   0 (0x00)
-diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml
++model:     85 (0x55)
++stepping:   4 (0x04)
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
 new file mode 100644
-index 0000000000..887926ae19
+index 0000000000..cb9233ee22
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml
-@@ -0,0 +1,65 @@
-+<!-- Ice Lake Server -->
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
+@@ -0,0 +1,54 @@
++<!-- Intel(R) Xeon(R) Gold 6130 CPU @ 2.10GHz -->
 +<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000001b' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000606a0' ebx='0x25200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00feff01' ebx='0x000000f0' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00050654' ebx='0x29200800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
++  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
 +  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x02c0003f' ecx='0x0000003f' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x3c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x3c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x04c0003f' ecx='0x000003ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x02c0003f' ecx='0x00006fff' edx='0x00000004'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00001020'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00090ef7' ebx='0x00000002' ecx='0x00000009' edx='0x00000003'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xf3bfffff' ecx='0x40417f5e' edx='0xbc000012'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x3c004143' ebx='0x03c0003f' ecx='0x000003ff' edx='0x00000000'/>
++  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x3c07c163' ebx='0x0280003f' ecx='0x00007fff' edx='0x00000004'/>
++  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002020'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd39ffffb' ecx='0x00000018' edx='0x9c002400'/>
 +  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x08300805' ebx='0x00000000' ecx='0x0000000f' edx='0x00008604'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000025'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x0000001c' ecx='0x00000201' edx='0x00000025'/>
++  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000029'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000005' ebx='0x00000020' ecx='0x00000201' edx='0x00000029'/>
 +  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x000002e7' ebx='0x00000a88' ecx='0x00000a88' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000988' ecx='0x00000100' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x000002ff' ebx='0x00000a88' ecx='0x00000a88' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000a08' ecx='0x00000100' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x05' eax='0x00000040' ebx='0x00000440' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x06' eax='0x00000200' ebx='0x00000480' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x07' eax='0x00000400' ebx='0x00000680' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x09' eax='0x00000008' ebx='0x00000a80' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000006f' ecx='0x00000000' edx='0x00000002'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000008' ebx='0x00007000' ecx='0x0000006f' edx='0x00000007'/>
++  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x0000007f' ecx='0x00000000' edx='0x00000002'/>
++  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00010000' ecx='0x0000007f' edx='0x00000007'/>
 +  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x0000000a' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x0000000b' ebx='0x00000c00' ecx='0x00000004' edx='0x0000000e'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x03' eax='0x00000059' ebx='0x00000000' ecx='0x00000004' edx='0x0000000e'/>
++  <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x0000000a' ebx='0x00000600' ecx='0x00000004' edx='0x0000000f'/>
++  <cpuid eax_in='0x00000010' ecx_in='0x03' eax='0x00000059' ebx='0x00000000' ecx='0x00000004' edx='0x00000007'/>
 +  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f1fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000a0' ecx='0x017d7840' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x000007d0' ebx='0x00000bb8' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x00' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x01' eax='0x00000000' ebx='0x00080007' ecx='0x00000001' edx='0x00004122'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x02' eax='0x00000000' ebx='0x0010000f' ecx='0x00000001' edx='0x00004125'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x03' eax='0x00000000' ebx='0x00040001' ecx='0x00000010' edx='0x00004024'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x04' eax='0x00000000' ebx='0x00040006' ecx='0x00000008' edx='0x00004024'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x05' eax='0x00000000' ebx='0x00080008' ecx='0x00000001' edx='0x00004124'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x06' eax='0x00000000' ebx='0x00080007' ecx='0x00000080' edx='0x00004043'/>
-+  <cpuid eax_in='0x00000018' ecx_in='0x07' eax='0x00000000' ebx='0x00080009' ecx='0x00000080' edx='0x00004043'/>
-+  <cpuid eax_in='0x00000019' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000001a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000001b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000a8' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000834' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
++  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x6c6f4720' ebx='0x31362064' ecx='0x43203033' edx='0x40205550'/>
++  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x312e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003934' ebx='0x00000200' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000000' edx='0x00000000'/>
-+  <msr index='0x10a' edx='0x00000000' eax='0x0000000b'/>
++  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000834' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000834' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
 +</cpudata>
 -- 
-2.24.0
+2.26.2
 
diff --git a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-8268-CPU.patch b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-9242-CPU.patch
similarity index 51%
rename from SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-8268-CPU.patch
rename to SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-9242-CPU.patch
index 97de9d0..4df4203 100644
--- a/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-8268-CPU.patch
+++ b/SOURCES/libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-9242-CPU.patch
@@ -1,94 +1,92 @@
-From 5a7f0fd05ad3c86dd8f8be7870bd536de2512baa Mon Sep 17 00:00:00 2001
-Message-Id: <5a7f0fd05ad3c86dd8f8be7870bd536de2512baa@dist-git>
+From 0bd5ba1097ac8824a4a4a96b654f7ac8374703af Mon Sep 17 00:00:00 2001
+Message-Id: <0bd5ba1097ac8824a4a4a96b654f7ac8374703af@dist-git>
 From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:20 +0200
-Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) Platinum 8268 CPU
+Date: Tue, 26 May 2020 10:59:35 +0200
+Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) Platinum 9242 CPU
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+Cascadelake-Server with family 6, model 85, stepping 7.
+
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit e024625735daec9f9f0bc292f06e37d7099805f1)
+(cherry picked from commit 8605960389d208936b7f2cf3d2842a22a1aa7e22)
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1693433
-
-Conflicts:
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-            - md-clear feature did not exist at the time of the original
-              patch, but downstream already has it
+https://bugzilla.redhat.com/show_bug.cgi?id=1840010
 
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <809df143b79b1052ce3e643d9b97926b5bdd7001.1561068591.git.jdenemar@redhat.com>
+Message-Id: <72ee1c6054fd300004508dd4fa01fd319dc2b527.1590483392.git.jdenemar@redhat.com>
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
 ---
- tests/cputest.c                               |   1 +
- ...6_64-cpuid-Xeon-Platinum-8268-disabled.xml |   7 +
- ...86_64-cpuid-Xeon-Platinum-8268-enabled.xml |   8 +
- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml |  36 +
- .../x86_64-cpuid-Xeon-Platinum-8268-host.xml  |  37 +
- .../x86_64-cpuid-Xeon-Platinum-8268-json.xml  |  13 +
- .../x86_64-cpuid-Xeon-Platinum-8268.json      | 702 ++++++++++++++++++
- .../x86_64-cpuid-Xeon-Platinum-8268.sig       |   4 +
- .../x86_64-cpuid-Xeon-Platinum-8268.xml       |  54 ++
- 9 files changed, 862 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml
+ tests/cputest.c                               |    1 +
+ ...6_64-cpuid-Xeon-Platinum-9242-disabled.xml |    7 +
+ ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml |   10 +
+ .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml |   38 +
+ .../x86_64-cpuid-Xeon-Platinum-9242-host.xml  |   39 +
+ .../x86_64-cpuid-Xeon-Platinum-9242-json.xml  |   21 +
+ .../x86_64-cpuid-Xeon-Platinum-9242.json      | 1405 +++++++++++++++++
+ .../x86_64-cpuid-Xeon-Platinum-9242.sig       |    4 +
+ .../x86_64-cpuid-Xeon-Platinum-9242.xml       |   68 +
+ 9 files changed, 1593 insertions(+)
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.json
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.sig
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.xml
 
 diff --git a/tests/cputest.c b/tests/cputest.c
-index 0cb9a57592..e62cda34b7 100644
+index 1f59f0d3a9..f9f1ca74ff 100644
 --- a/tests/cputest.c
 +++ b/tests/cputest.c
-@@ -1293,6 +1293,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7540", JSON_MODELS);
+@@ -1267,6 +1267,7 @@ mymain(void)
      DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-5115", JSON_MODELS);
      DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-8268", JSON_HOST);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-8268", JSON_HOST);
++    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-9242", JSON_MODELS);
      DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST);
      DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE);
- 
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ice-Lake-Server", JSON_MODELS);
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
 new file mode 100644
-index 0000000000..32522eb9af
+index 0000000000..e7c59cef1e
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
 @@ -0,0 +1,7 @@
 +<!-- Features disabled by QEMU -->
 +<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x28000000'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
 +  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
 +</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
 new file mode 100644
-index 0000000000..434ac1956a
+index 0000000000..43c3a93a16
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-enabled.xml
-@@ -0,0 +1,8 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+@@ -0,0 +1,10 @@
 +<!-- Features enabled by QEMU -->
 +<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
 +  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000080c' edx='0x84000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000080c' edx='0xac000400'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
++  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01001000' ecx='0x00000000' edx='0x00000000'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x000000ab'/>
 +</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
 new file mode 100644
-index 0000000000..2836481454
+index 0000000000..faabdde8a0
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-@@ -0,0 +1,36 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+@@ -0,0 +1,38 @@
 +<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Server-IBRS</model>
++  <model fallback='forbid'>Cascadelake-Server</model>
 +  <vendor>Intel</vendor>
 +  <feature policy='require' name='ds'/>
 +  <feature policy='require' name='acpi'/>
@@ -109,29 +107,31 @@ index 0000000000..2836481454
 +  <feature policy='require' name='osxsave'/>
 +  <feature policy='require' name='tsc_adjust'/>
 +  <feature policy='require' name='cmt'/>
-+  <feature policy='require' name='clflushopt'/>
 +  <feature policy='require' name='intel-pt'/>
 +  <feature policy='require' name='pku'/>
 +  <feature policy='require' name='ospke'/>
-+  <feature policy='require' name='avx512vnni'/>
 +  <feature policy='require' name='md-clear'/>
 +  <feature policy='require' name='stibp'/>
 +  <feature policy='require' name='arch-capabilities'/>
-+  <feature policy='require' name='ssbd'/>
 +  <feature policy='require' name='xsaves'/>
 +  <feature policy='require' name='mbm_total'/>
 +  <feature policy='require' name='mbm_local'/>
 +  <feature policy='require' name='invtsc'/>
++  <feature policy='require' name='rdctl-no'/>
++  <feature policy='require' name='ibrs-all'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='tsx-ctrl'/>
 +</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
 new file mode 100644
-index 0000000000..032d8ffeca
+index 0000000000..01447f3478
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-@@ -0,0 +1,37 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+@@ -0,0 +1,39 @@
 +<cpu>
 +  <arch>x86_64</arch>
-+  <model>Skylake-Server-IBRS</model>
++  <model>Cascadelake-Server</model>
 +  <vendor>Intel</vendor>
 +  <feature name='ds'/>
 +  <feature name='acpi'/>
@@ -152,50 +152,61 @@ index 0000000000..032d8ffeca
 +  <feature name='osxsave'/>
 +  <feature name='tsc_adjust'/>
 +  <feature name='cmt'/>
-+  <feature name='clflushopt'/>
 +  <feature name='intel-pt'/>
 +  <feature name='pku'/>
 +  <feature name='ospke'/>
-+  <feature name='avx512vnni'/>
 +  <feature name='md-clear'/>
 +  <feature name='stibp'/>
 +  <feature name='arch-capabilities'/>
-+  <feature name='ssbd'/>
 +  <feature name='xsaves'/>
 +  <feature name='mbm_total'/>
 +  <feature name='mbm_local'/>
 +  <feature name='invtsc'/>
++  <feature name='rdctl-no'/>
++  <feature name='ibrs-all'/>
++  <feature name='skip-l1dfl-vmentry'/>
++  <feature name='mds-no'/>
++  <feature name='tsx-ctrl'/>
 +</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
 new file mode 100644
-index 0000000000..12431de213
+index 0000000000..36e95029be
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
-@@ -0,0 +1,13 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+@@ -0,0 +1,21 @@
 +<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Server-IBRS</model>
++  <model fallback='forbid'>Cascadelake-Server</model>
 +  <vendor>Intel</vendor>
 +  <feature policy='require' name='ss'/>
++  <feature policy='require' name='vmx'/>
 +  <feature policy='require' name='hypervisor'/>
 +  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
 +  <feature policy='require' name='umip'/>
 +  <feature policy='require' name='pku'/>
-+  <feature policy='require' name='avx512vnni'/>
-+  <feature policy='require' name='ssbd'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='arch-capabilities'/>
 +  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='ibpb'/>
++  <feature policy='require' name='amd-ssbd'/>
++  <feature policy='require' name='rdctl-no'/>
++  <feature policy='require' name='ibrs-all'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='tsx-ctrl'/>
 +</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.json b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.json
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.json b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.json
 new file mode 100644
-index 0000000000..71451f893d
+index 0000000000..103b094135
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.json
-@@ -0,0 +1,702 @@
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.json
+@@ -0,0 +1,1405 @@
 +{
 +  "return": {
 +    "model": {
 +      "name": "base",
 +      "props": {
++        "vmx-entry-load-rtit-ctl": false,
 +        "phys-bits": 0,
 +        "core-id": -1,
 +        "xlevel": 2147483656,
@@ -203,18 +214,26 @@ index 0000000000..71451f893d
 +        "ia64": false,
 +        "ssb-no": false,
 +        "aes": true,
++        "vmx-apicv-xapic": true,
 +        "mmx": true,
 +        "rdpid": false,
++        "vmx-page-walk-4": true,
++        "vmx-page-walk-5": false,
 +        "arat": true,
 +        "gfni": false,
++        "vmx-desc-exit": true,
 +        "ibrs-all": true,
 +        "pause-filter": false,
 +        "xsavec": true,
 +        "intel-pt": false,
++        "vmx-cr8-store-exit": true,
 +        "hv-frequencies": false,
 +        "tsc-frequency": 0,
++        "vmx-rdseed-exit": true,
 +        "xd": true,
++        "x-intel-pt-auto-level": false,
 +        "hv-vendor-id": "",
++        "vmx-eptp-switching": true,
 +        "kvm-asyncpf": true,
 +        "kvm_asyncpf": true,
 +        "perfctr_core": false,
@@ -223,46 +242,76 @@ index 0000000000..71451f893d
 +        "pbe": false,
 +        "decodeassists": false,
 +        "avx512cd": true,
++        "vmx-exit-load-efer": true,
++        "vmx-exit-clear-bndcfgs": false,
 +        "sse4_1": true,
 +        "sse4.1": true,
 +        "sse4-1": true,
 +        "family": 6,
 +        "legacy-cache": true,
++        "vmx-vmwrite-vmexit-fields": true,
++        "vmx-vnmi": true,
++        "vmx-true-ctls": true,
++        "host-phys-bits-limit": 48,
++        "vmx-ept-execonly": true,
++        "vmx-exit-save-efer": true,
++        "vmx-invept-all-context": true,
 +        "vmware-cpuid-freq": true,
 +        "wbnoinvd": false,
 +        "avx512f": true,
++        "hv-stimer-direct": false,
 +        "msr": true,
 +        "mce": true,
 +        "mca": true,
 +        "hv-runtime": false,
 +        "xcrypt": false,
 +        "thread-id": -1,
-+        "min-level": 13,
++        "vmx-exit-load-pat": true,
++        "vmx-intr-exit": true,
++        "min-level": 31,
++        "vmx-flexpriority": true,
 +        "xgetbv1": true,
 +        "cid": false,
 +        "hv-relaxed": false,
 +        "hv-crash": false,
 +        "ds": false,
 +        "fxsr": true,
++        "avx512-bf16": false,
++        "vmx-cr8-load-exit": true,
 +        "xsaveopt": true,
++        "vmx-apicv-vid": true,
++        "vmx-exit-save-pat": true,
 +        "xtpr": false,
++        "tsx-ctrl": true,
++        "vmx-ple": false,
 +        "hv-evmcs": false,
 +        "avx512vl": true,
 +        "avx512-vpopcntdq": false,
 +        "phe": false,
 +        "extapic": false,
 +        "3dnowprefetch": true,
++        "vmx-vmfunc": true,
++        "vmx-activity-shutdown": false,
 +        "avx512vbmi2": false,
++        "vmx-encls-exit": false,
 +        "cr8legacy": false,
++        "vmx-msr-bitmap": true,
++        "stibp": true,
 +        "cpuid-0xb": true,
 +        "xcrypt-en": false,
++        "vmx-mwait-exit": true,
 +        "kvm_pv_eoi": true,
++        "vmx-pml": true,
 +        "apic-id": 4294967295,
++        "vmx-nmi-exit": true,
++        "vmx-invept-single-context-noglobals": true,
 +        "rsba": false,
 +        "pn": false,
 +        "dca": false,
 +        "vendor": "GenuineIntel",
++        "vmx-unrestricted-guest": true,
 +        "hv-ipi": false,
++        "vmx-cr3-store-noexit": true,
 +        "pku": true,
 +        "smx": false,
 +        "cmp_legacy": false,
@@ -276,6 +325,7 @@ index 0000000000..71451f893d
 +        "hle": true,
 +        "npt": false,
 +        "rdctl-no": true,
++        "vmx-invvpid": true,
 +        "memory": "/machine/unattached/system[0]",
 +        "clwb": true,
 +        "lbrv": false,
@@ -287,44 +337,64 @@ index 0000000000..71451f893d
 +        "pfthreshold": false,
 +        "smep": true,
 +        "smap": true,
++        "vmx-invpcid-exit": true,
 +        "x2apic": true,
 +        "avx512vbmi": false,
 +        "avx512vnni": true,
++        "vmx-apicv-x2apic": true,
++        "kvm-pv-sched-yield": true,
 +        "hv-stimer": false,
++        "vmx-invlpg-exit": true,
 +        "x-hv-synic-kvm-only": true,
++        "vmx-invvpid-all-context": true,
 +        "i64": true,
++        "vmx-activity-hlt": true,
 +        "flushbyasid": false,
 +        "f16c": true,
++        "vmx-exit-ack-intr": true,
 +        "ace2-en": false,
 +        "pat": true,
 +        "pae": true,
 +        "sse": true,
++        "die-id": -1,
++        "vmx-tsc-offset": true,
 +        "phe-en": false,
 +        "kvm_nopiodelay": true,
 +        "kvm-nopiodelay": true,
 +        "tm": false,
 +        "kvmclock-stable-bit": true,
++        "vmx-rdtsc-exit": true,
 +        "hypervisor": true,
++        "vmx-rdtscp-exit": true,
 +        "socket-id": -1,
++        "mds-no": true,
 +        "pcommit": false,
++        "vmx-vpid": true,
 +        "syscall": true,
-+        "level": 13,
++        "level": 31,
 +        "avx512dq": true,
 +        "x-migrate-smi-count": false,
 +        "svm": false,
 +        "full-cpuid-auto-level": true,
 +        "hv-reset": false,
 +        "invtsc": false,
++        "vmx-monitor-exit": true,
 +        "sse3": true,
 +        "sse2": true,
++        "vmx-wbinvd-exit": true,
 +        "ssbd": true,
 +        "est": false,
++        "kvm-poll-control": true,
++        "kvm_poll_control": true,
 +        "avx512ifma": false,
 +        "tm2": false,
 +        "kvm-pv-ipi": true,
 +        "kvm-pv-eoi": true,
 +        "cx8": true,
++        "vmx-invvpid-single-addr": true,
++        "waitpkg": false,
 +        "cldemote": false,
++        "vmx-ept": true,
 +        "hv-reenlightenment": false,
 +        "kvm_mmu": false,
 +        "kvm-mmu": false,
@@ -335,7 +405,9 @@ index 0000000000..71451f893d
 +        "fill-mtrr-mask": true,
 +        "avx512bitalg": false,
 +        "nodeid_msr": false,
++        "vmx-entry-load-bndcfgs": false,
 +        "pdcm": false,
++        "vmx-exit-clear-rtit-ctl": false,
 +        "movbe": true,
 +        "model": 85,
 +        "nrip_save": false,
@@ -343,15 +415,17 @@ index 0000000000..71451f893d
 +        "kvm_pv_unhalt": true,
 +        "ssse3": true,
 +        "sse4a": false,
++        "vmx-pause-exit": true,
 +        "invpcid": true,
 +        "pdpe1gb": true,
 +        "tsc-deadline": true,
 +        "skip-l1dfl-vmentry": true,
++        "vmx-exit-load-perf-global-ctrl": false,
 +        "fma": true,
 +        "cx16": true,
 +        "de": true,
 +        "enforce": false,
-+        "stepping": 6,
++        "stepping": 7,
 +        "xsave": true,
 +        "clflush": true,
 +        "skinit": false,
@@ -361,50 +435,77 @@ index 0000000000..71451f893d
 +        "ibs": false,
 +        "ds_cpl": false,
 +        "ds-cpl": false,
++        "vmx-exit-nosave-debugctl": true,
 +        "host-phys-bits": true,
 +        "fma4": false,
++        "vmx-invept": true,
 +        "la57": false,
 +        "osvw": false,
 +        "check": true,
-+        "hv-spinlocks": -1,
++        "hv-spinlocks": 4294967295,
++        "vmx-eptad": true,
 +        "pmu": false,
 +        "pmm": false,
 +        "apic": true,
++        "vmx-entry-noload-debugctl": true,
 +        "spec-ctrl": true,
++        "vmx-posted-intr": true,
++        "vmx-apicv-register": true,
 +        "min-xlevel2": 0,
 +        "tsc-adjust": true,
 +        "tsc_adjust": true,
 +        "kvm-steal-time": true,
 +        "kvm_steal_time": true,
++        "vmx-zero-len-inject": false,
 +        "kvmclock": true,
++        "pschange-mc-no": true,
 +        "l3-cache": true,
++        "vmx-rdrand-exit": true,
 +        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
++        "hv-passthrough": false,
++        "amd-ssbd": true,
++        "ibpb": true,
 +        "xop": false,
 +        "avx": true,
++        "core-capability": false,
++        "vmx-invept-single-context": true,
++        "movdiri": false,
 +        "ace2": false,
 +        "avx512bw": true,
 +        "acpi": false,
 +        "hv-vapic": false,
 +        "fsgsbase": true,
++        "vmx-ept-1gb": true,
++        "vmx-ept-2mb": true,
 +        "ht": false,
++        "vmx-io-exit": true,
 +        "nx": true,
 +        "pclmulqdq": true,
 +        "mmxext": false,
 +        "vaes": false,
 +        "popcnt": true,
 +        "xsaves": true,
++        "movdir64b": false,
 +        "tcg-cpuid": true,
++        "vmx-shadow-vmcs": true,
 +        "lm": true,
++        "vmx-exit-save-preemption-timer": true,
++        "vmx-entry-load-pat": true,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": true,
 +        "umip": true,
++        "vmx-store-lma": true,
++        "vmx-movdr-exit": true,
 +        "pse": true,
 +        "avx2": true,
 +        "sep": true,
 +        "pclmuldq": true,
 +        "virt-ssbd": false,
++        "vmx-cr3-load-noexit": true,
 +        "x-hv-max-vps": -1,
 +        "nodeid-msr": false,
++        "md-clear": true,
++        "split-lock-detect": false,
 +        "kvm": true,
 +        "misalignsse": false,
 +        "min-xlevel": 2147483656,
@@ -416,19 +517,31 @@ index 0000000000..71451f893d
 +        "tsc-scale": false,
 +        "topoext": false,
 +        "hv-vpindex": false,
++        "hv-no-nonarch-coresharing": "off",
++        "vmx-preemption-timer": true,
++        "ucode-rev": 0,
 +        "xlevel2": 0,
 +        "clflushopt": true,
++        "vmx-vnmi-pending": true,
 +        "kvm-no-smi-migration": false,
 +        "monitor": false,
++        "vmx-vintr-pending": true,
 +        "avx512er": false,
 +        "pmm-en": false,
 +        "pcid": true,
-+        "arch-capabilities": false,
++        "taa-no": false,
++        "vmx-secondary-ctls": true,
++        "arch-capabilities": true,
++        "vmx-xsaves": true,
++        "clzero": false,
 +        "3dnow": false,
 +        "erms": true,
-+        "lahf-lm": true,
++        "vmx-entry-ia32e-mode": true,
++        "x-force-features": false,
 +        "lahf_lm": true,
++        "lahf-lm": true,
 +        "vpclmulqdq": false,
++        "vmx-ins-outs": true,
 +        "fxsr-opt": false,
 +        "hv-synic": false,
 +        "xstore": false,
@@ -444,20 +557,28 @@ index 0000000000..71451f893d
 +        "rdrand": true,
 +        "rdseed": true,
 +        "avx512-4vnniw": false,
-+        "vmx": false,
++        "vmx": true,
 +        "vme": true,
 +        "dtes64": false,
 +        "mtrr": true,
 +        "rdtscp": true,
++        "xsaveerptr": false,
 +        "pse36": true,
 +        "kvm-pv-tlb-flush": true,
++        "vmx-activity-wait-sipi": false,
 +        "tbm": false,
 +        "wdt": false,
++        "vmx-rdpmc-exit": true,
++        "level-func7": 0,
++        "vmx-entry-load-efer": true,
++        "vmx-mtf": true,
 +        "pause_filter": false,
 +        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) Platinum 8268 CPU @ 2.90GHz",
++        "model-id": "Intel(R) Xeon(R) Platinum 9242 CPU @ 2.30GHz",
 +        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
 +        "avx512pf": false,
++        "vmx-hlt-exit": true,
 +        "xstore-en": false
 +      }
 +    }
@@ -489,6 +610,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "qemu64-v1",
++      "typename": "qemu64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "qemu64",
 +      "typename": "qemu64-x86_64-cpu",
 +      "unavailable-features": [],
@@ -496,6 +624,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "qemu32-v1",
++      "typename": "qemu32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "qemu32",
 +      "typename": "qemu32-x86_64-cpu",
 +      "unavailable-features": [],
@@ -503,6 +638,20 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "phenom-v1",
++      "typename": "phenom-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "sse4a",
++        "npt"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "phenom",
 +      "typename": "phenom-x86_64-cpu",
 +      "unavailable-features": [
@@ -517,6 +666,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "pentium3-v1",
++      "typename": "pentium3-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "pentium3",
 +      "typename": "pentium3-x86_64-cpu",
 +      "unavailable-features": [],
@@ -524,6 +680,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "pentium2-v1",
++      "typename": "pentium2-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "pentium2",
 +      "typename": "pentium2-x86_64-cpu",
 +      "unavailable-features": [],
@@ -531,6 +694,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "pentium-v1",
++      "typename": "pentium-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "pentium",
 +      "typename": "pentium-x86_64-cpu",
 +      "unavailable-features": [],
@@ -538,6 +708,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "n270-v1",
++      "typename": "n270-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "n270",
 +      "typename": "n270-x86_64-cpu",
 +      "unavailable-features": [],
@@ -545,6 +722,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "kvm64-v1",
++      "typename": "kvm64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "kvm64",
 +      "typename": "kvm64-x86_64-cpu",
 +      "unavailable-features": [],
@@ -552,6 +736,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "kvm32-v1",
++      "typename": "kvm32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "kvm32",
 +      "typename": "kvm32-x86_64-cpu",
 +      "unavailable-features": [],
@@ -559,11 +750,9 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a"
-+      ],
++      "name": "coreduo-v1",
++      "typename": "coreduo-v1-x86_64-cpu",
++      "unavailable-features": [],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -575,6 +764,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "core2duo-v1",
++      "typename": "core2duo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "core2duo",
 +      "typename": "core2duo-x86_64-cpu",
 +      "unavailable-features": [],
@@ -582,6 +778,17 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "athlon-v1",
++      "typename": "athlon-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "athlon",
 +      "typename": "athlon-x86_64-cpu",
 +      "unavailable-features": [
@@ -593,6 +800,20 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Westmere-v2",
++      "typename": "Westmere-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v1",
++      "typename": "Westmere-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Westmere-IBRS",
 +      "typename": "Westmere-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -607,6 +828,79 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Snowridge-v2",
++      "typename": "Snowridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v1",
++      "typename": "Snowridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge",
++      "typename": "Snowridge-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v3",
++      "typename": "Skylake-Server-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v2",
++      "typename": "Skylake-Server-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v1",
++      "typename": "Skylake-Server-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-noTSX-IBRS",
++      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Skylake-Server-IBRS",
 +      "typename": "Skylake-Server-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -621,6 +915,34 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Skylake-Client-v3",
++      "typename": "Skylake-Client-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v2",
++      "typename": "Skylake-Client-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v1",
++      "typename": "Skylake-Client-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-noTSX-IBRS",
++      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Skylake-Client-IBRS",
 +      "typename": "Skylake-Client-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -635,6 +957,20 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "SandyBridge-v2",
++      "typename": "SandyBridge-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v1",
++      "typename": "SandyBridge-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "SandyBridge-IBRS",
 +      "typename": "SandyBridge-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -649,6 +985,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Penryn-v1",
++      "typename": "Penryn-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Penryn",
 +      "typename": "Penryn-x86_64-cpu",
 +      "unavailable-features": [],
@@ -656,6 +999,21 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Opteron_G5-v1",
++      "typename": "Opteron_G5-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "tbm",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Opteron_G5",
 +      "typename": "Opteron_G5-x86_64-cpu",
 +      "unavailable-features": [
@@ -669,6 +1027,20 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Opteron_G4-v1",
++      "typename": "Opteron_G4-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Opteron_G4",
 +      "typename": "Opteron_G4-x86_64-cpu",
 +      "unavailable-features": [
@@ -681,6 +1053,16 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Opteron_G3-v1",
++      "typename": "Opteron_G3-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Opteron_G3",
 +      "typename": "Opteron_G3-x86_64-cpu",
 +      "unavailable-features": [
@@ -691,6 +1073,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Opteron_G2-v1",
++      "typename": "Opteron_G2-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Opteron_G2",
 +      "typename": "Opteron_G2-x86_64-cpu",
 +      "unavailable-features": [],
@@ -698,6 +1087,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Opteron_G1-v1",
++      "typename": "Opteron_G1-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Opteron_G1",
 +      "typename": "Opteron_G1-x86_64-cpu",
 +      "unavailable-features": [],
@@ -705,6 +1101,20 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Nehalem-v2",
++      "typename": "Nehalem-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v1",
++      "typename": "Nehalem-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Nehalem-IBRS",
 +      "typename": "Nehalem-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -719,6 +1129,19 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "KnightsMill-v1",
++      "typename": "KnightsMill-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512pf",
++        "avx512er",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "KnightsMill",
 +      "typename": "KnightsMill-x86_64-cpu",
 +      "unavailable-features": [
@@ -732,6 +1155,20 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "IvyBridge-v2",
++      "typename": "IvyBridge-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v1",
++      "typename": "IvyBridge-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "IvyBridge-IBRS",
 +      "typename": "IvyBridge-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -746,11 +1183,10 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
-+      "name": "Icelake-Server",
-+      "typename": "Icelake-Server-x86_64-cpu",
++      "name": "Icelake-Server-v2",
++      "typename": "Icelake-Server-v2-x86_64-cpu",
 +      "unavailable-features": [
 +        "avx512vbmi",
-+        "",
 +        "avx512vbmi2",
 +        "gfni",
 +        "vaes",
@@ -764,11 +1200,61 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
-+      "name": "Icelake-Client",
-+      "typename": "Icelake-Client-x86_64-cpu",
++      "name": "Icelake-Server-v1",
++      "typename": "Icelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-noTSX",
++      "typename": "Icelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server",
++      "typename": "Icelake-Server-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v2",
++      "typename": "Icelake-Client-v2-x86_64-cpu",
 +      "unavailable-features": [
 +        "avx512vbmi",
-+        "",
 +        "avx512vbmi2",
 +        "gfni",
 +        "vaes",
@@ -781,6 +1267,82 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Icelake-Client-v1",
++      "typename": "Icelake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-noTSX",
++      "typename": "Icelake-Client-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client",
++      "typename": "Icelake-Client-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v4",
++      "typename": "Haswell-v4-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v3",
++      "typename": "Haswell-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v2",
++      "typename": "Haswell-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v1",
++      "typename": "Haswell-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Haswell-noTSX-IBRS",
 +      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
 +      "unavailable-features": [],
@@ -809,6 +1371,40 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "EPYC-v2",
++      "typename": "EPYC-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v1",
++      "typename": "EPYC-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "EPYC-IBPB",
 +      "typename": "EPYC-IBPB-x86_64-cpu",
 +      "unavailable-features": [
@@ -818,8 +1414,7 @@ index 0000000000..71451f893d
 +        "cr8legacy",
 +        "sse4a",
 +        "misalignsse",
-+        "osvw",
-+        "ibpb"
++        "osvw"
 +      ],
 +      "static": false,
 +      "migration-safe": true
@@ -840,6 +1435,63 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Dhyana-v1",
++      "typename": "Dhyana-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana",
++      "typename": "Dhyana-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v1",
++      "typename": "Denverton-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton",
++      "typename": "Denverton-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe-v1",
++      "typename": "Conroe-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Conroe",
 +      "typename": "Conroe-x86_64-cpu",
 +      "unavailable-features": [],
@@ -847,11 +1499,65 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "Cascadelake-Server-v3",
++      "typename": "Cascadelake-Server-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v2",
++      "typename": "Cascadelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v1",
++      "typename": "Cascadelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-noTSX",
++      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "Cascadelake-Server",
 +      "typename": "Cascadelake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        ""
-+      ],
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v4",
++      "typename": "Broadwell-v4-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v3",
++      "typename": "Broadwell-v3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v2",
++      "typename": "Broadwell-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v1",
++      "typename": "Broadwell-v1-x86_64-cpu",
++      "unavailable-features": [],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -884,6 +1590,13 @@ index 0000000000..71451f893d
 +      "migration-safe": true
 +    },
 +    {
++      "name": "486-v1",
++      "typename": "486-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "486",
 +      "typename": "486-x86_64-cpu",
 +      "unavailable-features": [],
@@ -893,26 +1606,26 @@ index 0000000000..71451f893d
 +  ],
 +  "id": "definitions"
 +}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.sig b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.sig
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.sig b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.sig
 new file mode 100644
-index 0000000000..018161ff52
+index 0000000000..082a25b4ee
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.sig
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.sig
 @@ -0,0 +1,4 @@
-+050656
++050657
 +family:     6 (0x06)
 +model:     85 (0x55)
-+stepping:   6 (0x06)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml
++stepping:   7 (0x07)
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.xml
 new file mode 100644
-index 0000000000..75472d44fe
+index 0000000000..e3bdd881b6
 --- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml
-@@ -0,0 +1,54 @@
-+<!-- Intel(R) Xeon(R) Platinum 8268 CPU @ 2.90GHz -->
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.xml
+@@ -0,0 +1,68 @@
++<!-- Intel(R) Xeon(R) Platinum 9242 CPU @ 2.30GHz -->
 +<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00050656' ebx='0x44400800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
++  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000001f' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00050657' ebx='0x07800800' ecx='0x7ffefbff' edx='0xbfebfbff'/>
 +  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/>
 +  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x7c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
@@ -920,13 +1633,13 @@ index 0000000000..75472d44fe
 +  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x7c004143' ebx='0x03c0003f' ecx='0x000003ff' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x7c0fc163' ebx='0x0280003f' ecx='0x0000cfff' edx='0x00000005'/>
 +  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00002020'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000ef7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd39ffffb' ecx='0x00000818' edx='0xbc000400'/>
 +  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300404' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000044'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000006' ebx='0x00000030' ecx='0x00000201' edx='0x00000044'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000007'/>
++  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000006' ebx='0x00000030' ecx='0x00000201' edx='0x00000007'/>
 +  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x000002ff' ebx='0x00000a88' ecx='0x00000a88' edx='0x00000000'/>
 +  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000a08' ecx='0x00000100' edx='0x00000000'/>
@@ -949,20 +1662,34 @@ index 0000000000..75472d44fe
 +  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
 +  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000e8' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x000000b8' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x000008fc' ebx='0x00000ed8' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0x00000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000019' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000007'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x01' eax='0x00000006' ebx='0x00000030' ecx='0x00000201' edx='0x00000007'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x02' eax='0x00000007' ebx='0x00000060' ecx='0x00000502' edx='0x00000007'/>
++  <cpuid eax_in='0x0000001f' ecx_in='0x03' eax='0x00000000' ebx='0x00000000' ecx='0x00000003' edx='0x00000007'/>
++  <cpuid eax_in='0x20000000' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000007'/>
 +  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
 +  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x616c5020' ebx='0x756e6974' ecx='0x3238206d' edx='0x43203836'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x40205550' ebx='0x392e3220' ecx='0x7a484730' edx='0x00000000'/>
++  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x616c5020' ebx='0x756e6974' ecx='0x3239206d' edx='0x43203234'/>
++  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x40205550' ebx='0x332e3220' ecx='0x7a484730' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
 +  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
 +  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x000008fc' ebx='0x00000ed8' ecx='0x00000064' edx='0x00000000'/>
++  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x000008fc' ebx='0x00000ed8' ecx='0x00000064' edx='0x00000000'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x000000ab'/>
 +</cpudata>
 -- 
-2.22.0
+2.26.2
 
diff --git a/SOURCES/libvirt-cputest-Add-support-for-MSR-features-to-cpu-parse.sh.patch b/SOURCES/libvirt-cputest-Add-support-for-MSR-features-to-cpu-parse.sh.patch
deleted file mode 100644
index 0fae604..0000000
--- a/SOURCES/libvirt-cputest-Add-support-for-MSR-features-to-cpu-parse.sh.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7084115edc91fd3cff8ba35af1fc705c917973cf Mon Sep 17 00:00:00 2001
-Message-Id: <7084115edc91fd3cff8ba35af1fc705c917973cf@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:41 +0200
-Subject: [PATCH] cputest: Add support for MSR features to cpu-parse.sh
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The script just parses whatever cpu-gather.sh printed out.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8904492e21537f3b820e577964e67ad670fa640b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/cputestdata/cpu-parse.sh
-            - no need to update this script downstream
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <55c3125aef5a2d7bf7b2d7a6fc5c868af7903447.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml
-index 75472d44fe..f1261da891 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268.xml
-@@ -51,4 +51,5 @@
-   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x0000302e' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-   <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000b54' ebx='0x00000f3c' ecx='0x00000064' edx='0x00000000'/>
-+  <msr index='0x10a' edx='0x00000000' eax='0x0000002b'/>
- </cpudata>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-cputest-Test-CPU-signatures.patch b/SOURCES/libvirt-cputest-Test-CPU-signatures.patch
deleted file mode 100644
index a1923a3..0000000
--- a/SOURCES/libvirt-cputest-Test-CPU-signatures.patch
+++ /dev/null
@@ -1,755 +0,0 @@
-From 58b7dda3dda6a768f465f2b8782ef665bd0d7f72 Mon Sep 17 00:00:00 2001
-Message-Id: <58b7dda3dda6a768f465f2b8782ef665bd0d7f72@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:08 +0200
-Subject: [PATCH] cputest: Test CPU signatures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The signature computation code is not too complicated and it will likely
-never change so testing it is not very important. We do it mostly for a
-nice side effect of easily accessible signature numbers for all CPU
-data files.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit dd08d27fc205c86961b6d957fbb92da5aead5d1b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <24fc3fddd709251f12a12589605c76634af8fb1b.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/cputest.c                               | 86 +++++++++++++++++++
- tests/cputestdata/x86_64-cpuid-A10-5800K.sig  |  4 +
- tests/cputestdata/x86_64-cpuid-Atom-D510.sig  |  4 +
- tests/cputestdata/x86_64-cpuid-Atom-N450.sig  |  4 +
- .../cputestdata/x86_64-cpuid-Core-i5-2500.sig |  4 +
- .../x86_64-cpuid-Core-i5-2540M.sig            |  4 +
- .../x86_64-cpuid-Core-i5-4670T.sig            |  4 +
- .../cputestdata/x86_64-cpuid-Core-i5-650.sig  |  4 +
- .../cputestdata/x86_64-cpuid-Core-i5-6600.sig |  4 +
- .../x86_64-cpuid-Core-i7-2600-xsaveopt.sig    |  4 +
- .../cputestdata/x86_64-cpuid-Core-i7-2600.sig |  4 +
- .../x86_64-cpuid-Core-i7-3520M.sig            |  4 +
- .../x86_64-cpuid-Core-i7-3740QM.sig           |  4 +
- .../cputestdata/x86_64-cpuid-Core-i7-3770.sig |  4 +
- .../x86_64-cpuid-Core-i7-4510U.sig            |  4 +
- .../x86_64-cpuid-Core-i7-4600U.sig            |  4 +
- .../x86_64-cpuid-Core-i7-5600U-arat.sig       |  4 +
- .../x86_64-cpuid-Core-i7-5600U-ibrs.sig       |  4 +
- .../x86_64-cpuid-Core-i7-5600U.sig            |  4 +
- .../x86_64-cpuid-Core-i7-7600U.sig            |  4 +
- .../cputestdata/x86_64-cpuid-Core-i7-7700.sig |  4 +
- .../cputestdata/x86_64-cpuid-Core-i7-8700.sig |  4 +
- .../cputestdata/x86_64-cpuid-Core2-E6850.sig  |  4 +
- .../cputestdata/x86_64-cpuid-Core2-Q9500.sig  |  4 +
- .../x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig   |  4 +
- .../x86_64-cpuid-EPYC-7601-32-Core.sig        |  4 +
- tests/cputestdata/x86_64-cpuid-FX-8150.sig    |  4 +
- .../cputestdata/x86_64-cpuid-Opteron-1352.sig |  4 +
- .../cputestdata/x86_64-cpuid-Opteron-2350.sig |  4 +
- .../cputestdata/x86_64-cpuid-Opteron-6234.sig |  4 +
- .../cputestdata/x86_64-cpuid-Opteron-6282.sig |  4 +
- .../x86_64-cpuid-Pentium-P6100.sig            |  4 +
- tests/cputestdata/x86_64-cpuid-Phenom-B95.sig |  4 +
- .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig |  4 +
- tests/cputestdata/x86_64-cpuid-Xeon-5110.sig  |  4 +
- .../x86_64-cpuid-Xeon-E3-1245-v5.sig          |  4 +
- .../x86_64-cpuid-Xeon-E5-2609-v3.sig          |  4 +
- .../x86_64-cpuid-Xeon-E5-2623-v4.sig          |  4 +
- .../x86_64-cpuid-Xeon-E5-2630-v3.sig          |  4 +
- .../x86_64-cpuid-Xeon-E5-2630-v4.sig          |  4 +
- .../x86_64-cpuid-Xeon-E5-2650-v3.sig          |  4 +
- .../x86_64-cpuid-Xeon-E5-2650-v4.sig          |  4 +
- .../cputestdata/x86_64-cpuid-Xeon-E5-2650.sig |  4 +
- .../cputestdata/x86_64-cpuid-Xeon-E7-4820.sig |  4 +
- .../cputestdata/x86_64-cpuid-Xeon-E7-4830.sig |  4 +
- .../x86_64-cpuid-Xeon-E7-8890-v3.sig          |  4 +
- tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig |  4 +
- .../x86_64-cpuid-Xeon-Gold-5115.sig           |  4 +
- .../x86_64-cpuid-Xeon-Gold-6148.sig           |  4 +
- tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig |  4 +
- tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig |  4 +
- 51 files changed, 286 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-D510.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-N450.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3520M.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4510U.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-8700.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-Q9500.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-FX-8150.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-1352.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6282.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Pentium-P6100.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-5110.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 9e5f807823..0cb9a57592 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -37,6 +37,7 @@
- #include "testutils.h"
- #include "cpu_conf.h"
- #include "cpu/cpu.h"
-+#include "cpu/cpu_x86.h"
- #include "cpu/cpu_map.h"
- #include "virstring.h"
- 
-@@ -648,6 +649,62 @@ cpuTestGuestCPUID(const void *arg)
- }
- 
- 
-+static int
-+cpuTestCompareSignature(const struct data *data,
-+                        virCPUDataPtr hostData)
-+{
-+    VIR_AUTOFREE(char *) result = NULL;
-+    VIR_AUTOFREE(char *) sigStr = NULL;
-+    unsigned long signature;
-+    unsigned int family;
-+    unsigned int model;
-+    unsigned int stepping;
-+
-+    signature = virCPUx86DataGetSignature(hostData, &family, &model, &stepping);
-+
-+    if (virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig",
-+                    abs_srcdir, virArchToString(data->arch), data->host) < 0)
-+        return -1;
-+
-+    if (virAsprintf(&sigStr,
-+                    "%1$06lx\n"
-+                    "family:   %2$3u (0x%2$02x)\n"
-+                    "model:    %3$3u (0x%3$02x)\n"
-+                    "stepping: %4$3u (0x%4$02x)\n",
-+                    signature, family, model, stepping) < 0)
-+        return -1;
-+
-+    return virTestCompareToFile(sigStr, result);
-+}
-+
-+
-+static int
-+cpuTestCPUIDSignature(const void *arg)
-+{
-+    const struct data *data = arg;
-+    virCPUDataPtr hostData = NULL;
-+    char *hostFile = NULL;
-+    char *host = NULL;
-+    int ret = -1;
-+
-+    if (virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml",
-+                    abs_srcdir, virArchToString(data->arch), data->host) < 0)
-+        goto cleanup;
-+
-+    if (virTestLoadFile(hostFile, &host) < 0 ||
-+        !(hostData = virCPUDataParse(host)))
-+        goto cleanup;
-+
-+    ret = cpuTestCompareSignature(data, hostData);
-+
-+ cleanup:
-+    virCPUDataFree(hostData);
-+    VIR_FREE(hostFile);
-+    VIR_FREE(host);
-+    return ret;
-+}
-+
-+
- static int
- cpuTestUpdateLiveCompare(virArch arch,
-                          virCPUDefPtr actual,
-@@ -869,6 +926,31 @@ cpuTestJSONCPUID(const void *arg)
-     VIR_FREE(result);
-     return ret;
- }
-+
-+
-+static int
-+cpuTestJSONSignature(const void *arg)
-+{
-+    const struct data *data = arg;
-+    virQEMUCapsPtr qemuCaps = NULL;
-+    virCPUDataPtr hostData = NULL;
-+    qemuMonitorCPUModelInfoPtr modelInfo;
-+    int ret = -1;
-+
-+    if (!(qemuCaps = cpuTestMakeQEMUCaps(data)))
-+        goto cleanup;
-+
-+    modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, VIR_DOMAIN_VIRT_KVM);
-+    if (!(hostData = virQEMUCapsGetCPUModelX86Data(modelInfo, false)))
-+        goto cleanup;
-+
-+    ret = cpuTestCompareSignature(data, hostData);
-+
-+ cleanup:
-+    virObjectUnref(qemuCaps);
-+    virCPUDataFree(hostData);
-+    return ret;
-+}
- #endif
- 
- 
-@@ -1014,6 +1096,8 @@ mymain(void)
-         if (json != JSON_NONE) { \
-             DO_TEST(arch, cpuTestJSONCPUID, host, host, \
-                     NULL, NULL, json, 0); \
-+            DO_TEST(arch, cpuTestJSONSignature, host, host, \
-+                    NULL, NULL, 0, 0); \
-         } \
-     } while (0)
- #else
-@@ -1026,6 +1110,8 @@ mymain(void)
-                 NULL, NULL, 0, 0); \
-         DO_TEST(arch, cpuTestGuestCPUID, host, host, \
-                 NULL, NULL, json, 0); \
-+        DO_TEST(arch, cpuTestCPUIDSignature, host, host, \
-+                NULL, NULL, 0, 0); \
-         DO_TEST_JSON(arch, host, json); \
-         if (json != JSON_NONE) { \
-             DO_TEST(arch, cpuTestUpdateLive, host, host, \
-diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K.sig b/tests/cputestdata/x86_64-cpuid-A10-5800K.sig
-new file mode 100644
-index 0000000000..8045eda561
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K.sig
-@@ -0,0 +1,4 @@
-+610f01
-+family:    21 (0x15)
-+model:     16 (0x10)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510.sig b/tests/cputestdata/x86_64-cpuid-Atom-D510.sig
-new file mode 100644
-index 0000000000..d22d28ff8a
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510.sig
-@@ -0,0 +1,4 @@
-+0106ca
-+family:     6 (0x06)
-+model:     28 (0x1c)
-+stepping:  10 (0x0a)
-diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450.sig b/tests/cputestdata/x86_64-cpuid-Atom-N450.sig
-new file mode 100644
-index 0000000000..d22d28ff8a
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450.sig
-@@ -0,0 +1,4 @@
-+0106ca
-+family:     6 (0x06)
-+model:     28 (0x1c)
-+stepping:  10 (0x0a)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500.sig b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.sig
-new file mode 100644
-index 0000000000..9b113c3798
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.sig
-@@ -0,0 +1,4 @@
-+0206a7
-+family:     6 (0x06)
-+model:     42 (0x2a)
-+stepping:   7 (0x07)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.sig b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.sig
-new file mode 100644
-index 0000000000..9b113c3798
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.sig
-@@ -0,0 +1,4 @@
-+0206a7
-+family:     6 (0x06)
-+model:     42 (0x2a)
-+stepping:   7 (0x07)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.sig b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.sig
-new file mode 100644
-index 0000000000..e2fb6c5dd2
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.sig
-@@ -0,0 +1,4 @@
-+0306c3
-+family:     6 (0x06)
-+model:     60 (0x3c)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650.sig b/tests/cputestdata/x86_64-cpuid-Core-i5-650.sig
-new file mode 100644
-index 0000000000..fc7c566de5
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650.sig
-@@ -0,0 +1,4 @@
-+020652
-+family:     6 (0x06)
-+model:     37 (0x25)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600.sig b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.sig
-new file mode 100644
-index 0000000000..7e57c2ded6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.sig
-@@ -0,0 +1,4 @@
-+0506e3
-+family:     6 (0x06)
-+model:     94 (0x5e)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.sig
-new file mode 100644
-index 0000000000..9b113c3798
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.sig
-@@ -0,0 +1,4 @@
-+0206a7
-+family:     6 (0x06)
-+model:     42 (0x2a)
-+stepping:   7 (0x07)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.sig
-new file mode 100644
-index 0000000000..9b113c3798
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.sig
-@@ -0,0 +1,4 @@
-+0206a7
-+family:     6 (0x06)
-+model:     42 (0x2a)
-+stepping:   7 (0x07)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.sig
-new file mode 100644
-index 0000000000..9c6ea10a83
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.sig
-@@ -0,0 +1,4 @@
-+0306a9
-+family:     6 (0x06)
-+model:     58 (0x3a)
-+stepping:   9 (0x09)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.sig
-new file mode 100644
-index 0000000000..9c6ea10a83
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.sig
-@@ -0,0 +1,4 @@
-+0306a9
-+family:     6 (0x06)
-+model:     58 (0x3a)
-+stepping:   9 (0x09)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.sig
-new file mode 100644
-index 0000000000..9c6ea10a83
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.sig
-@@ -0,0 +1,4 @@
-+0306a9
-+family:     6 (0x06)
-+model:     58 (0x3a)
-+stepping:   9 (0x09)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U.sig
-new file mode 100644
-index 0000000000..fd6726a3da
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U.sig
-@@ -0,0 +1,4 @@
-+040651
-+family:     6 (0x06)
-+model:     69 (0x45)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.sig
-new file mode 100644
-index 0000000000..fd6726a3da
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.sig
-@@ -0,0 +1,4 @@
-+040651
-+family:     6 (0x06)
-+model:     69 (0x45)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.sig
-new file mode 100644
-index 0000000000..dd18d0f76d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.sig
-@@ -0,0 +1,4 @@
-+0306d4
-+family:     6 (0x06)
-+model:     61 (0x3d)
-+stepping:   4 (0x04)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.sig
-new file mode 100644
-index 0000000000..dd18d0f76d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.sig
-@@ -0,0 +1,4 @@
-+0306d4
-+family:     6 (0x06)
-+model:     61 (0x3d)
-+stepping:   4 (0x04)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.sig
-new file mode 100644
-index 0000000000..dd18d0f76d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.sig
-@@ -0,0 +1,4 @@
-+0306d4
-+family:     6 (0x06)
-+model:     61 (0x3d)
-+stepping:   4 (0x04)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.sig
-new file mode 100644
-index 0000000000..8f757722bb
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U.sig
-@@ -0,0 +1,4 @@
-+0806e9
-+family:     6 (0x06)
-+model:    142 (0x8e)
-+stepping:   9 (0x09)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-7700.sig
-new file mode 100644
-index 0000000000..d4db84a618
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700.sig
-@@ -0,0 +1,4 @@
-+0906e9
-+family:     6 (0x06)
-+model:    158 (0x9e)
-+stepping:   9 (0x09)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700.sig b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.sig
-new file mode 100644
-index 0000000000..45d6ea29d0
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700.sig
-@@ -0,0 +1,4 @@
-+0906ea
-+family:     6 (0x06)
-+model:    158 (0x9e)
-+stepping:  10 (0x0a)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850.sig b/tests/cputestdata/x86_64-cpuid-Core2-E6850.sig
-new file mode 100644
-index 0000000000..2382914bc7
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850.sig
-@@ -0,0 +1,4 @@
-+0006fb
-+family:     6 (0x06)
-+model:     15 (0x0f)
-+stepping:  11 (0x0b)
-diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500.sig b/tests/cputestdata/x86_64-cpuid-Core2-Q9500.sig
-new file mode 100644
-index 0000000000..9aec5927d0
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500.sig
-@@ -0,0 +1,4 @@
-+01067a
-+family:     6 (0x06)
-+model:     23 (0x17)
-+stepping:  10 (0x0a)
-diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig
-new file mode 100644
-index 0000000000..8fe15b7991
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig
-@@ -0,0 +1,4 @@
-+800f12
-+family:    23 (0x17)
-+model:      1 (0x01)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core.sig b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core.sig
-new file mode 100644
-index 0000000000..8fe15b7991
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core.sig
-@@ -0,0 +1,4 @@
-+800f12
-+family:    23 (0x17)
-+model:      1 (0x01)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150.sig b/tests/cputestdata/x86_64-cpuid-FX-8150.sig
-new file mode 100644
-index 0000000000..4b6440a315
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-FX-8150.sig
-@@ -0,0 +1,4 @@
-+600f12
-+family:    21 (0x15)
-+model:      1 (0x01)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352.sig b/tests/cputestdata/x86_64-cpuid-Opteron-1352.sig
-new file mode 100644
-index 0000000000..d21535b4b9
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352.sig
-@@ -0,0 +1,4 @@
-+100f23
-+family:    16 (0x10)
-+model:      2 (0x02)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350.sig b/tests/cputestdata/x86_64-cpuid-Opteron-2350.sig
-new file mode 100644
-index 0000000000..d21535b4b9
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350.sig
-@@ -0,0 +1,4 @@
-+100f23
-+family:    16 (0x10)
-+model:      2 (0x02)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234.sig b/tests/cputestdata/x86_64-cpuid-Opteron-6234.sig
-new file mode 100644
-index 0000000000..4b6440a315
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234.sig
-@@ -0,0 +1,4 @@
-+600f12
-+family:    21 (0x15)
-+model:      1 (0x01)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282.sig b/tests/cputestdata/x86_64-cpuid-Opteron-6282.sig
-new file mode 100644
-index 0000000000..4b6440a315
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282.sig
-@@ -0,0 +1,4 @@
-+600f12
-+family:    21 (0x15)
-+model:      1 (0x01)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100.sig b/tests/cputestdata/x86_64-cpuid-Pentium-P6100.sig
-new file mode 100644
-index 0000000000..8712d34023
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100.sig
-@@ -0,0 +1,4 @@
-+020655
-+family:     6 (0x06)
-+model:     37 (0x25)
-+stepping:   5 (0x05)
-diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95.sig b/tests/cputestdata/x86_64-cpuid-Phenom-B95.sig
-new file mode 100644
-index 0000000000..c93dbebc45
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95.sig
-@@ -0,0 +1,4 @@
-+100f42
-+family:    16 (0x10)
-+model:      4 (0x04)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig
-new file mode 100644
-index 0000000000..031bb84902
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig
-@@ -0,0 +1,4 @@
-+800f11
-+family:    23 (0x17)
-+model:      1 (0x01)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110.sig b/tests/cputestdata/x86_64-cpuid-Xeon-5110.sig
-new file mode 100644
-index 0000000000..15f8400ca6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110.sig
-@@ -0,0 +1,4 @@
-+0006f6
-+family:     6 (0x06)
-+model:     15 (0x0f)
-+stepping:   6 (0x06)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.sig
-new file mode 100644
-index 0000000000..7e57c2ded6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.sig
-@@ -0,0 +1,4 @@
-+0506e3
-+family:     6 (0x06)
-+model:     94 (0x5e)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.sig
-new file mode 100644
-index 0000000000..2c548c9934
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.sig
-@@ -0,0 +1,4 @@
-+0306f2
-+family:     6 (0x06)
-+model:     63 (0x3f)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.sig
-new file mode 100644
-index 0000000000..4d1622a8ef
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.sig
-@@ -0,0 +1,4 @@
-+0406f1
-+family:     6 (0x06)
-+model:     79 (0x4f)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.sig
-new file mode 100644
-index 0000000000..2c548c9934
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.sig
-@@ -0,0 +1,4 @@
-+0306f2
-+family:     6 (0x06)
-+model:     63 (0x3f)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.sig
-new file mode 100644
-index 0000000000..4d1622a8ef
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.sig
-@@ -0,0 +1,4 @@
-+0406f1
-+family:     6 (0x06)
-+model:     79 (0x4f)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.sig
-new file mode 100644
-index 0000000000..2c548c9934
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.sig
-@@ -0,0 +1,4 @@
-+0306f2
-+family:     6 (0x06)
-+model:     63 (0x3f)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.sig
-new file mode 100644
-index 0000000000..4d1622a8ef
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.sig
-@@ -0,0 +1,4 @@
-+0406f1
-+family:     6 (0x06)
-+model:     79 (0x4f)
-+stepping:   1 (0x01)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.sig
-new file mode 100644
-index 0000000000..d6493fe186
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.sig
-@@ -0,0 +1,4 @@
-+0206d7
-+family:     6 (0x06)
-+model:     45 (0x2d)
-+stepping:   7 (0x07)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.sig
-new file mode 100644
-index 0000000000..8738e95e41
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.sig
-@@ -0,0 +1,4 @@
-+0206f2
-+family:     6 (0x06)
-+model:     47 (0x2f)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.sig
-new file mode 100644
-index 0000000000..8738e95e41
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.sig
-@@ -0,0 +1,4 @@
-+0206f2
-+family:     6 (0x06)
-+model:     47 (0x2f)
-+stepping:   2 (0x02)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.sig
-new file mode 100644
-index 0000000000..8fb489fac9
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.sig
-@@ -0,0 +1,4 @@
-+0306f4
-+family:     6 (0x06)
-+model:     63 (0x3f)
-+stepping:   4 (0x04)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig
-new file mode 100644
-index 0000000000..afc150cf82
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig
-@@ -0,0 +1,4 @@
-+0206e6
-+family:     6 (0x06)
-+model:     46 (0x2e)
-+stepping:   6 (0x06)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.sig b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.sig
-new file mode 100644
-index 0000000000..1a3f3449f0
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.sig
-@@ -0,0 +1,4 @@
-+050654
-+family:     6 (0x06)
-+model:     85 (0x55)
-+stepping:   4 (0x04)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.sig b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.sig
-new file mode 100644
-index 0000000000..1a3f3449f0
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.sig
-@@ -0,0 +1,4 @@
-+050654
-+family:     6 (0x06)
-+model:     85 (0x55)
-+stepping:   4 (0x04)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig
-new file mode 100644
-index 0000000000..4b641ba966
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig
-@@ -0,0 +1,4 @@
-+0106a5
-+family:     6 (0x06)
-+model:     26 (0x1a)
-+stepping:   5 (0x05)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig b/tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig
-new file mode 100644
-index 0000000000..e17253472f
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig
-@@ -0,0 +1,4 @@
-+010676
-+family:     6 (0x06)
-+model:     23 (0x17)
-+stepping:   6 (0x06)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-daemon-Register-secret-driver-before-storage-driver.patch b/SOURCES/libvirt-daemon-Register-secret-driver-before-storage-driver.patch
deleted file mode 100644
index 3825d3b..0000000
--- a/SOURCES/libvirt-daemon-Register-secret-driver-before-storage-driver.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8a9a0815510ef6de1ee34b865a768d0c6fd7b828 Mon Sep 17 00:00:00 2001
-Message-Id: <8a9a0815510ef6de1ee34b865a768d0c6fd7b828@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:18:14 +0200
-Subject: [PATCH] daemon: Register secret driver before storage driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The order in which drivers are registered is important because
-their stateInitialize and stateAutoStart callback are called in
-that order. Well, stateAutoStart is going away and therefore if
-there is some dependency between two drivers (e.g. when
-initializing storage driver expects secret driver to be available
-already), the registration of such drivers must happen in correct
-order.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c6266ddb0214512200c5043f3196d3ca3e73919d)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1685151
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <f67abc5158c74a295438b5e2f1b8106e8910bfde.1561641375.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/remote/remote_daemon.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
-index 9f3a5f38ad..4cd6784099 100644
---- a/src/remote/remote_daemon.c
-+++ b/src/remote/remote_daemon.c
-@@ -314,6 +314,10 @@ static int daemonInitialize(void)
-     if (virDriverLoadModule("interface", "interfaceRegister", false) < 0)
-         return -1;
- #endif
-+#ifdef WITH_SECRETS
-+    if (virDriverLoadModule("secret", "secretRegister", false) < 0)
-+        return -1;
-+#endif
- #ifdef WITH_STORAGE
-     if (virDriverLoadModule("storage", "storageRegister", false) < 0)
-         return -1;
-@@ -322,10 +326,6 @@ static int daemonInitialize(void)
-     if (virDriverLoadModule("nodedev", "nodedevRegister", false) < 0)
-         return -1;
- #endif
--#ifdef WITH_SECRETS
--    if (virDriverLoadModule("secret", "secretRegister", false) < 0)
--        return -1;
--#endif
- #ifdef WITH_NWFILTER
-     if (virDriverLoadModule("nwfilter", "nwfilterRegister", false) < 0)
-         return -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-docs-Describe-protected-virtualization-guest-setup.patch b/SOURCES/libvirt-docs-Describe-protected-virtualization-guest-setup.patch
new file mode 100644
index 0000000..b7e2705
--- /dev/null
+++ b/SOURCES/libvirt-docs-Describe-protected-virtualization-guest-setup.patch
@@ -0,0 +1,245 @@
+From 026160bc76bab26772c2a80bd50ae55119e3b60b Mon Sep 17 00:00:00 2001
+Message-Id: <026160bc76bab26772c2a80bd50ae55119e3b60b@dist-git>
+From: Viktor Mihajlovski <mihajlov@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:23 +0200
+Subject: [PATCH] docs: Describe protected virtualization guest setup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Protected virtualization/IBM Secure Execution for Linux protects
+guest memory and state from the host.
+
+Add some basic information about technology and a brief guide
+on setting up secure guests with libvirt.
+
+Signed-off-by: Viktor Mihajlovski <mihajlov@linux.ibm.com>
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit f0d0cd6179709461b026f24569a688065e90d766)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <cf598d01d242bb56e64e14bfc32cece69341d949.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/kbase.html.in                 |   3 +
+ docs/kbase/s390_protected_virt.rst | 189 +++++++++++++++++++++++++++++
+ 2 files changed, 192 insertions(+)
+ create mode 100644 docs/kbase/s390_protected_virt.rst
+
+diff --git a/docs/kbase.html.in b/docs/kbase.html.in
+index f2975960f6..05773db16d 100644
+--- a/docs/kbase.html.in
++++ b/docs/kbase.html.in
+@@ -14,6 +14,9 @@
+         <dt><a href="kbase/secureusage.html">Secure usage</a></dt>
+         <dd>Secure usage of the libvirt APIs</dd>
+ 
++        <dt><a href="kbase/s390_protected_virt.html">Protected virtualization on s390</a></dt>
++        <dd>Running secure s390 guests with IBM Secure Execution</dd>
++
+         <dt><a href="kbase/launch_security_sev.html">Launch security</a></dt>
+         <dd>Securely launching VMs with AMD SEV</dd>
+ 
+diff --git a/docs/kbase/s390_protected_virt.rst b/docs/kbase/s390_protected_virt.rst
+new file mode 100644
+index 0000000000..f38d16d743
+--- /dev/null
++++ b/docs/kbase/s390_protected_virt.rst
+@@ -0,0 +1,189 @@
++================================
++Protected Virtualization on s390
++================================
++
++.. contents::
++
++Overview
++========
++
++Protected virtualization, also known as IBM Secure Execution is a
++hardware-based privacy protection technology for s390x (IBM Z).
++It allows to execute virtual machines such that the host system
++has no access to a VM's state and memory contents.
++
++Unlike other similar technologies, the memory of a running guest
++is not encrypted but protected by hardware access controls, which
++may only be manipulated by trusted system firmware, called
++ultravisor.
++
++For the cases where the host needs access to guest memory (e.g. for
++paging), it can request pages to be exported to it. The exported page
++will be encrypted with a unique key for the running guest by the
++ultravisor. The ultravisor also computes an integrity value for
++the page, and stores it in a special table, together with the page
++index and a counter. This way it can verify the integrity of
++the page content upon re-import into the guest.
++
++In other cases it may be necessary for a guest to grant the host access
++to dedicated memory regions (e.g. for I/O). The guest can request
++that the ultravisor removes the memory protection from individual
++pages, so that they can be shared with the host. Likewise, the
++guest can undo the sharing.
++
++A secure guest will initially start in a regular non-protected VM.
++The start-up is controlled by a small bootstrap program loaded
++into memory together with encrypted operating system components and
++a control structure (the PV header).
++The operating system components (e.g. Linux kernel, initial RAM
++file system, kernel parameters) are encrypted and integrity
++protected. The component encryption keys and integrity values are
++stored in the PV header.
++The PV header is wrapped with a public key belonging to a specific
++system (in fact it can be wrapped with multiple such keys). The
++matching private key is only accessible by trusted hardware and
++firmware in that specific system.
++Consequently, such a secure guest boot image can only be run on the
++systems it has been prepared for. Its contents can't be decrypted
++without access to the private key and it can't be modified as
++it is integrity protected.
++
++Host Requirements
++=================
++
++IBM Secure Execution for Linux has some hardware and firmware
++requirements. The system hardware must be an IBM z15 (or newer),
++or an IBM LinuxONE III (or newer).
++
++It is also necessary that the IBM Secure Execution feature is
++enabled for that system. With libvirt >= 6.5.0 you can run
++``libvirt-host--validate`` or otherwise check for facility '158', e.g.
++
++::
++
++   $ grep facilities /proc/cpuinfo | grep 158
++
++The kernel must include the protected virtualization support
++which can be verified by checking for the presence of directory
++``/sys/firmware/uv``. It will only be present when both the
++hardware and the kernel support are available.
++
++Finally, the host operating system must donate some memory to
++the ultravisor needed to store memory security information.
++This is achieved by specifying the following kernel command
++line parameter to the host boot configuration
++
++::
++
++   prot_virt=1
++
++
++Guest Requirements
++==================
++
++Guest Boot
++----------
++
++To start a guest in protected virtualization secure mode, the
++boot image must have been prepared first with the program
++``genprotimg`` using the correct public key for this host.
++``genprotimg`` is part of the package ``s390-tools``, or
++``s390-utils``, depending on the Linux distribution being used.
++It can also be found at
++`<https://github.com/ibm-s390-tools/s390-tools/tree/master/genprotimg>`_
++
++The guests have to be configured to use the host CPU model, which
++must contain the ``unpack`` facility indicating ultravisor guest support.
++
++With the following command it's possible to check whether the host
++CPU model satisfies the requirement
++
++::
++
++   $ virsh domcapabilities | grep unpack
++
++which should return
++
++::
++
++   <feature policy='require' name='unpack'/>
++
++Note that on hosts with libvirt < 6.5.0 if the check fails despite
++the host system actually supporting protected virtualization guests,
++this can be caused by a stale libvirt capabilities cache.
++To recover, run the following commands
++
++::
++
++   $ systemctl stop libvirtd
++   $ rm /var/cache/libvirt/qemu/capabilities/*.xml
++   $ systemctl start libvirtd
++
++
++Guest I/O
++---------
++
++Protected virtualization guests support I/O using virtio devices.
++As the virtio data structures of secure guests are not accessible
++by the host, it is necessary to use shared memory ('bounce buffers').
++
++To enable virtio devices to use shared buffers, it is necessary
++to configure them with platform_iommu enabled. This can done by adding
++``iommu='on'`` to the driver element of a virtio device definition in the
++guest's XML, e.g.
++
++::
++
++   <interface type='network'>
++     <source network='default'/>
++     <model type='virtio'/>
++     <driver name='vhost' iommu='on'/>
++   </interface>
++
++It is mandatory to define all virtio bus devices in this way to
++prevent the host from attempting to access protected memory.
++Ballooning will not work and is fenced by QEMU. It should be
++disabled by specifying
++
++::
++
++   <memballoon model='none'/>
++
++Finally, the guest Linux must be instructed to allocate I/O
++buffers using memory shared between host and guest using SWIOTLB.
++This is done by adding ``swiotlb=nnn`` to the guest's kernel command
++line string, where ``nnn`` stands for the number of statically
++allocated 2K entries. A commonly used value for swiotlb is 262144.
++
++Example guest definition
++========================
++
++Minimal domain XML for a protected virtualization guest, essentially
++it's mostly about the ``iommu`` property
++
++::
++
++   <domain type='kvm'>
++     <name>protected</name>
++     <memory unit='KiB'>2048000</memory>
++     <currentMemory unit='KiB'>2048000</currentMemory>
++     <vcpu>1</vcpu>
++     <os>
++       <type arch='s390x'>hvm</type>
++     </os>
++     <cpu mode='host-model'/>
++     <devices>
++       <disk type='file' device='disk'>
++         <driver name='qemu' type='qcow2' cache='none' io='native' iommu='on'>
++         <source file='/var/lib/libvirt/images/protected.qcow2'/>
++         <target dev='vda' bus='virtio'/>
++       </disk>
++       <interface type='network'>
++         <driver iommu='on'/>
++         <source network='default'/>
++         <model type='virtio'/>
++       </interface>
++       <console type='pty'/>
++       <memballoon model='none'/>
++     </devices>
++   </domain>
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-docs-Document-the-new-slices-sub-element-of-disk-s-source.patch b/SOURCES/libvirt-docs-Document-the-new-slices-sub-element-of-disk-s-source.patch
new file mode 100644
index 0000000..349ee96
--- /dev/null
+++ b/SOURCES/libvirt-docs-Document-the-new-slices-sub-element-of-disk-s-source.patch
@@ -0,0 +1,100 @@
+From 0f126297ca984aa2ef145e2a703fff3dc31c53db Mon Sep 17 00:00:00 2001
+Message-Id: <0f126297ca984aa2ef145e2a703fff3dc31c53db@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:19 +0100
+Subject: [PATCH] docs: Document the new <slices> sub-element of disk's
+ <source>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We are going to add support for specifying offset and size attributes
+which will allow controling where the image and where the guest data
+itself starts in the source of the disk. This will be represented by
+a <slices> element filled with either a <slice type='storage'> for the
+offset of the image format data.
+
+Add the XML documentation and RNG schema.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 44f0f76890c6b53a893ffc370836794d74317c34)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <9f5488f2e0e5b6d7df386fa428f7779346cbcff4.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomain.html.in     | 13 +++++++++++++
+ docs/schemas/domaincommon.rng | 19 +++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index ec48ed77a5..5dbb8b59cf 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2878,6 +2878,9 @@
+   &lt;disk type='block' device='lun'&gt;
+     &lt;driver name='qemu' type='raw'/&gt;
+     &lt;source dev='/dev/sda'&gt;
++      &lt;slices&gt;
++        &lt;slice type='storage' offset='12345' size='123'/&gt;
++      &lt;/slices&gt;
+       &lt;reservations managed='no'&gt;
+         &lt;source type='unix' path='/path/to/qemu-pr-helper' mode='client'/&gt;
+       &lt;/reservations&gt;
+@@ -3360,6 +3363,16 @@
+             controller.
+             <span class="since">Since 6.0.0</span>
+           </dd>
++          <dt><code>slices</code></dt>
++          <dd>The <code>slices</code> element using its <code>slice</code>
++            sub-elements allows configuring offset and size of either the
++            location of the image format (<code>slice type='storage'</code>)
++            inside the storage source or the guest data inside the image format
++            container (future expansion).
++
++            The <code>offset</code> and <code>size</code> values are in bytes.
++            <span class="since">Since 6.1.0</span>
++          </dd>
+         </dl>
+ 
+         <p>
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 19476a2735..38aef19e89 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1596,12 +1596,31 @@
+     </optional>
+   </define>
+ 
++  <define name="diskSourceSlice">
++    <attribute name='offset'>
++      <ref name="positiveInteger"/>
++    </attribute>
++    <attribute name='size'>
++      <ref name="positiveInteger"/>
++    </attribute>
++  </define>
++
+   <define name="diskSourceCommon">
+     <optional>
+       <attribute name="index">
+         <ref name="positiveInteger"/>
+       </attribute>
+     </optional>
++    <optional>
++      <element name='slices'>
++        <element name='slice'>
++          <attribute name='type'>
++            <value>storage</value>
++          </attribute>
++          <ref name="diskSourceSlice"/>
++        </element>
++      </element>
++    </optional>
+   </define>
+ 
+   <define name="diskSource">
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-docs-Drop-dev-net-tun-from-the-list-of-shared-devices.patch b/SOURCES/libvirt-docs-Drop-dev-net-tun-from-the-list-of-shared-devices.patch
deleted file mode 100644
index fdb0fee..0000000
--- a/SOURCES/libvirt-docs-Drop-dev-net-tun-from-the-list-of-shared-devices.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7194b00ad873e4b0c8b6b69fac840ae56bda1e91 Mon Sep 17 00:00:00 2001
-Message-Id: <7194b00ad873e4b0c8b6b69fac840ae56bda1e91@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 1 Feb 2019 17:21:53 +0100
-Subject: [PATCH] docs: Drop /dev/net/tun from the list of shared devices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was a left-over that should have been dropped along the change in
-qemu.conf.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 13500ee28922077010481305b5b55851f310d477)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1665400
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/drvqemu.html.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
-index 13adb5c22b..d51ccf2412 100644
---- a/docs/drvqemu.html.in
-+++ b/docs/drvqemu.html.in
-@@ -396,8 +396,7 @@ chmod o+x /path/to/directory
- /dev/null, /dev/full, /dev/zero,
- /dev/random, /dev/urandom,
- /dev/ptmx, /dev/kvm, /dev/kqemu,
--/dev/rtc, /dev/hpet, /dev/net/tun,
--/dev/sev
-+/dev/rtc, /dev/hpet, /dev/sev
- </pre>
- 
-     <p>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-docs-Enhance-polkit-documentation-to-describe-secondary-connection.patch b/SOURCES/libvirt-docs-Enhance-polkit-documentation-to-describe-secondary-connection.patch
deleted file mode 100644
index 50692d6..0000000
--- a/SOURCES/libvirt-docs-Enhance-polkit-documentation-to-describe-secondary-connection.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 075028e74f4d11c8b0d3bb3e857e4811b148a4e1 Mon Sep 17 00:00:00 2001
-Message-Id: <075028e74f4d11c8b0d3bb3e857e4811b148a4e1@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 5 Nov 2018 07:48:38 -0500
-Subject: [PATCH] docs: Enhance polkit documentation to describe secondary
- connection
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1631608 (RHEL 8.0)
-https://bugzilla.redhat.com/show_bug.cgi?id=1631606 (RHEL 7.7)
-
-Since commit 8259255 usage of a primary connection driver for
-a virConnect has been modified to open (virConnectOpen) and use
-a connection to the specific driver in order to handle the API
-calls to/for that driver. This causes some confusion and issues
-for ACL polkit rule scripts to know exactly which driver by
-name will be used.
-
-Add some documentation describing the processing of the primary
-and secondary connection as well as the list of the connect_driver
-names used for each driver.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 4f1107614dc1384c4aa7a5582a16aecba8b9310f)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- docs/aclpolkit.html.in | 117 +++++++++++++++++++++++++++++++++++++++++
- docs/libvirt.css       |   1 +
- 2 files changed, 118 insertions(+)
-
-diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in
-index ee00b98461..ac54f125da 100644
---- a/docs/aclpolkit.html.in
-+++ b/docs/aclpolkit.html.in
-@@ -287,6 +287,123 @@
-       </tbody>
-     </table>
- 
-+    <h2><a id="connect_driver">Hypervisor Driver connect_driver</a></h2>
-+    <p>
-+      The <code>connect_driver</code> parameter describes the
-+      client's <a href="remote.html">remote Connection Driver</a>
-+      name based on the <a href="uri.html">URI</a> used for the
-+      connection.
-+    </p>
-+    <p>
-+      <span class="since">Since 4.1.0</span>, when calling an API
-+      outside the scope of the primary connection driver, the
-+      primary driver will attempt to open a secondary connection
-+      to the specific API driver in order to process the API. For
-+      example, when hypervisor domain processing needs to make an
-+      API call within the storage driver or the network filter driver
-+      an attempt to open a connection to the "storage" or "nwfilter"
-+      driver will be made. Similarly, a "storage" primary connection
-+      may need to create a connection to the "secret" driver in order
-+      to process secrets for the API. If successful, then calls to
-+      those API's will occur in the <code>connect_driver</code> context
-+      of the secondary connection driver rather than in the context of
-+      the primary driver. This affects the <code>connect_driver</code>
-+      returned from rule generation from the <code>action.loookup</code>
-+      function. The following table provides a list of the various
-+      connection drivers and the <code>connect_driver</code> name
-+      used by each regardless of primary or secondary connection.
-+      The access denied error message from libvirt will list the
-+      connection driver by name that denied the access.
-+    </p>
-+
-+    <h3><a id="object_connect_driver">Connection Driver Name</a></h3>
-+    <table class="acl">
-+      <thead>
-+        <tr>
-+          <th>Connection Driver</th>
-+          <th><code>connect_driver</code> name</th>
-+        </tr>
-+      </thead>
-+      <tbody>
-+        <tr>
-+          <td>bhyve</td>
-+          <td>bhyve</td>
-+        </tr>
-+        <tr>
-+          <td>esx</td>
-+          <td>ESX</td>
-+        </tr>
-+        <tr>
-+          <td>hyperv</td>
-+          <td>Hyper-V</td>
-+        </tr>
-+        <tr>
-+          <td>interface</td>
-+          <td>interface</td>
-+        </tr>
-+        <tr>
-+          <td>libxl</td>
-+          <td>xenlight</td>
-+        </tr>
-+        <tr>
-+          <td>lxc</td>
-+          <td>LXC</td>
-+        </tr>
-+        <tr>
-+          <td>network</td>
-+          <td>network</td>
-+        </tr>
-+        <tr>
-+          <td>nodedev</td>
-+          <td>nodedev</td>
-+        </tr>
-+        <tr>
-+          <td>nwfilter</td>
-+          <td>NWFilter</td>
-+        </tr>
-+        <tr>
-+          <td>openvz</td>
-+          <td>OPENVZ</td>
-+        </tr>
-+        <tr>
-+          <td>phyp</td>
-+          <td>PHYP</td>
-+        </tr>
-+        <tr>
-+          <td>qemu</td>
-+          <td>QEMU</td>
-+        </tr>
-+        <tr>
-+          <td>secret</td>
-+          <td>secret</td>
-+        </tr>
-+        <tr>
-+          <td>storage</td>
-+          <td>storage</td>
-+        </tr>
-+        <tr>
-+          <td>uml</td>
-+          <td>UML</td>
-+        </tr>
-+        <tr>
-+          <td>vbox</td>
-+          <td>VBOX</td>
-+        </tr>
-+        <tr>
-+          <td>vmware</td>
-+          <td>VMWARE</td>
-+        </tr>
-+        <tr>
-+          <td>vz</td>
-+          <td>vz</td>
-+        </tr>
-+        <tr>
-+          <td>xenapi</td>
-+          <td>XenAPI</td>
-+        </tr>
-+      </tbody>
-+    </table>
-+
- 
-     <h2><a id="user">User identity attributes</a></h2>
- 
-diff --git a/docs/libvirt.css b/docs/libvirt.css
-index b2ed33926a..e590b33cfb 100644
---- a/docs/libvirt.css
-+++ b/docs/libvirt.css
-@@ -393,6 +393,7 @@ table.acl {
- 
- table.acl tr, table.acl td {
-     padding: 0.3em;
-+    border: 1px solid #ccc;
- }
- 
- table.acl thead {
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-docs-List-the-armvtimer-timer-among-all-others.patch b/SOURCES/libvirt-docs-List-the-armvtimer-timer-among-all-others.patch
new file mode 100644
index 0000000..e55ca95
--- /dev/null
+++ b/SOURCES/libvirt-docs-List-the-armvtimer-timer-among-all-others.patch
@@ -0,0 +1,42 @@
+From 5cef3caf8b82a15405eb7d08c96c346451cab7f7 Mon Sep 17 00:00:00 2001
+Message-Id: <5cef3caf8b82a15405eb7d08c96c346451cab7f7@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 14:50:34 +0100
+Subject: [PATCH] docs: List the armvtimer timer among all others
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 1d742a8772848a72667e1e5e0fa0841abf0af647)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214135034.719753-1-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomain.html.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 98a811bd09..2b6a3fb921 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2466,9 +2466,9 @@
+             "platform" (currently unsupported),
+             "hpet" (libxl, xen, qemu), "kvmclock" (qemu),
+             "pit" (qemu), "rtc" (qemu), "tsc" (libxl, qemu -
+-            <span class="since">since 3.2.0</span>)
+-            or "hypervclock"
+-            (qemu - <span class="since">since 1.2.2</span>).
++            <span class="since">since 3.2.0</span>), "hypervclock"
++            (qemu - <span class="since">since 1.2.2</span>) or
++            "armvtimer" (qemu - <span class="since">since 6.1.0</span>).
+ 
+             The <code>hypervclock</code> timer adds support for the
+             reference time counter and the reference page for iTSC
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-docs-Rephrase-the-mediated-devices-hostdev-section-a-bit.patch b/SOURCES/libvirt-docs-Rephrase-the-mediated-devices-hostdev-section-a-bit.patch
deleted file mode 100644
index 7b833a8..0000000
--- a/SOURCES/libvirt-docs-Rephrase-the-mediated-devices-hostdev-section-a-bit.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 504df691c5175e21a379cb340e88556d2b6cc508 Mon Sep 17 00:00:00 2001
-Message-Id: <504df691c5175e21a379cb340e88556d2b6cc508@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:04:04 +0200
-Subject: [PATCH] docs: Rephrase the mediated devices hostdev section a bit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Currently it reads:
-Refer MDEV to create a mediated device on the host
-
-...even though it resembles English, it's not a proper English.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 32b52ed838dd393b4249ddcb9d4b17f1deafbc2b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 3554c3dc30..0e8f0a125f 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -4509,8 +4509,9 @@
-           determines how the host's vfio driver will expose the device to the
-           guest. Currently, <code>model='vfio-pci'</code> and
-           <code>model='vfio-ccw'</code> (<span class="since">Since 4.4.0</span>)
--          is supported. Refer <a href="drvnodedev.html#MDEV">MDEV</a> to create
--          a mediated device on the host.
-+          is supported. <a href="drvnodedev.html#MDEV">MDEV</a> section
-+          provides more information about mediated devices as well as how to
-+          create mediated devices on the host.
-           <span class="since">Since 4.6.0 (QEMU 2.12)</span> an optional
-           <code>display</code> attribute may be used to enable or disable
-           support for an accelerated remote desktop backed by a mediated
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-docs-Update-AMD-launch-secure-description.patch b/SOURCES/libvirt-docs-Update-AMD-launch-secure-description.patch
new file mode 100644
index 0000000..61b2820
--- /dev/null
+++ b/SOURCES/libvirt-docs-Update-AMD-launch-secure-description.patch
@@ -0,0 +1,56 @@
+From b89b5b577ae05a9f453a55b8e7cbd81db27e95df Mon Sep 17 00:00:00 2001
+Message-Id: <b89b5b577ae05a9f453a55b8e7cbd81db27e95df@dist-git>
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:22 +0200
+Subject: [PATCH] docs: Update AMD launch secure description
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Update document with changes in qemu capability caching and the added
+secure guest support checking for AMD SEV in virt-host-validate.
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 2c3ffa37284b9fa3d1e6c369fa2bb71c6f6dd92a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1229877019008ac6f0135296af502e596c3e30e5.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/kbase/launch_security_sev.rst | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/docs/kbase/launch_security_sev.rst b/docs/kbase/launch_security_sev.rst
+index 65f258587d..19b978481a 100644
+--- a/docs/kbase/launch_security_sev.rst
++++ b/docs/kbase/launch_security_sev.rst
+@@ -30,8 +30,11 @@ Enabling SEV on the host
+ ========================
+ 
+ Before VMs can make use of the SEV feature you need to make sure your
+-AMD CPU does support SEV. You can check whether SEV is among the CPU
+-flags with:
++AMD CPU does support SEV. You can run ``libvirt-host-validate``
++(libvirt >= 6.5.0) to check if your host supports secure guests or you
++can follow the manual checks below.
++
++You can manually check whether SEV is among the CPU flags with:
+ 
+ ::
+ 
+@@ -109,7 +112,7 @@ following:
+      </features>
+    </domainCapabilities>
+ 
+-Note that if libvirt was already installed and libvirtd running before
++Note that if libvirt (<6.5.0) was already installed and libvirtd running before
+ enabling SEV in the kernel followed by the host reboot you need to force
+ libvirtd to re-probe both the host and QEMU capabilities. First stop
+ libvirtd:
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-docs-add-virtiofs-kbase.patch b/SOURCES/libvirt-docs-add-virtiofs-kbase.patch
new file mode 100644
index 0000000..99e20ba
--- /dev/null
+++ b/SOURCES/libvirt-docs-add-virtiofs-kbase.patch
@@ -0,0 +1,198 @@
+From ee1081b3b87179b5b9ed6a1d14694962fa04a5fd Mon Sep 17 00:00:00 2001
+Message-Id: <ee1081b3b87179b5b9ed6a1d14694962fa04a5fd@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:40 +0100
+Subject: [PATCH] docs: add virtiofs kbase
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a document describing the usage of virtiofs.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit aecf1f5d702ad710aed99a688f38f05cc304b03a)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+
+Conflicts: * downstream is missing the link to qemu-passthrough-security
+  docs/kbase.html.in
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <a037a8c8db2e3be9a54467859b700a9d7ab15429.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/kbase.html.in      |   3 +
+ docs/kbase/virtiofs.rst | 147 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 150 insertions(+)
+ create mode 100644 docs/kbase/virtiofs.rst
+
+diff --git a/docs/kbase.html.in b/docs/kbase.html.in
+index c156414c41..7d6caf3cb1 100644
+--- a/docs/kbase.html.in
++++ b/docs/kbase.html.in
+@@ -29,6 +29,9 @@
+         <dt><a href="kbase/backing_chains.html">Backing chain management</a></dt>
+         <dd>Explanation of how disk backing chain specification impacts libvirt's
+           behaviour and basic troubleshooting steps of disk problems.</dd>
++
++        <dt><a href="kbase/virtiofs.html">Virtio-FS</a></dt>
++        <dd>Share a filesystem between the guest and the host</dd>
+       </dl>
+     </div>
+ 
+diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst
+new file mode 100644
+index 0000000000..68fbafcf37
+--- /dev/null
++++ b/docs/kbase/virtiofs.rst
+@@ -0,0 +1,147 @@
++============================
++Sharing files with Virtio-FS
++============================
++
++.. contents::
++
++=========
++Virtio-FS
++=========
++
++Virtio-FS is a shared file system that lets virtual machines access
++a directory tree on the host. Unlike existing approaches, it
++is designed to offer local file system semantics and performance.
++
++See https://virtio-fs.gitlab.io/
++
++==========
++Host setup
++==========
++
++The host-side virtiofsd daemon, like other vhost-user backed devices,
++requires shared memory between the host and the guest. As of QEMU 4.2, this
++requires specifying a NUMA topology for the guest and explicitly specifying
++a memory backend. Multiple options are available:
++
++Either of the following:
++
++* Use file-backed memory
++
++  Configure the directory where the files backing the memory will be stored
++  with the ``memory_backing_dir`` option in ``/etc/libvirt/qemu.conf``
++
++  ::
++
++    # This directory is used for memoryBacking source if configured as file.
++    # NOTE: big files will be stored here
++    memory_backing_dir = "/dev/shm/"
++
++* Use hugepage-backed memory
++
++  Make sure there are enough huge pages allocated for the requested guest memory.
++  For example, for one guest with 2 GiB of RAM backed by 2 MiB hugepages:
++
++  ::
++
++      # virsh allocpages 2M 1024
++
++===========
++Guest setup
++===========
++
++#. Specify the NUMA topology
++
++   in the domain XML of the guest.
++   For the simplest one-node topology for a guest with 2GiB of RAM and 8 vCPUs:
++
++   ::
++
++      <domain>
++        ...
++        <cpu ...>
++          <numa>
++            <cell id='0' cpus='0-7' memory='2' unit='GiB' memAccess='shared'/>
++          </numa>
++        </cpu>
++       ...
++      </domain>
++
++   Note that the CPU element might already be specified and only one is allowed.
++
++#. Specify the memory backend
++
++   Either of the following:
++
++   * File-backed memory
++
++     ::
++
++        <domain>
++          ...
++          <memoryBacking>
++            <access mode='shared'/>
++          </memoryBacking>
++          ...
++        </domain>
++
++     This will create a file in the directory specified in ``qemu.conf``
++
++   * Hugepage-backed memory
++
++     ::
++
++        <domain>
++          ...
++          <memoryBacking>
++            <hugepages>
++              <page size='2' unit='M'/>
++            </hugepages>
++            <access mode='shared'/>
++          </memoryBacking>
++          ...
++        </domain>
++
++#. Add the ``vhost-user-fs`` QEMU device via the ``filesystem`` element
++
++   ::
++
++      <domain>
++        ...
++        <devices>
++          ...
++          <filesystem type='mount' accessmode='passthrough'>
++            <driver type='virtiofs'/>
++            <source dir='/path'/>
++            <target dir='mount_tag'/>
++          </filesystem>
++          ...
++        </devices>
++      </domain>
++
++   Note that despite its name, the ``target dir`` is actually a mount tag and does
++   not have to correspond to the desired mount point in the guest.
++
++   So far, ``passthrough`` is the only supported access mode and it requires
++   running the ``virtiofsd`` daemon as root.
++
++#. Boot the guest and mount the filesystem
++
++   ::
++
++      guest# mount -t virtiofs mount_tag /mnt/mount/path
++
++   Note: this requires virtiofs support in the guest kernel (Linux v5.4 or later)
++
++===================
++Optional parameters
++===================
++
++More optional elements can be specified
++
++::
++
++  <driver type='virtiofs' queue='1024'/>
++  <binary path='/usr/libexec/virtiofsd' xattr='on'>
++    <cache mode='always'/>
++    <lock posix_lock='on' flock='on'/>
++  </binary>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-docs-document-interface-subelement-teaming.patch b/SOURCES/libvirt-docs-document-interface-subelement-teaming.patch
new file mode 100644
index 0000000..9271d56
--- /dev/null
+++ b/SOURCES/libvirt-docs-document-interface-subelement-teaming.patch
@@ -0,0 +1,180 @@
+From a7ad591f6a6b86b24b1ed030cc9b1ca5b3bf4346 Mon Sep 17 00:00:00 2001
+Message-Id: <a7ad591f6a6b86b24b1ed030cc9b1ca5b3bf4346@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 30 Jan 2020 14:12:44 -0500
+Subject: [PATCH] docs: document <interface> subelement <teaming>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit f0f34056ab26eaa9f903a51cd1fa155088fd640f)
+
+Conflicts:
+   docs/news.xml - feature is in release 6.1.0 upstream, but
+      that release doesn't exist downstream.
+
+https://bugzilla.redhat.com/1693587
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200130191244.24174-7-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/formatdomain.html.in | 101 ++++++++++++++++++++++++++++++++++++++
+ docs/news.xml             |  28 +++++++++++
+ 2 files changed, 129 insertions(+)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 4db9c292b7..98a811bd09 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -5873,6 +5873,107 @@
+ &lt;/devices&gt;
+ ...</pre>
+ 
++    <h5><a id="elementsTeaming">Teaming a virtio/hostdev NIC pair</a></h5>
++
++    <p>
++      <span class="since">Since 6.1.0 (QEMU and KVM only, requires
++        QEMU 4.2.0 or newer axnd a guest virtio-net driver supporting
++        the "failover" feature, such as the one included in Linux
++        kernel 4.18 and newer)
++      </span>
++      The <code>&lt;teaming&gt;</code> element of two interfaces can
++      be used to connect them as a team/bond device in the guest
++      (assuming proper support in the hypervisor and the guest
++      network driver).
++    </p>
++
++<pre>
++...
++&lt;devices&gt;
++  &lt;interface type='network'&gt;
++    &lt;source network='mybridge'/&gt;
++    &lt;mac address='00:11:22:33:44:55'/&gt;
++    &lt;model type='virtio'/&gt;
++    &lt;teaming type='persistent'/&gt;
++    &lt;alias name='ua-backup0'/&gt;
++  &lt;/interface&gt;
++  &lt;interface type='network'&gt;
++    &lt;source network='hostdev-pool'/&gt;
++    &lt;mac address='00:11:22:33:44:55'/&gt;
++    &lt;model type='virtio'/&gt;
++    &lt;teaming type='transient' persistent='ua-backup0'/&gt;
++  &lt;/interface&gt;
++&lt;/devices&gt;
++...</pre>
++
++    <p>
++      The <code>&lt;teaming&gt;</code> element required
++      attribute <code>type</code> will be set to
++      either <code>"persistent"</code> to indicate a device that
++      should always be present in the domain,
++      or <code>"transient"</code> to indicate a device that may
++      periodically be removed, then later re-added to the domain. When
++      type="transient", there should be a second attribute
++      to <code>&lt;teaming&gt;</code> called <code>"persistent"</code>
++      - this attribute should be set to the alias name of the other
++      device in the pair (the one that has <code>&lt;teaming
++      type="persistent'/&gt;</code>).
++    </p>
++    <p>
++      In the particular case of QEMU,
++      libvirt's <code>&lt;teaming&gt;</code> element is used to setup
++      a virtio-net "failover" device pair. For this setup, the
++      persistent device must be an interface with <code>&lt;model
++      type="virtio"/&gt;</code>, and the transient device must
++      be <code>&lt;interface type='hostdev'/&gt;</code>
++      (or <code>&lt;interface type='network'/&gt;</code> where the
++      referenced network defines a pool of SRIOV VFs). The guest will
++      then have a simple network team/bond device made of the virtio
++      NIC + hostdev NIC pair. In this configuration, the
++      higher-performing hostdev NIC will normally be preferred for all
++      network traffic, but when the domain is migrated, QEMU will
++      automatically unplug the VF from the guest, and then hotplug a
++      similar device once migration is completed; while migration is
++      taking place, network traffic will use the virtio NIC. (Of
++      course the emulated virtio NIC and the hostdev NIC must be
++      connected to the same subnet for bonding to work properly).
++    </p>
++    <p>
++      NB1: Since you must know the alias name of the virtio NIC when
++      configuring the hostdev NIC, it will need to be manually set in
++      the virtio NIC's configuration (as with all other manually set
++      alias names, this means it must start with "ua-").
++    </p>
++    <p>
++      NB2: Currently the only implementation of the guest OS
++      virtio-net driver supporting virtio-net failover requires that
++      the MAC addresses of the virtio and hostdev NIC must
++      match. Since that may not always be a requirement in the future,
++      libvirt doesn't enforce this limitation - it is up to the
++      person/management application that is creating the configuration
++      to assure the MAC addresses of the two devices match.
++    </p>
++    <p>
++      NB3: Since the PCI addresses of the SRIOV VFs on the hosts that
++      are the source and destination of the migration will almost
++      certainly be different, either higher level management software
++      will need to modify the <code>&lt;source&gt;</code> of the
++      hostdev NIC (<code>&lt;interface type='hostdev'&gt;</code>) at
++      the start of migration, or (a simpler solution) the
++      configuration will need to use a libvirt "hostdev" virtual
++      network that maintains a pool of such devices, as is implied in
++      the example's use of the libvirt network named "hostdev-pool" -
++      as long as the hostdev network pools on both hosts have the same
++      name, libvirt itself will take care of allocating an appropriate
++      device on both ends of the migration. Similarly the XML for the
++      virtio interface must also either work correctly unmodified on
++      both the source and destination of the migration (e.g. by
++      connecting to the same bridge device on both hosts, or by using
++      the same virtual network), or the management software must
++      properly modify the interface XML during migration so that the
++      virtio device remains connected to the same network segment
++      before and after migration.
++    </p>
+ 
+     <h5><a id="elementsNICSMulticast">Multicast tunnel</a></h5>
+ 
+diff --git a/docs/news.xml b/docs/news.xml
+index 731f010297..408ffc8518 100644
+--- a/docs/news.xml
++++ b/docs/news.xml
+@@ -65,6 +65,34 @@
+       </change>
+     </section>
+     <section title="New features">
++      <change>
++        <summary>
++          support for virtio+hostdev NIC &lt;teaming&gt;
++        </summary>
++        <description>
++          QEMU 4.2.0 and later, combined with a sufficiently recent
++          guest virtio-net driver (e.g. the driver included in Linux
++          kernel 4.18 and later), supports setting up a simple network
++          bond device comprised of one virtio emulated NIC and one
++          hostdev NIC (which must be an SRIOV VF). (in QEMU, this is
++          known as the "virtio failover" feature). The allure of this
++          setup is that the bond will always favor the hostdev device,
++          providing better performance, until the guest is migrated -
++          at that time QEMU will automatically unplug the hostdev NIC
++          and the bond will send all traffic via the virtio NIC until
++          migration is completed, then QEMU on the destination side
++          will hotplug a new hostdev NIC and the bond will switch back
++          to using the hostdev for network traffic. The result is that
++          guests desiring the extra performance of a hostdev NIC are
++          now migratable without network downtime (performance is just
++          degraded during migration) and without requiring a
++          complicated bonding configuration in the guest OS network
++          config and complicated unplug/replug logic in the management
++          application on the host - it can instead all be accomplished
++          in libvirt with the interface &lt;teaming&gt; subelement
++          "type" and "persistent" attributes.
++        </description>
++      </change>
+       <change>
+         <summary>
+           new PCI hostdev address type: unassigned
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-docs-domaincaps-Mention-VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA.patch b/SOURCES/libvirt-docs-domaincaps-Mention-VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA.patch
new file mode 100644
index 0000000..d98867b
--- /dev/null
+++ b/SOURCES/libvirt-docs-domaincaps-Mention-VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA.patch
@@ -0,0 +1,43 @@
+From 6a852bbf144600e756877ae98736e214a8e8d0cb Mon Sep 17 00:00:00 2001
+Message-Id: <6a852bbf144600e756877ae98736e214a8e8d0cb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:28 +0100
+Subject: [PATCH] docs: domaincaps: Mention
+ VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The flag for the virDomainUndefine API is supported even if we report
+that <backup supported='no'/>. Mention it in the docs.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 7d7e7e2c197782ce06525b0a63cd43e452c3a711)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <bfb56ef76cee8e5e3698df9d7deceb93e5c83b97.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomaincaps.html.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in
+index 6bf7a1c17a..2ac8632c69 100644
+--- a/docs/formatdomaincaps.html.in
++++ b/docs/formatdomaincaps.html.in
+@@ -565,7 +565,10 @@
+ 
+     <p>Reports whether the hypervisor supports the backup, checkpoint, and
+     related features. (<code>virDomainBackupBegin</code>,
+-    <code>virDomainCheckpointCreateXML</code> etc).
++    <code>virDomainCheckpointCreateXML</code> etc). The presence of the
++    <code>backup</code> element even if <code>supported='no'</code> implies that
++    the <code>VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA</code> flag for
++    <code>virDomainUndefine</code> is supported.
+     </p>
+ 
+     <h4><a id="elementsSEV">SEV capabilities</a></h4>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-docs-fix-a-typo.patch b/SOURCES/libvirt-docs-fix-a-typo.patch
new file mode 100644
index 0000000..9394ba7
--- /dev/null
+++ b/SOURCES/libvirt-docs-fix-a-typo.patch
@@ -0,0 +1,38 @@
+From afd2a8af9d8cb356dcff17791371f4794be368d2 Mon Sep 17 00:00:00 2001
+Message-Id: <afd2a8af9d8cb356dcff17791371f4794be368d2@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 21 Feb 2020 14:32:10 +0100
+Subject: [PATCH] docs: fix a typo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+s/axnd/and/
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Fixes: f0f34056ab26eaa9f903a51cd1fa155088fd640f
+(cherry picked from commit 5b63cb5abff09882feda8e333285259aecc8e9e8)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1805742
+Message-Id: <f5919e9de65a7f593862ddcf1fc50b6f0b7e5bc0.1582291906.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/formatdomain.html.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 5dbb8b59cf..50914a5207 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -5891,7 +5891,7 @@
+ 
+     <p>
+       <span class="since">Since 6.1.0 (QEMU and KVM only, requires
+-        QEMU 4.2.0 or newer axnd a guest virtio-net driver supporting
++        QEMU 4.2.0 or newer and a guest virtio-net driver supporting
+         the "failover" feature, such as the one included in Linux
+         kernel 4.18 and newer)
+       </span>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-docs-formatdomain-Close-source-on-one-of-disk-examples.patch b/SOURCES/libvirt-docs-formatdomain-Close-source-on-one-of-disk-examples.patch
new file mode 100644
index 0000000..8fb7ca2
--- /dev/null
+++ b/SOURCES/libvirt-docs-formatdomain-Close-source-on-one-of-disk-examples.patch
@@ -0,0 +1,35 @@
+From 1a2f74b8b9e507b17d49a3060d29910facba9d89 Mon Sep 17 00:00:00 2001
+Message-Id: <1a2f74b8b9e507b17d49a3060d29910facba9d89@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:13 +0100
+Subject: [PATCH] docs: formatdomain: Close <source> on one of disk examples
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4e93c47576e4c9c37b34fc50707bee97e66d6a19)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <8da0026666677c92084e46f242a48e5248a226e6.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/formatdomain.html.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 2b6a3fb921..ec48ed77a5 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -2881,6 +2881,7 @@
+       &lt;reservations managed='no'&gt;
+         &lt;source type='unix' path='/path/to/qemu-pr-helper' mode='client'/&gt;
+       &lt;/reservations&gt;
++    &lt;/source&gt;
+     &lt;target dev='sda' bus='scsi'/&gt;
+     &lt;address type='drive' controller='0' bus='0' target='3' unit='0'/&gt;
+   &lt;/disk&gt;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-docs-formatdomain-Mention-missing-protocols.patch b/SOURCES/libvirt-docs-formatdomain-Mention-missing-protocols.patch
new file mode 100644
index 0000000..57b6daa
--- /dev/null
+++ b/SOURCES/libvirt-docs-formatdomain-Mention-missing-protocols.patch
@@ -0,0 +1,45 @@
+From d03688c61e7609b22770f5fa6228431edfc45945 Mon Sep 17 00:00:00 2001
+Message-Id: <d03688c61e7609b22770f5fa6228431edfc45945@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:43 +0200
+Subject: [PATCH] docs: formatdomain: Mention missing protocols
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+http, https, ftp, ftps, and tftp were not mentioned in the
+documentation. Note that 'ssh' is still omitted as it's used only
+internally.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b24281c93405d6e3efb6edb3e7abff31628966b8)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <ed3aac8a1ddcf415808dc9104ce7638344c09523.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/formatdomain.html.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 2b8f9eabc2..143db21d4d 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -3086,10 +3086,11 @@
+               <dd>
+               The <code>protocol</code> attribute specifies the protocol to
+               access to the requested image. Possible values are "nbd",
+-              "iscsi", "rbd", "sheepdog", "gluster" or "vxhs".
++              "iscsi", "rbd", "sheepdog", "gluster", "vxhs", "http", "https",
++              "ftp", ftps", or "tftp".
+ 
+-              <p>If the <code>protocol</code> attribute is "rbd", "sheepdog",
+-              "gluster", or "vxhs", an additional attribute <code>name</code>
++              <p>For any <code>protocol</code> other than <code>nbd</code>
++              an additional attribute <code>name</code>
+               is mandatory to specify which volume/image will be used.
+               </p>
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-docs-mention-hotplug-off-in-news.xml.patch b/SOURCES/libvirt-docs-mention-hotplug-off-in-news.xml.patch
new file mode 100644
index 0000000..4406351
--- /dev/null
+++ b/SOURCES/libvirt-docs-mention-hotplug-off-in-news.xml.patch
@@ -0,0 +1,48 @@
+From 3582a1666686111b86e7b06341bb1a113d7e9b84 Mon Sep 17 00:00:00 2001
+Message-Id: <3582a1666686111b86e7b06341bb1a113d7e9b84@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:09 -0400
+Subject: [PATCH] docs: mention hotplug='off' in news.xml
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 389811d517c270c4f916fce4b3d64f90331244d7)
+
+Conflicts:
+  docs/news.xml
+      upstream this feature is in 6.3.0. downstream is fixed in 6.0.0-whatever
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-7-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/news.xml | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/docs/news.xml b/docs/news.xml
+index 408ffc8518..676a427853 100644
+--- a/docs/news.xml
++++ b/docs/news.xml
+@@ -65,6 +65,18 @@
+       </change>
+     </section>
+     <section title="New features">
++      <change>
++        <summary>
++          qemu: support disabling hotplug/unplug of PCIe devices
++        </summary>
++        <description>
++          libvirt can now set the "hotplug" option for pcie-root-ports
++          and pcie-switch-downstream-ports, which can be used to
++          disable hotplug/unplug of devices from these ports (default
++          behavior is for these controllers to accept all
++          hotplug/unplug attempts, but this is often undesireable).
++        </description>
++      </change>
+       <change>
+         <summary>
+           support for virtio+hostdev NIC &lt;teaming&gt;
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-docs-reduce-excessive-spacing-in-ToC-for-RST-files.patch b/SOURCES/libvirt-docs-reduce-excessive-spacing-in-ToC-for-RST-files.patch
new file mode 100644
index 0000000..3f17419
--- /dev/null
+++ b/SOURCES/libvirt-docs-reduce-excessive-spacing-in-ToC-for-RST-files.patch
@@ -0,0 +1,39 @@
+From f62a2308cc4b92842363d1cc714c101983374857 Mon Sep 17 00:00:00 2001
+Message-Id: <f62a2308cc4b92842363d1cc714c101983374857@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:33 +0100
+Subject: [PATCH] docs: reduce excessive spacing in ToC for RST files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The table of contents in the RST based files uses <p> tags inside the
+<li>, which results in 1em's worth of spacing above & below each
+entry. This results in way too much whitespace in the ToC.
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4be5a2f0c2c6f1236828592d8cb9ca5dc6f9df10)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <7d1090688b1ea9a76e46416d461784318b5cb8d4.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/libvirt.css | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/docs/libvirt.css b/docs/libvirt.css
+index 2fe123395c..18e55dac59 100644
+--- a/docs/libvirt.css
++++ b/docs/libvirt.css
+@@ -579,3 +579,7 @@ ul.news-section-content li dl dd {
+     font-family: monospace;
+     background: #eeeeee;
+ }
++
++.contents li p {
++    margin: 2px;
++}
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-docs-render-class-literal-with-monospace-font.patch b/SOURCES/libvirt-docs-render-class-literal-with-monospace-font.patch
new file mode 100644
index 0000000..912fc93
--- /dev/null
+++ b/SOURCES/libvirt-docs-render-class-literal-with-monospace-font.patch
@@ -0,0 +1,41 @@
+From 20fafe768fcaa5aef96d5d77e1209f46e48228e0 Mon Sep 17 00:00:00 2001
+Message-Id: <20fafe768fcaa5aef96d5d77e1209f46e48228e0@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:32 +0100
+Subject: [PATCH] docs: render class="literal" with monospace font
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When using ``....`` in RST, this results in <span class="literal">...</span>
+instead of <code>...</code>. We thus need an extra rule to render it
+with a monospace font. Colouring a light gray also helps the text
+stand out a little more and matches background of <pre> blocks.
+
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 039787c71a2bee6e60ddf5cb0515c0cdb85dd20b)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <72f7f14e62e058c436303fdeed68986f435b9011.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/libvirt.css | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/docs/libvirt.css b/docs/libvirt.css
+index d2e1842b62..2fe123395c 100644
+--- a/docs/libvirt.css
++++ b/docs/libvirt.css
+@@ -574,3 +574,8 @@ ul.news-section-content li dl dd {
+     margin-top: 0.5em;
+     margin-bottom: 0.5em;
+ }
++
++.literal, code {
++    font-family: monospace;
++    background: #eeeeee;
++}
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-docs-schema-Add-missing-alias-to-vsock-device.patch b/SOURCES/libvirt-docs-schema-Add-missing-alias-to-vsock-device.patch
deleted file mode 100644
index c620434..0000000
--- a/SOURCES/libvirt-docs-schema-Add-missing-alias-to-vsock-device.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a998757a131ac8ee6db448bd9806efa4b3a0b11b Mon Sep 17 00:00:00 2001
-Message-Id: <a998757a131ac8ee6db448bd9806efa4b3a0b11b@dist-git>
-From: Han Han <hhan@redhat.com>
-Date: Fri, 13 Jul 2018 13:08:27 +0200
-Subject: [PATCH] docs: schema: Add missing <alias> to vsock device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1600345
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit c03d36b91d62890b376a2ff8f9d65fac069dce42)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1600345
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/schemas/domaincommon.rng | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index bd687ce9d3..f24a56392a 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -4234,6 +4234,9 @@
-         <optional>
-           <ref name="address"/>
-         </optional>
-+        <optional>
-+          <ref name="alias"/>
-+        </optional>
-       </interleave>
-     </element>
-   </define>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-docs-schemas-Decouple-the-virtio-options-from-each-other.patch b/SOURCES/libvirt-docs-schemas-Decouple-the-virtio-options-from-each-other.patch
deleted file mode 100644
index fba0e09..0000000
--- a/SOURCES/libvirt-docs-schemas-Decouple-the-virtio-options-from-each-other.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From eb6fef622ded5762649db2d766c1eb3d876859c9 Mon Sep 17 00:00:00 2001
-Message-Id: <eb6fef622ded5762649db2d766c1eb3d876859c9@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Mon, 15 Jul 2019 08:52:07 +0200
-Subject: [PATCH] docs: schemas: Decouple the virtio options from each other
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Currently, all of the VirtioOptions are under a single <optional>
-element, however, neither our parser/formatter or QEMU driver requires
-the presence of all the options if only a single one from the set has
-been specified, so fix it and silence the schema validator.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 87b4e1cd7e7ec23dc69c8082948cd3bb49e18ff3)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1729675
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <9d20b6d62248ef82a42128c461ef8c94cbc64e09.1563173480.git.eskultet@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/schemas/domaincommon.rng | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 2b6d4dced6..7d37caa246 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -5417,6 +5417,8 @@
-       <attribute name="iommu">
-         <ref name="virOnOff"/>
-       </attribute>
-+    </optional>
-+    <optional>
-       <attribute name="ats">
-         <ref name="virOnOff"/>
-       </attribute>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-domain_nwfilter-Return-early-if-net-has-no-name-in-virDomainConfNWFilterTeardownImpl.patch b/SOURCES/libvirt-domain_nwfilter-Return-early-if-net-has-no-name-in-virDomainConfNWFilterTeardownImpl.patch
deleted file mode 100644
index 071f0a4..0000000
--- a/SOURCES/libvirt-domain_nwfilter-Return-early-if-net-has-no-name-in-virDomainConfNWFilterTeardownImpl.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9996e3dd0e17e3019881e097bc38ac25527cddb1 Mon Sep 17 00:00:00 2001
-Message-Id: <9996e3dd0e17e3019881e097bc38ac25527cddb1@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 25 Jul 2018 13:52:55 +0200
-Subject: [PATCH] domain_nwfilter: Return early if net has no name in
- virDomainConfNWFilterTeardownImpl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1607831
-
-This function is called from various clean up paths (e.g.
-from qemuBuildInterfaceCommandLine). However, depending on the
-stage the interface creation process failed at, net->ifname might
-still be not filled in when control jumps to cleanup label. If
-that is the case return early (avoiding useless error message
-produced in virNWFilterBindingLookupByPortDev) as there is no
-NWFilter to tear down anyway.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 3087b27cffdd46ad0e953e061d6f3c519aefd5d8)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_nwfilter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
-index 24b5f42ddd..f39c8a1f9b 100644
---- a/src/conf/domain_nwfilter.c
-+++ b/src/conf/domain_nwfilter.c
-@@ -133,6 +133,9 @@ virDomainConfNWFilterTeardownImpl(virConnectPtr conn,
- {
-     virNWFilterBindingPtr binding;
- 
-+    if (!net->ifname)
-+        return;
-+
-     binding = virNWFilterBindingLookupByPortDev(conn, net->ifname);
-     if (!binding)
-         return;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-esx-storage-Fix-typo-lsilogic-lsiLogic.patch b/SOURCES/libvirt-esx-storage-Fix-typo-lsilogic-lsiLogic.patch
deleted file mode 100644
index a03c66f..0000000
--- a/SOURCES/libvirt-esx-storage-Fix-typo-lsilogic-lsiLogic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 19a946157484d0c2e3af38b46401114664da3b48 Mon Sep 17 00:00:00 2001
-Message-Id: <19a946157484d0c2e3af38b46401114664da3b48@dist-git>
-From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
-Date: Wed, 25 Jul 2018 13:33:50 +0200
-Subject: [PATCH] esx storage: Fix typo lsilogic -> lsiLogic
-
-Commit 77298458d027db4d3e082213355e2d792f65158d changed the esx storage
-adapter from busLogic to lsilogic, introducing a typo. Changing it back
-to lsiLogic (with capital L) solves the issue. With this change, libvirt can now
-create volumes in ESX again.
-
-Thanks to Jaroslav Suchanek who figured out what was the issue in the
-first place.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1571759
-Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
-(cherry picked from commit a1450d774f9412b6589418bf8bcafd12690d098a)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/esx/esx_storage_backend_vmfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
-index 630a6aa8c9..bb2de4b69f 100644
---- a/src/esx/esx_storage_backend_vmfs.c
-+++ b/src/esx/esx_storage_backend_vmfs.c
-@@ -967,9 +967,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool,
-         /*
-          * FIXME: The adapter type is a required parameter, but there is no
-          * way to let the user specify it in the volume XML config. Therefore,
--         * default to 'lsilogic' here.
-+         * default to 'lsiLogic' here.
-          */
--        virtualDiskSpec->adapterType = (char *)"lsilogic";
-+        virtualDiskSpec->adapterType = (char *)"lsiLogic";
- 
-         virtualDiskSpec->capacityKb->value =
-           VIR_DIV_UP(def->target.capacity, 1024); /* Scale from byte to kilobyte */
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-examples-Add-clean-traffic-gateway-into-nwfilters.patch b/SOURCES/libvirt-examples-Add-clean-traffic-gateway-into-nwfilters.patch
deleted file mode 100644
index 2a22fcc..0000000
--- a/SOURCES/libvirt-examples-Add-clean-traffic-gateway-into-nwfilters.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8eb23363ec3f89792c638c72832ff99ae5ec8169 Mon Sep 17 00:00:00 2001
-Message-Id: <8eb23363ec3f89792c638c72832ff99ae5ec8169@dist-git>
-From: Ales Musil <amusil@redhat.com>
-Date: Sun, 29 Jul 2018 16:56:18 +0200
-Subject: [PATCH] examples: Add clean-traffic-gateway into nwfilters
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The filter purpose is to simulate isolated private VLAN.
-
-The behavior can be achieved by limiting network traffic
-to traffic between VM and gateway. Because there is no
-concept of the PVLAN in the linux bridge.
-
-The filter also contains parts from clean-traffic
-to prevent VM from spoofing its IP and MAC address.
-
-To use this filter the user just needs to set
-the GATEWAY_MAC variable to gateway MAC address.
-
-Signed-off-by: Ales Musil <amusil@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit ac01fbc90b7eb4ccc7a6140d618d1a3859365155)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1603115
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../xml/nwfilter/clean-traffic-gateway.xml    | 34 +++++++++++++++++++
- 1 file changed, 34 insertions(+)
- create mode 100644 examples/xml/nwfilter/clean-traffic-gateway.xml
-
-diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/examples/xml/nwfilter/clean-traffic-gateway.xml
-new file mode 100644
-index 0000000000..b8c204041a
---- /dev/null
-+++ b/examples/xml/nwfilter/clean-traffic-gateway.xml
-@@ -0,0 +1,34 @@
-+<filter name='clean-traffic-gateway'>
-+    <!-- An example of a traffic filter enforcing clean traffic
-+            from a VM by
-+              - preventing MAC spoofing -->
-+    <filterref filter='no-mac-spoofing'/>
-+
-+    <!-- preventing IP spoofing on outgoing -->
-+    <filterref filter='no-ip-spoofing'/>
-+
-+    <!-- preventing ARP spoofing/poisoning -->
-+    <filterref filter='no-arp-spoofing'/>
-+
-+    <!-- accept all other incoming and outgoing ARP traffic -->
-+    <rule action='accept' direction='inout' priority='-500'>
-+        <mac protocolid='arp'/>
-+    </rule>
-+
-+    <!-- accept traffic only from specified MAC address -->
-+    <rule action='accept' direction='in'>
-+        <mac match='yes' srcmacaddr='$GATEWAY_MAC'/>
-+    </rule>
-+
-+    <!-- allow traffic only to specified MAC address -->
-+    <rule action='accept' direction='out'>
-+        <mac match='yes' dstmacaddr='$GATEWAY_MAC'/>
-+    </rule>
-+
-+    <!-- preventing any other traffic than between specified MACs
-+    and ARP -->
-+    <filterref filter='no-other-l2-traffic'/>
-+
-+    <!-- allow qemu to send a self-announce upon migration end -->
-+    <filterref filter='qemu-announce-self'/>
-+</filter>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-hostcpu-add-support-for-reporting-die_id-in-NUMA-topology.patch b/SOURCES/libvirt-hostcpu-add-support-for-reporting-die_id-in-NUMA-topology.patch
new file mode 100644
index 0000000..2866b6b
--- /dev/null
+++ b/SOURCES/libvirt-hostcpu-add-support-for-reporting-die_id-in-NUMA-topology.patch
@@ -0,0 +1,519 @@
+From 15b2ac591a1c024ecf92a7e40d22eed6e59684b8 Mon Sep 17 00:00:00 2001
+Message-Id: <15b2ac591a1c024ecf92a7e40d22eed6e59684b8@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 3 Feb 2020 18:07:25 +0000
+Subject: [PATCH] hostcpu: add support for reporting die_id in NUMA topology
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Update the host CPU code to report the die_id in the NUMA topology
+capabilities. On systems with multiple dies, this fixes the bug
+where CPU cores can't be distinguished:
+
+ <cpus num='12'>
+   <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+   <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+   <cpu id='2' socket_id='0' core_id='0' siblings='2'/>
+   <cpu id='3' socket_id='0' core_id='1' siblings='3'/>
+ </cpus>
+
+Notice how core_id is repeated within the scope of the same socket_id.
+
+It now reports
+
+ <cpus num='12'>
+   <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+   <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
+   <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/>
+   <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/>
+ </cpus>
+
+So core_id is now unique within a (socket_id, die_id) pair.
+
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 7b79ee2f78bbf2af76df2f6466919e19ae05aeeb)
+
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785211
+Message-Id: <20200203180726.2203691-5-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/schemas/capability.rng                   |  3 ++
+ src/conf/capabilities.c                       |  5 ++-
+ src/conf/capabilities.h                       |  1 +
+ src/libvirt_linux.syms                        |  1 +
+ src/util/virhostcpu.c                         | 16 ++++++++++
+ src/util/virhostcpu.h                         |  1 +
+ .../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 +++++++++----------
+ .../vircaps2xmldata/vircaps-x86_64-basic.xml  | 32 +++++++++----------
+ .../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +++++-----
+ .../vircaps-x86_64-resctrl-cdp.xml            | 24 +++++++-------
+ .../vircaps-x86_64-resctrl-cmt.xml            | 24 +++++++-------
+ .../vircaps-x86_64-resctrl-fake-feature.xml   | 24 +++++++-------
+ .../vircaps-x86_64-resctrl-skx-twocaches.xml  |  2 +-
+ .../vircaps-x86_64-resctrl-skx.xml            |  2 +-
+ .../vircaps-x86_64-resctrl.xml                | 24 +++++++-------
+ 15 files changed, 116 insertions(+), 91 deletions(-)
+
+diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
+index 91ee523116..031c55bf20 100644
+--- a/docs/schemas/capability.rng
++++ b/docs/schemas/capability.rng
+@@ -265,6 +265,9 @@
+         <attribute name='socket_id'>
+           <ref name='unsignedInt'/>
+         </attribute>
++        <attribute name='die_id'>
++          <ref name='unsignedInt'/>
++        </attribute>
+         <attribute name='core_id'>
+           <ref name='unsignedInt'/>
+         </attribute>
+diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
+index bf1d9936ed..4bbc79334e 100644
+--- a/src/conf/capabilities.c
++++ b/src/conf/capabilities.c
+@@ -874,8 +874,9 @@ virCapabilitiesHostNUMAFormat(virCapsHostNUMAPtr caps,
+                     return -1;
+ 
+                 virBufferAsprintf(buf,
+-                                  " socket_id='%d' core_id='%d' siblings='%s'",
++                                  " socket_id='%d' die_id='%d' core_id='%d' siblings='%s'",
+                                   cell->cpus[j].socket_id,
++                                  cell->cpus[j].die_id,
+                                   cell->cpus[j].core_id,
+                                   siblings);
+                 VIR_FREE(siblings);
+@@ -1463,6 +1464,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED,
+     cpu->id = cpu_id;
+ 
+     if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 ||
++        virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 ||
+         virHostCPUGetCore(cpu_id, &cpu->core_id) < 0)
+         return -1;
+ 
+@@ -1591,6 +1593,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMAPtr caps)
+                         goto error;
+                     if (tmp) {
+                         cpus[cid].id = id;
++                        cpus[cid].die_id = 0;
+                         cpus[cid].socket_id = s;
+                         cpus[cid].core_id = c;
+                         if (!(cpus[cid].siblings = virBitmapNew(ncpus)))
+diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
+index 4a49e94aa5..75f29666c9 100644
+--- a/src/conf/capabilities.h
++++ b/src/conf/capabilities.h
+@@ -88,6 +88,7 @@ struct _virCapsGuest {
+ struct _virCapsHostNUMACellCPU {
+     unsigned int id;
+     unsigned int socket_id;
++    unsigned int die_id;
+     unsigned int core_id;
+     virBitmapPtr siblings;
+ };
+diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms
+index 5fa2c790ef..55649ae39c 100644
+--- a/src/libvirt_linux.syms
++++ b/src/libvirt_linux.syms
+@@ -4,6 +4,7 @@
+ 
+ # util/virhostcpu.h
+ virHostCPUGetCore;
++virHostCPUGetDie;
+ virHostCPUGetInfoPopulateLinux;
+ virHostCPUGetSiblingsList;
+ virHostCPUGetSocket;
+diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
+index 256976cce1..09c959cd25 100644
+--- a/src/util/virhostcpu.c
++++ b/src/util/virhostcpu.c
+@@ -218,6 +218,22 @@ virHostCPUGetSocket(unsigned int cpu, unsigned int *socket)
+     return 0;
+ }
+ 
++int
++virHostCPUGetDie(unsigned int cpu, unsigned int *die)
++{
++    int ret = virFileReadValueUint(die,
++                                   "%s/cpu/cpu%u/topology/die_id",
++                                   SYSFS_SYSTEM_PATH, cpu);
++
++    /* If the file is not there, it's 0 */
++    if (ret == -2)
++        *die = 0;
++    else if (ret < 0)
++        return -1;
++
++    return 0;
++}
++
+ int
+ virHostCPUGetCore(unsigned int cpu, unsigned int *core)
+ {
+diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
+index d95d380d4a..9be2e51a38 100644
+--- a/src/util/virhostcpu.h
++++ b/src/util/virhostcpu.h
+@@ -65,6 +65,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
+ 
+ #ifdef __linux__
+ int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket);
++int virHostCPUGetDie(unsigned int cpu, unsigned int *die);
+ int virHostCPUGetCore(unsigned int cpu, unsigned int *core);
+ 
+ virBitmapPtr virHostCPUGetSiblingsList(unsigned int cpu);
+diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
+index 50466f9162..0a04052c40 100644
+--- a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
++++ b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
+@@ -16,10 +16,10 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='4'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -28,10 +28,10 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='4'>
+-            <cpu id='4' socket_id='1' core_id='4' siblings='4'/>
+-            <cpu id='5' socket_id='1' core_id='5' siblings='5'/>
+-            <cpu id='6' socket_id='1' core_id='6' siblings='6'/>
+-            <cpu id='7' socket_id='1' core_id='7' siblings='7'/>
++            <cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/>
++            <cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/>
+           </cpus>
+         </cell>
+         <cell id='2'>
+@@ -40,10 +40,10 @@
+           <pages unit='KiB' size='2048'>8192</pages>
+           <pages unit='KiB' size='1048576'>10240</pages>
+           <cpus num='4'>
+-            <cpu id='8' socket_id='2' core_id='8' siblings='8'/>
+-            <cpu id='9' socket_id='2' core_id='9' siblings='9'/>
+-            <cpu id='10' socket_id='2' core_id='10' siblings='10'/>
+-            <cpu id='11' socket_id='2' core_id='11' siblings='11'/>
++            <cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/>
++            <cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/>
++            <cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/>
++            <cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/>
+           </cpus>
+         </cell>
+         <cell id='3'>
+@@ -52,10 +52,10 @@
+           <pages unit='KiB' size='2048'>10240</pages>
+           <pages unit='KiB' size='1048576'>12288</pages>
+           <cpus num='4'>
+-            <cpu id='12' socket_id='3' core_id='12' siblings='12'/>
+-            <cpu id='13' socket_id='3' core_id='13' siblings='13'/>
+-            <cpu id='14' socket_id='3' core_id='14' siblings='14'/>
+-            <cpu id='15' socket_id='3' core_id='15' siblings='15'/>
++            <cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/>
++            <cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/>
++            <cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/>
++            <cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml
+index e7be6def3e..4da09f889c 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml
+@@ -14,10 +14,10 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='4'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -26,10 +26,10 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='4'>
+-            <cpu id='4' socket_id='1' core_id='4' siblings='4'/>
+-            <cpu id='5' socket_id='1' core_id='5' siblings='5'/>
+-            <cpu id='6' socket_id='1' core_id='6' siblings='6'/>
+-            <cpu id='7' socket_id='1' core_id='7' siblings='7'/>
++            <cpu id='4' socket_id='1' die_id='0' core_id='4' siblings='4'/>
++            <cpu id='5' socket_id='1' die_id='0' core_id='5' siblings='5'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='6' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='7' siblings='7'/>
+           </cpus>
+         </cell>
+         <cell id='2'>
+@@ -38,10 +38,10 @@
+           <pages unit='KiB' size='2048'>8192</pages>
+           <pages unit='KiB' size='1048576'>10240</pages>
+           <cpus num='4'>
+-            <cpu id='8' socket_id='2' core_id='8' siblings='8'/>
+-            <cpu id='9' socket_id='2' core_id='9' siblings='9'/>
+-            <cpu id='10' socket_id='2' core_id='10' siblings='10'/>
+-            <cpu id='11' socket_id='2' core_id='11' siblings='11'/>
++            <cpu id='8' socket_id='2' die_id='0' core_id='8' siblings='8'/>
++            <cpu id='9' socket_id='2' die_id='0' core_id='9' siblings='9'/>
++            <cpu id='10' socket_id='2' die_id='0' core_id='10' siblings='10'/>
++            <cpu id='11' socket_id='2' die_id='0' core_id='11' siblings='11'/>
+           </cpus>
+         </cell>
+         <cell id='3'>
+@@ -50,10 +50,10 @@
+           <pages unit='KiB' size='2048'>10240</pages>
+           <pages unit='KiB' size='1048576'>12288</pages>
+           <cpus num='4'>
+-            <cpu id='12' socket_id='3' core_id='12' siblings='12'/>
+-            <cpu id='13' socket_id='3' core_id='13' siblings='13'/>
+-            <cpu id='14' socket_id='3' core_id='14' siblings='14'/>
+-            <cpu id='15' socket_id='3' core_id='15' siblings='15'/>
++            <cpu id='12' socket_id='3' die_id='0' core_id='12' siblings='12'/>
++            <cpu id='13' socket_id='3' die_id='0' core_id='13' siblings='13'/>
++            <cpu id='14' socket_id='3' die_id='0' core_id='14' siblings='14'/>
++            <cpu id='15' socket_id='3' die_id='0' core_id='15' siblings='15'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
+index ca671a1640..28f00c0a90 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
+@@ -17,14 +17,14 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='8'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0,4'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1,5'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2,6'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3,7'/>
+-            <cpu id='4' socket_id='0' core_id='0' siblings='0,4'/>
+-            <cpu id='5' socket_id='0' core_id='1' siblings='1,5'/>
+-            <cpu id='6' socket_id='0' core_id='2' siblings='2,6'/>
+-            <cpu id='7' socket_id='0' core_id='3' siblings='3,7'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0,4'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1,5'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
++            <cpu id='4' socket_id='0' die_id='0' core_id='0' siblings='0,4'/>
++            <cpu id='5' socket_id='0' die_id='0' core_id='1' siblings='1,5'/>
++            <cpu id='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
++            <cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
+index 1d3df318c5..ee26fe9464 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
+@@ -17,12 +17,12 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='6'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
+-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
+-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
++            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
++            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -31,12 +31,12 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='6'>
+-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
+-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
+-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
+-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
+-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
+-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
++            <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/>
++            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
++            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
++            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
+index 6a8cd0e909..acdd97ec58 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml
+@@ -17,12 +17,12 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='6'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
+-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
+-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
++            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
++            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -31,12 +31,12 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='6'>
+-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
+-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
+-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
+-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
+-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
+-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
++            <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/>
++            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
++            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
++            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
+index 4e46ead616..5f3678e072 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
+@@ -17,12 +17,12 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='6'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
+-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
+-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
++            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
++            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -31,12 +31,12 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='6'>
+-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
+-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
+-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
+-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
+-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
+-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
++            <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/>
++            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
++            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
++            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
+index 44c1042afe..6769bd0591 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
+@@ -17,7 +17,7 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='1'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
+index 8382a26c7a..bc52480905 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml
+@@ -17,7 +17,7 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='1'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
+index a27b3e247e..c386edd4b0 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
+@@ -17,12 +17,12 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='6'>
+-            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='0' core_id='1' siblings='1'/>
+-            <cpu id='2' socket_id='0' core_id='2' siblings='2'/>
+-            <cpu id='3' socket_id='0' core_id='3' siblings='3'/>
+-            <cpu id='4' socket_id='0' core_id='4' siblings='4'/>
+-            <cpu id='5' socket_id='0' core_id='5' siblings='5'/>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3'/>
++            <cpu id='4' socket_id='0' die_id='0' core_id='4' siblings='4'/>
++            <cpu id='5' socket_id='0' die_id='0' core_id='5' siblings='5'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -31,12 +31,12 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='6'>
+-            <cpu id='6' socket_id='1' core_id='0' siblings='6'/>
+-            <cpu id='7' socket_id='1' core_id='1' siblings='7'/>
+-            <cpu id='8' socket_id='1' core_id='2' siblings='8'/>
+-            <cpu id='9' socket_id='1' core_id='3' siblings='9'/>
+-            <cpu id='10' socket_id='1' core_id='4' siblings='10'/>
+-            <cpu id='11' socket_id='1' core_id='5' siblings='11'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
++            <cpu id='8' socket_id='1' die_id='0' core_id='2' siblings='8'/>
++            <cpu id='9' socket_id='1' die_id='0' core_id='3' siblings='9'/>
++            <cpu id='10' socket_id='1' die_id='0' core_id='4' siblings='10'/>
++            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
+           </cpus>
+         </cell>
+       </cells>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-internal-introduce-a-family-of-NULLSTR-macros.patch b/SOURCES/libvirt-internal-introduce-a-family-of-NULLSTR-macros.patch
deleted file mode 100644
index e4bf0c4..0000000
--- a/SOURCES/libvirt-internal-introduce-a-family-of-NULLSTR-macros.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From c93476692d7e0373f147c3ed20761ea1fe836e89 Mon Sep 17 00:00:00 2001
-Message-Id: <c93476692d7e0373f147c3ed20761ea1fe836e89@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:16 +0200
-Subject: [PATCH] internal: introduce a family of NULLSTR macros
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-NULLSTR_EMPTY, the quiet child,
-NULLSTR_STAR, the famous one and
-NULLSTR_MINUS, the grumpy one.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit bd5519deb75e9ff8adcd56d34cbe82dd6a341bcb)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <16722b79dbd931a33ef495b863c5716bb5d6e97c.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/internal.h | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/internal.h b/src/internal.h
-index 47ff0479d2..a4f6605a50 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -244,6 +244,21 @@
-  */
- # define EMPTYSTR(s) ((s) ? (s) : "-")
- 
-+/*
-+ * Turn a NULL string into an empty string
-+ */
-+# define NULLSTR_EMPTY(s) ((s) ? (s) : "")
-+
-+/*
-+ * Turn a NULL string into a star
-+ */
-+# define NULLSTR_STAR(s) ((s) ? (s) : "*")
-+
-+/*
-+ * Turn a NULL string into a minus sign
-+ */
-+# define NULLSTR_MINUS(s) ((s) ? (s) : "-")
-+
- /**
-  * SWAP:
-  *
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-kbase-Add-document-outlining-internals-of-incremental-backup-in-qemu.patch b/SOURCES/libvirt-kbase-Add-document-outlining-internals-of-incremental-backup-in-qemu.patch
new file mode 100644
index 0000000..9637db6
--- /dev/null
+++ b/SOURCES/libvirt-kbase-Add-document-outlining-internals-of-incremental-backup-in-qemu.patch
@@ -0,0 +1,267 @@
+From 02714666a525ea4dd8756f66fae28163fb685d05 Mon Sep 17 00:00:00 2001
+Message-Id: <02714666a525ea4dd8756f66fae28163fb685d05@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:06 +0200
+Subject: [PATCH] kbase: Add document outlining internals of incremental backup
+ in qemu
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Outline the basics and how to integrate with externally created
+overlays. Other topics will continue later.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit da5e5a1e154836abe83077cf477c104b8f98b1d2)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+
+Conflicts: docs/kbase.html.in: real time kvm article not backported
+Message-Id: <e0fea1e270856b642c34827eb3af1c0b01afd510.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/kbase.html.in                        |   3 +
+ docs/kbase/incrementalbackupinternals.rst | 217 ++++++++++++++++++++++
+ 2 files changed, 220 insertions(+)
+ create mode 100644 docs/kbase/incrementalbackupinternals.rst
+
+diff --git a/docs/kbase.html.in b/docs/kbase.html.in
+index 7d6caf3cb1..f2975960f6 100644
+--- a/docs/kbase.html.in
++++ b/docs/kbase.html.in
+@@ -32,6 +32,9 @@
+ 
+         <dt><a href="kbase/virtiofs.html">Virtio-FS</a></dt>
+         <dd>Share a filesystem between the guest and the host</dd>
++
++        <dt><a href="kbase/incrementalbackupinternals.html">Incremental backup internals</a></dt>
++        <dd>Incremental backup implementation details relevant for users</dd>
+       </dl>
+     </div>
+ 
+diff --git a/docs/kbase/incrementalbackupinternals.rst b/docs/kbase/incrementalbackupinternals.rst
+new file mode 100644
+index 0000000000..0c4b4f7486
+--- /dev/null
++++ b/docs/kbase/incrementalbackupinternals.rst
+@@ -0,0 +1,217 @@
++================================================
++Internals of incremental backup handling in qemu
++================================================
++
++.. contents::
++
++Libvirt's implementation of incremental backups in the ``qemu`` driver uses
++qemu's ``block-dirty-bitmaps`` under the hood to track the guest visible disk
++state changes corresponding to the points in time described by a libvirt
++checkpoint.
++
++There are some semantica implications with how libvirt creates and manages the
++bitmaps which de-facto become API as they are written into the disk images, and
++this document will try to summarize them.
++
++Glossary
++========
++
++See the knowledge base article on
++`domain state capture <https://libvirt.org/kbase/domainstatecapture.html>`_ for
++a deeper explanation of some of the concepts.
++
++Checkpoint
++
++    A libvirt object which represents a named point in time of the life of the
++    vm where libvirt tracks writes the VM has done, thereby allowing a backup of
++    only the blocks which changed. Note that state of the VM memory is _not_
++    captured.
++
++    A checkpoint can be created either explicitly via the corresponding API
++    (although this isn't very useful on its own), or simultaneously with an
++    incremental or full backup of the VM using the ``virDomainBackupBegin`` API
++    which allows a next backup to only copy the differences.
++
++Backup
++
++    A copy of either all blocks of selected disks (full backup) or blocks changed
++    since a checkpoint (incremental backup) at the time the backup job was
++    started. (Blocks modified while the backup job is running are not part of the
++    backup!)
++
++Snapshot
++
++    Similarly to a checkpoint it's a point in time in the lifecycle of the VM
++    but the state of the VM including memory is captured at that point allowing
++    returning to the state later.
++
++Blockjob
++
++    A long running job which modifies the shape and/or location of the disk
++    backing chain (images storing the disk contents). Libvirt supports
++    ``block pull`` where data is moved up the chain towards the active layer,
++    ``block commit`` where data is moved down the chain towards the base/oldest
++    image. These blockjobs always remove images from the backing chain. Lastly
++    ``block copy`` where image is moved to a different location (and possibly
++    collapsed moving all of the data into the new location into the one image).
++
++block-dirty-bitmap (bitmap)
++
++    A data structure in qemu tracking which blocks were written by the guest
++    OS since the bitmap was created.
++
++Relationships of bitmaps, checkpoints and VM disks
++==================================================
++
++When a checkpoint is created libvirt creates a block-dirty-bitmap for every
++configured VM disk named the same way as the chcheckpoint. The bitmap is
++actively recording which blocks were changed by the guest OS from that point on.
++Other bitmaps are not impacted by any way as they are self-contained:
++
++::
++
++ +----------------+       +----------------+
++ | disk: vda      |       | disk: vdb      |
++ +--------+-------+       +--------+-------+
++          |                        |
++ +--------v-------+       +--------v-------+
++ | vda-1.qcow2    |       | vdb-1.qcow2    |
++ |                |       |                |
++ | bitmaps: chk-a |       | bitmaps: chk-a |
++ |          chk-b |       |          chk-b |
++ |                |       |                |
++ +----------------+       +----------------+
++
++Bitmaps are created at the same time to track changes to all disks in sync and
++are active and persisted in the QCOW2 image. Other formats currently don't
++support this feature.
++
++Modification of bitmaps outside of libvirt is not recommended, but when adhering
++to the same semantics which the document will describe it should be safe to do
++so, even if we obviously can't guarantee that.
++
++
++Integration with external snapshots
++===================================
++
++Handling of bitmaps
++-------------------
++
++Creating an external snapshot involves adding a new layer to the backing chain
++on top of the previous chain. In this step there are no new bitmaps created by
++default, which would mean that backups become impossible after this step.
++
++To prevent this from happening we need to re-create the active bitmaps in the
++new top/active layer of the backing chain which allows us to continue tracking
++the changes with same granularity as before and also allows libvirt to stitch
++together all the corresponding bitmaps to do a backup across snapshots.
++
++After taking a snapshot of the ``vda`` disk from the example above placed into
++``vda-2.qcow2`` the following topology will be created:
++
++::
++
++   +----------------+
++   | disk: vda      |
++   +-------+--------+
++           |
++   +-------v--------+    +----------------+
++   | vda-2.qcow2    |    | vda-1.qcow2    |
++   |                |    |                |
++   | bitmaps: chk-a +----> bitmaps: chk-a |
++   |          chk-b |    |          chk-b |
++   |                |    |                |
++   +----------------+    +----------------+
++
++Checking bitmap health
++----------------------
++
++QEMU optimizes disk writes by only updating the bitmaps in certain cases. This
++also can cause problems in cases when e.g. QEMU crashes.
++
++For a chain of corresponding bitmaps in a backing chain to be considered valid
++and eligible for use with ``virDomainBackupBegin`` it must conform to the
++following rules:
++
++1) Top image must contain the bitmap
++2) If any of the backing images in the chain contain the bitmap too, all
++   contiguous images must have the bitmap (no gaps)
++3) all of the above bitmaps must be marked as active
++   (``auto`` flag in ``qemu-img`` output, ``recording`` in qemu)
++4) none of the above bitmaps can be inconsistent
++   (``in-use`` flag in ``qemu-img`` provided that it's not used on image which
++   is currently in use by a qemu instance, or ``inconsistent`` in qemu)
++
++::
++
++ # check that image has bitmaps
++  $ qemu-img info vda-1.qcow2
++   image: vda-1.qcow2
++   file format: qcow2
++   virtual size: 100 MiB (104857600 bytes)
++   disk size: 220 KiB
++   cluster_size: 65536
++   Format specific information:
++       compat: 1.1
++       compression type: zlib
++       lazy refcounts: false
++       bitmaps:
++           [0]:
++               flags:
++                   [0]: in-use
++                   [1]: auto
++               name: chk-a
++               granularity: 65536
++           [1]:
++               flags:
++                   [0]: auto
++               name: chk-b
++               granularity: 65536
++       refcount bits: 16
++       corrupt: false
++
++(See also the ``qemuBlockBitmapChainIsValid`` helper method in
++``src/qemu/qemu_block.c``)
++
++Creating external snapshots manually
++--------------------------------------
++
++To create the same topology outside of libvirt (e.g when doing snapshots offline)
++a new ``qemu-img`` which supports the ``bitmap`` subcommand is recommended. The
++following algorithm then ensures that the new image after snapshot will work
++with backups (note that ``jq`` is a JSON processor):
++
++::
++
++  #!/bin/bash
++
++  # arguments
++  SNAP_IMG="vda-2.qcow2"
++  BACKING_IMG="vda-1.qcow2"
++
++  # constants - snapshots and bitmaps work only with qcow2
++  SNAP_FMT="qcow2"
++  BACKING_IMG_FMT="qcow2"
++
++  # create snapshot overlay
++  qemu-img create -f "$SNAP_FMT" -F "$BACKING_IMG_FMT" -b "$BACKING_IMG" "$SNAP_IMG"
++
++  BACKING_IMG_INFO=$(qemu-img info --output=json -f "$BACKING_IMG_FMT" "$BACKING_IMG")
++  BACKING_BITMAPS=$(jq '."format-specific".data.bitmaps' <<< "$BACKING_IMG_INFO")
++
++  if [ "x$BACKING_BITMAPS" = "xnull" ]; then
++      exit 0
++  fi
++
++  for BACKING_BITMAP_ in $(jq -c '.[]' <<< "$BACKING_BITMAPS"); do
++      BITMAP_FLAGS=$(jq -c -r '.flags[]' <<< "$BACKING_BITMAP_")
++      BITMAP_NAME=$(jq -r '.name' <<< "$BACKING_BITMAP_")
++
++      if grep 'in-use' <<< "$BITMAP_FLAGS" ||
++         grep -v 'auto' <<< "$BITMAP_FLAGS"; then
++         continue
++      fi
++
++      qemu-img bitmap -f "$SNAP_FMT" "$SNAP_IMG" --add "$BITMAP_NAME"
++
++  done
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-kbase-backing_chains-Add-steps-how-to-securely-probe-image-format.patch b/SOURCES/libvirt-kbase-backing_chains-Add-steps-how-to-securely-probe-image-format.patch
new file mode 100644
index 0000000..942f80c
--- /dev/null
+++ b/SOURCES/libvirt-kbase-backing_chains-Add-steps-how-to-securely-probe-image-format.patch
@@ -0,0 +1,54 @@
+From 9146b5849b0dfc2ee59eea09712cc7f5f88c88f2 Mon Sep 17 00:00:00 2001
+Message-Id: <9146b5849b0dfc2ee59eea09712cc7f5f88c88f2@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:45 +0100
+Subject: [PATCH] kbase: backing_chains: Add steps how to securely probe image
+ format
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We document steps how to fix images if they are rejected for missing
+the 'backing file format' field. Document also how to securely probe
+the image format if it's unknown.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 82d5b762f11b50abb710c751251f28d4325a4c91)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <039ebfe436c361b067ef73a7c0bb16db1e410044.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/kbase/backing_chains.rst | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/docs/kbase/backing_chains.rst b/docs/kbase/backing_chains.rst
+index 12ed6253ac..af848ccb14 100644
+--- a/docs/kbase/backing_chains.rst
++++ b/docs/kbase/backing_chains.rst
+@@ -176,6 +176,21 @@ properly. ``$BACKING_IMAGE_PATH`` should be specified as a full absolute path.
+ If relative referencing of the backing image is desired, the path must be
+ relative to the location of image described by ``$IMAGE_PATH``.
+ 
++**Important:** If the ``$BACKING_IMAGE_FORMAT`` is not known it can be queried
++using ``qemu-img info $BACKING_IMAGE_PATH`` and looking for the ``file format:``
++field, but for security reasons should be used *only* if at least one of the
++following criteria is met:
++
++- ``file format`` is ``raw``
++- ``backing file`` is NOT present
++- ``backing file`` is present AND is correct/trusted
++
++Note that the last criteria may require manual inspection and thus should not
++be scripted unless the trust for the image can be expressed programatically.
++
++Also note that the above steps may need to be repeated recursively for any
++subsequent backing images.
++
+ Missing images reported after after moving disk images into a different path
+ ----------------------------------------------------------------------------
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-kbase-backing_chains-Clarify-some-aspects-of-image-probing.patch b/SOURCES/libvirt-kbase-backing_chains-Clarify-some-aspects-of-image-probing.patch
new file mode 100644
index 0000000..12428cc
--- /dev/null
+++ b/SOURCES/libvirt-kbase-backing_chains-Clarify-some-aspects-of-image-probing.patch
@@ -0,0 +1,70 @@
+From 2256db09e8b86b58be3c86b1575d64d7a9f5d05c Mon Sep 17 00:00:00 2001
+Message-Id: <2256db09e8b86b58be3c86b1575d64d7a9f5d05c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:44 +0100
+Subject: [PATCH] kbase: backing_chains: Clarify some aspects of image probing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit d552b93448e253552c7e53a1240132c9763d2b24)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <b44052c081a18bec62762ab2a7358abd0e914a3a.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ docs/kbase/backing_chains.rst | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/docs/kbase/backing_chains.rst b/docs/kbase/backing_chains.rst
+index 3b3f0583e5..12ed6253ac 100644
+--- a/docs/kbase/backing_chains.rst
++++ b/docs/kbase/backing_chains.rst
+@@ -46,14 +46,17 @@ system used on the host so that the hypervisor can access the files and possibly
+ also directly to configure the hypervisor to use the appropriate images. Thus
+ it's important to properly setup the formats and paths of the backing images.
+ 
++Any externally created image should always use the -F switch of ``qemu-img``
++to specify the format of the backing file to avoid probing.
++
+ Image detection caveats
+ -----------------------
+ 
+ Detection of the backing chain requires libvirt to read and understand the
+ ``backing file`` field recorded in the image metadata and also being able to
+ recurse and read the backing file. Due to security implications libvirt
+-will not attempt to detect the format of the backing image if the image metadata
+-doesn't contain it.
++will refuse to use backing images of any image whose format was not specified
++explicitly in the XML or the overlay image itself.
+ 
+ Libvirt also might lack support for a network disk storage technology and thus
+ may be unable to visit and detect backing chains on such storage. This may
+@@ -104,6 +107,8 @@ Note that it's also possible to partially specify the chain in the XML but omit
+ the terminating element. This will result into probing from the last specified
+ ``<backingStore>``
+ 
++Any image specified explicitly will not be probed for backing file or format.
++
+ 
+ Manual image creation
+ =====================
+@@ -113,6 +118,13 @@ them properly so that they work with libvirt as expected. The created disk
+ images must contain the format of the backing image in the metadata. This
+ means that the **-F** parameter of ``qemu-img`` must always be used.
+ 
++::
++
++  qemu-img -f qcow2 -F qcow2 -b /path/to/backing /path/to/overlay
++
++Note that if '/path/to/backing' is relative the path is considered relative to
++the location of '/path/to/overlay'.
++
+ Troubleshooting
+ ===============
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-lib-Drop-UDEVSETTLE.patch b/SOURCES/libvirt-lib-Drop-UDEVSETTLE.patch
deleted file mode 100644
index 33c3c7e..0000000
--- a/SOURCES/libvirt-lib-Drop-UDEVSETTLE.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From b5dbb3bd65642516a773a2cdf67efe977cfec4b4 Mon Sep 17 00:00:00 2001
-Message-Id: <b5dbb3bd65642516a773a2cdf67efe977cfec4b4@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:55:37 +0200
-Subject: [PATCH] lib: Drop UDEVSETTLE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The udevsettle binary is no longer used anywhere as it was
-replaced by 'udevadm settle'. There's no reason for us to even
-check for it in configure.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2944dcb2de014a881c3539a43f989c2a723e87ca)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1710575
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <b69a2303299a9d69d58d4d54cebd306cdba87c3b.1561643698.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- m4/virt-external-programs.m4 | 5 -----
- src/util/virutil.c           | 6 +-----
- 2 files changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4
-index ab6149288f..3c915e1a65 100644
---- a/m4/virt-external-programs.m4
-+++ b/m4/virt-external-programs.m4
-@@ -46,7 +46,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
-   AC_PATH_PROG([RADVD], [radvd], [radvd], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([TC], [tc], [tc], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([UDEVADM], [udevadm], [], [$LIBVIRT_SBIN_PATH])
--  AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH])
-@@ -71,10 +70,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
-     AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"],
-                        [Location or name of the udevadm program])
-   fi
--  if test -n "$UDEVSETTLE"; then
--    AC_DEFINE_UNQUOTED([UDEVSETTLE], ["$UDEVSETTLE"],
--                       [Location or name of the udevsettle program])
--  fi
-   if test -n "$MODPROBE"; then
-     AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
-                        [Location or name of the modprobe program])
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index d37c1ac632..68d3217248 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1621,14 +1621,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
- #endif
- 
- 
--#if defined(UDEVADM) || defined(UDEVSETTLE)
-+#if defined(UDEVADM)
- void virWaitForDevices(void)
- {
--# ifdef UDEVADM
-     const char *const settleprog[] = { UDEVADM, "settle", NULL };
--# else
--    const char *const settleprog[] = { UDEVSETTLE, NULL };
--# endif
-     int exitstatus;
- 
-     if (access(settleprog[0], X_OK) != 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-locking-restrict-sockets-to-mode-0600.patch b/SOURCES/libvirt-locking-restrict-sockets-to-mode-0600.patch
deleted file mode 100644
index 38abe7f..0000000
--- a/SOURCES/libvirt-locking-restrict-sockets-to-mode-0600.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0fce9e5a4f4e7f12a5eb2fc0cc44f30f26d83157 Mon Sep 17 00:00:00 2001
-Message-Id: <0fce9e5a4f4e7f12a5eb2fc0cc44f30f26d83157@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 15 May 2019 21:40:57 +0100
-Subject: [PATCH] locking: restrict sockets to mode 0600
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virtlockd daemon's only intended client is the libvirtd daemon. As
-such it should never allow clients from other user accounts to connect.
-The code already enforces this and drops clients from other UIDs, but
-we can get earlier (and thus stronger) protection against DoS by setting
-the socket permissions to 0600
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f111e09468693909b1f067aa575efdafd9a262a1)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <20190515204058.28077-3-berrange@redhat.com>
----
- src/locking/virtlockd-admin.socket.in | 1 +
- src/locking/virtlockd.socket.in       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
-index 2a7500f3d0..f674c492f7 100644
---- a/src/locking/virtlockd-admin.socket.in
-+++ b/src/locking/virtlockd-admin.socket.in
-@@ -5,6 +5,7 @@ Before=libvirtd.service
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
- Service=virtlockd.service
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
-index 45e0f20235..d701b27516 100644
---- a/src/locking/virtlockd.socket.in
-+++ b/src/locking/virtlockd.socket.in
-@@ -4,6 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-logging-restrict-sockets-to-mode-0600.patch b/SOURCES/libvirt-logging-restrict-sockets-to-mode-0600.patch
deleted file mode 100644
index cfb4301..0000000
--- a/SOURCES/libvirt-logging-restrict-sockets-to-mode-0600.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3988a7d012fc93eaae82961f72f7c53f26763651 Mon Sep 17 00:00:00 2001
-Message-Id: <3988a7d012fc93eaae82961f72f7c53f26763651@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 15 May 2019 21:40:58 +0100
-Subject: [PATCH] logging: restrict sockets to mode 0600
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virtlogd daemon's only intended client is the libvirtd daemon. As
-such it should never allow clients from other user accounts to connect.
-The code already enforces this and drops clients from other UIDs, but
-we can get earlier (and thus stronger) protection against DoS by setting
-the socket permissions to 0600
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit e37bd65f9948c1185456b2cdaa3bd6e875af680f)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <20190515204058.28077-4-berrange@redhat.com>
----
- src/logging/virtlogd-admin.socket.in | 1 +
- src/logging/virtlogd.socket.in       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-admin.socket.in
-index 595e6c4c4b..5c41dfeb7b 100644
---- a/src/logging/virtlogd-admin.socket.in
-+++ b/src/logging/virtlogd-admin.socket.in
-@@ -5,6 +5,7 @@ Before=libvirtd.service
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlogd-admin-sock
- Service=virtlogd.service
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
-index 22b9360c8d..ae48cdab9a 100644
---- a/src/logging/virtlogd.socket.in
-+++ b/src/logging/virtlogd.socket.in
-@@ -4,6 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlogd-sock
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-lxc-Use-virCgroupGetMemoryStat.patch b/SOURCES/libvirt-lxc-Use-virCgroupGetMemoryStat.patch
deleted file mode 100644
index 8e84f9b..0000000
--- a/SOURCES/libvirt-lxc-Use-virCgroupGetMemoryStat.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From fef35da9603a70a60d29420b9cff0db4fc2f0f82 Mon Sep 17 00:00:00 2001
-Message-Id: <fef35da9603a70a60d29420b9cff0db4fc2f0f82@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:02 +0200
-Subject: [PATCH] lxc: Use virCgroupGetMemoryStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit e634c7cd0d3265506198e1f58f1af1fd774f06b1)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <28c2e0f232ee1c3bce10654df15aa212d5f09996.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/lxc/lxc_cgroup.c | 65 +++++---------------------------------------
- 1 file changed, 7 insertions(+), 58 deletions(-)
-
-diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
-index 8e937ec389..d93a19d684 100644
---- a/src/lxc/lxc_cgroup.c
-+++ b/src/lxc/lxc_cgroup.c
-@@ -220,64 +220,13 @@ static int virLXCCgroupGetMemTotal(virCgroupPtr cgroup,
- static int virLXCCgroupGetMemStat(virCgroupPtr cgroup,
-                                   virLXCMeminfoPtr meminfo)
- {
--    int ret = 0;
--    FILE *statfd = NULL;
--    char *statFile = NULL;
--    char *line = NULL;
--    size_t n;
--
--    ret = virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.stat", &statFile);
--    if (ret != 0) {
--        virReportSystemError(-ret, "%s",
--                             _("cannot get the path of MEMORY cgroup controller"));
--        return ret;
--    }
--
--    statfd = fopen(statFile, "r");
--    if (statfd == NULL) {
--        ret = -errno;
--        goto cleanup;
--    }
--
--    while (getline(&line, &n, statfd) > 0) {
--
--        char *value = strchr(line, ' ');
--        char *nl = value ? strchr(line, '\n') : NULL;
--        unsigned long long stat_value;
--
--        if (!value)
--            continue;
--
--        if (nl)
--            *nl = '\0';
--
--        *value = '\0';
--
--        if (virStrToLong_ull(value + 1, NULL, 10, &stat_value) < 0) {
--            ret = -EINVAL;
--            goto cleanup;
--        }
--        if (STREQ(line, "cache"))
--            meminfo->cached = stat_value >> 10;
--        else if (STREQ(line, "inactive_anon"))
--            meminfo->inactive_anon = stat_value >> 10;
--        else if (STREQ(line, "active_anon"))
--            meminfo->active_anon = stat_value >> 10;
--        else if (STREQ(line, "inactive_file"))
--            meminfo->inactive_file = stat_value >> 10;
--        else if (STREQ(line, "active_file"))
--            meminfo->active_file = stat_value >> 10;
--        else if (STREQ(line, "unevictable"))
--            meminfo->unevictable = stat_value >> 10;
--    }
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(line);
--    VIR_FREE(statFile);
--    VIR_FORCE_FCLOSE(statfd);
--    return ret;
-+    return virCgroupGetMemoryStat(cgroup,
-+                                  &meminfo->cached,
-+                                  &meminfo->inactive_anon,
-+                                  &meminfo->active_anon,
-+                                  &meminfo->inactive_file,
-+                                  &meminfo->active_file,
-+                                  &meminfo->unevictable);
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-m4-Drop-needless-string-checks.patch b/SOURCES/libvirt-m4-Drop-needless-string-checks.patch
deleted file mode 100644
index 887ee23..0000000
--- a/SOURCES/libvirt-m4-Drop-needless-string-checks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 899e80657b58f8ef4c0faf452859fd9649d33b79 Mon Sep 17 00:00:00 2001
-Message-Id: <899e80657b58f8ef4c0faf452859fd9649d33b79@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:55:39 +0200
-Subject: [PATCH] m4: Drop needless string checks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We provide default values for both MODPROBE and RMMOD and thus
-there is no way that their paths can be empty strings.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 3c8d5762a9fcf3f7d23a41d0b49def0387ecddf7)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1710575
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <cb42f6a7b7462140e463a33a7b421ed441617266.1561643698.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- m4/virt-external-programs.m4 | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4
-index f1ae104b32..0f995998c3 100644
---- a/m4/virt-external-programs.m4
-+++ b/m4/virt-external-programs.m4
-@@ -67,14 +67,10 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
-                      [Location or name of the ovs-vsctl program])
-   AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"],
-                      [Location or name of the udevadm program])
--  if test -n "$MODPROBE"; then
--    AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
--                       [Location or name of the modprobe program])
--  fi
--  if test -n "$RMMOD"; then
--    AC_DEFINE_UNQUOTED([RMMOD], ["$RMMOD"],
--                       [Location or name of the rmmod program])
--  fi
-+  AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
-+                     [Location or name of the modprobe program])
-+  AC_DEFINE_UNQUOTED([RMMOD], ["$RMMOD"],
-+                     [Location or name of the rmmod program])
-   AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"],
-                      [Location or name of the scrub program (for wiping algorithms)])
-   AC_DEFINE_UNQUOTED([ADDR2LINE], ["$ADDR2LINE"],
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-m4-Provide-default-value-fore-UDEVADM.patch b/SOURCES/libvirt-m4-Provide-default-value-fore-UDEVADM.patch
deleted file mode 100644
index de7a3aa..0000000
--- a/SOURCES/libvirt-m4-Provide-default-value-fore-UDEVADM.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 1113a43a48b3c15f908a396ec88e9499df10f7b4 Mon Sep 17 00:00:00 2001
-Message-Id: <1113a43a48b3c15f908a396ec88e9499df10f7b4@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:55:38 +0200
-Subject: [PATCH] m4: Provide default value fore UDEVADM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It may happen that the system where libvirt is built at doesn't
-have udevadm binary but the one where it runs does have it.
-If we change how udevadm is run in virWaitForDevices() then we
-can safely pass a default value in m4 macro.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 523b799d3c356b9b4ea0b117a60cfc3b603eaffa)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1710575
-
-Difference to the upstream commit is that I had to drop
-VIR_AUTOPTR() of virCommand because that does not exist in the
-downstream yet.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <3d2deafb1bf06eddd721fceb15961b27c8dbf0cf.1561643698.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- m4/virt-external-programs.m4 |  9 +++------
- src/util/virutil.c           | 16 ++++++++--------
- 2 files changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4
-index 3c915e1a65..f1ae104b32 100644
---- a/m4/virt-external-programs.m4
-+++ b/m4/virt-external-programs.m4
-@@ -45,7 +45,7 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
-   AC_PATH_PROG([DNSMASQ], [dnsmasq], [dnsmasq], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([RADVD], [radvd], [radvd], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([TC], [tc], [tc], [$LIBVIRT_SBIN_PATH])
--  AC_PATH_PROG([UDEVADM], [udevadm], [], [$LIBVIRT_SBIN_PATH])
-+  AC_PATH_PROG([UDEVADM], [udevadm], [udevadm], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH])
-   AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH])
-@@ -65,11 +65,8 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
-                      [Location or name of the mm-ctl program])
-   AC_DEFINE_UNQUOTED([OVSVSCTL], ["$OVSVSCTL"],
-                      [Location or name of the ovs-vsctl program])
--
--  if test -n "$UDEVADM"; then
--    AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"],
--                       [Location or name of the udevadm program])
--  fi
-+  AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"],
-+                     [Location or name of the udevadm program])
-   if test -n "$MODPROBE"; then
-     AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
-                        [Location or name of the modprobe program])
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 68d3217248..cd67f54bc2 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1621,25 +1621,25 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
- #endif
- 
- 
--#if defined(UDEVADM)
- void virWaitForDevices(void)
- {
--    const char *const settleprog[] = { UDEVADM, "settle", NULL };
-+    virCommandPtr cmd = NULL;
-+    VIR_AUTOFREE(char *) udev = NULL;
-     int exitstatus;
- 
--    if (access(settleprog[0], X_OK) != 0)
-+    if (!(udev = virFindFileInPath(UDEVADM)))
-+        return;
-+
-+    if (!(cmd = virCommandNewArgList(udev, "settle", NULL)))
-         return;
- 
-     /*
-      * NOTE: we ignore errors here; this is just to make sure that any device
-      * nodes that are being created finish before we try to scan them.
-      */
--    ignore_value(virRun(settleprog, &exitstatus));
-+    ignore_value(virCommandRun(cmd, &exitstatus));
-+    virCommandFree(cmd);
- }
--#else
--void virWaitForDevices(void)
--{}
--#endif
- 
- #if WITH_DEVMAPPER
- bool
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-network-allow-configuring-firewalld-zone-for-virtual-network-bridge-device.patch b/SOURCES/libvirt-network-allow-configuring-firewalld-zone-for-virtual-network-bridge-device.patch
deleted file mode 100644
index be208e1..0000000
--- a/SOURCES/libvirt-network-allow-configuring-firewalld-zone-for-virtual-network-bridge-device.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-From 69de85ec80efd714528955e9c0ab67ee6811c824 Mon Sep 17 00:00:00 2001
-Message-Id: <69de85ec80efd714528955e9c0ab67ee6811c824@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Fri, 1 Feb 2019 20:29:32 -0500
-Subject: [PATCH] network: allow configuring firewalld zone for virtual network
- bridge device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since we're setting the zone anyway, it will be useful to allow
-setting a different (custom) zone for each network. This will be done
-by adding a "zone" attribute to the "bridge" element, e.g.:
-
-   ...
-   <bridge name='virbr0' zone='myzone'/>
-   ...
-
-If a zone is specified in the config and it can't be honored, this
-will be an error.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 30a6f9168634f8ce269f1ef294c4a18d9c95939c)
-
-Conflicts:
-
-   src/conf/network_conf.c - upstream added a new bool called
-     hasBridge that is the equivalent of all the comparisons in the
-     if() just following the line that adds "zone='blah'" to the xml
-     string.
-
-https://bugzilla.redhat.com/1650320
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/firewall.html.in                      |  5 ++
- docs/formatnetwork.html.in                 | 17 ++++
- docs/schemas/basictypes.rng                |  6 ++
- docs/schemas/network.rng                   |  6 ++
- src/conf/network_conf.c                    | 14 +++-
- src/conf/network_conf.h                    |  1 +
- src/network/bridge_driver_linux.c          | 95 +++++++++++++---------
- tests/networkxml2xmlin/routed-network.xml  |  2 +-
- tests/networkxml2xmlout/routed-network.xml |  2 +-
- 9 files changed, 106 insertions(+), 42 deletions(-)
-
-diff --git a/docs/firewall.html.in b/docs/firewall.html.in
-index 5d584e582e..e86ab0d974 100644
---- a/docs/firewall.html.in
-+++ b/docs/firewall.html.in
-@@ -151,6 +151,11 @@ MASQUERADE all  --  *      *       192.168.122.0/24    !192.168.122.0/24</pre>
-       iptables rules regardless of which backend is in use by
-       firewalld.
-     </p>
-+    <p>
-+      NB: It is possible to manually set the firewalld zone for a
-+      network's interface with the "zone" attribute of the network's
-+      "bridge" element.
-+    </p>
-     <p>
-       NB: Prior to libvirt 5.1.0, the firewalld "libvirt" zone did not
-       exist, and prior to firewalld 0.7.0 a feature crucial to making
-diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
-index 363a72bbc9..7ddcfee127 100644
---- a/docs/formatnetwork.html.in
-+++ b/docs/formatnetwork.html.in
-@@ -152,6 +152,23 @@
-           <span class="since">Since 1.2.11, requires kernel 3.17 or
-           newer</span>
-         </p>
-+
-+        <p>
-+          The optional <code>zone</code> attribute of
-+          the <code>bridge</code> element is used to specify
-+          the <a href="https://firewalld.org">firewalld</a>
-+          zone for the bridge of a network with <code>forward</code>
-+          mode of "nat", "route", "open", or one with
-+          no <code>forward</code> specified. By default, the bridges
-+          of all virtual networks with these forward modes are placed
-+          in the firewalld zone named "libvirt", which permits
-+          incoming DNS, DHCP, TFTP, and SSH to the host from guests on
-+          the network. This behavior can be changed either by
-+          modifying the libvirt zone (using firewalld management
-+          tools), or by placing the network in a different zone (which
-+          will also be managed using firewalld tools).
-+          <span class="since">Since 5.1.0</span>
-+        </p>
-       </dd>
- 
-       <dt><code>mtu</code></dt>
-diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
-index 1a18cd31b1..b45a7fcdc8 100644
---- a/docs/schemas/basictypes.rng
-+++ b/docs/schemas/basictypes.rng
-@@ -252,6 +252,12 @@
-     </data>
-   </define>
- 
-+  <define name="zoneName">
-+    <data type="string">
-+      <param name="pattern">[a-zA-Z0-9_\-]+</param>
-+    </data>
-+  </define>
-+
-   <define name="filePath">
-     <data type="string">
-       <param name="pattern">.+</param>
-diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
-index f37c422bf3..2a6e3358fd 100644
---- a/docs/schemas/network.rng
-+++ b/docs/schemas/network.rng
-@@ -58,6 +58,12 @@
-               </attribute>
-             </optional>
- 
-+            <optional>
-+              <attribute name="zone">
-+                <ref name="zoneName"/>
-+              </attribute>
-+            </optional>
-+
-             <optional>
-               <attribute name="stp">
-                 <ref name="virOnOff"/>
-diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
-index 630a87fc07..1e3650b70f 100644
---- a/src/conf/network_conf.c
-+++ b/src/conf/network_conf.c
-@@ -206,6 +206,7 @@ virNetworkDefFree(virNetworkDefPtr def)
- 
-     VIR_FREE(def->name);
-     VIR_FREE(def->bridge);
-+    VIR_FREE(def->bridgeZone);
-     VIR_FREE(def->domain);
- 
-     virNetworkForwardDefClear(&def->forward);
-@@ -1689,6 +1690,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
- 
-     /* Parse bridge information */
-     def->bridge = virXPathString("string(./bridge[1]/@name)", ctxt);
-+    def->bridgeZone = virXPathString("string(./bridge[1]/@zone)", ctxt);
-     stp = virXPathString("string(./bridge[1]/@stp)", ctxt);
-     def->stp = (stp && STREQ(stp, "off")) ? false : true;
- 
-@@ -1925,6 +1927,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
-                            def->name);
-             goto error;
-         }
-+        if (def->bridgeZone) {
-+            virReportError(VIR_ERR_XML_ERROR,
-+                           _("bridge zone not allowed in %s mode (network '%s')"),
-+                           virNetworkForwardTypeToString(def->forward.type),
-+                           def->name);
-+            goto error;
-+        }
-         if (def->macTableManager) {
-             virReportError(VIR_ERR_XML_ERROR,
-                            _("bridge macTableManager setting not allowed "
-@@ -1936,9 +1945,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
-         ATTRIBUTE_FALLTHROUGH;
- 
-     case VIR_NETWORK_FORWARD_BRIDGE:
--        if (def->delay || stp) {
-+        if (def->delay || stp || def->bridgeZone) {
-             virReportError(VIR_ERR_XML_ERROR,
--                           _("bridge delay/stp options only allowed in "
-+                           _("bridge delay/stp/zone options only allowed in "
-                              "route, nat, and isolated mode, not in %s "
-                              "(network '%s')"),
-                            virNetworkForwardTypeToString(def->forward.type),
-@@ -2478,6 +2487,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
- 
-         virBufferAddLit(buf, "<bridge");
-         virBufferEscapeString(buf, " name='%s'", def->bridge);
-+        virBufferEscapeString(buf, " zone='%s'", def->bridgeZone);
-         if (def->forward.type == VIR_NETWORK_FORWARD_NONE ||
-             def->forward.type == VIR_NETWORK_FORWARD_NAT ||
-             def->forward.type == VIR_NETWORK_FORWARD_ROUTE ||
-diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
-index 54c8ed1c4c..415792166f 100644
---- a/src/conf/network_conf.h
-+++ b/src/conf/network_conf.h
-@@ -237,6 +237,7 @@ struct _virNetworkDef {
-     int   connections; /* # of guest interfaces connected to this network */
- 
-     char *bridge;       /* Name of bridge device */
-+    char *bridgeZone;  /* name of firewalld zone for bridge */
-     int  macTableManager; /* enum virNetworkBridgeMACTableManager */
-     char *domain;
-     int domainLocalOnly; /* enum virTristateBool: yes disables dns forwarding */
-diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
-index 823d5a9742..121d42b646 100644
---- a/src/network/bridge_driver_linux.c
-+++ b/src/network/bridge_driver_linux.c
-@@ -642,49 +642,68 @@ int networkAddFirewallRules(virNetworkDefPtr def)
-     virFirewallPtr fw = NULL;
-     int ret = -1;
- 
--    /* if firewalld is active, try to set the "libvirt" zone. This is
--     * desirable (for consistency) if firewalld is using the iptables
--     * backend, but is necessary (for basic network connectivity) if
--     * firewalld is using the nftables backend
--     */
--    if (virFirewallDIsRegistered() == 0) {
-+    if (def->bridgeZone) {
- 
--        /* if the "libvirt" zone exists, then set it. If not, and
--         * if firewalld is using the nftables backend, then we
--         * need to log an error because the combination of
--         * nftables + default zone means that traffic cannot be
--         * forwarded (and even DHCP and DNS from guest to host
--         * will probably no be permitted by the default zone
-+        /* if a firewalld zone has been specified, fail/log an error
-+         * if we can't honor it
-          */
--        if (virFirewallDZoneExists("libvirt")) {
--            if (virFirewallDInterfaceSetZone(def->bridge, "libvirt") < 0)
--                goto cleanup;
--        } else {
--            unsigned long version;
--            int vresult = virFirewallDGetVersion(&version);
-+        if (virFirewallDIsRegistered() < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("zone %s requested for network %s "
-+                             "but firewalld is not active"),
-+                           def->bridgeZone, def->name);
-+            goto cleanup;
-+        }
- 
--            if (vresult < 0)
--                goto cleanup;
-+        if (virFirewallDInterfaceSetZone(def->bridge, def->bridgeZone) < 0)
-+            goto cleanup;
- 
--            /* Support for nftables backend was added in firewalld
--             * 0.6.0. Support for rule priorities (required by the
--             * 'libvirt' zone, which should be installed by a
--             * libvirt package, *not* by firewalld) was not added
--             * until firewalld 0.7.0 (unless it was backported).
-+    } else {
-+
-+        /* if firewalld is active, try to set the "libvirt" zone. This is
-+         * desirable (for consistency) if firewalld is using the iptables
-+         * backend, but is necessary (for basic network connectivity) if
-+         * firewalld is using the nftables backend
-+         */
-+        if (virFirewallDIsRegistered() == 0) {
-+
-+            /* if the "libvirt" zone exists, then set it. If not, and
-+             * if firewalld is using the nftables backend, then we
-+             * need to log an error because the combination of
-+             * nftables + default zone means that traffic cannot be
-+             * forwarded (and even DHCP and DNS from guest to host
-+             * will probably no be permitted by the default zone
-              */
--            if (version >= 6000 &&
--                virFirewallDGetBackend() == VIR_FIREWALLD_BACKEND_NFTABLES) {
--                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                               _("firewalld is set to use the nftables "
--                                 "backend, but the required firewalld "
--                                 "'libvirt' zone is missing. Either set "
--                                 "the firewalld backend to 'iptables', or "
--                                 "ensure that firewalld has a 'libvirt' "
--                                 "zone by upgrading firewalld to a "
--                                 "version supporting rule priorities "
--                                 "(0.7.0+) and/or rebuilding "
--                                 "libvirt with --with-firewalld-zone"));
--                goto cleanup;
-+            if (virFirewallDZoneExists("libvirt")) {
-+                if (virFirewallDInterfaceSetZone(def->bridge, "libvirt") < 0)
-+                    goto cleanup;
-+            } else {
-+                unsigned long version;
-+                int vresult = virFirewallDGetVersion(&version);
-+
-+                if (vresult < 0)
-+                    goto cleanup;
-+
-+                /* Support for nftables backend was added in firewalld
-+                 * 0.6.0. Support for rule priorities (required by the
-+                 * 'libvirt' zone, which should be installed by a
-+                 * libvirt package, *not* by firewalld) was not added
-+                 * until firewalld 0.7.0 (unless it was backported).
-+                 */
-+                if (version >= 6000 &&
-+                    virFirewallDGetBackend() == VIR_FIREWALLD_BACKEND_NFTABLES) {
-+                    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                                   _("firewalld is set to use the nftables "
-+                                     "backend, but the required firewalld "
-+                                     "'libvirt' zone is missing. Either set "
-+                                     "the firewalld backend to 'iptables', or "
-+                                     "ensure that firewalld has a 'libvirt' "
-+                                     "zone by upgrading firewalld to a "
-+                                     "version supporting rule priorities "
-+                                     "(0.7.0+) and/or rebuilding "
-+                                     "libvirt with --with-firewalld-zone"));
-+                    goto cleanup;
-+                }
-             }
-         }
-     }
-diff --git a/tests/networkxml2xmlin/routed-network.xml b/tests/networkxml2xmlin/routed-network.xml
-index ab5e15b1f6..fce01df132 100644
---- a/tests/networkxml2xmlin/routed-network.xml
-+++ b/tests/networkxml2xmlin/routed-network.xml
-@@ -1,7 +1,7 @@
- <network>
-   <name>local</name>
-   <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
--  <bridge name="virbr1"/>
-+  <bridge name="virbr1" zone="myzone"/>
-   <mac address='12:34:56:78:9A:BC'/>
-   <forward mode="route" dev="eth1"/>
-   <ip address="192.168.122.1" netmask="255.255.255.0">
-diff --git a/tests/networkxml2xmlout/routed-network.xml b/tests/networkxml2xmlout/routed-network.xml
-index 81abf06e9f..2e13cf4ffa 100644
---- a/tests/networkxml2xmlout/routed-network.xml
-+++ b/tests/networkxml2xmlout/routed-network.xml
-@@ -4,7 +4,7 @@
-   <forward dev='eth1' mode='route'>
-     <interface dev='eth1'/>
-   </forward>
--  <bridge name='virbr1' stp='on' delay='0'/>
-+  <bridge name='virbr1' zone='myzone' stp='on' delay='0'/>
-   <mac address='12:34:56:78:9a:bc'/>
-   <ip address='192.168.122.1' netmask='255.255.255.0'>
-   </ip>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-network-explicitly-allow-icmp-icmpv6-in-libvirt-zonefile.patch b/SOURCES/libvirt-network-explicitly-allow-icmp-icmpv6-in-libvirt-zonefile.patch
deleted file mode 100644
index 6478d5c..0000000
--- a/SOURCES/libvirt-network-explicitly-allow-icmp-icmpv6-in-libvirt-zonefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f649b1f8a050402bbd1d28ee78e1522121347977 Mon Sep 17 00:00:00 2001
-Message-Id: <f649b1f8a050402bbd1d28ee78e1522121347977@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Thu, 14 Feb 2019 15:26:55 -0500
-Subject: [PATCH] network: explicitly allow icmp/icmpv6 in libvirt zonefile
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The libvirt zonefile for firewalld (added in commit 3b71f2e4) does the
-following:
-
-1) lists specific services it wants to allow, then
-
-2) uses a lower priority <reject/> rule to block all other services to
-   the host, and then finally,
-
-3) relies on the zone's default "accept" policy to, accept all
-   forwarded traffic (since forwarded traffic is ignored by the
-   slightly higher priority <reject/> rule in (2)).
-
-I had assumed that icmp traffic was either being allowed at the top of
-the rules, or that it would be ignored by the <reject/> rule and
-passed by the default accept policy (similar to forwarded traffic),
-but this assumption was incorrect; the <reject/> rule does block icmp
-traffic. This became apparent when DHCPv6 which requires ICMPv6 in
-addition to udp/dhcpv6) failed to work.
-
-This all means that in order to achieve our original goal of "similar
-behavior to a default reject policy, but also allowing forwarded
-traffic", we need to add rules to allow all icmp and icmpv6 traffic to
-the libvirt zone, and that's what this patch does.
-
-This is a further refinement of the resolution to
-https://bugzilla.redhat.com/1650320
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Acked-by: Eric Garver <eric@garver.life>
-(cherry picked from commit 41adfe8ca932e9fa34cd1b3f238c17b52e6b3888)
-Message-Id: <20190214202655.22715-1-laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/network/libvirt.zone | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/network/libvirt.zone b/src/network/libvirt.zone
-index bf81db1b6e..b1e84b52ec 100644
---- a/src/network/libvirt.zone
-+++ b/src/network/libvirt.zone
-@@ -15,6 +15,8 @@
- <rule priority='32767'>
-   <reject/>
- </rule>
-+<protocol value='icmp'/>
-+<protocol value='ipv6-icmp'/>
- <service name='dhcp'/>
- <service name='dhcpv6'/>
- <service name='dns'/>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-network-set-firewalld-zone-of-bridges-to-libvirt-zone-when-appropriate.patch b/SOURCES/libvirt-network-set-firewalld-zone-of-bridges-to-libvirt-zone-when-appropriate.patch
deleted file mode 100644
index a6ec172..0000000
--- a/SOURCES/libvirt-network-set-firewalld-zone-of-bridges-to-libvirt-zone-when-appropriate.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 8cc240a1652a465727d5b66d9fb6a5fa71656dba Mon Sep 17 00:00:00 2001
-Message-Id: <8cc240a1652a465727d5b66d9fb6a5fa71656dba@dist-git>
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 1 Feb 2019 20:29:31 -0500
-Subject: [PATCH] network: set firewalld zone of bridges to "libvirt" zone when
- appropriate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch restores broken guest network connectivity after a host
-firewalld is switched to using an nftables backend. It does this by
-adding libvirt networks' bridge interfaces to the new "libvirt" zone
-in firewalld.
-
-After this patch, the bridge interface of any network created by
-libvirt (when firewalld is active) will be added to the firewalld
-zone called "libvirt" if it exists (regardless of the firewalld
-backend setting). This behavior does *not* depend on whether or not
-libvirt has installed the libvirt zone file (set with
-"--with[out]-firewalld-zone" during the configure phase of the package
-build).
-
-If the libvirt zone doesn't exist (either because the package was
-configured to not install it, or possibly it was installed, but
-firewalld doesn't support rule priorities, resulting in a parse
-error), the bridge will remain in firewalld's default zone, which
-could be innocuous (in the case that the firewalld backend is
-iptables, guest networking will still function properly with the
-bridge in the default zone), or it could be disastrous (if the
-firewalld backend is nftables, we can be assured that guest networking
-will fail). In order to be unobtrusive in the former case, and
-informative in the latter, when the libvirt zone doesn't exist we
-then check the firewalld version to see if it's new enough to support
-the nftables backend, and then if the backend is actually set to
-nftables, before logging an error (and failing the net-start
-operation, since the network couldn't possibly work anyway).
-
-When the libvirt zone is used, network behavior is *slightly*
-different from behavior of previous libvirt. In the past, libvirt
-network behavior would be affected by the configuration of firewalld's
-default zone (usually "public"), but now it is affected only by the
-"libvirt" zone), and thus almost surely warrants a release note for
-any distro upgrading to libvirt 5.1 or above. Although it's
-unfortunate that we have to deal with a mandatory behavior change, the
-architecture of multiple hooks makes it impossible to *not* change
-behavior in some way, and the new behavior is arguably better (since
-it will now be possible to manage access to the host from virtual
-machines vs from public interfaces separately).
-
-Creates-and-Resolves: https://bugzilla.redhat.com/1650320
-Resolves: https://bugzilla.redhat.com/1638342
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit ae05211a360077f56883cd0a6c0f82ed57f746cb)
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/firewall.html.in             | 33 +++++++++++++++++++++
- src/network/bridge_driver_linux.c | 48 +++++++++++++++++++++++++++++++
- 2 files changed, 81 insertions(+)
-
-diff --git a/docs/firewall.html.in b/docs/firewall.html.in
-index 0a50687c26..5d584e582e 100644
---- a/docs/firewall.html.in
-+++ b/docs/firewall.html.in
-@@ -129,6 +129,39 @@ MASQUERADE all  --  *      *       192.168.122.0/24    !192.168.122.0/24</pre>
-       </li>
-     </ul>
- 
-+    <h3><a id="fw-firewalld-and-virtual-network-driver">firewalld and the virtual network driver</a>
-+    </h3>
-+    <p>
-+      If <a href="https://firewalld.org">firewalld</a> is active on
-+      the host, libvirt will attempt to place the bridge interface of
-+      a libvirt virtual network into the firewalld zone named
-+      "libvirt" (thus making all guest->host traffic on that network
-+      subject to the rules of the "libvirt" zone). This is done
-+      because, if firewalld is using its nftables backend (available
-+      since firewalld 0.6.0) the default firewalld zone (which would
-+      be used if libvirt didn't explicitly set the zone) prevents
-+      forwarding traffic from guests through the bridge, as well as
-+      preventing DHCP, DNS, and most other traffic from guests to
-+      host. The zone named "libvirt" is installed into the firewalld
-+      configuration by libvirt (not by firewalld), and allows
-+      forwarded traffic through the bridge as well as DHCP, DNS, TFTP,
-+      and SSH traffic to the host - depending on firewalld's backend
-+      this will be implemented via either iptables or nftables
-+      rules. libvirt's own rules outlined above will *always* be
-+      iptables rules regardless of which backend is in use by
-+      firewalld.
-+    </p>
-+    <p>
-+      NB: Prior to libvirt 5.1.0, the firewalld "libvirt" zone did not
-+      exist, and prior to firewalld 0.7.0 a feature crucial to making
-+      the "libvirt" zone operate properly (rich rule priority
-+      settings) was not implemented in firewalld. In cases where one
-+      or the other of the two packages is missing the necessary
-+      functionality, it's still possible to have functional guest
-+      networking by setting the firewalld backend to "iptables" (in
-+      firewalld prior to 0.6.0, this was the only backend available).
-+    </p>
-+
-     <h3><a id="fw-network-filter-driver">The network filter driver</a>
-     </h3>
-     <p>This driver provides a fully configurable network filtering capability
-diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
-index 3effcdce22..823d5a9742 100644
---- a/src/network/bridge_driver_linux.c
-+++ b/src/network/bridge_driver_linux.c
-@@ -29,6 +29,7 @@
- #include "virstring.h"
- #include "virlog.h"
- #include "virfirewall.h"
-+#include "virfirewalld.h"
- 
- #define VIR_FROM_THIS VIR_FROM_NONE
- 
-@@ -641,6 +642,53 @@ int networkAddFirewallRules(virNetworkDefPtr def)
-     virFirewallPtr fw = NULL;
-     int ret = -1;
- 
-+    /* if firewalld is active, try to set the "libvirt" zone. This is
-+     * desirable (for consistency) if firewalld is using the iptables
-+     * backend, but is necessary (for basic network connectivity) if
-+     * firewalld is using the nftables backend
-+     */
-+    if (virFirewallDIsRegistered() == 0) {
-+
-+        /* if the "libvirt" zone exists, then set it. If not, and
-+         * if firewalld is using the nftables backend, then we
-+         * need to log an error because the combination of
-+         * nftables + default zone means that traffic cannot be
-+         * forwarded (and even DHCP and DNS from guest to host
-+         * will probably no be permitted by the default zone
-+         */
-+        if (virFirewallDZoneExists("libvirt")) {
-+            if (virFirewallDInterfaceSetZone(def->bridge, "libvirt") < 0)
-+                goto cleanup;
-+        } else {
-+            unsigned long version;
-+            int vresult = virFirewallDGetVersion(&version);
-+
-+            if (vresult < 0)
-+                goto cleanup;
-+
-+            /* Support for nftables backend was added in firewalld
-+             * 0.6.0. Support for rule priorities (required by the
-+             * 'libvirt' zone, which should be installed by a
-+             * libvirt package, *not* by firewalld) was not added
-+             * until firewalld 0.7.0 (unless it was backported).
-+             */
-+            if (version >= 6000 &&
-+                virFirewallDGetBackend() == VIR_FIREWALLD_BACKEND_NFTABLES) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                               _("firewalld is set to use the nftables "
-+                                 "backend, but the required firewalld "
-+                                 "'libvirt' zone is missing. Either set "
-+                                 "the firewalld backend to 'iptables', or "
-+                                 "ensure that firewalld has a 'libvirt' "
-+                                 "zone by upgrading firewalld to a "
-+                                 "version supporting rule priorities "
-+                                 "(0.7.0+) and/or rebuilding "
-+                                 "libvirt with --with-firewalld-zone"));
-+                goto cleanup;
-+            }
-+        }
-+    }
-+
-     fw = virFirewallNew();
- 
-     virFirewallStartTransaction(fw, 0);
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-networkGetDHCPLeases-Don-t-always-report-error-if-unable-to-read-leases-file.patch b/SOURCES/libvirt-networkGetDHCPLeases-Don-t-always-report-error-if-unable-to-read-leases-file.patch
deleted file mode 100644
index ea712c5..0000000
--- a/SOURCES/libvirt-networkGetDHCPLeases-Don-t-always-report-error-if-unable-to-read-leases-file.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From dfd454d377c90f5a039c6a8487703dd604bffabc Mon Sep 17 00:00:00 2001
-Message-Id: <dfd454d377c90f5a039c6a8487703dd604bffabc@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 26 Jul 2018 11:41:09 +0200
-Subject: [PATCH] networkGetDHCPLeases: Don't always report error if unable to
- read leases file
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1600468
-
-If we are unable to read leases file (no matter what the reason
-is), we return 0 - just like if there were no leases. However,
-because we use virFileReadAll() an error is printed into the log.
-Note that not all networks have leases file - only those for
-which we start dnsmasq.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 142c4b10fd8f55b7d2e86f5a184608da70f2edd3)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/network/bridge_driver.c | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index ac849581ec..1ad95d524c 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -4157,13 +4157,20 @@ networkGetDHCPLeases(virNetworkPtr net,
-     custom_lease_file = networkDnsmasqLeaseFileNameCustom(driver, def->bridge);
- 
-     /* Read entire contents */
--    if ((custom_lease_file_len = virFileReadAll(custom_lease_file,
--                                                VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX,
--                                                &lease_entries)) < 0) {
--        /* Even though src/network/leaseshelper.c guarantees the existence of
--         * leases file (even if no leases are present), and the control reaches
--         * here, instead of reporting error, return 0 leases */
--        rv = 0;
-+    if ((custom_lease_file_len = virFileReadAllQuiet(custom_lease_file,
-+                                                     VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX,
-+                                                     &lease_entries)) < 0) {
-+        /* Not all networks are guaranteed to have leases file.
-+         * Only those which run dnsmasq. Therefore, if we failed
-+         * to read the leases file, don't report error. Return 0
-+         * leases instead. */
-+        if (errno == ENOENT) {
-+            rv = 0;
-+        } else {
-+            virReportSystemError(errno,
-+                                 _("Unable to read leases file: %s"),
-+                                 custom_lease_file);
-+        }
-         goto error;
-     }
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-nodedev-fix-race-in-API-usage-vs-initial-device-enumeration.patch b/SOURCES/libvirt-nodedev-fix-race-in-API-usage-vs-initial-device-enumeration.patch
new file mode 100644
index 0000000..1ee5791
--- /dev/null
+++ b/SOURCES/libvirt-nodedev-fix-race-in-API-usage-vs-initial-device-enumeration.patch
@@ -0,0 +1,256 @@
+From b155913f796b313ce969ae318beb66e3e35d13dc Mon Sep 17 00:00:00 2001
+Message-Id: <b155913f796b313ce969ae318beb66e3e35d13dc@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Thu, 11 Jun 2020 18:21:26 +0100
+Subject: [PATCH] nodedev: fix race in API usage vs initial device enumeration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+During startup the udev node device driver impl uses a background thread
+to populate the list of devices to avoid blocking the daemon startup
+entirely. There is no synchronization to the public APIs, so it is
+possible for an application to start calling APIs before the device
+initialization is complete.
+
+This was not a problem in the old approach where libvirtd was started
+on boot, as initialization would easily complete before any APIs were
+called.
+
+With the use of socket activation, however, APIs are invoked from the
+very moment the daemon starts. This is easily seen by doing a
+
+  'virsh -c nodedev:///system list'
+
+the first time it runs it will only show one or two devices. The second
+time it runs it will show all devices. The solution is to introduce a
+flag and condition variable for APIs to synchronize against before
+returning any data.
+
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 008abeb03c262149b756ad5a226ff6cbc5e37e2c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1846237
+https://bugzilla.redhat.com/show_bug.cgi?id=1845459
+Message-Id: <20200611172126.269081-2-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/conf/virnodedeviceobj.h          |  2 ++
+ src/node_device/node_device_driver.c | 44 ++++++++++++++++++++++++++++
+ src/node_device/node_device_hal.c    | 15 ++++++++++
+ src/node_device/node_device_udev.c   | 13 ++++++++
+ 4 files changed, 74 insertions(+)
+
+diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
+index c4d3c55d73..c9df8dedab 100644
+--- a/src/conf/virnodedeviceobj.h
++++ b/src/conf/virnodedeviceobj.h
+@@ -36,6 +36,8 @@ typedef struct _virNodeDeviceDriverState virNodeDeviceDriverState;
+ typedef virNodeDeviceDriverState *virNodeDeviceDriverStatePtr;
+ struct _virNodeDeviceDriverState {
+     virMutex lock;
++    virCond initCond;
++    bool initialized;
+ 
+     /* pid file FD, ensures two copies of the driver can't use the same root */
+     int lockFD;
+diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
+index b630be4399..a894f7265f 100644
+--- a/src/node_device/node_device_driver.c
++++ b/src/node_device/node_device_driver.c
+@@ -162,6 +162,22 @@ nodeDeviceUnlock(void)
+ }
+ 
+ 
++static int
++nodeDeviceWaitInit(void)
++{
++    nodeDeviceLock();
++    while (!driver->initialized) {
++        if (virCondWait(&driver->initCond, &driver->lock) < 0) {
++            virReportSystemError(errno, "%s",
++                                 _("failed to wait on condition"));
++            nodeDeviceUnlock();
++            return -1;
++        }
++    }
++    nodeDeviceUnlock();
++    return 0;
++}
++
+ int
+ nodeNumOfDevices(virConnectPtr conn,
+                  const char *cap,
+@@ -172,6 +188,9 @@ nodeNumOfDevices(virConnectPtr conn,
+ 
+     virCheckFlags(0, -1);
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return -1;
++
+     return virNodeDeviceObjListNumOfDevices(driver->devs, conn, cap,
+                                             virNodeNumOfDevicesCheckACL);
+ }
+@@ -189,6 +208,9 @@ nodeListDevices(virConnectPtr conn,
+ 
+     virCheckFlags(0, -1);
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return -1;
++
+     return virNodeDeviceObjListGetNames(driver->devs, conn,
+                                         virNodeListDevicesCheckACL,
+                                         cap, names, maxnames);
+@@ -205,6 +227,9 @@ nodeConnectListAllNodeDevices(virConnectPtr conn,
+     if (virConnectListAllNodeDevicesEnsureACL(conn) < 0)
+         return -1;
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return -1;
++
+     return virNodeDeviceObjListExport(conn, driver->devs, devices,
+                                       virConnectListAllNodeDevicesCheckACL,
+                                       flags);
+@@ -234,6 +259,9 @@ nodeDeviceLookupByName(virConnectPtr conn,
+     virNodeDeviceDefPtr def;
+     virNodeDevicePtr device = NULL;
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return NULL;
++
+     if (!(obj = nodeDeviceObjFindByName(name)))
+         return NULL;
+     def = virNodeDeviceObjGetDef(obj);
+@@ -262,6 +290,9 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
+ 
+     virCheckFlags(0, NULL);
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return NULL;
++
+     if (!(obj = virNodeDeviceObjListFindSCSIHostByWWNs(driver->devs,
+                                                        wwnn, wwpn)))
+         return NULL;
+@@ -475,6 +506,10 @@ nodeDeviceCreateXML(virConnectPtr conn,
+     const char *virt_type = NULL;
+ 
+     virCheckFlags(0, NULL);
++
++    if (nodeDeviceWaitInit() < 0)
++        return NULL;
++
+     virt_type  = virConnectGetType(conn);
+ 
+     if (!(def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, virt_type)))
+@@ -519,6 +554,9 @@ nodeDeviceDestroy(virNodeDevicePtr device)
+     char *wwnn = NULL, *wwpn = NULL;
+     unsigned int parent_host;
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return -1;
++
+     if (!(obj = nodeDeviceObjFindByName(device->name)))
+         return -1;
+     def = virNodeDeviceObjGetDef(obj);
+@@ -574,6 +612,9 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn,
+     if (virConnectNodeDeviceEventRegisterAnyEnsureACL(conn) < 0)
+         return -1;
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return -1;
++
+     if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventState,
+                                           device, eventID, callback,
+                                           opaque, freecb, &callbackID) < 0)
+@@ -590,6 +631,9 @@ nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn,
+     if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0)
+         return -1;
+ 
++    if (nodeDeviceWaitInit() < 0)
++        return -1;
++
+     if (virObjectEventStateDeregisterID(conn,
+                                         driver->nodeDeviceEventState,
+                                         callbackID, true) < 0)
+diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
+index 4cef7c2c12..0d48895b66 100644
+--- a/src/node_device/node_device_hal.c
++++ b/src/node_device/node_device_hal.c
+@@ -603,6 +603,15 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED,
+         VIR_FREE(driver);
+         return VIR_DRV_STATE_INIT_ERROR;
+     }
++
++    if (virCondInit(&driver->initCond) < 0) {
++        virReportSystemError(errno, "%s",
++                             _("Unable to initialize condition variable"));
++        virMutexDestroy(&driver->lock);
++        VIR_FREE(driver);
++        return VIR_DRV_STATE_INIT_ERROR;
++    }
++
+     nodeDeviceLock();
+ 
+     if (privileged) {
+@@ -693,6 +702,11 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED,
+     }
+     VIR_FREE(udi);
+ 
++    nodeDeviceLock();
++    driver->initialized = true;
++    nodeDeviceUnlock();
++    virCondBroadcast(&driver->initCond);
++
+     return VIR_DRV_STATE_INIT_COMPLETE;
+ 
+  failure:
+@@ -725,6 +739,7 @@ nodeStateCleanup(void)
+ 
+         VIR_FREE(driver->stateDir);
+         nodeDeviceUnlock();
++        virCondDestroy(&driver->initCond);
+         virMutexDestroy(&driver->lock);
+         VIR_FREE(driver);
+         return 0;
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index 4b33dc25d8..ae3d081e66 100644
+--- a/src/node_device/node_device_udev.c
++++ b/src/node_device/node_device_udev.c
+@@ -1476,6 +1476,7 @@ nodeStateCleanup(void)
+         virPidFileRelease(driver->stateDir, "driver", driver->lockFD);
+ 
+     VIR_FREE(driver->stateDir);
++    virCondDestroy(&driver->initCond);
+     virMutexDestroy(&driver->lock);
+     VIR_FREE(driver);
+ 
+@@ -1743,6 +1744,11 @@ nodeStateInitializeEnumerate(void *opaque)
+     if (udevEnumerateDevices(udev) != 0)
+         goto error;
+ 
++    nodeDeviceLock();
++    driver->initialized = true;
++    nodeDeviceUnlock();
++    virCondBroadcast(&driver->initCond);
++
+     return;
+ 
+  error:
+@@ -1798,6 +1804,13 @@ nodeStateInitialize(bool privileged,
+         VIR_FREE(driver);
+         return VIR_DRV_STATE_INIT_ERROR;
+     }
++    if (virCondInit(&driver->initCond) < 0) {
++        virReportSystemError(errno, "%s",
++                             _("Unable to initialize condition variable"));
++        virMutexDestroy(&driver->lock);
++        VIR_FREE(driver);
++        return VIR_DRV_STATE_INIT_ERROR;
++    }
+ 
+     driver->privileged = privileged;
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-nwfilter-Resolve-SEGV-for-NWFilter-Snoop-processing.patch b/SOURCES/libvirt-nwfilter-Resolve-SEGV-for-NWFilter-Snoop-processing.patch
deleted file mode 100644
index 1bbd8b8..0000000
--- a/SOURCES/libvirt-nwfilter-Resolve-SEGV-for-NWFilter-Snoop-processing.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6293887f71e7db7ea8a3923aacf7d0fb27b47559 Mon Sep 17 00:00:00 2001
-Message-Id: <6293887f71e7db7ea8a3923aacf7d0fb27b47559@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Thu, 26 Jul 2018 09:39:32 -0400
-Subject: [PATCH] nwfilter: Resolve SEGV for NWFilter Snoop processing
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1599973
-
-Commit id fca9afa08 changed the @req->ifname to use
-@req->binding->portdevname fillingin the @req->binding
-in a similar way that @req->ifname would have been
-filled in during virNWFilterDHCPSnoopReq processing.
-
-However, in doing so it did not take into account some
-code paths where the @req->binding should be checked
-instead of @req->binding->portdevname. These checks
-led to SEGVs in some cases during libvirtd reload
-processing in virNWFilterSnoopRemAllReqIter (for
-stop during nwfilterStateCleanup processing) and
-virNWFilterSnoopReqLeaseDel (for start during
-nwfilterStateInitialize processing).
-
-In particular, when reading the nwfilter.leases file
-a new @req is created, but the @req->binding is not
-filled in. That's left to virNWFilterDHCPSnoopReq
-processing which checks if the @req already exists
-in the @virNWFilterSnoopState.snoopReqs hash table
-after adding a virNWFilterSnoopState.ifnameToKey
-entry for the @req->binding->portdevname by a
-@ref->ikey value.
-
-NB: virNWFilterSnoopIPLeaseInstallRule and
-    virNWFilterDHCPSnoopThread do not need the
-    req->binding check since they can only be called
-    after the filter->binding is created/assigned.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 5229494b01acf97dbc6f3028e9718667e9e1426a)
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/nwfilter/nwfilter_dhcpsnoop.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
-index 533c45f080..2ae134ed19 100644
---- a/src/nwfilter/nwfilter_dhcpsnoop.c
-+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
-@@ -846,7 +846,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req,
-     int ret = 0;
-     virNWFilterSnoopIPLeasePtr ipl;
-     char *ipstr = NULL;
--    int ipAddrLeft;
-+    int ipAddrLeft = 0;
- 
-     /* protect req->start, req->ifname and the lease */
-     virNWFilterSnoopReqLock(req);
-@@ -867,7 +867,8 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req,
-     if (update_leasefile)
-         virNWFilterSnoopLeaseFileSave(ipl);
- 
--    ipAddrLeft = virNWFilterIPAddrMapDelIPAddr(req->binding->portdevname, ipstr);
-+    if (req->binding)
-+        ipAddrLeft = virNWFilterIPAddrMapDelIPAddr(req->binding->portdevname, ipstr);
- 
-     if (!req->threadkey || !instantiate)
-         goto skip_instantiate;
-@@ -2037,7 +2038,7 @@ virNWFilterSnoopRemAllReqIter(const void *payload,
-     /* protect req->binding->portdevname */
-     virNWFilterSnoopReqLock(req);
- 
--    if (req->binding->portdevname) {
-+    if (req->binding && req->binding->portdevname) {
-         ignore_value(virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey,
-                                         req->binding->portdevname));
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-nwfilter-fix-adding-std-MAC-and-IP-values-to-filter-binding.patch b/SOURCES/libvirt-nwfilter-fix-adding-std-MAC-and-IP-values-to-filter-binding.patch
deleted file mode 100644
index aa55e53..0000000
--- a/SOURCES/libvirt-nwfilter-fix-adding-std-MAC-and-IP-values-to-filter-binding.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From a8234641ad57553aa054bded71ed97c94f3100f1 Mon Sep 17 00:00:00 2001
-Message-Id: <a8234641ad57553aa054bded71ed97c94f3100f1@dist-git>
-From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Date: Wed, 5 Jun 2019 14:51:10 +0200
-Subject: [PATCH] nwfilter: fix adding std MAC and IP values to filter binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit d1a7c08eb changed filter instantiation code to ignore MAC and IP
-variables explicitly specified for filter binding. It just replaces
-explicit values with values associated with the binding. Before the
-commit virNWFilterCreateVarsFrom was used so that explicit value
-take precedence. Let's bring old behavior back.
-
-This is useful. For example if domain has two interfaces it makes
-sense to list both mac adresses in MAC var of every interface
-filterref. So that if guest make a bond of these interfaces
-and start sending frames with one of the mac adresses from
-both interfaces we can pass outgress traffic from both
-interfaces too.
-
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-(cherry picked from commit 01e11ebcb6e8f24662b7c67b70134c192785691c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1691356
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/nwfilter/nwfilter_gentech_driver.c | 92 +++++++++-----------------
- 1 file changed, 32 insertions(+), 60 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
-index e5dea91f83..ece5d28f41 100644
---- a/src/nwfilter/nwfilter_gentech_driver.c
-+++ b/src/nwfilter/nwfilter_gentech_driver.c
-@@ -128,60 +128,6 @@ virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst)
- }
- 
- 
--/**
-- * virNWFilterVarHashmapAddStdValues:
-- * @tables: pointer to hash tabel to add values to
-- * @macaddr: The string of the MAC address to add to the hash table,
-- *    may be NULL
-- * @ipaddr: The string of the IP address to add to the hash table;
-- *    may be NULL
-- *
-- * Returns 0 in case of success, -1 in case an error happened with
-- * error having been reported.
-- *
-- * Adds a couple of standard keys (MAC, IP) to the hash table.
-- */
--static int
--virNWFilterVarHashmapAddStdValues(virHashTablePtr table,
--                                  const char *macaddr,
--                                  const virNWFilterVarValue *ipaddr)
--{
--    virNWFilterVarValue *val;
--
--    if (macaddr) {
--        val = virNWFilterVarValueCreateSimpleCopyValue(macaddr);
--        if (!val)
--            return -1;
--
--        if (virHashUpdateEntry(table,
--                               NWFILTER_STD_VAR_MAC,
--                               val) < 0) {
--            virNWFilterVarValueFree(val);
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           "%s", _("Could not add variable 'MAC' to hashmap"));
--            return -1;
--        }
--    }
--
--    if (ipaddr) {
--        val = virNWFilterVarValueCopy(ipaddr);
--        if (!val)
--            return -1;
--
--        if (virHashUpdateEntry(table,
--                               NWFILTER_STD_VAR_IP,
--                               val) < 0) {
--            virNWFilterVarValueFree(val);
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           "%s", _("Could not add variable 'IP' to hashmap"));
--            return -1;
--        }
--    }
--
--    return 0;
--}
--
--
- /**
-  * Convert a virHashTable into a string of comma-separated
-  * variable names.
-@@ -707,6 +653,28 @@ virNWFilterDoInstantiate(virNWFilterTechDriverPtr techdriver,
- }
- 
- 
-+static int
-+virNWFilterVarHashmapAddStdValue(virHashTablePtr table,
-+                                 const char *var,
-+                                 const char *value)
-+{
-+    virNWFilterVarValue *val;
-+
-+    if (virHashLookup(table, var))
-+        return 0;
-+
-+    if (!(val = virNWFilterVarValueCreateSimpleCopyValue(value)))
-+        return -1;
-+
-+    if (virHashAddEntry(table, var, val) < 0) {
-+        virNWFilterVarValueFree(val);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- /*
-  * Call this function while holding the NWFilter filter update lock
-  */
-@@ -719,7 +687,7 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver,
-                                    bool forceWithPendingReq,
-                                    bool *foundNewFilter)
- {
--    int rc;
-+    int rc = -1;
-     const char *drvname = EBIPTABLES_DRIVER_ID;
-     virNWFilterTechDriverPtr techdriver;
-     virNWFilterObjPtr obj;
-@@ -745,14 +713,18 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver,
-         return -1;
- 
-     virMacAddrFormat(&binding->mac, vmmacaddr);
-+    if (virNWFilterVarHashmapAddStdValue(binding->filterparams,
-+                                         NWFILTER_STD_VAR_MAC,
-+                                         vmmacaddr) < 0)
-+        goto err_exit;
- 
-     ipaddr = virNWFilterIPAddrMapGetIPAddr(binding->portdevname);
--
--    if (virNWFilterVarHashmapAddStdValues(binding->filterparams,
--                                          vmmacaddr, ipaddr) < 0) {
--        rc = -1;
-+    if (ipaddr &&
-+        virNWFilterVarHashmapAddStdValue(binding->filterparams,
-+                                         NWFILTER_STD_VAR_IP,
-+                                         virNWFilterVarValueGetSimple(ipaddr)) < 0)
-         goto err_exit;
--    }
-+
- 
-     filter = virNWFilterObjGetDef(obj);
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-process-wait-longer-5-30s-on-hard-shutdown.patch b/SOURCES/libvirt-process-wait-longer-5-30s-on-hard-shutdown.patch
deleted file mode 100644
index 18c41e6..0000000
--- a/SOURCES/libvirt-process-wait-longer-5-30s-on-hard-shutdown.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bdf2e9979df2382c6a386f191c74a6055c0228cd Mon Sep 17 00:00:00 2001
-Message-Id: <bdf2e9979df2382c6a386f191c74a6055c0228cd@dist-git>
-From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Date: Tue, 11 Feb 2020 18:47:10 +0100
-Subject: [PATCH] process: wait longer 5->30s on hard shutdown
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In cases where virProcessKillPainfully already reailizes that
-SIGTERM wasn't enough we are partially on a bad path already.
-Maybe the system is overloaded or having serious trouble to free and
-reap resources in time.
-
-In those case give the SIGKILL that was sent after 10 seconds some more
-time to take effect if force was set (only then we are falling back to
-SIGKILL anyway).
-
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 9a4e4b942df0474503e7524ea427351a46c0eabe)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1785338
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200211174710.203500-3-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virprocess.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virprocess.c b/src/util/virprocess.c
-index 297c96a8e5..1085e6cd5d 100644
---- a/src/util/virprocess.c
-+++ b/src/util/virprocess.c
-@@ -354,7 +354,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay)
-     size_t i;
-     int ret = -1;
-     /* This is in 1/5th seconds since polling is on a 0.2s interval */
--    unsigned int polldelay = 75 + (extradelay*5);
-+    unsigned int polldelay = (force ? 200 : 75) + (extradelay*5);
-     const char *signame = "TERM";
- 
-     VIR_DEBUG("vpid=%lld force=%d extradelay=%u",
-@@ -363,7 +363,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay)
-     /* This loop sends SIGTERM, then waits a few iterations (10 seconds)
-      * to see if it dies. If the process still hasn't exited, and
-      * @force is requested, a SIGKILL will be sent, and this will
--     * wait up to 5 seconds more for the process to exit before
-+     * wait up to 30 seconds more for the process to exit before
-      * returning.
-      *
-      * An extra delay can be passed by the caller for cases that are
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-process-wait-longer-on-kill-per-assigned-Hostdev.patch b/SOURCES/libvirt-process-wait-longer-on-kill-per-assigned-Hostdev.patch
deleted file mode 100644
index 54ce621..0000000
--- a/SOURCES/libvirt-process-wait-longer-on-kill-per-assigned-Hostdev.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 92027209ce5acc92b43dc15ef582f7c8c8095cf6 Mon Sep 17 00:00:00 2001
-Message-Id: <92027209ce5acc92b43dc15ef582f7c8c8095cf6@dist-git>
-From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Date: Tue, 11 Feb 2020 18:47:09 +0100
-Subject: [PATCH] process: wait longer on kill per assigned Hostdev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It was found that in cases with host devices virProcessKillPainfully
-might be able to send signal zero to the target PID for quite a while
-with the process already being gone from /proc/<PID>.
-
-That is due to cleanup and reset of devices which might include a
-secondary bus reset that on top of the actions taken has a 1s delay
-to let the bus settle. Due to that guests with plenty of Host devices
-could easily exceed the default timeouts.
-
-To solve that, this adds an extra delay of 2s per hostdev that is associated
-to a VM.
-
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-(cherry picked from commit be2ca0444728edd12a000653d3693d68a5c9102f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1785338
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20200211174710.203500-2-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/qemu/qemu_process.c  |  7 +++++--
- src/util/virprocess.c    | 20 +++++++++++++++++---
- src/util/virprocess.h    |  3 +++
- 4 files changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index f4b54cee0b..2ad21a68bc 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2646,6 +2646,7 @@ virProcessGetPids;
- virProcessGetStartTime;
- virProcessKill;
- virProcessKillPainfully;
-+virProcessKillPainfullyDelay;
- virProcessNamespaceAvailable;
- virProcessRunInMountNamespace;
- virProcessSchedPolicyTypeFromString;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 17d48357b3..4d10a38f1d 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6918,8 +6918,11 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags)
-         return 0;
-     }
- 
--    ret = virProcessKillPainfully(vm->pid,
--                                  !!(flags & VIR_QEMU_PROCESS_KILL_FORCE));
-+    /* Request an extra delay of two seconds per current nhostdevs
-+     * to be safe against stalls by the kernel freeing up the resources */
-+    ret = virProcessKillPainfullyDelay(vm->pid,
-+                                       !!(flags & VIR_QEMU_PROCESS_KILL_FORCE),
-+                                       vm->def->nhostdevs * 2);
- 
-     return ret;
- }
-diff --git a/src/util/virprocess.c b/src/util/virprocess.c
-index f92b0dce37..297c96a8e5 100644
---- a/src/util/virprocess.c
-+++ b/src/util/virprocess.c
-@@ -344,15 +344,21 @@ int virProcessKill(pid_t pid, int sig)
-  * Returns 0 if it was killed gracefully, 1 if it
-  * was killed forcibly, -1 if it is still alive,
-  * or another error occurred.
-+ *
-+ * Callers can proide an extra delay in seconds to
-+ * wait longer than the default.
-  */
- int
--virProcessKillPainfully(pid_t pid, bool force)
-+virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay)
- {
-     size_t i;
-     int ret = -1;
-+    /* This is in 1/5th seconds since polling is on a 0.2s interval */
-+    unsigned int polldelay = 75 + (extradelay*5);
-     const char *signame = "TERM";
- 
--    VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force);
-+    VIR_DEBUG("vpid=%lld force=%d extradelay=%u",
-+              (long long)pid, force, extradelay);
- 
-     /* This loop sends SIGTERM, then waits a few iterations (10 seconds)
-      * to see if it dies. If the process still hasn't exited, and
-@@ -360,9 +366,12 @@ virProcessKillPainfully(pid_t pid, bool force)
-      * wait up to 5 seconds more for the process to exit before
-      * returning.
-      *
-+     * An extra delay can be passed by the caller for cases that are
-+     * expected to clean up slower than usual.
-+     *
-      * Note that setting @force could result in dataloss for the process.
-      */
--    for (i = 0; i < 75; i++) {
-+    for (i = 0; i < polldelay; i++) {
-         int signum;
-         if (i == 0) {
-             signum = SIGTERM; /* kindly suggest it should exit */
-@@ -405,6 +414,11 @@ virProcessKillPainfully(pid_t pid, bool force)
- }
- 
- 
-+int virProcessKillPainfully(pid_t pid, bool force)
-+{
-+    return virProcessKillPainfullyDelay(pid, force, 0);
-+}
-+
- #if HAVE_SCHED_GETAFFINITY
- 
- int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
-diff --git a/src/util/virprocess.h b/src/util/virprocess.h
-index 3c5a882772..5faa0892fe 100644
---- a/src/util/virprocess.h
-+++ b/src/util/virprocess.h
-@@ -55,6 +55,9 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw)
- int virProcessKill(pid_t pid, int sig);
- 
- int virProcessKillPainfully(pid_t pid, bool force);
-+int virProcessKillPainfullyDelay(pid_t pid,
-+                                 bool force,
-+                                 unsigned int extradelay);
- 
- int virProcessSetAffinity(pid_t pid, virBitmapPtr map);
- 
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-qemu-Add-APIs-for-translating-CPU-features.patch b/SOURCES/libvirt-qemu-Add-APIs-for-translating-CPU-features.patch
deleted file mode 100644
index 4879d4d..0000000
--- a/SOURCES/libvirt-qemu-Add-APIs-for-translating-CPU-features.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From cb2374042f3e998b90e6ea025dadfae9333b49cd Mon Sep 17 00:00:00 2001
-Message-Id: <cb2374042f3e998b90e6ea025dadfae9333b49cd@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:51 +0200
-Subject: [PATCH] qemu: Add APIs for translating CPU features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So far we always used libvirt's name of each CPU feature relying on
-backward compatible aliases in QEMU. The new translation table can be
-used whenever QEMU mandates or prefers canonical feature names.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 61ee757e2002507d711c195628619b9eff38b57a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5b080656d143733a77780affc6dd0d322216d6e7.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 64 ++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_capabilities.h |  8 +++++
- 2 files changed, 72 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 851cb73cfc..d2a2f7418a 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2755,6 +2755,70 @@ virQEMUCapsCPUFilterFeatures(const char *name,
- }
- 
- 
-+typedef struct _virQEMUCapsCPUFeatureTranslationTable virQEMUCapsCPUFeatureTranslationTable;
-+typedef virQEMUCapsCPUFeatureTranslationTable *virQEMUCapsCPUFeatureTranslationTablePtr;
-+struct _virQEMUCapsCPUFeatureTranslationTable {
-+    const char *libvirt;
-+    const char *qemu;
-+};
-+
-+virQEMUCapsCPUFeatureTranslationTable virQEMUCapsCPUFeaturesX86[] = {
-+    {"cmp_legacy", "cmp-legacy"},
-+    {"ds_cpl", "ds-cpl"},
-+    {"fxsr_opt", "fxsr-opt"},
-+    {"kvm_pv_eoi", "kvm-pv-eoi"},
-+    {"kvm_pv_unhalt", "kvm-pv-unhalt"},
-+    {"lahf_lm", "lahf-lm"},
-+    {"nodeid_msr", "nodeid-msr"},
-+    {"pclmuldq", "pclmulqdq"},
-+    {"perfctr_core", "perfctr-core"},
-+    {"perfctr_nb", "perfctr-nb"},
-+    {"tsc_adjust", "tsc-adjust"},
-+    {NULL, NULL}
-+};
-+
-+
-+static const char *
-+virQEMUCapsCPUFeatureTranslate(virQEMUCapsPtr qemuCaps,
-+                               const char *feature,
-+                               bool reversed)
-+{
-+    virQEMUCapsCPUFeatureTranslationTablePtr table = NULL;
-+    virQEMUCapsCPUFeatureTranslationTablePtr entry;
-+
-+    if (ARCH_IS_X86(qemuCaps->arch))
-+        table = virQEMUCapsCPUFeaturesX86;
-+
-+    if (!table || !feature)
-+        return feature;
-+
-+    for (entry = table; entry->libvirt; entry++) {
-+        const char *key = reversed ? entry->qemu : entry->libvirt;
-+
-+        if (STREQ(feature, key))
-+            return reversed ? entry->libvirt : entry->qemu;
-+    }
-+
-+    return feature;
-+}
-+
-+
-+const char *
-+virQEMUCapsCPUFeatureToQEMU(virQEMUCapsPtr qemuCaps,
-+                            const char *feature)
-+{
-+    return virQEMUCapsCPUFeatureTranslate(qemuCaps, feature, false);
-+}
-+
-+
-+const char *
-+virQEMUCapsCPUFeatureFromQEMU(virQEMUCapsPtr qemuCaps,
-+                              const char *feature)
-+{
-+    return virQEMUCapsCPUFeatureTranslate(qemuCaps, feature, true);
-+}
-+
-+
- /**
-  * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,
-  *          1 when the caller should fall back to using virCapsPtr->host.cpu,
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index bea4767f3c..8a27acd8a4 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -628,6 +628,14 @@ bool virQEMUCapsGuestIsNative(virArch host,
- bool virQEMUCapsCPUFilterFeatures(const char *name,
-                                   void *opaque);
- 
-+const char *
-+virQEMUCapsCPUFeatureToQEMU(virQEMUCapsPtr qemuCaps,
-+                            const char *feature);
-+
-+const char *
-+virQEMUCapsCPUFeatureFromQEMU(virQEMUCapsPtr qemuCaps,
-+                              const char *feature);
-+
- virSEVCapabilityPtr
- virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps);
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Add-capability-for-the-HTM-pSeries-feature.patch b/SOURCES/libvirt-qemu-Add-capability-for-the-HTM-pSeries-feature.patch
deleted file mode 100644
index 0d846a7..0000000
--- a/SOURCES/libvirt-qemu-Add-capability-for-the-HTM-pSeries-feature.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2069f9ba35378cf58c5636583ce76e68bead5a03 Mon Sep 17 00:00:00 2001
-Message-Id: <2069f9ba35378cf58c5636583ce76e68bead5a03@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 3 Jul 2018 15:25:15 +0200
-Subject: [PATCH] qemu: Add capability for the HTM pSeries feature
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-
-(cherry picked from commit 755a5765accf8fe9b2b8ec3fb01c37ac91313c7c)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1525599
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Acked-by: David Gibson <dgibson@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c                     | 2 ++
- src/qemu/qemu_capabilities.h                     | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml  | 1 +
- 4 files changed, 5 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 37c8fbe3d3..c7da916f9a 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -501,6 +501,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               /* 310 */
-               "sev-guest",
-               "machine.pseries.cap-hpt-max-page-size",
-+              "machine.pseries.cap-htm",
-     );
- 
- 
-@@ -1431,6 +1432,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] =
- 
- static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = {
-     { "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE },
-+    { "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM },
- };
- 
- static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index df9bf49abb..a048a1cf02 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -485,6 +485,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     /* 310 */
-     QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.cap-hpt-max-page-size */
-+    QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-index 2ee582f343..7139179304 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-@@ -166,6 +166,7 @@
-   <flag name='vhost-vsock'/>
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-+  <flag name='machine.pseries.cap-htm'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>428334</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-index 7e958b2efc..33cd00e613 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-@@ -166,6 +166,7 @@
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-   <flag name='machine.pseries.cap-hpt-max-page-size'/>
-+  <flag name='machine.pseries.cap-htm'/>
-   <version>2012050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>446771</microcodeVersion>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Add-ccw-support-for-vhost-vsock.patch b/SOURCES/libvirt-qemu-Add-ccw-support-for-vhost-vsock.patch
deleted file mode 100644
index 169cc85..0000000
--- a/SOURCES/libvirt-qemu-Add-ccw-support-for-vhost-vsock.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 31a61d20cc35f444b2b49deb146d667fb122668d Mon Sep 17 00:00:00 2001
-Message-Id: <31a61d20cc35f444b2b49deb146d667fb122668d@dist-git>
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Wed, 17 Apr 2019 14:46:01 +0200
-Subject: [PATCH] qemu: Add ccw support for vhost-vsock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add support and tests for vhost-vsock-ccw.
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 927ef9f2a6ba22213501e99dcf5ecb5f62f8f72d)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-RHEL 8.1: https://bugzilla.redhat.com/show_bug.cgi?id=1698855
-Message-Id: <ec91ac8fd92152e31ce4af53b4d38725cff805a7.1555505143.git.jtomko@redhat.com>
-
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_command.c                       |  8 +++--
- src/qemu/qemu_domain.c                        | 10 ++++--
- src/qemu/qemu_domain_address.c                |  7 +++-
- .../vhost-vsock-ccw-auto.s390x-latest.args    | 32 +++++++++++++++++++
- .../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 +++++++++++++++
- .../vhost-vsock-ccw.s390x-latest.args         | 32 +++++++++++++++++++
- tests/qemuxml2argvdata/vhost-vsock-ccw.xml    | 32 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  2 ++
- .../vhost-vsock-ccw-auto.xml                  | 32 +++++++++++++++++++
- tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml  |  1 +
- tests/qemuxml2xmltest.c                       |  5 +++
- 11 files changed, 181 insertions(+), 5 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
- create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
- create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
- create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml
- create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
- create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 66abd3fe86..a8c832bad8 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -10219,10 +10219,14 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
- {
-     qemuDomainVsockPrivatePtr priv = (qemuDomainVsockPrivatePtr)vsock->privateData;
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
--    const char *device = "vhost-vsock-pci";
-     char *ret = NULL;
- 
--    virBufferAsprintf(&buf, "%s", device);
-+    if (vsock->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
-+        virBufferAddLit(&buf, "vhost-vsock-ccw");
-+    } else {
-+        virBufferAddLit(&buf, "vhost-vsock-pci");
-+    }
-+
-     virBufferAsprintf(&buf, ",id=%s", vsock->info.alias);
-     virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
-     virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index c530733e97..be3477bf8a 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -5559,7 +5559,8 @@ qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory ATTRIBUTE_UNU
- 
- 
- static int
--qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock ATTRIBUTE_UNUSED,
-+qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock,
-+                                 const virDomainDef *def,
-                                  virQEMUCapsPtr qemuCaps)
- {
-     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) {
-@@ -5568,6 +5569,11 @@ qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock ATTRIBUTE_UNUSED
-                          "with this QEMU binary"));
-         return -1;
-     }
-+
-+    if (!qemuDomainCheckCCWS390AddressSupport(def, vsock->info, qemuCaps,
-+                                              "vsock"))
-+        return -1;
-+
-     return 0;
- }
- 
-@@ -5715,7 +5721,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-         break;
- 
-     case VIR_DOMAIN_DEVICE_VSOCK:
--        ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, qemuCaps);
-+        ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, def, qemuCaps);
-         break;
- 
-     case VIR_DOMAIN_DEVICE_TPM:
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index 3e50521c11..79d2b9f9c4 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -310,7 +310,8 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def,
-        declare address-less virtio devices to be of address type 'type'
-        disks, networks, videos, consoles, controllers, memballoon and rng
-        in this order
--       if type is ccw filesystem devices are declared to be of address type ccw
-+       if type is ccw filesystem and vsock devices are declared to be of
-+       address type ccw
-     */
-     size_t i;
- 
-@@ -377,6 +378,10 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def,
-             if (def->fss[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
-                 def->fss[i]->info.type = type;
-         }
-+        if (def->vsock &&
-+            def->vsock->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
-+            def->vsock->info.type = type;
-+        }
-     }
- }
- 
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
-new file mode 100644
-index 0000000000..6092f8e85c
---- /dev/null
-+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
-@@ -0,0 +1,32 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=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,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
-+id=virtio-disk0,bootindex=1 \
-+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-device vhost-vsock-ccw,id=vsock0,guest-cid=42,vhostfd=6789,devno=fe.0.0002 \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
-new file mode 100644
-index 0000000000..e5b60765ab
---- /dev/null
-+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml
-@@ -0,0 +1,25 @@
-+<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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='virtio'/>
-+    </disk>
-+    <vsock>
-+      <cid auto='yes'/>
-+    </vsock>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
-new file mode 100644
-index 0000000000..93eb3f3430
---- /dev/null
-+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
-@@ -0,0 +1,32 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=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,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot strict=on \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
-+id=virtio-disk0,bootindex=1 \
-+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-device vhost-vsock-ccw,id=vsock0,guest-cid=4,vhostfd=6789,devno=fe.0.0003 \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
-new file mode 100644
-index 0000000000..083061c6cc
---- /dev/null
-+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
-@@ -0,0 +1,32 @@
-+<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='s390x' machine='s390-ccw-virtio'>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-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>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+    <vsock model='virtio'>
-+      <cid auto='no' address='4'/>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
-+    </vsock>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index abb256c913..7f25cccf9d 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -2972,6 +2972,8 @@ mymain(void)
- 
-     DO_TEST_CAPS_LATEST("vhost-vsock");
-     DO_TEST_CAPS_LATEST("vhost-vsock-auto");
-+    DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x");
-+    DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x");
- 
-     DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
- 
-diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
-new file mode 100644
-index 0000000000..38a0fb3808
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
-@@ -0,0 +1,32 @@
-+<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='s390x' machine='s390-ccw-virtio'>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-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>
-+    <memballoon model='virtio'>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
-+    </memballoon>
-+    <panic model='s390'/>
-+    <vsock model='virtio'>
-+      <cid auto='yes'/>
-+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
-+    </vsock>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
-new file mode 120000
-index 0000000000..e0fa69dba9
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/vhost-vsock-ccw.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index dbac863239..2a2bf01ffa 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -1231,6 +1231,11 @@ mymain(void)
- 
-     DO_TEST("vhost-vsock", QEMU_CAPS_DEVICE_VHOST_VSOCK);
-     DO_TEST("vhost-vsock-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK);
-+    DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK,
-+            QEMU_CAPS_CCW);
-+    DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK,
-+            QEMU_CAPS_CCW);
-+
- 
-     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
-         virFileDeleteTree(fakerootdir);
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu-Add-check-for-whether-KVM-nesting-is-enabled.patch b/SOURCES/libvirt-qemu-Add-check-for-whether-KVM-nesting-is-enabled.patch
deleted file mode 100644
index e0a225d..0000000
--- a/SOURCES/libvirt-qemu-Add-check-for-whether-KVM-nesting-is-enabled.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 2e68dbce9f8d49e57a0e16a202483b59e9497054 Mon Sep 17 00:00:00 2001
-Message-Id: <2e68dbce9f8d49e57a0e16a202483b59e9497054@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Thu, 13 Dec 2018 10:54:33 -0500
-Subject: [PATCH] qemu: Add check for whether KVM nesting is enabled
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1645139
-
-Support for nested KVM is handled via a kernel module configuration
-parameters values for kvm_intel, kvm_amd, kvm_hv (PPC), or kvm (s390).
-While it's possible to fetch the kmod config values via virKModConfig,
-unfortunately that is the static value and we need to get the
-current/dynamic value from the kernel file system.
-
-So this patch adds a new API virHostKVMSupportsNesting that will
-search the 3 kernel modules to get the nesting value and check if
-it is 'Y' (or 'y' just in case) to return a true/false whether
-the KVM kernel supports nesting.
-
-We need to do this in order to handle cases where adjustments to
-the value are made after libvirtd is started to force a refetch of
-the latest QEMU capabilities since the correct CPU settings need
-to be made for a guest to add the "vmx=on" to/for the guest config.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit b183a75319b90d0af5512be513743e1eab950612)
-
-NB:
-Handled merge/build conflict/issue where VIR_AUTOFREE isn't defined
-(or backported to RHEL git).  So rather than relying on the automatic
-free of memory, prior to each possible return add a VIR_FREE. It was
-that or adjust the logic to set a retval and use goto cleanup type
-logic. This way just seemed cleaner.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c | 58 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 57b1b99076..ba8c717e22 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -550,6 +550,7 @@ struct _virQEMUCaps {
-     virObject parent;
- 
-     bool usedQMP;
-+    bool kvmSupportsNesting;
- 
-     char *binary;
-     time_t ctime;
-@@ -1606,6 +1607,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
-         return NULL;
- 
-     ret->usedQMP = qemuCaps->usedQMP;
-+    ret->kvmSupportsNesting = qemuCaps->kvmSupportsNesting;
- 
-     if (VIR_STRDUP(ret->binary, qemuCaps->binary) < 0)
-         goto error;
-@@ -3597,6 +3599,9 @@ virQEMUCapsLoadCache(virArch hostArch,
-     virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);
-     virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU);
- 
-+    if (virXPathBoolean("boolean(./kvmSupportsNesting)", ctxt) > 0)
-+        qemuCaps->kvmSupportsNesting = true;
-+
-     ret = 0;
-  cleanup:
-     VIR_FREE(str);
-@@ -3813,6 +3818,9 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
-     if (qemuCaps->sevCapabilities)
-         virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
- 
-+    if (qemuCaps->kvmSupportsNesting)
-+        virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
-+
-     virBufferAdjustIndent(&buf, -2);
-     virBufferAddLit(&buf, "</qemuCaps>\n");
- 
-@@ -3853,6 +3861,45 @@ virQEMUCapsSaveFile(void *data,
- }
- 
- 
-+/* Check the kernel module parameters 'nested' file to determine if enabled
-+ *
-+ *   Intel: 'kvm_intel' uses 'Y'
-+ *   AMD:   'kvm_amd' uses '1'
-+ *   PPC64: 'kvm_hv' uses 'Y'
-+ *   S390:  'kvm' uses '1'
-+ */
-+static bool
-+virQEMUCapsKVMSupportsNesting(void)
-+{
-+    static char const * const kmod[] = {"kvm_intel", "kvm_amd",
-+                                        "kvm_hv", "kvm"};
-+    char * value = NULL;
-+    int rc;
-+    size_t i;
-+
-+    for (i = 0; i < ARRAY_CARDINALITY(kmod); i++) {
-+        VIR_FREE(value);
-+        rc = virFileReadValueString(&value, "/sys/module/%s/parameters/nested",
-+                                    kmod[i]);
-+        if (rc == -2)
-+            continue;
-+        if (rc < 0) {
-+            virResetLastError();
-+            VIR_FREE(value);
-+            return false;
-+        }
-+
-+        if (value[0] == 'Y' || value[0] == 'y' || value[0] == '1') {
-+            VIR_FREE(value);
-+            return true;
-+        }
-+    }
-+
-+    VIR_FREE(value);
-+    return false;
-+}
-+
-+
- static bool
- virQEMUCapsIsValid(void *data,
-                    void *privData)
-@@ -3861,6 +3908,7 @@ virQEMUCapsIsValid(void *data,
-     virQEMUCapsCachePrivPtr priv = privData;
-     bool kvmUsable;
-     struct stat sb;
-+    bool kvmSupportsNesting;
- 
-     if (!qemuCaps->binary)
-         return true;
-@@ -3938,6 +3986,14 @@ virQEMUCapsIsValid(void *data,
-                       qemuCaps->kernelVersion);
-             return false;
-         }
-+
-+        kvmSupportsNesting = virQEMUCapsKVMSupportsNesting();
-+        if (kvmSupportsNesting != qemuCaps->kvmSupportsNesting) {
-+            VIR_DEBUG("Outdated capabilities for '%s': kvm kernel nested "
-+                      "value changed from %d",
-+                     qemuCaps->binary, qemuCaps->kvmSupportsNesting);
-+            return false;
-+        }
-     }
- 
-     return true;
-@@ -4591,6 +4647,8 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,
- 
-         if (VIR_STRDUP(qemuCaps->kernelVersion, kernelVersion) < 0)
-             goto error;
-+
-+        qemuCaps->kvmSupportsNesting = virQEMUCapsKVMSupportsNesting();
-     }
- 
-  cleanup:
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-Add-hotpluging-support-for-PCI-devices-on-S390-guests.patch b/SOURCES/libvirt-qemu-Add-hotpluging-support-for-PCI-devices-on-S390-guests.patch
deleted file mode 100644
index 23ac15d..0000000
--- a/SOURCES/libvirt-qemu-Add-hotpluging-support-for-PCI-devices-on-S390-guests.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From 84d44b33a64b6fd7f77d021249d23dc054243ddf Mon Sep 17 00:00:00 2001
-Message-Id: <84d44b33a64b6fd7f77d021249d23dc054243ddf@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:29 +0200
-Subject: [PATCH] qemu: Add hotpluging support for PCI devices on S390 guests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This commit adds hotplug support for PCI devices on S390 guests.
-There's no need to implement hot unplug for zPCI as QEMU implements
-an unplug callback which will unplug both PCI and zPCI device in a
-cascaded way.
-Currently, the following PCI devices are supported:
-  virtio-blk-pci
-  virtio-net-pci
-  virtio-rng-pci
-  virtio-input-host-pci
-  virtio-keyboard-pci
-  virtio-mouse-pci
-  virtio-tablet-pci
-  vfio-pci
-  SCSIVhost device
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit 1d1e264f13d14ed05838bae2fcec2ffef26671f2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_hotplug.c
-    + context
-      - missing 83fe11e950bc
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-13-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 160 +++++++++++++++++++++++++++++++++++++---
- 1 file changed, 151 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 776cd75474..abe2632556 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -154,6 +154,80 @@ qemuHotplugPrepareDiskAccess(virQEMUDriverPtr driver,
- }
- 
- 
-+static int
-+qemuDomainAttachZPCIDevice(qemuMonitorPtr mon,
-+                           virDomainDeviceInfoPtr info)
-+{
-+    char *devstr_zpci = NULL;
-+    int ret = -1;
-+
-+    if (!(devstr_zpci = qemuBuildZPCIDevStr(info)))
-+        goto cleanup;
-+
-+    if (qemuMonitorAddDevice(mon, devstr_zpci) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    VIR_FREE(devstr_zpci);
-+    return ret;
-+}
-+
-+
-+static int
-+qemuDomainDetachZPCIDevice(qemuMonitorPtr mon,
-+                           virDomainDeviceInfoPtr info)
-+{
-+    char *zpciAlias = NULL;
-+    int ret = -1;
-+
-+    if (virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid) < 0)
-+        goto cleanup;
-+
-+    if (qemuMonitorDelDevice(mon, zpciAlias) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    VIR_FREE(zpciAlias);
-+    return ret;
-+}
-+
-+
-+static int
-+qemuDomainAttachExtensionDevice(qemuMonitorPtr mon,
-+                                virDomainDeviceInfoPtr info)
-+{
-+    if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI ||
-+        info->addr.pci.extFlags == VIR_PCI_ADDRESS_EXTENSION_NONE) {
-+        return 0;
-+    }
-+
-+    if (info->addr.pci.extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI)
-+        return qemuDomainAttachZPCIDevice(mon, info);
-+
-+    return 0;
-+}
-+
-+
-+static int
-+qemuDomainDetachExtensionDevice(qemuMonitorPtr mon,
-+                                virDomainDeviceInfoPtr info)
-+{
-+    if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI ||
-+        info->addr.pci.extFlags == VIR_PCI_ADDRESS_EXTENSION_NONE) {
-+        return 0;
-+    }
-+
-+    if (info->addr.pci.extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI)
-+        return qemuDomainDetachZPCIDevice(mon, info);
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuHotplugWaitForTrayEject(virQEMUDriverPtr driver,
-                             virDomainObjPtr vm,
-@@ -403,9 +477,14 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
-     if (qemuBlockStorageSourceAttachApply(priv->mon, data) < 0)
-         goto exit_monitor;
- 
--    if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
-+    if (qemuDomainAttachExtensionDevice(priv->mon, &disk->info) < 0)
-         goto exit_monitor;
- 
-+    if (qemuMonitorAddDevice(priv->mon, devstr) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &disk->info));
-+        goto exit_monitor;
-+    }
-+
-     if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-         ret = -2;
-         goto error;
-@@ -519,7 +598,16 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
-         goto cleanup;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    ret = qemuMonitorAddDevice(priv->mon, devstr);
-+
-+    if ((ret = qemuDomainAttachExtensionDevice(priv->mon,
-+                                               &controller->info)) < 0) {
-+        goto exit_monitor;
-+    }
-+
-+    if ((ret = qemuMonitorAddDevice(priv->mon, devstr)) < 0)
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &controller->info));
-+
-+ exit_monitor:
-     if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-         releaseaddr = false;
-         ret = -1;
-@@ -969,6 +1057,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-     }
- 
-     if (qemuDomainIsS390CCW(vm->def) &&
-+        net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
-         virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) {
-         net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW;
-         if (!(ccwaddrs = qemuDomainCCWAddrSetCreateFromDomain(vm->def)))
-@@ -1038,7 +1127,15 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-         goto try_remove;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
-+
-+    if (qemuDomainAttachExtensionDevice(priv->mon, &net->info) < 0) {
-+        ignore_value(qemuDomainObjExitMonitor(driver, vm));
-+        virDomainAuditNet(vm, NULL, net, "attach", false);
-+        goto try_remove;
-+    }
-+
-     if (qemuMonitorAddDevice(priv->mon, nicstr) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &net->info));
-         ignore_value(qemuDomainObjExitMonitor(driver, vm));
-         virDomainAuditNet(vm, NULL, net, "attach", false);
-         goto try_remove;
-@@ -1256,8 +1353,16 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
-         goto error;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    ret = qemuMonitorAddDeviceWithFd(priv->mon, devstr,
--                                     configfd, configfd_name);
-+
-+    if ((ret = qemuDomainAttachExtensionDevice(priv->mon, hostdev->info)) < 0)
-+        goto exit_monitor;
-+
-+    if ((ret = qemuMonitorAddDeviceWithFd(priv->mon, devstr,
-+                                          configfd, configfd_name)) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->info));
-+    }
-+
-+ exit_monitor:
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto error;
- 
-@@ -1913,9 +2018,14 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver,
-     if (qemuMonitorAddObject(priv->mon, &props, &objAlias) < 0)
-         goto exit_monitor;
- 
--    if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
-+    if (qemuDomainAttachExtensionDevice(priv->mon, &rng->info) < 0)
-         goto exit_monitor;
- 
-+    if (qemuMonitorAddDevice(priv->mon, devstr) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &rng->info));
-+        goto exit_monitor;
-+    }
-+
-     if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-         releaseaddr = false;
-         goto cleanup;
-@@ -2407,8 +2517,16 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver,
- 
-     qemuDomainObjEnterMonitor(driver, vm);
- 
--    ret = qemuMonitorAddDeviceWithFd(priv->mon, devstr, vhostfd, vhostfdName);
-+    if ((ret = qemuDomainAttachExtensionDevice(priv->mon, hostdev->info)) < 0)
-+        goto exit_monitor;
- 
-+    if ((ret = qemuMonitorAddDeviceWithFd(priv->mon, devstr, vhostfd,
-+                                          vhostfdName)) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->info));
-+        goto exit_monitor;
-+    }
-+
-+ exit_monitor:
-     if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0)
-         goto audit;
- 
-@@ -2653,9 +2771,14 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver,
- 
-     release_backing = true;
- 
--    if (qemuMonitorAddDevice(priv->mon, shmstr) < 0)
-+    if (qemuDomainAttachExtensionDevice(priv->mon, &shmem->info) < 0)
-         goto exit_monitor;
- 
-+    if (qemuMonitorAddDevice(priv->mon, shmstr) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &shmem->info));
-+        goto exit_monitor;
-+    }
-+
-     if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-         release_address = false;
-         goto cleanup;
-@@ -2827,9 +2950,15 @@ qemuDomainAttachInputDevice(virQEMUDriverPtr driver,
-         goto cleanup;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
-+
-+    if (qemuDomainAttachExtensionDevice(priv->mon, &input->info) < 0)
-         goto exit_monitor;
- 
-+    if (qemuMonitorAddDevice(priv->mon, devstr) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &input->info));
-+        goto exit_monitor;
-+    }
-+
-     if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-         releaseaddr = false;
-         goto cleanup;
-@@ -2906,9 +3035,15 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver,
-         goto cleanup;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    if (qemuMonitorAddDeviceWithFd(priv->mon, devstr, vsockPriv->vhostfd, fdname) < 0)
-+
-+    if (qemuDomainAttachExtensionDevice(priv->mon, &vsock->info) < 0)
-         goto exit_monitor;
- 
-+    if (qemuMonitorAddDeviceWithFd(priv->mon, devstr, vsockPriv->vhostfd, fdname) < 0) {
-+        ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &vsock->info));
-+        goto exit_monitor;
-+    }
-+
-     if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-         releaseaddr = false;
-         goto cleanup;
-@@ -4932,10 +5067,17 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
-         qemuDomainMarkDeviceForRemoval(vm, &detach->info);
- 
-     qemuDomainObjEnterMonitor(driver, vm);
-+    if (detach->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
-+        qemuDomainDetachExtensionDevice(priv->mon, &detach->info)) {
-+        goto exit_monitor;
-+    }
-+
-     if (qemuMonitorDelDevice(priv->mon, detach->info.alias)) {
-         ignore_value(qemuDomainObjExitMonitor(driver, vm));
-         goto cleanup;
-     }
-+
-+ exit_monitor:
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto cleanup;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Add-support-for-slices-of-type-storage.patch b/SOURCES/libvirt-qemu-Add-support-for-slices-of-type-storage.patch
new file mode 100644
index 0000000..76ccfc3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Add-support-for-slices-of-type-storage.patch
@@ -0,0 +1,231 @@
+From 9d2cbc9ca4405fcf11e5796414af0038eb7c7f9e Mon Sep 17 00:00:00 2001
+Message-Id: <9d2cbc9ca4405fcf11e5796414af0038eb7c7f9e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:24 +0100
+Subject: [PATCH] qemu: Add support for slices of type 'storage'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Implement support for the slice of type 'storage' which allows to set
+the offset and size which modifies where qemu should look for the start
+of the format container inside the image.
+
+Since slicing is done using the 'raw' driver we need to add another
+layer into the blockdev tree if there's any non-raw image format driver
+used to access the data.
+
+This patch adds the blockdev integration and setup of the image data so
+that we can use the slices for any backing image.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 0e644e6e47a48830dc10b090a999d4ba2e7d5394)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <1f8e63abfd1836f1df91f54cf2c018a7d5047825.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c    | 68 +++++++++++++++++++++++++++++++++++++++-
+ src/qemu/qemu_block.h    |  4 +++
+ src/qemu/qemu_blockjob.c |  1 +
+ src/qemu/qemu_command.c  |  8 +++++
+ src/qemu/qemu_domain.c   |  4 +++
+ 5 files changed, 84 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 387a2db2e6..5bd5c955a4 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1423,11 +1423,16 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src,
+                                        virStorageSourcePtr backingStore)
+ {
+     g_autoptr(virJSONValue) props = NULL;
++    const char *storagenode = src->nodestorage;
++
++    if (src->sliceStorage &&
++        src->format != VIR_STORAGE_FILE_RAW)
++        storagenode = src->sliceStorage->nodename;
+ 
+     if (!(props = qemuBlockStorageSourceGetBlockdevFormatProps(src)))
+         return NULL;
+ 
+-    if (virJSONValueObjectAppendString(props, "file", src->nodestorage) < 0)
++    if (virJSONValueObjectAppendString(props, "file", storagenode) < 0)
+         return NULL;
+ 
+     if (backingStore) {
+@@ -1456,6 +1461,32 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src,
+ }
+ 
+ 
++static virJSONValuePtr
++qemuBlockStorageSourceGetBlockdevStorageSliceProps(virStorageSourcePtr src)
++{
++    g_autoptr(virJSONValue) props = NULL;
++
++    if (qemuBlockNodeNameValidate(src->sliceStorage->nodename) < 0)
++        return NULL;
++
++    if (virJSONValueObjectCreate(&props,
++                                 "s:driver", "raw",
++                                 "s:node-name", src->sliceStorage->nodename,
++                                 "U:offset", src->sliceStorage->offset,
++                                 "U:size", src->sliceStorage->size,
++                                 "s:file", src->nodestorage,
++                                 "b:auto-read-only", true,
++                                 "s:discard", "unmap",
++                                 NULL) < 0)
++        return NULL;
++
++    if (qemuBlockStorageSourceGetBlockdevGetCacheProps(src, props) < 0)
++        return NULL;
++
++    return g_steal_pointer(&props);
++}
++
++
+ void
+ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data)
+ {
+@@ -1463,6 +1494,7 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data)
+         return;
+ 
+     virJSONValueFree(data->storageProps);
++    virJSONValueFree(data->storageSliceProps);
+     virJSONValueFree(data->formatProps);
+     virJSONValueFree(data->prmgrProps);
+     virJSONValueFree(data->authsecretProps);
+@@ -1513,6 +1545,13 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src,
+     data->storageNodeName = src->nodestorage;
+     data->formatNodeName = src->nodeformat;
+ 
++    if (src->sliceStorage && src->format != VIR_STORAGE_FILE_RAW) {
++        if (!(data->storageSliceProps = qemuBlockStorageSourceGetBlockdevStorageSliceProps(src)))
++            return NULL;
++
++        data->storageSliceNodeName = src->sliceStorage->nodename;
++    }
++
+     return g_steal_pointer(&data);
+ }
+ 
+@@ -1581,6 +1620,21 @@ qemuBlockStorageSourceAttachApplyFormat(qemuMonitorPtr mon,
+ }
+ 
+ 
++static int
++qemuBlockStorageSourceAttachApplyStorageSlice(qemuMonitorPtr mon,
++                                              qemuBlockStorageSourceAttachDataPtr data)
++{
++    if (data->storageSliceProps) {
++        if (qemuMonitorBlockdevAdd(mon, &data->storageSliceProps) < 0)
++            return -1;
++
++        data->storageSliceAttached = true;
++    }
++
++    return 0;
++}
++
++
+ /**
+  * qemuBlockStorageSourceAttachApply:
+  * @mon: monitor object
+@@ -1600,6 +1654,7 @@ qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon,
+ {
+     if (qemuBlockStorageSourceAttachApplyStorageDeps(mon, data) < 0 ||
+         qemuBlockStorageSourceAttachApplyStorage(mon, data) < 0 ||
++        qemuBlockStorageSourceAttachApplyStorageSlice(mon, data) < 0 ||
+         qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 ||
+         qemuBlockStorageSourceAttachApplyFormat(mon, data) < 0)
+         return -1;
+@@ -1642,6 +1697,9 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon,
+     if (data->formatAttached)
+         ignore_value(qemuMonitorBlockdevDel(mon, data->formatNodeName));
+ 
++    if (data->storageSliceAttached)
++        ignore_value(qemuMonitorBlockdevDel(mon, data->storageSliceNodeName));
++
+     if (data->storageAttached)
+         ignore_value(qemuMonitorBlockdevDel(mon, data->storageNodeName));
+ 
+@@ -1689,6 +1747,14 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src,
+         data->formatAttached = true;
+         data->storageNodeName = src->nodestorage;
+         data->storageAttached = true;
++
++        /* 'raw' format doesn't need the extra 'raw' layer when slicing, thus
++         * the nodename is NULL */
++        if (src->sliceStorage &&
++            src->sliceStorage->nodename) {
++            data->storageSliceNodeName = src->sliceStorage->nodename;
++            data->storageSliceAttached = true;
++        }
+     }
+ 
+     if (src->pr &&
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index a816190bb7..eab0128d5d 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -82,6 +82,10 @@ struct qemuBlockStorageSourceAttachData {
+     const char *storageNodeName;
+     bool storageAttached;
+ 
++    virJSONValuePtr storageSliceProps;
++    const char *storageSliceNodeName;
++    bool storageSliceAttached;
++
+     virJSONValuePtr formatProps;
+     const char *formatNodeName;
+     bool formatAttached;
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 6b59bbeb2c..71df0d1ab2 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1316,6 +1316,7 @@ qemuBlockJobProcessEventConcludedCreate(virQEMUDriverPtr driver,
+     backend->formatAttached = false;
+     if (job->data.create.storage) {
+         backend->storageAttached = false;
++        backend->storageSliceAttached = false;
+         VIR_FREE(backend->encryptsecretAlias);
+     }
+ 
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 1a5142d472..252809a8d7 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -2427,6 +2427,14 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd,
+         VIR_FREE(tmp);
+     }
+ 
++    if (data->storageSliceProps) {
++        if (!(tmp = virJSONValueToString(data->storageSliceProps, false)))
++            return -1;
++
++        virCommandAddArgList(cmd, "-blockdev", tmp, NULL);
++        VIR_FREE(tmp);
++    }
++
+     if (data->formatProps) {
+         if (!(tmp = virJSONValueToString(data->formatProps, false)))
+             return -1;
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 948bf3011c..0baa80582c 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -16444,6 +16444,10 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDefPtr disk,
+     src->nodestorage = g_strdup_printf("libvirt-%u-storage", src->id);
+     src->nodeformat = g_strdup_printf("libvirt-%u-format", src->id);
+ 
++    if (src->sliceStorage &&
++        src->format != VIR_STORAGE_FILE_RAW)
++        src->sliceStorage->nodename = g_strdup_printf("libvirt-%u-slice-sto", src->id);
++
+     if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0)
+         return -1;
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Add-the-QEMU_CAPS_CPU_KVM_NO_ADJVTIME-capability.patch b/SOURCES/libvirt-qemu-Add-the-QEMU_CAPS_CPU_KVM_NO_ADJVTIME-capability.patch
new file mode 100644
index 0000000..65106cf
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Add-the-QEMU_CAPS_CPU_KVM_NO_ADJVTIME-capability.patch
@@ -0,0 +1,82 @@
+From 694540f2c93ccee78e203c5fe92be5e1a05a2281 Mon Sep 17 00:00:00 2001
+Message-Id: <694540f2c93ccee78e203c5fe92be5e1a05a2281@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 13:12:34 +0100
+Subject: [PATCH] qemu: Add the QEMU_CAPS_CPU_KVM_NO_ADJVTIME capability
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We will use this capability to detect whether the QEMU binary
+supports the kvm-no-adjvtime CPU feature.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 204e2306e582524b46c4e26e1f0aa354aa50d006)
+
+Conflicts:
+
+  * src/qemu/qemu_capabilities.c
+    src/qemu/qemu_capabilities.h
+
+    + tpm-spapr has not been backported
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214121237.623948-4-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                      | 2 ++
+ src/qemu/qemu_capabilities.h                      | 1 +
+ tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 10c17323be..6912a6f72b 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -557,6 +557,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+ 
+               /* 350 */
+               "virtio-net.failover",
++              "cpu.kvm-no-adjvtime",
+     );
+ 
+ 
+@@ -1557,6 +1558,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendMemfd[]
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMaxCPU[] = {
+     { "unavailable-features", QEMU_CAPS_CPU_UNAVAILABLE_FEATURES },
++    { "kvm-no-adjvtime", QEMU_CAPS_CPU_KVM_NO_ADJVTIME },
+ };
+ 
+ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 6ab0eabd3f..4ccb0c55bc 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -538,6 +538,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+ 
+     /* 350 */
+     QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
++    QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+index 6b365dd75d..e871ba528e 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+@@ -178,6 +178,7 @@
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
+   <flag name='virtio-net.failover'/>
++  <flag name='cpu.kvm-no-adjvtime'/>
+   <version>4002050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700241</microcodeVersion>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Add-type-filter-to-qemuMonitorJSONParsePropsList.patch b/SOURCES/libvirt-qemu-Add-type-filter-to-qemuMonitorJSONParsePropsList.patch
deleted file mode 100644
index abaeb89..0000000
--- a/SOURCES/libvirt-qemu-Add-type-filter-to-qemuMonitorJSONParsePropsList.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 3004a0c300e65777cf888a49eddcfdda8cd59941 Mon Sep 17 00:00:00 2001
-Message-Id: <3004a0c300e65777cf888a49eddcfdda8cd59941@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:00 +0200
-Subject: [PATCH] qemu: Add type filter to qemuMonitorJSONParsePropsList
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function converts a list of QOM properties into a NULL-terminated
-array of property names. The new type parameter may be used to limit the
-result to properties of a specific type.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 430023e5ee3f7549104f5eb09e3c26563a11882c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <aaae4013352ac5c6724550a340921c394a701bcc.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor_json.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 8fead72ecf..abf952cd34 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -6067,11 +6067,13 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon,
- static int
- qemuMonitorJSONParsePropsList(virJSONValuePtr cmd,
-                               virJSONValuePtr reply,
-+                              const char *type,
-                               char ***props)
- {
-     virJSONValuePtr data;
-     char **proplist = NULL;
-     size_t n = 0;
-+    size_t count = 0;
-     size_t i;
-     int ret = -1;
- 
-@@ -6089,17 +6091,21 @@ qemuMonitorJSONParsePropsList(virJSONValuePtr cmd,
-         virJSONValuePtr child = virJSONValueArrayGet(data, i);
-         const char *tmp;
- 
-+        if (type &&
-+            STRNEQ_NULLABLE(virJSONValueObjectGetString(child, "type"), type))
-+            continue;
-+
-         if (!(tmp = virJSONValueObjectGetString(child, "name"))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("reply data was missing 'name'"));
-             goto cleanup;
-         }
- 
--        if (VIR_STRDUP(proplist[i], tmp) < 0)
-+        if (VIR_STRDUP(proplist[count++], tmp) < 0)
-             goto cleanup;
-     }
- 
--    ret = n;
-+    ret = count;
-     *props = proplist;
-     proplist = NULL;
- 
-@@ -6132,7 +6138,7 @@ int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon,
-         goto cleanup;
-     }
- 
--    ret = qemuMonitorJSONParsePropsList(cmd, reply, props);
-+    ret = qemuMonitorJSONParsePropsList(cmd, reply, NULL, props);
-  cleanup:
-     virJSONValueFree(reply);
-     virJSONValueFree(cmd);
-@@ -6164,7 +6170,7 @@ qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
-         goto cleanup;
-     }
- 
--    ret = qemuMonitorJSONParsePropsList(cmd, reply, props);
-+    ret = qemuMonitorJSONParsePropsList(cmd, reply, NULL, props);
-  cleanup:
-     virJSONValueFree(reply);
-     virJSONValueFree(cmd);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Add-zPCI-address-definition-check.patch b/SOURCES/libvirt-qemu-Add-zPCI-address-definition-check.patch
deleted file mode 100644
index b88cfa0..0000000
--- a/SOURCES/libvirt-qemu-Add-zPCI-address-definition-check.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 9aef6ea4b1d8a79e353bb34ab5559c698cad1eb1 Mon Sep 17 00:00:00 2001
-Message-Id: <9aef6ea4b1d8a79e353bb34ab5559c698cad1eb1@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:26 +0200
-Subject: [PATCH] qemu: Add zPCI address definition check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We should ensure that QEMU supports zPCI when a zPCI address is defined
-in XML and otherwise report an error. This patch introduces a generic
-validation function qemuDomainDeviceDefValidateAddress() which calls
-qemuDomainDeviceDefValidateZPCIAddress() if address type is PCI address.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit e6565d54db3d52ae38b5934877be4d004c2d5f35)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_domain.c
-    + context
-      - missing 709f57c25be8
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-10-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.c                        | 36 +++++++++++++++++++
- .../hostdev-vfio-zpci-wrong-arch.xml          | 34 ++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  2 ++
- 3 files changed, 72 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index da961f0de9..8604385aa2 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -5681,6 +5681,38 @@ qemuDomainDeviceDefValidateGraphics(const virDomainGraphicsDef *graphics,
- }
- 
- 
-+static int
-+qemuDomainDeviceDefValidateZPCIAddress(virDomainDeviceInfoPtr info,
-+                                       virQEMUCapsPtr qemuCaps)
-+{
-+    if (!virZPCIDeviceAddressIsEmpty(&info->addr.pci.zpci) &&
-+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       "%s",
-+                       _("This QEMU binary doesn't support zPCI"));
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+qemuDomainDeviceDefValidateAddress(const virDomainDeviceDef *dev,
-+                                   virQEMUCapsPtr qemuCaps)
-+{
-+    virDomainDeviceInfoPtr info;
-+
-+    if (!(info = virDomainDeviceGetInfo((virDomainDeviceDef *)dev)))
-+        return 0;
-+
-+    if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)
-+        return qemuDomainDeviceDefValidateZPCIAddress(info, qemuCaps);
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-                             const virDomainDef *def,
-@@ -5694,6 +5726,9 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-                                             def->emulator)))
-         return -1;
- 
-+    if ((ret = qemuDomainDeviceDefValidateAddress(dev, qemuCaps)) < 0)
-+        goto cleanup;
-+
-     switch ((virDomainDeviceType)dev->type) {
-     case VIR_DOMAIN_DEVICE_NET:
-         ret = qemuDomainDeviceDefValidateNetwork(dev->data.net);
-@@ -5769,6 +5804,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-         break;
-     }
- 
-+ cleanup:
-     virObjectUnref(qemuCaps);
-     return ret;
- }
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
-new file mode 100644
-index 0000000000..bfb2f83a3b
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
-@@ -0,0 +1,34 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest2</name>
-+  <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219100</memory>
-+  <currentMemory unit='KiB'>219100</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci' managed='yes'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0001' bus='00' slot='00' function='0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'>
-+        <zpci uid='0x0019' fid='0x0000001f'/>
-+      </address>
-+    </hostdev>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 2eb2505971..1066de8bc4 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1632,6 +1632,8 @@ mymain(void)
-     DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics",
-             QEMU_CAPS_DEVICE_VFIO_PCI,
-             QEMU_CAPS_VFIO_PCI_DISPLAY);
-+    DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch",
-+                        QEMU_CAPS_DEVICE_VFIO_PCI);
-     DO_TEST("hostdev-vfio-zpci",
-             QEMU_CAPS_DEVICE_VFIO_PCI,
-             QEMU_CAPS_DEVICE_ZPCI);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Allow-creating-ppc64-guests-with-graphics-and-no-USB-mouse.patch b/SOURCES/libvirt-qemu-Allow-creating-ppc64-guests-with-graphics-and-no-USB-mouse.patch
deleted file mode 100644
index 7a6af43..0000000
--- a/SOURCES/libvirt-qemu-Allow-creating-ppc64-guests-with-graphics-and-no-USB-mouse.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1c58390619bfdd6174b1d24bc5b64caae45487b0 Mon Sep 17 00:00:00 2001
-Message-Id: <1c58390619bfdd6174b1d24bc5b64caae45487b0@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Wed, 17 Apr 2019 11:21:25 +0200
-Subject: [PATCH] qemu: Allow creating ppc64 guests with graphics and no USB
- mouse
-
-The existing behavior for ppc64 guests is to always add a USB
-keyboard and mouse combo if graphics are present; unfortunately,
-this means any attempt to use a USB tablet will cause both pointing
-devices to show up in the guest, which in turn will result in poor
-user experience.
-
-We can't just stop adding the USB mouse or start adding a USB tablet
-instead, because existing applications and users might rely on the
-current behavior; however, we can avoid adding the USB mouse if a USB
-tablet is already present, thus allowing users and applications to
-create guests that contain a single pointing device.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1683681
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
-
-(cherry picked from commit 186bb479d0f409dc75175bea48a760838c479a6c)
-
-Conflicts:
-  * src/qemu/qemu_domain.c
-    + context in qemuDomainDefAddDefaultDevices()
-      - missing 6427bfc8b3bb
-
-Deleted:
-  * tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
-    + doesn't exist downstream
-      - missing 4d7ea75e1e73
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190417092125.10277-2-abologna@redhat.com>
----
- src/qemu/qemu_domain.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index be3477bf8a..cc2a896a07 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3323,6 +3323,26 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
-         def->memballoon = memballoon;
-     }
- 
-+    if (addDefaultUSBMouse) {
-+        bool hasUSBTablet = false;
-+        size_t j;
-+
-+        for (j = 0; j < def->ninputs; j++) {
-+            if (def->inputs[j]->type == VIR_DOMAIN_INPUT_TYPE_TABLET &&
-+                def->inputs[j]->bus == VIR_DOMAIN_INPUT_BUS_USB) {
-+                hasUSBTablet = true;
-+                break;
-+            }
-+        }
-+
-+        /* Historically, we have automatically added USB keyboard and
-+         * mouse to some guests. While the former device is generally
-+         * safe to have, adding the latter is undesiderable if a USB
-+         * tablet is already present in the guest */
-+        if (hasUSBTablet)
-+            addDefaultUSBMouse = false;
-+    }
-+
-     if (addDefaultUSBKBD &&
-         def->ngraphics > 0 &&
-         virDomainDefMaybeAddInput(def,
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu-Auto-add-pci-root-for-s390-s390x-guests.patch b/SOURCES/libvirt-qemu-Auto-add-pci-root-for-s390-s390x-guests.patch
deleted file mode 100644
index 98d484f..0000000
--- a/SOURCES/libvirt-qemu-Auto-add-pci-root-for-s390-s390x-guests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dc63c5044631d30981960d96568cd2abb3d31ede Mon Sep 17 00:00:00 2001
-Message-Id: <dc63c5044631d30981960d96568cd2abb3d31ede@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:23 +0200
-Subject: [PATCH] qemu: Auto add pci-root for s390/s390x guests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The pci-root depends on zpci capability. So autogenerate pci-root if
-zpci exists.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit d46673913802b65dd7d33562cce41a78cbc85a88)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-7-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@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 21f0722495..da961f0de9 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3228,6 +3228,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
-     case VIR_ARCH_S390X:
-         addDefaultUSB = false;
-         addPanicDevice = true;
-+        addPCIRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ZPCI);
-         break;
- 
-     case VIR_ARCH_SPARC:
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Avoid-duplicate-resume-events-and-state-changes.patch b/SOURCES/libvirt-qemu-Avoid-duplicate-resume-events-and-state-changes.patch
deleted file mode 100644
index 119205a..0000000
--- a/SOURCES/libvirt-qemu-Avoid-duplicate-resume-events-and-state-changes.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From 69532ea0b55b307884add6d95d70b998adcea60a Mon Sep 17 00:00:00 2001
-Message-Id: <69532ea0b55b307884add6d95d70b998adcea60a@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 12 Sep 2018 14:34:33 +0200
-Subject: [PATCH] qemu: Avoid duplicate resume events and state changes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The only place where VIR_DOMAIN_EVENT_RESUMED should be generated is the
-RESUME event handler to make sure we don't generate duplicate events or
-state changes. In the worse case the duplicity can revert or cover
-changes done by other event handlers.
-
-For example, after QEMU sent RESUME, BLOCK_IO_ERROR, and STOP events
-we could happily mark the domain as running and report
-VIR_DOMAIN_EVENT_RESUMED to registered clients.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1612943
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit e6d77a75c4bf0c017d62b717b75e4bb6aa7a456b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634758
-https://bugzilla.redhat.com/show_bug.cgi?id=1634759
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_driver.c    | 13 -----------
- src/qemu/qemu_migration.c | 49 ++++++++++++++++-----------------------
- src/qemu/qemu_process.c   | 10 ++++----
- 3 files changed, 24 insertions(+), 48 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index ec1a43d41d..bafef1e3b5 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -1863,7 +1863,6 @@ static int qemuDomainResume(virDomainPtr dom)
-     virQEMUDriverPtr driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     int ret = -1;
--    virObjectEventPtr event = NULL;
-     int state;
-     int reason;
-     virQEMUDriverConfigPtr cfg = NULL;
-@@ -1902,9 +1901,6 @@ static int qemuDomainResume(virDomainPtr dom)
-                                "%s", _("resume operation failed"));
-             goto endjob;
-         }
--        event = virDomainEventLifecycleNewFromObj(vm,
--                                         VIR_DOMAIN_EVENT_RESUMED,
--                                         VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
-     }
-     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
-         goto endjob;
-@@ -1915,7 +1911,6 @@ static int qemuDomainResume(virDomainPtr dom)
- 
-  cleanup:
-     virDomainObjEndAPI(&vm);
--    virObjectEventStateQueue(driver->domainEventState, event);
-     virObjectUnref(cfg);
-     return ret;
- }
-@@ -16033,7 +16028,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
-     virDomainDefPtr config = NULL;
-     virQEMUDriverConfigPtr cfg = NULL;
-     virCapsPtr caps = NULL;
--    bool was_running = false;
-     bool was_stopped = false;
-     qemuDomainSaveCookiePtr cookie;
-     virCPUDefPtr origCPU = NULL;
-@@ -16224,7 +16218,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
-             priv = vm->privateData;
-             if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
-                 /* Transitions 5, 6 */
--                was_running = true;
-                 if (qemuProcessStopCPUs(driver, vm,
-                                         VIR_DOMAIN_PAUSED_FROM_SNAPSHOT,
-                                         QEMU_ASYNC_JOB_START) < 0)
-@@ -16321,12 +16314,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
-                 event = virDomainEventLifecycleNewFromObj(vm,
-                                                  VIR_DOMAIN_EVENT_STARTED,
-                                                  detail);
--            } else if (!was_running) {
--                /* Transition 8 */
--                detail = VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT;
--                event = virDomainEventLifecycleNewFromObj(vm,
--                                                 VIR_DOMAIN_EVENT_RESUMED,
--                                                 detail);
-             }
-         }
-         break;
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 825a9d399b..67940330aa 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -2982,14 +2982,10 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver,
-         virFreeError(orig_err);
- 
-         if (virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED &&
--            reason == VIR_DOMAIN_PAUSED_POSTCOPY) {
-+            reason == VIR_DOMAIN_PAUSED_POSTCOPY)
-             qemuMigrationAnyPostcopyFailed(driver, vm);
--        } else if (qemuMigrationSrcRestoreDomainState(driver, vm)) {
--            event = virDomainEventLifecycleNewFromObj(vm,
--                                                      VIR_DOMAIN_EVENT_RESUMED,
--                                                      VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
--            virObjectEventStateQueue(driver->domainEventState, event);
--        }
-+        else
-+            qemuMigrationSrcRestoreDomainState(driver, vm);
- 
-         qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
-                                  priv->job.migParams, priv->job.apiFlags);
-@@ -4624,11 +4620,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver,
-         qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
-                                  priv->job.migParams, priv->job.apiFlags);
- 
--    if (qemuMigrationSrcRestoreDomainState(driver, vm)) {
--        event = virDomainEventLifecycleNewFromObj(vm,
--                                         VIR_DOMAIN_EVENT_RESUMED,
--                                         VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
--    }
-+    qemuMigrationSrcRestoreDomainState(driver, vm);
- 
-     qemuMigrationJobFinish(driver, vm);
-     if (!virDomainObjIsActive(vm) && ret == 0) {
-@@ -4672,7 +4664,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver,
-                              unsigned long resource)
- {
-     qemuDomainObjPrivatePtr priv = vm->privateData;
--    virObjectEventPtr event = NULL;
-     int ret = -1;
- 
-     /* If we didn't start the job in the begin phase, start it now. */
-@@ -4694,11 +4685,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver,
-                                         nmigrate_disks, migrate_disks, migParams);
- 
-     if (ret < 0) {
--        if (qemuMigrationSrcRestoreDomainState(driver, vm)) {
--            event = virDomainEventLifecycleNewFromObj(vm,
--                                                      VIR_DOMAIN_EVENT_RESUMED,
--                                                      VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
--        }
-+        qemuMigrationSrcRestoreDomainState(driver, vm);
-         goto endjob;
-     }
- 
-@@ -4722,7 +4709,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver,
- 
-  cleanup:
-     virDomainObjEndAPI(&vm);
--    virObjectEventStateQueue(driver->domainEventState, event);
-     return ret;
- }
- 
-@@ -5074,13 +5060,8 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver,
-                 goto endjob;
-         }
- 
--        if (inPostCopy) {
-+        if (inPostCopy)
-             doKill = false;
--            event = virDomainEventLifecycleNewFromObj(vm,
--                                        VIR_DOMAIN_EVENT_RESUMED,
--                                        VIR_DOMAIN_EVENT_RESUMED_POSTCOPY);
--            virObjectEventStateQueue(driver->domainEventState, event);
--        }
-     }
- 
-     if (mig->jobInfo) {
-@@ -5111,10 +5092,20 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver,
- 
-     dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, vm->def->id);
- 
--    event = virDomainEventLifecycleNewFromObj(vm,
--                                              VIR_DOMAIN_EVENT_RESUMED,
--                                              VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
--    virObjectEventStateQueue(driver->domainEventState, event);
-+    if (inPostCopy) {
-+        /* The only RESUME event during post-copy migration is triggered by
-+         * QEMU when the running domain moves from the source to the
-+         * destination host, but then the migration keeps running until all
-+         * modified memory is transferred from the source host. This will
-+         * result in VIR_DOMAIN_EVENT_RESUMED with RESUMED_POSTCOPY detail.
-+         * However, our API documentation says we need to fire another RESUMED
-+         * event at the very end of migration with RESUMED_MIGRATED detail.
-+         */
-+        event = virDomainEventLifecycleNewFromObj(vm,
-+                                                  VIR_DOMAIN_EVENT_RESUMED,
-+                                                  VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
-+        virObjectEventStateQueue(driver->domainEventState, event);
-+    }
- 
-     if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
-         virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER);
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 37568165b7..2d51c0fa25 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -436,7 +436,6 @@ qemuProcessFakeReboot(void *opaque)
-     virDomainObjPtr vm = opaque;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     virQEMUDriverPtr driver = priv->driver;
--    virObjectEventPtr event = NULL;
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-     virDomainRunningReason reason = VIR_DOMAIN_RUNNING_BOOTED;
-     int ret = -1, rc;
-@@ -473,9 +472,6 @@ qemuProcessFakeReboot(void *opaque)
-         goto endjob;
-     }
-     priv->gotShutdown = false;
--    event = virDomainEventLifecycleNewFromObj(vm,
--                                     VIR_DOMAIN_EVENT_RESUMED,
--                                     VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
- 
-     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) {
-         VIR_WARN("Unable to save status on vm %s after state change",
-@@ -491,7 +487,6 @@ qemuProcessFakeReboot(void *opaque)
-     if (ret == -1)
-         ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE));
-     virDomainObjEndAPI(&vm);
--    virObjectEventStateQueue(driver->domainEventState, event);
-     virObjectUnref(cfg);
- }
- 
-@@ -3073,7 +3068,10 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
-     if (ret < 0)
-         goto release;
- 
--    virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason);
-+    /* The RESUME event handler will change the domain state with the reason
-+     * saved in priv->runningReason and it will also emit corresponding domain
-+     * lifecycle event.
-+     */
- 
-  cleanup:
-     virObjectUnref(cfg);
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Avoid-probing-non-native-binaries-all-the-time.patch b/SOURCES/libvirt-qemu-Avoid-probing-non-native-binaries-all-the-time.patch
deleted file mode 100644
index 6f6b428..0000000
--- a/SOURCES/libvirt-qemu-Avoid-probing-non-native-binaries-all-the-time.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f8257195c948438cec0956ec4cc246d00d576d92 Mon Sep 17 00:00:00 2001
-Message-Id: <f8257195c948438cec0956ec4cc246d00d576d92@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:51 +0200
-Subject: [PATCH] qemu: Avoid probing non-native binaries all the time
-
-A side effect of recent changes is that we would always try
-to regenerate the capabilities cache for non-native QEMU
-binaries based on /dev/kvm availability, which is of course
-complete nonsense. Make sure that doesn't happen.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 55e5eb94788be06dd366de4987523bbc731672db)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 14d7b8fbf7..9b3f35553b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3905,6 +3905,14 @@ virQEMUCapsIsValid(void *data,
-         return false;
-     }
- 
-+    if (!virQEMUCapsGuestIsNative(priv->hostArch, qemuCaps->arch)) {
-+        VIR_DEBUG("Guest arch (%s) is not native to host arch (%s), "
-+                  "skipping KVM-related checks",
-+                  virArchToString(qemuCaps->arch),
-+                  virArchToString(priv->hostArch));
-+        return true;
-+    }
-+
-     kvmUsable = virFileAccessibleAs("/dev/kvm", R_OK | W_OK,
-                                     priv->runUid, priv->runGid) == 0;
- 
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Check-if-AMD-secure-guest-support-is-enabled.patch b/SOURCES/libvirt-qemu-Check-if-AMD-secure-guest-support-is-enabled.patch
new file mode 100644
index 0000000..a394827
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Check-if-AMD-secure-guest-support-is-enabled.patch
@@ -0,0 +1,80 @@
+From 71e87f4da22992c5d9f858535a1acaa7201aa7d3 Mon Sep 17 00:00:00 2001
+Message-Id: <71e87f4da22992c5d9f858535a1acaa7201aa7d3@dist-git>
+From: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:19 +0200
+Subject: [PATCH] qemu: Check if AMD secure guest support is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Implement secure guest check for AMD SEV (Secure Encrypted
+Virtualization) in order to invalidate the qemu capabilities
+cache in case the availability of the feature changed.
+
+For AMD SEV the verification consists of:
+ - checking if /sys/module/kvm_amd/parameters/sev contains the
+   value '1': meaning SEV is enabled in the host kernel;
+ - checking if /dev/sev exists
+
+Signed-off-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 657365e74f489b70bfbf2eb014db63046c5e3888)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <1c3393cb71b731f5632d150d77f9920b591aa5ee.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_capabilities.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 8a4b43c269..278eaa0009 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -4543,6 +4543,27 @@ virQEMUCapsKVMSupportsSecureGuestS390(void)
+ }
+ 
+ 
++/*
++ * Check whether AMD Secure Encrypted Virtualization (x86) is enabled
++ */
++static bool
++virQEMUCapsKVMSupportsSecureGuestAMD(void)
++{
++    g_autofree char *modValue = NULL;
++
++    if (virFileReadValueString(&modValue, "/sys/module/kvm_amd/parameters/sev") < 0)
++        return false;
++
++    if (modValue[0] != '1')
++        return false;
++
++    if (virFileExists(QEMU_DEV_SEV))
++        return true;
++
++    return false;
++}
++
++
+ /*
+  * Check whether the secure guest functionality is enabled.
+  * See the specific architecture function for details on the verifications made.
+@@ -4554,6 +4575,10 @@ virQEMUCapsKVMSupportsSecureGuest(void)
+ 
+     if (ARCH_IS_S390(arch))
+         return virQEMUCapsKVMSupportsSecureGuestS390();
++
++    if (ARCH_IS_X86(arch))
++        return virQEMUCapsKVMSupportsSecureGuestAMD();
++
+     return false;
+ }
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-Check-if-s390-secure-guest-support-is-enabled.patch b/SOURCES/libvirt-qemu-Check-if-s390-secure-guest-support-is-enabled.patch
new file mode 100644
index 0000000..eed06bf
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Check-if-s390-secure-guest-support-is-enabled.patch
@@ -0,0 +1,166 @@
+From 00ca6e3be3959169559c5bc44dd929d0f313b014 Mon Sep 17 00:00:00 2001
+Message-Id: <00ca6e3be3959169559c5bc44dd929d0f313b014@dist-git>
+From: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:18 +0200
+Subject: [PATCH] qemu: Check if s390 secure guest support is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch introduces a common function to verify if the
+availability of the so-called Secure Guest feature on the host
+has changed in order to invalidate the qemu capabilities cache.
+It can be used as an entry point for verification on different
+architectures.
+
+For s390 the verification consists of:
+- checking if /sys/firmware/uv is available: meaning the HW
+facility is available and the host OS supports it;
+- checking if the kernel cmdline contains 'prot_virt=1': meaning
+the host OS wants to use the feature.
+
+Whenever the availability of the feature does not match the secure
+guest flag in the cache then libvirt will re-build it in order to
+pick up the new set of capabilities available.
+
+Signed-off-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Tested-by: Viktor Mihajlovski <mihajlov@linux.ibm.com>
+Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit b611b620ceaf940017ba4d0b8b0638869c751509)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <3b91df0693526810b255db4ddc9af3484d655cbf.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_capabilities.c | 61 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 7609f44efb..8a4b43c269 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -23,6 +23,7 @@
+ 
+ #include "qemu_capabilities.h"
+ #include "viralloc.h"
++#include "virarch.h"
+ #include "vircrypto.h"
+ #include "virlog.h"
+ #include "virerror.h"
+@@ -642,6 +643,7 @@ struct _virQEMUCaps {
+ 
+     bool usedQMP;
+     bool kvmSupportsNesting;
++    bool kvmSupportsSecureGuest;
+ 
+     char *binary;
+     time_t ctime;
+@@ -1837,6 +1839,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
+     ret->invalidation = qemuCaps->invalidation;
+     ret->usedQMP = qemuCaps->usedQMP;
+     ret->kvmSupportsNesting = qemuCaps->kvmSupportsNesting;
++    ret->kvmSupportsSecureGuest = qemuCaps->kvmSupportsSecureGuest;
+ 
+     ret->ctime = qemuCaps->ctime;
+ 
+@@ -4233,6 +4236,9 @@ virQEMUCapsLoadCache(virArch hostArch,
+     if (virXPathBoolean("boolean(./kvmSupportsNesting)", ctxt) > 0)
+         qemuCaps->kvmSupportsNesting = true;
+ 
++    if (virXPathBoolean("boolean(./kvmSupportsSecureGuest)", ctxt) > 0)
++        qemuCaps->kvmSupportsSecureGuest = true;
++
+     ret = 0;
+  cleanup:
+     VIR_FREE(str);
+@@ -4467,6 +4473,9 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
+     if (qemuCaps->kvmSupportsNesting)
+         virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
+ 
++    if (qemuCaps->kvmSupportsSecureGuest)
++        virBufferAddLit(&buf, "<kvmSupportsSecureGuest/>\n");
++
+     virBufferAdjustIndent(&buf, -2);
+     virBufferAddLit(&buf, "</qemuCaps>\n");
+ 
+@@ -4506,6 +4515,49 @@ virQEMUCapsSaveFile(void *data,
+ }
+ 
+ 
++/*
++ * Check whether IBM Secure Execution (S390) is enabled
++ */
++static bool
++virQEMUCapsKVMSupportsSecureGuestS390(void)
++{
++
++    g_autofree char *cmdline = NULL;
++    static const char *kValues[] = {"y", "Y", "on", "ON", "oN", "On", "1"};
++
++    if (!virFileIsDir("/sys/firmware/uv"))
++        return false;
++
++    if (virFileReadValueString(&cmdline, "/proc/cmdline") < 0)
++        return false;
++
++    /* we're prefix matching rather than equality matching here, because kernel
++     * would treat even something like prot_virt='yFOO' as enabled */
++    if (virKernelCmdlineMatchParam(cmdline, "prot_virt", kValues,
++                                   G_N_ELEMENTS(kValues),
++                                   VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST |
++                                   VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX))
++        return true;
++
++    return false;
++}
++
++
++/*
++ * Check whether the secure guest functionality is enabled.
++ * See the specific architecture function for details on the verifications made.
++ */
++static bool
++virQEMUCapsKVMSupportsSecureGuest(void)
++{
++    virArch arch = virArchFromHost();
++
++    if (ARCH_IS_S390(arch))
++        return virQEMUCapsKVMSupportsSecureGuestS390();
++    return false;
++}
++
++
+ /* Check the kernel module parameters 'nested' file to determine if enabled
+  *
+  *   Intel: 'kvm_intel' uses 'Y'
+@@ -4685,6 +4737,13 @@ virQEMUCapsIsValid(void *data,
+                      qemuCaps->binary, qemuCaps->kvmSupportsNesting);
+             return false;
+         }
++
++        if (virQEMUCapsKVMSupportsSecureGuest() != qemuCaps->kvmSupportsSecureGuest) {
++            VIR_DEBUG("Outdated capabilities for '%s': kvm kernel secure guest "
++                      "value changed from %d",
++                      qemuCaps->binary, qemuCaps->kvmSupportsSecureGuest);
++            return false;
++        }
+     }
+ 
+     return true;
+@@ -5166,6 +5225,8 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,
+         qemuCaps->kernelVersion = g_strdup(kernelVersion);
+ 
+         qemuCaps->kvmSupportsNesting = virQEMUCapsKVMSupportsNesting();
++
++        qemuCaps->kvmSupportsSecureGuest = virQEMUCapsKVMSupportsSecureGuest();
+     }
+ 
+     return qemuCaps;
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-Clarify-QEMU_CAPS_KVM.patch b/SOURCES/libvirt-qemu-Clarify-QEMU_CAPS_KVM.patch
deleted file mode 100644
index 076afca..0000000
--- a/SOURCES/libvirt-qemu-Clarify-QEMU_CAPS_KVM.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From b8ca3f396e09f0ba190656363c0d1fc6a0dd9cd6 Mon Sep 17 00:00:00 2001
-Message-Id: <b8ca3f396e09f0ba190656363c0d1fc6a0dd9cd6@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:52 +0200
-Subject: [PATCH] qemu: Clarify QEMU_CAPS_KVM
-
-This capability is documented as having one meaning (whether
-KVM is enabled by default) but is actually assigned two other
-meanings over its life: whether the query-kvm QMP command is
-available at first, and later on whether KVM is usable / was
-used during probing.
-
-Since the query-kvm QMP command was available in 1.5.0, we
-can avoid probing for it; additionally, we can simplify the
-logic by setting the flag when it applies instead of initially
-setting it and then clearing it when it doesn't.
-
-The flag's description is also updated to reflect reality.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit c3be8bb4235b447dc29568f96b8c31cc741fc358)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c | 19 ++-----------------
- src/qemu/qemu_capabilities.h |  2 +-
- 2 files changed, 3 insertions(+), 18 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 9b3f35553b..c7ece21dd2 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -1003,7 +1003,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
-     { "block-stream", QEMU_CAPS_BLOCKJOB_ASYNC },
-     { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY },
-     { "query-spice", QEMU_CAPS_SPICE },
--    { "query-kvm", QEMU_CAPS_KVM },
-     { "block-commit", QEMU_CAPS_BLOCK_COMMIT },
-     { "query-vnc", QEMU_CAPS_VNC },
-     { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR },
-@@ -2584,25 +2583,11 @@ virQEMUCapsProbeQMPKVMState(virQEMUCapsPtr qemuCaps,
-     bool enabled = false;
-     bool present = false;
- 
--    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
--        return 0;
--
-     if (qemuMonitorGetKVMState(mon, &enabled, &present) < 0)
-         return -1;
- 
--    /* The QEMU_CAPS_KVM flag was initially set according to the QEMU
--     * reporting the recognition of 'query-kvm' QMP command. That merely
--     * indicates existence of the command though, not whether KVM support
--     * is actually available, nor whether it is enabled by default.
--     *
--     * If it is not present we need to clear the flag, and if it is
--     * not enabled by default we need to change the flag.
--     */
--    if (!present) {
--        virQEMUCapsClear(qemuCaps, QEMU_CAPS_KVM);
--    } else if (!enabled) {
--        virQEMUCapsClear(qemuCaps, QEMU_CAPS_KVM);
--    }
-+    if (present && enabled)
-+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM);
- 
-     return 0;
- }
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 98668115d6..6acd9fe825 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -65,7 +65,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     X_QEMU_CAPS_MIGRATE_QEMU_TCP, /* have qemu tcp migration */
-     X_QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */
-     X_QEMU_CAPS_DRIVE_CACHE_V2, /* cache= flag wanting new v2 values */
--    QEMU_CAPS_KVM, /* Whether KVM is enabled by default */
-+    QEMU_CAPS_KVM, /* Whether KVM is usable / was used during probing */
-     X_QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */
- 
-     /* 15 */
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Create-multipath-targets-for-PRs.patch b/SOURCES/libvirt-qemu-Create-multipath-targets-for-PRs.patch
new file mode 100644
index 0000000..b122893
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Create-multipath-targets-for-PRs.patch
@@ -0,0 +1,399 @@
+From 73c83c67608896704bfeb55b7f973f3e5ee12c96 Mon Sep 17 00:00:00 2001
+Message-Id: <73c83c67608896704bfeb55b7f973f3e5ee12c96@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 17 Mar 2020 16:08:02 +0100
+Subject: [PATCH] qemu: Create multipath targets for PRs
+
+If a disk has persistent reservations enabled, qemu-pr-helper
+might open not only /dev/mapper/control but also individual
+targets of the multipath device. We are already querying for them
+in CGroups, but now we have to create them in the namespace too.
+This was brought up in [1].
+
+1: https://bugzilla.redhat.com/show_bug.cgi?id=1711045#c61
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Tested-by: Lin Ma <LMa@suse.com>
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+(cherry picked from commit a30078cb832646177defd256e77c632905f1e6d0)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1814157
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+
+Conflicts:
+src/qemu/qemu_domain.c: There are two conflicts. The first one is
+in the first hunk because 7e0d11be5b0 is not backported. The
+second conflict is in the third hunk and it is because
+db780004a9d and friends which switches the code over to use
+autofree and drops needless cleanup labels are not backported.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <7a59996bd80955551d37f775e8d682649b1f4a45.1584457667.git.mprivozn@redhat.com>
+Acked-by: Peter Krempa <pkrempa@redhat.com>
+---
+ src/qemu/qemu_domain.c                        | 64 ++++++++++------
+ src/util/virdevmapper.h                       |  4 +-
+ src/util/virutil.h                            |  2 +-
+ tests/qemuhotplugmock.c                       | 75 +++++++++++++++++++
+ tests/qemuhotplugtest.c                       | 13 ++++
+ .../qemuhotplug-disk-scsi-multipath.xml       |  8 ++
+ ...uhotplug-base-live+disk-scsi-multipath.xml | 62 +++++++++++++++
+ 7 files changed, 204 insertions(+), 24 deletions(-)
+ create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-multipath.xml
+ create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index a273aefa6b..36a63449b2 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -62,6 +62,7 @@
+ #include "virdomainsnapshotobjlist.h"
+ #include "virdomaincheckpointobjlist.h"
+ #include "backup_conf.h"
++#include "virdevmapper.h"
+ 
+ #ifdef MAJOR_IN_MKDEV
+ # include <sys/mkdev.h>
+@@ -14866,6 +14867,9 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
+     int ret = -1;
+ 
+     for (next = disk->src; virStorageSourceIsBacking(next); next = next->backingStore) {
++        VIR_AUTOSTRINGLIST targetPaths = NULL;
++        size_t i;
++
+         if (next->type == VIR_STORAGE_TYPE_NVME) {
+             g_autofree char *nvmePath = NULL;
+ 
+@@ -14884,6 +14888,19 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
+ 
+             if (qemuDomainCreateDevice(next->path, data, false) < 0)
+                 goto cleanup;
++
++            if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
++                errno != ENOSYS && errno != EBADF) {
++                virReportSystemError(errno,
++                                     _("Unable to get devmapper targets for %s"),
++                                     next->path);
++                goto cleanup;
++            }
++
++            for (i = 0; targetPaths && targetPaths[i]; i++) {
++                if (qemuDomainCreateDevice(targetPaths[i], data, false) < 0)
++                    goto cleanup;
++            }
+         }
+     }
+ 
+@@ -15910,21 +15927,19 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
+                              virStorageSourcePtr src)
+ {
+     virStorageSourcePtr next;
+-    char **paths = NULL;
++    VIR_AUTOSTRINGLIST paths = NULL;
+     size_t npaths = 0;
+     bool hasNVMe = false;
+-    g_autofree char *dmPath = NULL;
+-    g_autofree char *vfioPath = NULL;
+-    int ret = -1;
+ 
+     for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) {
++        VIR_AUTOSTRINGLIST targetPaths = NULL;
+         g_autofree char *tmpPath = NULL;
+ 
+         if (next->type == VIR_STORAGE_TYPE_NVME) {
+             hasNVMe = true;
+ 
+             if (!(tmpPath = virPCIDeviceAddressGetIOMMUGroupDev(&next->nvme->pciAddr)))
+-                goto cleanup;
++                return -1;
+         } else {
+             if (virStorageSourceIsEmpty(next) ||
+                 !virStorageSourceIsLocalStorage(next)) {
+@@ -15935,30 +15950,35 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
+             tmpPath = g_strdup(next->path);
+         }
+ 
+-        if (VIR_APPEND_ELEMENT(paths, npaths, tmpPath) < 0)
+-            goto cleanup;
++        if (virStringListAdd(&paths, tmpPath) < 0)
++            return -1;
++
++        if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
++            errno != ENOSYS && errno != EBADF) {
++            virReportSystemError(errno,
++                                 _("Unable to get devmapper targets for %s"),
++                                 next->path);
++            return -1;
++        }
++
++        if (virStringListMerge(&paths, &targetPaths) < 0)
++            return -1;
+     }
+ 
+     /* qemu-pr-helper might require access to /dev/mapper/control. */
+-    if (src->pr) {
+-        dmPath = g_strdup(QEMU_DEVICE_MAPPER_CONTROL_PATH);
+-        if (VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0)
+-            goto cleanup;
+-    }
++    if (src->pr &&
++        virStringListAdd(&paths, QEMU_DEVICE_MAPPER_CONTROL_PATH) < 0)
++        return -1;
+ 
+-    if (hasNVMe) {
+-        vfioPath = g_strdup(QEMU_DEV_VFIO);
+-        if (VIR_APPEND_ELEMENT(paths, npaths, vfioPath) < 0)
+-            goto cleanup;
+-    }
++    if (hasNVMe &&
++        virStringListAdd(&paths, QEMU_DEV_VFIO) < 0)
++        return -1;
+ 
++    npaths = virStringListLength((const char **) paths);
+     if (qemuDomainNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0)
+-        goto cleanup;
++        return -1;
+ 
+-    ret = 0;
+- cleanup:
+-    virStringListFreeCount(paths, npaths);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
+index e576d2bf7e..87bbc63cfd 100644
+--- a/src/util/virdevmapper.h
++++ b/src/util/virdevmapper.h
+@@ -20,6 +20,8 @@
+ 
+ #pragma once
+ 
++#include "internal.h"
++
+ int
+ virDevMapperGetTargets(const char *path,
+-                       char ***devPaths);
++                       char ***devPaths) G_GNUC_NO_INLINE;
+diff --git a/src/util/virutil.h b/src/util/virutil.h
+index a2530e21b5..58c45a6447 100644
+--- a/src/util/virutil.h
++++ b/src/util/virutil.h
+@@ -122,7 +122,7 @@ bool virValidateWWN(const char *wwn);
+ 
+ int virGetDeviceID(const char *path,
+                    int *maj,
+-                   int *min);
++                   int *min) G_GNUC_NO_INLINE;
+ int virSetDeviceUnprivSGIO(const char *path,
+                            int unpriv_sgio);
+ int virGetDeviceUnprivSGIO(const char *path,
+diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c
+index 43a9d79051..8e5b07788d 100644
+--- a/tests/qemuhotplugmock.c
++++ b/tests/qemuhotplugmock.c
+@@ -19,7 +19,24 @@
+ #include <config.h>
+ 
+ #include "qemu/qemu_hotplug.h"
++#include "qemu/qemu_process.h"
+ #include "conf/domain_conf.h"
++#include "virdevmapper.h"
++#include "virutil.h"
++#include "virmock.h"
++
++static int (*real_virGetDeviceID)(const char *path, int *maj, int *min);
++static bool (*real_virFileExists)(const char *path);
++
++static void
++init_syms(void)
++{
++    if (real_virFileExists)
++        return;
++
++    VIR_MOCK_REAL_INIT(virGetDeviceID);
++    VIR_MOCK_REAL_INIT(virFileExists);
++}
+ 
+ unsigned long long
+ qemuDomainGetUnplugTimeout(virDomainObjPtr vm G_GNUC_UNUSED)
+@@ -31,3 +48,61 @@ qemuDomainGetUnplugTimeout(virDomainObjPtr vm G_GNUC_UNUSED)
+         return 200;
+     return 100;
+ }
++
++
++int
++virDevMapperGetTargets(const char *path,
++                       char ***devPaths)
++{
++    *devPaths = NULL;
++
++    if (STREQ(path, "/dev/mapper/virt")) {
++        *devPaths = g_new(char *, 4);
++        (*devPaths)[0] = g_strdup("/dev/block/8:0");  /* /dev/sda */
++        (*devPaths)[1] = g_strdup("/dev/block/8:16"); /* /dev/sdb */
++        (*devPaths)[2] = g_strdup("/dev/block/8:32"); /* /dev/sdc */
++        (*devPaths)[3] = NULL;
++    }
++
++    return 0;
++}
++
++
++int
++virGetDeviceID(const char *path, int *maj, int *min)
++{
++    init_syms();
++
++    if (STREQ(path, "/dev/mapper/virt")) {
++        *maj = 254;
++        *min = 0;
++        return 0;
++    }
++
++    return real_virGetDeviceID(path, maj, min);
++}
++
++
++bool
++virFileExists(const char *path)
++{
++    init_syms();
++
++    if (STREQ(path, "/dev/mapper/virt"))
++        return true;
++
++    return real_virFileExists(path);
++}
++
++
++int
++qemuProcessStartManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED)
++{
++    return 0;
++}
++
++
++void
++qemuProcessKillManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED)
++{
++}
+diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
+index a60c8d1c93..2105c70ca8 100644
+--- a/tests/qemuhotplugtest.c
++++ b/tests/qemuhotplugtest.c
+@@ -87,6 +87,8 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
+     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VNC);
+     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE);
+     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
++    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER);
++    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_BLOCK);
+ 
+     if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0)
+         return -1;
+@@ -743,6 +745,17 @@ mymain(void)
+                    "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
+                    "human-monitor-command", HMP(""));
+ 
++    DO_TEST_ATTACH("base-live", "disk-scsi-multipath", false, true,
++                   "object-add", QMP_OK,
++                   "human-monitor-command", HMP("OK\\r\\n"),
++                   "device_add", QMP_OK);
++    DO_TEST_DETACH("base-live", "disk-scsi-multipath", true, true,
++                   "device_del", QMP_OK,
++                   "human-monitor-command", HMP(""));
++    DO_TEST_DETACH("base-live", "disk-scsi-multipath", false, false,
++                   "device_del", QMP_DEVICE_DELETED("scsi0-0-0-0") QMP_OK,
++                   "human-monitor-command", HMP(""));
++
+     DO_TEST_ATTACH("base-live", "qemu-agent", false, true,
+                    "chardev-add", QMP_OK,
+                    "device_add", QMP_OK);
+diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-multipath.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-multipath.xml
+new file mode 100644
+index 0000000000..5a6f955284
+--- /dev/null
++++ b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-multipath.xml
+@@ -0,0 +1,8 @@
++<disk type='block' device='lun'>
++    <driver name='qemu' type='raw'/>
++    <source dev='/dev/mapper/virt'>
++        <reservations managed='yes'/>
++    </source>
++    <target dev='sda' bus='scsi'/>
++  <address type='drive' controller='0' bus='0' target='0' unit='0'/>
++</disk>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
+new file mode 100644
+index 0000000000..40af064d10
+--- /dev/null
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
+@@ -0,0 +1,62 @@
++<domain type='kvm' id='7'>
++  <name>hotplug</name>
++  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
++  <memory unit='KiB'>4194304</memory>
++  <currentMemory unit='KiB'>4194304</currentMemory>
++  <vcpu placement='static'>4</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <features>
++    <acpi/>
++    <apic/>
++    <pae/>
++  </features>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>restart</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu-system-x86_64</emulator>
++    <disk type='block' device='lun'>
++      <driver name='qemu' type='raw'/>
++      <source dev='/dev/mapper/virt'>
++        <reservations managed='yes'>
++          <source type='unix' path='/tmp/lib/domain-7-hotplug/pr-helper0.sock' mode='client'/>
++        </reservations>
++      </source>
++      <backingStore/>
++      <target dev='sda' bus='scsi'/>
++      <alias name='scsi0-0-0-0'/>
++      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
++    </disk>
++    <controller type='usb' index='0'>
++      <alias name='usb'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
++    </controller>
++    <controller type='ide' index='0'>
++      <alias name='ide'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
++    </controller>
++    <controller type='scsi' index='0' model='virtio-scsi'>
++      <alias name='scsi0'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </controller>
++    <controller type='pci' index='0' model='pci-root'>
++      <alias name='pci'/>
++    </controller>
++    <controller type='virtio-serial' index='0'>
++      <alias name='virtio-serial0'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
++    </controller>
++    <input type='mouse' bus='ps2'>
++      <alias name='input0'/>
++    </input>
++    <input type='keyboard' bus='ps2'>
++      <alias name='input1'/>
++    </input>
++    <memballoon model='none'/>
++  </devices>
++  <seclabel type='none' model='none'/>
++</domain>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Don-t-cache-microcode-version.patch b/SOURCES/libvirt-qemu-Don-t-cache-microcode-version.patch
deleted file mode 100644
index 25c6132..0000000
--- a/SOURCES/libvirt-qemu-Don-t-cache-microcode-version.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 6832d9d8dd0963f4865801a29e848ff3256b3282 Mon Sep 17 00:00:00 2001
-Message-Id: <6832d9d8dd0963f4865801a29e848ff3256b3282@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 12 Apr 2019 21:21:05 +0200
-Subject: [PATCH] qemu: Don't cache microcode version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-My earlier commit be46f61326 was incomplete. It removed caching of
-microcode version in the CPU driver, which means the capabilities XML
-will see the correct microcode version. But it is also cached in the
-QEMU capabilities cache where it is used to detect whether we need to
-reprobe QEMU. By missing the second place, the original commit
-be46f61326 made the situation even worse since libvirt would report
-correct microcode version while still using the old host CPU model
-(visible in domain capabilities XML).
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 673c62a3b7855a0685d8f116e227c402720b9ee9)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-            - virQEMUCapsCacheLookupByArch refactoring (commits
-              7948ad4129a and 1a3de67001c) are missing
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c | 12 ++++++++----
- src/qemu/qemu_capabilities.h |  3 +--
- src/qemu/qemu_driver.c       |  9 +--------
- tests/testutilsqemu.c        |  2 +-
- 4 files changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 912f758bcd..0d6fa02560 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -4684,7 +4684,7 @@ virQEMUCapsNewData(const char *binary,
-                                            priv->libDir,
-                                            priv->runUid,
-                                            priv->runGid,
--                                           priv->microcodeVersion,
-+                                           virHostCPUGetMicrocodeVersion(),
-                                            priv->kernelVersion);
- }
- 
-@@ -4767,8 +4767,7 @@ virFileCachePtr
- virQEMUCapsCacheNew(const char *libDir,
-                     const char *cacheDir,
-                     uid_t runUid,
--                    gid_t runGid,
--                    unsigned int microcodeVersion)
-+                    gid_t runGid)
- {
-     char *capsCacheDir = NULL;
-     virFileCachePtr cache = NULL;
-@@ -4792,7 +4791,6 @@ virQEMUCapsCacheNew(const char *libDir,
- 
-     priv->runUid = runUid;
-     priv->runGid = runGid;
--    priv->microcodeVersion = microcodeVersion;
- 
-     if (uname(&uts) == 0 &&
-         virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0)
-@@ -4813,8 +4811,11 @@ virQEMUCapsPtr
- virQEMUCapsCacheLookup(virFileCachePtr cache,
-                        const char *binary)
- {
-+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
-     virQEMUCapsPtr ret = NULL;
- 
-+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-+
-     ret = virFileCacheLookup(cache, binary);
- 
-     VIR_DEBUG("Returning caps %p for %s", ret, binary);
-@@ -4860,10 +4861,13 @@ virQEMUCapsPtr
- virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
-                              virArch arch)
- {
-+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
-     virQEMUCapsPtr ret = NULL;
-     virArch target;
-     struct virQEMUCapsSearchData data = { .arch = arch };
- 
-+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-+
-     ret = virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch, &data);
-     if (!ret) {
-         /* If the first attempt at finding capabilities has failed, try
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 0c06081107..9550df2cd5 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -574,8 +574,7 @@ void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
- virFileCachePtr virQEMUCapsCacheNew(const char *libDir,
-                                     const char *cacheDir,
-                                     uid_t uid,
--                                    gid_t gid,
--                                    unsigned int microcodeVersion);
-+                                    gid_t gid);
- virQEMUCapsPtr virQEMUCapsCacheLookup(virFileCachePtr cache,
-                                       const char *binary);
- virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virFileCachePtr cache,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bafef1e3b5..88c08f88ee 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -592,8 +592,6 @@ qemuStateInitialize(bool privileged,
-     char *hugepagePath = NULL;
-     char *memoryBackingPath = NULL;
-     size_t i;
--    virCPUDefPtr hostCPU = NULL;
--    unsigned int microcodeVersion = 0;
- 
-     if (VIR_ALLOC(qemu_driver) < 0)
-         return -1;
-@@ -813,15 +811,10 @@ qemuStateInitialize(bool privileged,
-         run_gid = cfg->group;
-     }
- 
--    if ((hostCPU = virCPUProbeHost(virArchFromHost())))
--        microcodeVersion = hostCPU->microcodeVersion;
--    virCPUDefFree(hostCPU);
--
-     qemu_driver->qemuCapsCache = virQEMUCapsCacheNew(cfg->libDir,
-                                                      cfg->cacheDir,
-                                                      run_uid,
--                                                     run_gid,
--                                                     microcodeVersion);
-+                                                     run_gid);
-     if (!qemu_driver->qemuCapsCache)
-         goto error;
- 
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index dc7e90b952..3e0b753549 100644
---- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -617,7 +617,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
- 
-     /* Using /dev/null for libDir and cacheDir automatically produces errors
-      * upon attempt to use any of them */
--    driver->qemuCapsCache = virQEMUCapsCacheNew("/dev/null", "/dev/null", 0, 0, 0);
-+    driver->qemuCapsCache = virQEMUCapsCacheNew("/dev/null", "/dev/null", 0, 0);
-     if (!driver->qemuCapsCache)
-         goto error;
- 
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu-Don-t-check-for-dev-kvm-presence.patch b/SOURCES/libvirt-qemu-Don-t-check-for-dev-kvm-presence.patch
deleted file mode 100644
index dea2d19..0000000
--- a/SOURCES/libvirt-qemu-Don-t-check-for-dev-kvm-presence.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 748e6ba76086dbb122d6cd750ced935405194fc5 Mon Sep 17 00:00:00 2001
-Message-Id: <748e6ba76086dbb122d6cd750ced935405194fc5@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:53 +0200
-Subject: [PATCH] qemu: Don't check for /dev/kvm presence
-
-The file being present doesn't necessarily mean anything these
-days, as it's created independently of whether the kvm module
-has been loaded[1]; moreover, we're already gathering all the
-information we need through QMP, so poking the filesystem at
-all is entirely unnecessary.
-
-[1] https://github.com/systemd/systemd/commit/d35d6249d5a7ed3228
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 2f8b91ee74ff617aba322d034119427cad977af9)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index c7ece21dd2..5fd10c2d40 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -832,9 +832,8 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
-     if (!binary)
-         return 0;
- 
--    if (virFileExists("/dev/kvm") &&
--        (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
--         kvmbin))
-+    if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
-+        kvmbin)
-         haskvm = true;
- 
-     if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0)
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Don-t-crash-when-getting-targets-for-a-multipath.patch b/SOURCES/libvirt-qemu-Don-t-crash-when-getting-targets-for-a-multipath.patch
new file mode 100644
index 0000000..657264e
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Don-t-crash-when-getting-targets-for-a-multipath.patch
@@ -0,0 +1,84 @@
+From eb4cd7cd29f434bae7279b3166aac9f7eb2c2436 Mon Sep 17 00:00:00 2001
+Message-Id: <eb4cd7cd29f434bae7279b3166aac9f7eb2c2436@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 19 Mar 2020 19:46:43 +0100
+Subject: [PATCH] qemu: Don't crash when getting targets for a multipath
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In one of my previous commits I've introduced code that creates
+all devices for given (possible) multipath target. But I've made
+a mistake there - the code accesses 'next->path' without checking
+if the disk source is local. Note that the 'next->path' is
+NULL/doesn't make sense for VIR_STORAGE_TYPE_NVME.
+
+Fixes: a30078cb832646177defd256e77c632905f1e6d0
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1814947
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit aeb909bf9b4c3fa48d017475545df94f7c5d3b3a)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <3f21a46399486a42b8dd0fbbac25b75f4f6ac80a.1584643597.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 36a63449b2..3d31e176d1 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -15932,7 +15932,6 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
+     bool hasNVMe = false;
+ 
+     for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) {
+-        VIR_AUTOSTRINGLIST targetPaths = NULL;
+         g_autofree char *tmpPath = NULL;
+ 
+         if (next->type == VIR_STORAGE_TYPE_NVME) {
+@@ -15941,6 +15940,8 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
+             if (!(tmpPath = virPCIDeviceAddressGetIOMMUGroupDev(&next->nvme->pciAddr)))
+                 return -1;
+         } else {
++            VIR_AUTOSTRINGLIST targetPaths = NULL;
++
+             if (virStorageSourceIsEmpty(next) ||
+                 !virStorageSourceIsLocalStorage(next)) {
+                 /* Not creating device. Just continue. */
+@@ -15948,20 +15949,20 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
+             }
+ 
+             tmpPath = g_strdup(next->path);
+-        }
+ 
+-        if (virStringListAdd(&paths, tmpPath) < 0)
+-            return -1;
++            if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
++                errno != ENOSYS && errno != EBADF) {
++                virReportSystemError(errno,
++                                     _("Unable to get devmapper targets for %s"),
++                                     next->path);
++                return -1;
++            }
+ 
+-        if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
+-            errno != ENOSYS && errno != EBADF) {
+-            virReportSystemError(errno,
+-                                 _("Unable to get devmapper targets for %s"),
+-                                 next->path);
+-            return -1;
++            if (virStringListMerge(&paths, &targetPaths) < 0)
++                return -1;
+         }
+ 
+-        if (virStringListMerge(&paths, &targetPaths) < 0)
++        if (virStringListAdd(&paths, tmpPath) < 0)
+             return -1;
+     }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Don-t-emit-SUSPENDED_POSTCOPY-event-on-destination.patch b/SOURCES/libvirt-qemu-Don-t-emit-SUSPENDED_POSTCOPY-event-on-destination.patch
new file mode 100644
index 0000000..2ec063b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Don-t-emit-SUSPENDED_POSTCOPY-event-on-destination.patch
@@ -0,0 +1,53 @@
+From fcad662da8e472fc749a439d5bc2bdd30164d779 Mon Sep 17 00:00:00 2001
+Message-Id: <fcad662da8e472fc749a439d5bc2bdd30164d779@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 16 Jan 2020 19:57:53 +0100
+Subject: [PATCH] qemu: Don't emit SUSPENDED_POSTCOPY event on destination
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When pause-before-switchover QEMU capability is enabled, we get STOP
+event before MIGRATION event with postcopy-active state. To properly
+handle post-copy migration and emit correct events commit
+v4.10.0-rc1-4-geca9d21e6c added a hack to
+qemuProcessHandleMigrationStatus which translates the paused state
+reason to VIR_DOMAIN_PAUSED_POSTCOPY and emits
+VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY event when migration state changes
+to post-copy.
+
+However, the code was effective on both sides of migration resulting in
+a confusing VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY event on the destination
+host, where entering post-copy mode is already properly advertised by
+VIR_DOMAIN_EVENT_RESUMED_POSTCOPY event.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791458
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bd04d63ad97c21b6955710e6473a502f49816a3c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791886
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <9b32d5af0dd1d3bf7108abc426dc4d6ceeaa84f8.1579193220.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_process.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 4195042194..a7bbab9e56 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -1653,6 +1653,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED,
+     virDomainObjBroadcast(vm);
+ 
+     if (status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY &&
++        priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT &&
+         virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED &&
+         reason == VIR_DOMAIN_PAUSED_MIGRATION) {
+         VIR_DEBUG("Correcting paused state reason for domain %s to %s",
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Don-t-ignore-resume-events.patch b/SOURCES/libvirt-qemu-Don-t-ignore-resume-events.patch
deleted file mode 100644
index cc514a5..0000000
--- a/SOURCES/libvirt-qemu-Don-t-ignore-resume-events.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From f1857a275fc589565d1665c1a7239911ec72b9da Mon Sep 17 00:00:00 2001
-Message-Id: <f1857a275fc589565d1665c1a7239911ec72b9da@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 7 Nov 2018 14:34:52 +0100
-Subject: [PATCH] qemu: Don't ignore resume events
-
-Since commit v4.7.0-302-ge6d77a75c4 processing RESUME event is mandatory
-for updating domain state. But the event handler explicitly ignored this
-event in some cases. Thus the state would be wrong after a fake reboot
-or when a domain was rebooted after it crashed.
-
-BTW, the code to ignore RESUME event after SHUTDOWN didn't make sense
-even before making RESUME event mandatory. Most likely it was there as a
-result of careless copy&paste from qemuProcessHandleStop.
-
-The corresponding debug message was clarified since the original state
-does not have to be "paused" only and while we have a "resumed" event,
-the state is called "running".
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1612943
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit e47949357ba268e7e8c3adea7c262b84fa002302)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634759
-https://bugzilla.redhat.com/show_bug.cgi?id=1634758
-https://bugzilla.redhat.com/show_bug.cgi?id=1643338
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_process.c | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 23958bcbce..e4b19b938c 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -699,15 +699,10 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-         priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN;
-     }
- 
--    if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
--        if (priv->gotShutdown) {
--            VIR_DEBUG("Ignoring RESUME event after SHUTDOWN");
--            goto unlock;
--        }
--
-+    if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) {
-         eventDetail = qemuDomainRunningReasonToResumeEvent(reason);
--        VIR_DEBUG("Transitioned guest %s out of paused into resumed state, "
--                  "reason '%s', event detail %d",
-+        VIR_DEBUG("Transitioned guest %s into running state, reason '%s', "
-+                  "event detail %d",
-                   vm->def->name, virDomainRunningReasonTypeToString(reason),
-                   eventDetail);
- 
-@@ -722,7 +717,6 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-         }
-     }
- 
-- unlock:
-     virObjectUnlock(vm);
-     virObjectEventStateQueue(driver->domainEventState, event);
-     virObjectUnref(cfg);
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Don-t-store-disk-alias-in-qemuAgentDiskInfo.patch b/SOURCES/libvirt-qemu-Don-t-store-disk-alias-in-qemuAgentDiskInfo.patch
new file mode 100644
index 0000000..d5b4bf9
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Don-t-store-disk-alias-in-qemuAgentDiskInfo.patch
@@ -0,0 +1,192 @@
+From b4840a983e10b8cca99fa50ed3cf99af370a19c9 Mon Sep 17 00:00:00 2001
+Message-Id: <b4840a983e10b8cca99fa50ed3cf99af370a19c9@dist-git>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Thu, 20 Feb 2020 10:52:25 -0600
+Subject: [PATCH] qemu: Don't store disk alias in qemuAgentDiskInfo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The qemuAgentDiskInfo structure is filled with information received from
+the agent command response, except for the 'alias' field, which is
+retrieved from the vm definition. Limit this structure only to data that
+was received from the agent message.
+
+This is another intermediate step in moving the responsibility for
+searching the vmdef from qemu_agent.c to qemu_driver.c so that we can
+avoid holding an agent job and a normal job at the same time.
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 306b4cb070b8f57a22a261d1f097283f4ef84e65)
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1759566
+Message-Id: <20200220165227.11491-4-jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_agent.c | 64 ++++++++++++++++++++++++-------------------
+ 1 file changed, 36 insertions(+), 28 deletions(-)
+
+diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
+index 077b5538de..4739faeed8 100644
+--- a/src/qemu/qemu_agent.c
++++ b/src/qemu/qemu_agent.c
+@@ -1847,7 +1847,6 @@ qemuAgentSetTime(qemuAgentPtr mon,
+ typedef struct _qemuAgentDiskInfo qemuAgentDiskInfo;
+ typedef qemuAgentDiskInfo *qemuAgentDiskInfoPtr;
+ struct _qemuAgentDiskInfo {
+-    char *alias;
+     char *serial;
+     virPCIDeviceAddress pci_controller;
+     char *bus_type;
+@@ -1876,7 +1875,6 @@ qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info)
+         return;
+ 
+     VIR_FREE(info->serial);
+-    VIR_FREE(info->alias);
+     VIR_FREE(info->bus_type);
+     VIR_FREE(info->devnode);
+     VIR_FREE(info);
+@@ -1902,7 +1900,8 @@ qemuAgentFSInfoFree(qemuAgentFSInfoPtr info)
+ }
+ 
+ static virDomainFSInfoPtr
+-qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent)
++qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent,
++                        virDomainDefPtr vmdef)
+ {
+     virDomainFSInfoPtr ret = NULL;
+     size_t i;
+@@ -1920,8 +1919,19 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent)
+ 
+     ret->ndevAlias = agent->ndisks;
+ 
+-    for (i = 0; i < ret->ndevAlias; i++)
+-        ret->devAlias[i] = g_strdup(agent->disks[i]->alias);
++    for (i = 0; i < ret->ndevAlias; i++) {
++        qemuAgentDiskInfoPtr agentdisk = agent->disks[i];
++        virDomainDiskDefPtr diskDef;
++
++        if (!(diskDef = virDomainDiskByAddress(vmdef,
++                                               &agentdisk->pci_controller,
++                                               agentdisk->bus,
++                                               agentdisk->target,
++                                               agentdisk->unit)))
++            continue;
++
++        ret->devAlias[i] = g_strdup(diskDef->dst);
++    }
+ 
+     return ret;
+ 
+@@ -1932,8 +1942,7 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent)
+ 
+ static int
+ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+-                            qemuAgentFSInfoPtr fsinfo,
+-                            virDomainDefPtr vmdef)
++                            qemuAgentFSInfoPtr fsinfo)
+ {
+     size_t ndisks;
+     size_t i;
+@@ -1956,7 +1965,6 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+         virJSONValuePtr jsondisk = virJSONValueArrayGet(jsondisks, i);
+         virJSONValuePtr pci;
+         qemuAgentDiskInfoPtr disk;
+-        virDomainDiskDefPtr diskDef;
+         const char *val;
+ 
+         if (!jsondisk) {
+@@ -2007,14 +2015,6 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+         GET_DISK_ADDR(pci, &disk->pci_controller.function, "function");
+ 
+ #undef GET_DISK_ADDR
+-        if (!(diskDef = virDomainDiskByAddress(vmdef,
+-                                               &disk->pci_controller,
+-                                               disk->bus,
+-                                               disk->target,
+-                                               disk->unit)))
+-            continue;
+-
+-        disk->alias = g_strdup(diskDef->dst);
+     }
+ 
+     return 0;
+@@ -2026,8 +2026,7 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+  */
+ static int
+ qemuAgentGetFSInfoInternal(qemuAgentPtr mon,
+-                           qemuAgentFSInfoPtr **info,
+-                           virDomainDefPtr vmdef)
++                           qemuAgentFSInfoPtr **info)
+ {
+     size_t i;
+     int ret = -1;
+@@ -2143,7 +2142,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon,
+             goto cleanup;
+         }
+ 
+-        if (qemuAgentGetFSInfoFillDisks(disk, info_ret[i], vmdef) < 0)
++        if (qemuAgentGetFSInfoFillDisks(disk, info_ret[i]) < 0)
+             goto cleanup;
+     }
+ 
+@@ -2173,14 +2172,14 @@ qemuAgentGetFSInfo(qemuAgentPtr mon,
+     size_t i;
+     int nfs;
+ 
+-    nfs = qemuAgentGetFSInfoInternal(mon, &agentinfo, vmdef);
++    nfs = qemuAgentGetFSInfoInternal(mon, &agentinfo);
+     if (nfs < 0)
+         return ret;
+     if (VIR_ALLOC_N(info_ret, nfs) < 0)
+         goto cleanup;
+ 
+     for (i = 0; i < nfs; i++) {
+-        if (!(info_ret[i] = qemuAgentFSInfoToPublic(agentinfo[i])))
++        if (!(info_ret[i] = qemuAgentFSInfoToPublic(agentinfo[i], vmdef)))
+             goto cleanup;
+     }
+ 
+@@ -2215,7 +2214,7 @@ qemuAgentGetFSInfoParams(qemuAgentPtr mon,
+     size_t i, j;
+     int nfs;
+ 
+-    if ((nfs = qemuAgentGetFSInfoInternal(mon, &fsinfo, vmdef)) < 0)
++    if ((nfs = qemuAgentGetFSInfoInternal(mon, &fsinfo)) < 0)
+         return nfs;
+ 
+     if (virTypedParamsAddUInt(params, nparams, maxparams,
+@@ -2262,13 +2261,22 @@ qemuAgentGetFSInfoParams(qemuAgentPtr mon,
+                                   param_name, fsinfo[i]->ndisks) < 0)
+             goto cleanup;
+         for (j = 0; j < fsinfo[i]->ndisks; j++) {
++            virDomainDiskDefPtr diskdef = NULL;
+             qemuAgentDiskInfoPtr d = fsinfo[i]->disks[j];
+-            g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                       "fs.%zu.disk.%zu.alias", i, j);
+-            if (d->alias &&
+-                virTypedParamsAddString(params, nparams, maxparams,
+-                                        param_name, d->alias) < 0)
+-                goto cleanup;
++            /* match the disk to the target in the vm definition */
++            diskdef = virDomainDiskByAddress(vmdef,
++                                             &d->pci_controller,
++                                             d->bus,
++                                             d->target,
++                                             d->unit);
++            if (diskdef) {
++                g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                           "fs.%zu.disk.%zu.alias", i, j);
++                if (diskdef->dst &&
++                    virTypedParamsAddString(params, nparams, maxparams,
++                                            param_name, diskdef->dst) < 0)
++                    goto cleanup;
++            }
+ 
+             g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+                        "fs.%zu.disk.%zu.serial", i, j);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Don-t-take-double-pointer-in-qemuDomainSecretInfoFree.patch b/SOURCES/libvirt-qemu-Don-t-take-double-pointer-in-qemuDomainSecretInfoFree.patch
new file mode 100644
index 0000000..c319883
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Don-t-take-double-pointer-in-qemuDomainSecretInfoFree.patch
@@ -0,0 +1,161 @@
+From bcc3726dae87335a533565c6d679434fa69fe75e Mon Sep 17 00:00:00 2001
+Message-Id: <bcc3726dae87335a533565c6d679434fa69fe75e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:41 +0100
+Subject: [PATCH] qemu: Don't take double pointer in qemuDomainSecretInfoFree
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Using a double pointer prevents the function from being used as the
+automatic cleanup function for the given type.
+
+Remove the double pointer use by replacing the calls with
+g_clear_pointer which ensures that the pointer is cleared.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 38bc76bcc1e1bccb7f3265e15b60b0f6f8fe6dfa)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <56ebeda94754aab81a682202f26c1dc158ac063a.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c           | 30 +++++++++++++-----------------
+ src/qemu/qemu_domain.h           |  2 +-
+ src/qemu/qemu_migration_params.c |  2 +-
+ 3 files changed, 15 insertions(+), 19 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 14bab896bc..b77488026a 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1106,14 +1106,10 @@ qemuDomainSecretInfoClear(qemuDomainSecretInfoPtr secinfo,
+ 
+ 
+ void
+-qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo)
++qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr secinfo)
+ {
+-    if (!*secinfo)
+-        return;
+-
+-    qemuDomainSecretInfoClear(*secinfo, false);
+-
+-    VIR_FREE(*secinfo);
++    qemuDomainSecretInfoClear(secinfo, false);
++    g_free(secinfo);
+ }
+ 
+ 
+@@ -1203,8 +1199,8 @@ qemuDomainStorageSourcePrivateDispose(void *obj)
+ {
+     qemuDomainStorageSourcePrivatePtr priv = obj;
+ 
+-    qemuDomainSecretInfoFree(&priv->secinfo);
+-    qemuDomainSecretInfoFree(&priv->encinfo);
++    g_clear_pointer(&priv->secinfo, qemuDomainSecretInfoFree);
++    g_clear_pointer(&priv->encinfo, qemuDomainSecretInfoFree);
+ }
+ 
+ 
+@@ -1283,7 +1279,7 @@ qemuDomainChrSourcePrivateDispose(void *obj)
+ {
+     qemuDomainChrSourcePrivatePtr priv = obj;
+ 
+-    qemuDomainSecretInfoFree(&priv->secinfo);
++    g_clear_pointer(&priv->secinfo, qemuDomainSecretInfoFree);
+ }
+ 
+ 
+@@ -1362,7 +1358,7 @@ qemuDomainGraphicsPrivateDispose(void *obj)
+     qemuDomainGraphicsPrivatePtr priv = obj;
+ 
+     VIR_FREE(priv->tlsAlias);
+-    qemuDomainSecretInfoFree(&priv->secinfo);
++    g_clear_pointer(&priv->secinfo, qemuDomainSecretInfoFree);
+ }
+ 
+ 
+@@ -1642,7 +1638,7 @@ qemuDomainSecretInfoNewPlain(virSecretUsageType usageType,
+         return NULL;
+ 
+     if (qemuDomainSecretPlainSetup(secinfo, usageType, username, lookupDef) < 0) {
+-        qemuDomainSecretInfoFree(&secinfo);
++        g_clear_pointer(&secinfo, qemuDomainSecretInfoFree);
+         return NULL;
+     }
+ 
+@@ -1685,7 +1681,7 @@ qemuDomainSecretInfoNew(qemuDomainObjPrivatePtr priv,
+ 
+     if (qemuDomainSecretAESSetup(priv, secinfo, srcAlias, usageType, username,
+                                  lookupDef, isLuks) < 0) {
+-        qemuDomainSecretInfoFree(&secinfo);
++        g_clear_pointer(&secinfo, qemuDomainSecretInfoFree);
+         return NULL;
+     }
+ 
+@@ -1847,7 +1843,7 @@ qemuDomainSecretHostdevDestroy(virDomainHostdevDefPtr hostdev)
+         if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
+             srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
+             if (srcPriv && srcPriv->secinfo)
+-                qemuDomainSecretInfoFree(&srcPriv->secinfo);
++                g_clear_pointer(&srcPriv->secinfo, qemuDomainSecretInfoFree);
+         }
+     }
+ }
+@@ -1891,7 +1887,7 @@ qemuDomainSecretChardevDestroy(virDomainChrSourceDefPtr dev)
+     if (!chrSourcePriv || !chrSourcePriv->secinfo)
+         return;
+ 
+-    qemuDomainSecretInfoFree(&chrSourcePriv->secinfo);
++    g_clear_pointer(&chrSourcePriv->secinfo, qemuDomainSecretInfoFree);
+ }
+ 
+ 
+@@ -1947,7 +1943,7 @@ qemuDomainSecretGraphicsDestroy(virDomainGraphicsDefPtr graphics)
+         return;
+ 
+     VIR_FREE(gfxPriv->tlsAlias);
+-    qemuDomainSecretInfoFree(&gfxPriv->secinfo);
++    g_clear_pointer(&gfxPriv->secinfo, qemuDomainSecretInfoFree);
+ }
+ 
+ 
+@@ -2307,7 +2303,7 @@ qemuDomainObjPrivateFree(void *data)
+     }
+     VIR_FREE(priv->cleanupCallbacks);
+ 
+-    qemuDomainSecretInfoFree(&priv->migSecinfo);
++    g_clear_pointer(&priv->migSecinfo, qemuDomainSecretInfoFree);
+     qemuDomainMasterKeyFree(priv);
+ 
+     virHashFree(priv->blockjobs);
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 9d143b575d..89a967efd7 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -1032,7 +1032,7 @@ void qemuDomainMasterKeyRemove(qemuDomainObjPrivatePtr priv);
+ 
+ bool qemuDomainSupportsEncryptedSecret(qemuDomainObjPrivatePtr priv);
+ 
+-void qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo)
++void qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr secinfo)
+     ATTRIBUTE_NONNULL(1);
+ 
+ void qemuDomainSecretInfoDestroy(qemuDomainSecretInfoPtr secinfo);
+diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
+index 45acf8cda2..f61796713f 100644
+--- a/src/qemu/qemu_migration_params.c
++++ b/src/qemu/qemu_migration_params.c
+@@ -1090,7 +1090,7 @@ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver,
+     secAlias = qemuDomainGetSecretAESAlias(QEMU_MIGRATION_TLS_ALIAS_BASE, false);
+ 
+     qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, tlsAlias);
+-    qemuDomainSecretInfoFree(&QEMU_DOMAIN_PRIVATE(vm)->migSecinfo);
++    g_clear_pointer(&QEMU_DOMAIN_PRIVATE(vm)->migSecinfo, qemuDomainSecretInfoFree);
+ 
+     VIR_FREE(tlsAlias);
+     VIR_FREE(secAlias);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Don-t-use-full-CPU-model-expansion.patch b/SOURCES/libvirt-qemu-Don-t-use-full-CPU-model-expansion.patch
deleted file mode 100644
index e5dd84a..0000000
--- a/SOURCES/libvirt-qemu-Don-t-use-full-CPU-model-expansion.patch
+++ /dev/null
@@ -1,2643 +0,0 @@
-From a70b774016d7fa23e415e3c166a6549f257a2339 Mon Sep 17 00:00:00 2001
-Message-Id: <a70b774016d7fa23e415e3c166a6549f257a2339@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:57 +0200
-Subject: [PATCH] qemu: Don't use full CPU model expansion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We used type=full expansion on the result of previous type=static
-expansion to get all possible spellings of CPU features. Since we can
-now translate the QEMU's canonical names to our names, we can drop this
-magic and do only type=static CPU model expansion.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a3f2c802d240b6183b037ef4a1ca53b5de440800)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-            - file size based microcode version
-
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-            - QMP message IDs are different
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <27ac93d749ca253f4a45481c656e085be874caa9.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                  |    9 +-
- .../caps_4.1.0.x86_64.replies                 | 1964 +----------------
- .../caps_4.1.0.x86_64.xml                     |  228 +-
- 3 files changed, 49 insertions(+), 2152 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 88c651ea7b..78be2d35f4 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2421,10 +2421,13 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
- 
-     /* Some x86_64 features defined in cpu_map.xml use spelling which differ
-      * from the one preferred by QEMU. Static expansion would give us only the
--     * preferred spelling, thus we need to do a full expansion on the result of
--     * the initial static expansion to get all variants of all features.
-+     * preferred spelling. With new QEMU we always use the QEMU's canonical
-+     * names of all features and translate between them and our names. But for
-+     * older version of QEMU we need to do a full expansion on the result of
-+     * the initial static expansion to get all variants of feature names.
-      */
--    if (ARCH_IS_X86(qemuCaps->arch))
-+    if (ARCH_IS_X86(qemuCaps->arch) &&
-+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES))
-         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC_FULL;
-     else
-         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC;
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-index 5b4d7a8484..300785b8bc 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-@@ -21545,495 +21545,6 @@
-   "id": "libvirt-52"
- }
- 
--{
--  "execute": "query-cpu-model-expansion",
--  "arguments": {
--    "type": "full",
--    "model": {
--      "name": "base",
--      "props": {
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": true,
--        "intel-pt": false,
--        "kvm-asyncpf": true,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "avx512cd": false,
--        "decodeassists": false,
--        "sse4.1": true,
--        "family": 6,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "xcrypt": false,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": true,
--        "avx512vbmi2": false,
--        "cr8legacy": false,
--        "stibp": false,
--        "xcrypt-en": false,
--        "pn": false,
--        "rsba": false,
--        "dca": false,
--        "vendor": "GenuineIntel",
--        "pku": false,
--        "smx": false,
--        "cmp-legacy": false,
--        "avx512-4fmaps": false,
--        "vmcb-clean": false,
--        "hle": true,
--        "3dnowext": false,
--        "amd-no-ssb": false,
--        "npt": false,
--        "rdctl-no": false,
--        "clwb": false,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm-lock": false,
--        "smep": true,
--        "smap": true,
--        "pfthreshold": false,
--        "x2apic": true,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "flushbyasid": false,
--        "f16c": true,
--        "ace2-en": false,
--        "pae": true,
--        "pat": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm-nopiodelay": true,
--        "tm": false,
--        "kvmclock-stable-bit": true,
--        "hypervisor": true,
--        "mds-no": false,
--        "pcommit": false,
--        "syscall": true,
--        "avx512dq": false,
--        "svm": false,
--        "invtsc": false,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-eoi": true,
--        "kvm-pv-ipi": true,
--        "cx8": true,
--        "cldemote": false,
--        "kvm-mmu": false,
--        "sse4.2": true,
--        "pge": true,
--        "avx512bitalg": false,
--        "pdcm": false,
--        "model": 94,
--        "movbe": true,
--        "nrip-save": false,
--        "ssse3": true,
--        "sse4a": false,
--        "invpcid": true,
--        "pdpe1gb": true,
--        "tsc-deadline": true,
--        "skip-l1dfl-vmentry": true,
--        "fma": true,
--        "cx16": true,
--        "de": true,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ds-cpl": false,
--        "ibs": false,
--        "fma4": false,
--        "la57": false,
--        "osvw": false,
--        "apic": true,
--        "pmm": false,
--        "spec-ctrl": false,
--        "tsc-adjust": true,
--        "kvm-steal-time": true,
--        "kvmclock": true,
--        "lwp": false,
--        "amd-ssbd": false,
--        "xop": false,
--        "ibpb": false,
--        "avx": true,
--        "movdiri": false,
--        "acpi": false,
--        "avx512bw": false,
--        "ace2": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": false,
--        "popcnt": true,
--        "vaes": false,
--        "movdir64b": false,
--        "xsaves": true,
--        "lm": true,
--        "umip": true,
--        "pse": true,
--        "avx2": true,
--        "sep": true,
--        "virt-ssbd": false,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "misalignsse": false,
--        "min-xlevel": 2147483656,
--        "bmi1": true,
--        "bmi2": true,
--        "kvm-pv-unhalt": true,
--        "tsc-scale": false,
--        "topoext": false,
--        "clflushopt": true,
--        "monitor": false,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": true,
--        "arch-capabilities": true,
--        "3dnow": false,
--        "erms": true,
--        "lahf-lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "xstore": false,
--        "rtm": true,
--        "kvm-hint-dedicated": false,
--        "lmce": true,
--        "perfctr-nb": false,
--        "rdrand": true,
--        "rdseed": true,
--        "avx512-4vnniw": false,
--        "vme": true,
--        "vmx": true,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": true,
--        "tbm": false,
--        "wdt": false,
--        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
--        "sha-ni": false,
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-53"
--}
--
--{
--  "return": {
--    "model": {
--      "name": "base",
--      "props": {
--        "phys-bits": 0,
--        "core-id": -1,
--        "xlevel": 2147483656,
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": true,
--        "intel-pt": false,
--        "hv-frequencies": false,
--        "tsc-frequency": 0,
--        "xd": true,
--        "x-intel-pt-auto-level": true,
--        "hv-vendor-id": "",
--        "kvm-asyncpf": true,
--        "kvm_asyncpf": true,
--        "perfctr_core": false,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "decodeassists": false,
--        "avx512cd": false,
--        "sse4_1": true,
--        "sse4.1": true,
--        "sse4-1": true,
--        "family": 6,
--        "legacy-cache": true,
--        "host-phys-bits-limit": 0,
--        "vmware-cpuid-freq": true,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "hv-runtime": false,
--        "xcrypt": false,
--        "thread-id": -1,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "hv-relaxed": false,
--        "hv-crash": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "hv-evmcs": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": true,
--        "avx512vbmi2": false,
--        "cr8legacy": false,
--        "stibp": false,
--        "cpuid-0xb": true,
--        "xcrypt-en": false,
--        "kvm_pv_eoi": true,
--        "apic-id": 4294967295,
--        "rsba": false,
--        "pn": false,
--        "dca": false,
--        "vendor": "GenuineIntel",
--        "hv-ipi": false,
--        "pku": false,
--        "smx": false,
--        "cmp_legacy": false,
--        "cmp-legacy": false,
--        "node-id": -1,
--        "avx512-4fmaps": false,
--        "vmcb_clean": false,
--        "vmcb-clean": false,
--        "3dnowext": false,
--        "amd-no-ssb": false,
--        "hle": true,
--        "npt": false,
--        "rdctl-no": false,
--        "memory": "/machine/unattached/system[0]",
--        "clwb": false,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm_lock": false,
--        "svm-lock": false,
--        "pfthreshold": false,
--        "smep": true,
--        "smap": true,
--        "x2apic": true,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "hv-stimer": false,
--        "x-hv-synic-kvm-only": false,
--        "i64": true,
--        "flushbyasid": false,
--        "f16c": true,
--        "ace2-en": false,
--        "pat": true,
--        "pae": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm_nopiodelay": true,
--        "kvm-nopiodelay": true,
--        "tm": false,
--        "kvmclock-stable-bit": true,
--        "hypervisor": true,
--        "socket-id": -1,
--        "mds-no": false,
--        "pcommit": false,
--        "syscall": true,
--        "level": 13,
--        "avx512dq": false,
--        "x-migrate-smi-count": true,
--        "svm": false,
--        "full-cpuid-auto-level": true,
--        "hv-reset": false,
--        "invtsc": false,
--        "sse3": true,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-ipi": true,
--        "kvm-pv-eoi": true,
--        "cx8": true,
--        "cldemote": false,
--        "hv-reenlightenment": false,
--        "kvm_mmu": false,
--        "kvm-mmu": false,
--        "sse4_2": true,
--        "sse4.2": true,
--        "sse4-2": true,
--        "pge": true,
--        "fill-mtrr-mask": true,
--        "avx512bitalg": false,
--        "nodeid_msr": false,
--        "pdcm": false,
--        "movbe": true,
--        "model": 94,
--        "nrip_save": false,
--        "nrip-save": false,
--        "kvm_pv_unhalt": true,
--        "ssse3": true,
--        "sse4a": false,
--        "invpcid": true,
--        "pdpe1gb": true,
--        "tsc-deadline": true,
--        "skip-l1dfl-vmentry": true,
--        "fma": true,
--        "cx16": true,
--        "de": true,
--        "enforce": false,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ibs": false,
--        "ds_cpl": false,
--        "ds-cpl": false,
--        "host-phys-bits": false,
--        "fma4": false,
--        "la57": false,
--        "osvw": false,
--        "check": true,
--        "hv-spinlocks": -1,
--        "pmm": false,
--        "pmu": false,
--        "apic": true,
--        "spec-ctrl": false,
--        "min-xlevel2": 0,
--        "tsc-adjust": true,
--        "tsc_adjust": true,
--        "kvm-steal-time": true,
--        "kvm_steal_time": true,
--        "kvmclock": true,
--        "l3-cache": true,
--        "lwp": false,
--        "amd-ssbd": false,
--        "ibpb": false,
--        "xop": false,
--        "avx": true,
--        "movdiri": false,
--        "ace2": false,
--        "avx512bw": false,
--        "acpi": false,
--        "hv-vapic": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": false,
--        "vaes": false,
--        "popcnt": true,
--        "xsaves": true,
--        "movdir64b": false,
--        "tcg-cpuid": true,
--        "lm": true,
--        "umip": true,
--        "pse": true,
--        "avx2": true,
--        "sep": true,
--        "pclmuldq": true,
--        "virt-ssbd": false,
--        "x-hv-max-vps": -1,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "kvm": true,
--        "misalignsse": false,
--        "min-xlevel": 2147483656,
--        "kvm-pv-unhalt": true,
--        "bmi2": true,
--        "bmi1": true,
--        "realized": false,
--        "tsc_scale": false,
--        "tsc-scale": false,
--        "topoext": false,
--        "hv-vpindex": false,
--        "xlevel2": 0,
--        "clflushopt": true,
--        "kvm-no-smi-migration": false,
--        "monitor": false,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": true,
--        "arch-capabilities": true,
--        "3dnow": false,
--        "erms": true,
--        "lahf-lm": true,
--        "lahf_lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "hv-synic": false,
--        "xstore": false,
--        "fxsr_opt": false,
--        "kvm-hint-dedicated": false,
--        "rtm": true,
--        "lmce": true,
--        "hv-time": false,
--        "perfctr-nb": false,
--        "perfctr_nb": false,
--        "ffxsr": false,
--        "hv-tlbflush": false,
--        "rdrand": true,
--        "rdseed": true,
--        "avx512-4vnniw": false,
--        "vmx": true,
--        "vme": true,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": true,
--        "tbm": false,
--        "wdt": false,
--        "pause_filter": false,
--        "sha-ni": false,
--        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-53"
--}
--
- {
-   "execute": "query-cpu-model-expansion",
-   "arguments": {
-@@ -22045,7 +21556,7 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -22251,496 +21762,7 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
--}
--
--{
--  "execute": "query-cpu-model-expansion",
--  "arguments": {
--    "type": "full",
--    "model": {
--      "name": "base",
--      "props": {
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": true,
--        "intel-pt": false,
--        "kvm-asyncpf": true,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "avx512cd": false,
--        "decodeassists": false,
--        "sse4.1": true,
--        "family": 6,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "xcrypt": false,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": true,
--        "avx512vbmi2": false,
--        "cr8legacy": false,
--        "stibp": false,
--        "xcrypt-en": false,
--        "pn": false,
--        "rsba": false,
--        "dca": false,
--        "vendor": "GenuineIntel",
--        "pku": false,
--        "smx": false,
--        "cmp-legacy": false,
--        "avx512-4fmaps": false,
--        "vmcb-clean": false,
--        "hle": true,
--        "3dnowext": false,
--        "amd-no-ssb": false,
--        "npt": false,
--        "rdctl-no": false,
--        "clwb": false,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm-lock": false,
--        "smep": true,
--        "smap": true,
--        "pfthreshold": false,
--        "x2apic": true,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "flushbyasid": false,
--        "f16c": true,
--        "ace2-en": false,
--        "pae": true,
--        "pat": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm-nopiodelay": true,
--        "tm": false,
--        "kvmclock-stable-bit": true,
--        "hypervisor": true,
--        "mds-no": false,
--        "pcommit": false,
--        "syscall": true,
--        "avx512dq": false,
--        "svm": false,
--        "invtsc": false,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-eoi": true,
--        "kvm-pv-ipi": true,
--        "cx8": true,
--        "cldemote": false,
--        "kvm-mmu": false,
--        "sse4.2": true,
--        "pge": true,
--        "avx512bitalg": false,
--        "pdcm": false,
--        "model": 94,
--        "movbe": true,
--        "nrip-save": false,
--        "ssse3": true,
--        "sse4a": false,
--        "invpcid": true,
--        "pdpe1gb": true,
--        "tsc-deadline": true,
--        "skip-l1dfl-vmentry": true,
--        "fma": true,
--        "cx16": true,
--        "de": true,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ds-cpl": false,
--        "ibs": false,
--        "fma4": false,
--        "la57": false,
--        "osvw": false,
--        "apic": true,
--        "pmm": false,
--        "spec-ctrl": false,
--        "tsc-adjust": true,
--        "kvm-steal-time": true,
--        "kvmclock": true,
--        "lwp": false,
--        "amd-ssbd": false,
--        "xop": false,
--        "ibpb": false,
--        "avx": true,
--        "movdiri": false,
--        "acpi": false,
--        "avx512bw": false,
--        "ace2": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": false,
--        "popcnt": true,
--        "vaes": false,
--        "movdir64b": false,
--        "xsaves": true,
--        "lm": true,
--        "umip": true,
--        "pse": true,
--        "avx2": true,
--        "sep": true,
--        "virt-ssbd": false,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "misalignsse": false,
--        "min-xlevel": 2147483656,
--        "bmi1": true,
--        "bmi2": true,
--        "kvm-pv-unhalt": true,
--        "tsc-scale": false,
--        "topoext": false,
--        "clflushopt": true,
--        "monitor": false,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": true,
--        "arch-capabilities": true,
--        "3dnow": false,
--        "erms": true,
--        "lahf-lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "xstore": false,
--        "rtm": true,
--        "kvm-hint-dedicated": false,
--        "lmce": true,
--        "perfctr-nb": false,
--        "rdrand": true,
--        "rdseed": true,
--        "avx512-4vnniw": false,
--        "vme": true,
--        "vmx": true,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": true,
--        "tbm": false,
--        "wdt": false,
--        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
--        "sha-ni": false,
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-55"
--}
--
--{
--  "return": {
--    "model": {
--      "name": "base",
--      "props": {
--        "phys-bits": 0,
--        "core-id": -1,
--        "xlevel": 2147483656,
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": true,
--        "intel-pt": false,
--        "hv-frequencies": false,
--        "tsc-frequency": 0,
--        "xd": true,
--        "x-intel-pt-auto-level": true,
--        "hv-vendor-id": "",
--        "kvm-asyncpf": true,
--        "kvm_asyncpf": true,
--        "perfctr_core": false,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "decodeassists": false,
--        "avx512cd": false,
--        "sse4_1": true,
--        "sse4.1": true,
--        "sse4-1": true,
--        "family": 6,
--        "legacy-cache": true,
--        "host-phys-bits-limit": 0,
--        "vmware-cpuid-freq": true,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "hv-runtime": false,
--        "xcrypt": false,
--        "thread-id": -1,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "hv-relaxed": false,
--        "hv-crash": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "hv-evmcs": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": true,
--        "avx512vbmi2": false,
--        "cr8legacy": false,
--        "stibp": false,
--        "cpuid-0xb": true,
--        "xcrypt-en": false,
--        "kvm_pv_eoi": true,
--        "apic-id": 4294967295,
--        "rsba": false,
--        "pn": false,
--        "dca": false,
--        "vendor": "GenuineIntel",
--        "hv-ipi": false,
--        "pku": false,
--        "smx": false,
--        "cmp_legacy": false,
--        "cmp-legacy": false,
--        "node-id": -1,
--        "avx512-4fmaps": false,
--        "vmcb_clean": false,
--        "vmcb-clean": false,
--        "3dnowext": false,
--        "amd-no-ssb": false,
--        "hle": true,
--        "npt": false,
--        "rdctl-no": false,
--        "memory": "/machine/unattached/system[0]",
--        "clwb": false,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm_lock": false,
--        "svm-lock": false,
--        "pfthreshold": false,
--        "smep": true,
--        "smap": true,
--        "x2apic": true,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "hv-stimer": false,
--        "x-hv-synic-kvm-only": false,
--        "i64": true,
--        "flushbyasid": false,
--        "f16c": true,
--        "ace2-en": false,
--        "pat": true,
--        "pae": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm_nopiodelay": true,
--        "kvm-nopiodelay": true,
--        "tm": false,
--        "kvmclock-stable-bit": true,
--        "hypervisor": true,
--        "socket-id": -1,
--        "mds-no": false,
--        "pcommit": false,
--        "syscall": true,
--        "level": 13,
--        "avx512dq": false,
--        "x-migrate-smi-count": true,
--        "svm": false,
--        "full-cpuid-auto-level": true,
--        "hv-reset": false,
--        "invtsc": false,
--        "sse3": true,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-ipi": true,
--        "kvm-pv-eoi": true,
--        "cx8": true,
--        "cldemote": false,
--        "hv-reenlightenment": false,
--        "kvm_mmu": false,
--        "kvm-mmu": false,
--        "sse4_2": true,
--        "sse4.2": true,
--        "sse4-2": true,
--        "pge": true,
--        "fill-mtrr-mask": true,
--        "avx512bitalg": false,
--        "nodeid_msr": false,
--        "pdcm": false,
--        "movbe": true,
--        "model": 94,
--        "nrip_save": false,
--        "nrip-save": false,
--        "kvm_pv_unhalt": true,
--        "ssse3": true,
--        "sse4a": false,
--        "invpcid": true,
--        "pdpe1gb": true,
--        "tsc-deadline": true,
--        "skip-l1dfl-vmentry": true,
--        "fma": true,
--        "cx16": true,
--        "de": true,
--        "enforce": false,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ibs": false,
--        "ds_cpl": false,
--        "ds-cpl": false,
--        "host-phys-bits": false,
--        "fma4": false,
--        "la57": false,
--        "osvw": false,
--        "check": true,
--        "hv-spinlocks": -1,
--        "pmm": false,
--        "pmu": false,
--        "apic": true,
--        "spec-ctrl": false,
--        "min-xlevel2": 0,
--        "tsc-adjust": true,
--        "tsc_adjust": true,
--        "kvm-steal-time": true,
--        "kvm_steal_time": true,
--        "kvmclock": true,
--        "l3-cache": true,
--        "lwp": false,
--        "amd-ssbd": false,
--        "ibpb": false,
--        "xop": false,
--        "avx": true,
--        "movdiri": false,
--        "ace2": false,
--        "avx512bw": false,
--        "acpi": false,
--        "hv-vapic": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": false,
--        "vaes": false,
--        "popcnt": true,
--        "xsaves": true,
--        "movdir64b": false,
--        "tcg-cpuid": true,
--        "lm": true,
--        "umip": true,
--        "pse": true,
--        "avx2": true,
--        "sep": true,
--        "pclmuldq": true,
--        "virt-ssbd": false,
--        "x-hv-max-vps": -1,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "kvm": true,
--        "misalignsse": false,
--        "min-xlevel": 2147483656,
--        "kvm-pv-unhalt": true,
--        "bmi2": true,
--        "bmi1": true,
--        "realized": false,
--        "tsc_scale": false,
--        "tsc-scale": false,
--        "topoext": false,
--        "hv-vpindex": false,
--        "xlevel2": 0,
--        "clflushopt": true,
--        "kvm-no-smi-migration": false,
--        "monitor": false,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": true,
--        "arch-capabilities": true,
--        "3dnow": false,
--        "erms": true,
--        "lahf-lm": true,
--        "lahf_lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "hv-synic": false,
--        "xstore": false,
--        "fxsr_opt": false,
--        "kvm-hint-dedicated": false,
--        "rtm": true,
--        "lmce": true,
--        "hv-time": false,
--        "perfctr-nb": false,
--        "perfctr_nb": false,
--        "ffxsr": false,
--        "hv-tlbflush": false,
--        "rdrand": true,
--        "rdseed": true,
--        "avx512-4vnniw": false,
--        "vmx": true,
--        "vme": true,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": true,
--        "tbm": false,
--        "wdt": false,
--        "pause_filter": false,
--        "sha-ni": false,
--        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-55"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -23697,495 +22719,6 @@
-   "id": "libvirt-3"
- }
- 
--{
--  "execute": "query-cpu-model-expansion",
--  "arguments": {
--    "type": "full",
--    "model": {
--      "name": "base",
--      "props": {
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": false,
--        "intel-pt": false,
--        "kvm-asyncpf": false,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "avx512cd": false,
--        "decodeassists": false,
--        "sse4.1": true,
--        "family": 6,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "xcrypt": false,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": false,
--        "avx512vbmi2": false,
--        "cr8legacy": true,
--        "stibp": false,
--        "xcrypt-en": false,
--        "pn": false,
--        "rsba": false,
--        "dca": false,
--        "vendor": "AuthenticAMD",
--        "pku": true,
--        "smx": false,
--        "cmp-legacy": false,
--        "avx512-4fmaps": false,
--        "vmcb-clean": false,
--        "hle": false,
--        "3dnowext": true,
--        "amd-no-ssb": false,
--        "npt": true,
--        "rdctl-no": false,
--        "clwb": true,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm-lock": false,
--        "smep": true,
--        "smap": true,
--        "pfthreshold": false,
--        "x2apic": false,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "flushbyasid": false,
--        "f16c": false,
--        "ace2-en": false,
--        "pae": true,
--        "pat": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm-nopiodelay": false,
--        "tm": false,
--        "kvmclock-stable-bit": false,
--        "hypervisor": true,
--        "mds-no": false,
--        "pcommit": true,
--        "syscall": true,
--        "avx512dq": false,
--        "svm": true,
--        "invtsc": false,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-eoi": false,
--        "kvm-pv-ipi": false,
--        "cx8": true,
--        "cldemote": false,
--        "kvm-mmu": false,
--        "sse4.2": true,
--        "pge": true,
--        "avx512bitalg": false,
--        "pdcm": false,
--        "model": 6,
--        "movbe": true,
--        "nrip-save": false,
--        "ssse3": true,
--        "sse4a": true,
--        "invpcid": false,
--        "pdpe1gb": true,
--        "tsc-deadline": false,
--        "skip-l1dfl-vmentry": false,
--        "fma": false,
--        "cx16": true,
--        "de": true,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ds-cpl": false,
--        "ibs": false,
--        "fma4": false,
--        "la57": true,
--        "osvw": false,
--        "apic": true,
--        "pmm": false,
--        "spec-ctrl": false,
--        "tsc-adjust": false,
--        "kvm-steal-time": false,
--        "kvmclock": false,
--        "lwp": false,
--        "amd-ssbd": false,
--        "xop": false,
--        "ibpb": false,
--        "avx": false,
--        "movdiri": false,
--        "acpi": true,
--        "avx512bw": false,
--        "ace2": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": true,
--        "popcnt": true,
--        "vaes": false,
--        "movdir64b": false,
--        "xsaves": false,
--        "lm": true,
--        "umip": false,
--        "pse": true,
--        "avx2": false,
--        "sep": true,
--        "virt-ssbd": false,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "misalignsse": false,
--        "min-xlevel": 2147483658,
--        "bmi1": true,
--        "bmi2": true,
--        "kvm-pv-unhalt": false,
--        "tsc-scale": false,
--        "topoext": false,
--        "clflushopt": true,
--        "monitor": true,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": false,
--        "arch-capabilities": false,
--        "3dnow": true,
--        "erms": true,
--        "lahf-lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "xstore": false,
--        "rtm": false,
--        "kvm-hint-dedicated": false,
--        "lmce": false,
--        "perfctr-nb": false,
--        "rdrand": true,
--        "rdseed": false,
--        "avx512-4vnniw": false,
--        "vme": false,
--        "vmx": false,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": false,
--        "tbm": false,
--        "wdt": false,
--        "model-id": "QEMU TCG CPU version 2.5+",
--        "sha-ni": false,
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-4"
--}
--
--{
--  "return": {
--    "model": {
--      "name": "base",
--      "props": {
--        "phys-bits": 0,
--        "core-id": -1,
--        "xlevel": 2147483658,
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": false,
--        "intel-pt": false,
--        "hv-frequencies": false,
--        "tsc-frequency": 0,
--        "xd": true,
--        "x-intel-pt-auto-level": true,
--        "hv-vendor-id": "",
--        "kvm-asyncpf": false,
--        "kvm_asyncpf": false,
--        "perfctr_core": false,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "decodeassists": false,
--        "avx512cd": false,
--        "sse4_1": true,
--        "sse4.1": true,
--        "sse4-1": true,
--        "family": 6,
--        "legacy-cache": true,
--        "host-phys-bits-limit": 0,
--        "vmware-cpuid-freq": true,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "hv-runtime": false,
--        "xcrypt": false,
--        "thread-id": -1,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "hv-relaxed": false,
--        "hv-crash": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "hv-evmcs": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": false,
--        "avx512vbmi2": false,
--        "cr8legacy": true,
--        "stibp": false,
--        "cpuid-0xb": true,
--        "xcrypt-en": false,
--        "kvm_pv_eoi": false,
--        "apic-id": 4294967295,
--        "rsba": false,
--        "pn": false,
--        "dca": false,
--        "vendor": "AuthenticAMD",
--        "hv-ipi": false,
--        "pku": true,
--        "smx": false,
--        "cmp_legacy": false,
--        "cmp-legacy": false,
--        "node-id": -1,
--        "avx512-4fmaps": false,
--        "vmcb_clean": false,
--        "vmcb-clean": false,
--        "3dnowext": true,
--        "amd-no-ssb": false,
--        "hle": false,
--        "npt": true,
--        "rdctl-no": false,
--        "memory": "/machine/unattached/system[0]",
--        "clwb": true,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm_lock": false,
--        "svm-lock": false,
--        "pfthreshold": false,
--        "smep": true,
--        "smap": true,
--        "x2apic": false,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "hv-stimer": false,
--        "x-hv-synic-kvm-only": false,
--        "i64": true,
--        "flushbyasid": false,
--        "f16c": false,
--        "ace2-en": false,
--        "pat": true,
--        "pae": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm_nopiodelay": false,
--        "kvm-nopiodelay": false,
--        "tm": false,
--        "kvmclock-stable-bit": false,
--        "hypervisor": true,
--        "socket-id": -1,
--        "mds-no": false,
--        "pcommit": true,
--        "syscall": true,
--        "level": 13,
--        "avx512dq": false,
--        "x-migrate-smi-count": true,
--        "svm": true,
--        "full-cpuid-auto-level": true,
--        "hv-reset": false,
--        "invtsc": false,
--        "sse3": true,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-ipi": false,
--        "kvm-pv-eoi": false,
--        "cx8": true,
--        "cldemote": false,
--        "hv-reenlightenment": false,
--        "kvm_mmu": false,
--        "kvm-mmu": false,
--        "sse4_2": true,
--        "sse4.2": true,
--        "sse4-2": true,
--        "pge": true,
--        "fill-mtrr-mask": true,
--        "avx512bitalg": false,
--        "nodeid_msr": false,
--        "pdcm": false,
--        "movbe": true,
--        "model": 6,
--        "nrip_save": false,
--        "nrip-save": false,
--        "kvm_pv_unhalt": false,
--        "ssse3": true,
--        "sse4a": true,
--        "invpcid": false,
--        "pdpe1gb": true,
--        "tsc-deadline": false,
--        "skip-l1dfl-vmentry": false,
--        "fma": false,
--        "cx16": true,
--        "de": true,
--        "enforce": false,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ibs": false,
--        "ds_cpl": false,
--        "ds-cpl": false,
--        "host-phys-bits": false,
--        "fma4": false,
--        "la57": true,
--        "osvw": false,
--        "check": true,
--        "hv-spinlocks": -1,
--        "pmm": false,
--        "pmu": false,
--        "apic": true,
--        "spec-ctrl": false,
--        "min-xlevel2": 0,
--        "tsc-adjust": false,
--        "tsc_adjust": false,
--        "kvm-steal-time": false,
--        "kvm_steal_time": false,
--        "kvmclock": false,
--        "l3-cache": true,
--        "lwp": false,
--        "amd-ssbd": false,
--        "ibpb": false,
--        "xop": false,
--        "avx": false,
--        "movdiri": false,
--        "ace2": false,
--        "avx512bw": false,
--        "acpi": true,
--        "hv-vapic": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": true,
--        "vaes": false,
--        "popcnt": true,
--        "xsaves": false,
--        "movdir64b": false,
--        "tcg-cpuid": true,
--        "lm": true,
--        "umip": false,
--        "pse": true,
--        "avx2": false,
--        "sep": true,
--        "pclmuldq": true,
--        "virt-ssbd": false,
--        "x-hv-max-vps": -1,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "kvm": true,
--        "misalignsse": false,
--        "min-xlevel": 2147483658,
--        "kvm-pv-unhalt": false,
--        "bmi2": true,
--        "bmi1": true,
--        "realized": false,
--        "tsc_scale": false,
--        "tsc-scale": false,
--        "topoext": false,
--        "hv-vpindex": false,
--        "xlevel2": 0,
--        "clflushopt": true,
--        "kvm-no-smi-migration": false,
--        "monitor": true,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": false,
--        "arch-capabilities": false,
--        "3dnow": true,
--        "erms": true,
--        "lahf-lm": true,
--        "lahf_lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "hv-synic": false,
--        "xstore": false,
--        "fxsr_opt": false,
--        "kvm-hint-dedicated": false,
--        "rtm": false,
--        "lmce": false,
--        "hv-time": false,
--        "perfctr-nb": false,
--        "perfctr_nb": false,
--        "ffxsr": false,
--        "hv-tlbflush": false,
--        "rdrand": true,
--        "rdseed": false,
--        "avx512-4vnniw": false,
--        "vmx": false,
--        "vme": false,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": false,
--        "tbm": false,
--        "wdt": false,
--        "pause_filter": false,
--        "sha-ni": false,
--        "model-id": "QEMU TCG CPU version 2.5+",
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-4"
--}
--
- {
-   "execute": "query-cpu-model-expansion",
-   "arguments": {
-@@ -24197,7 +22730,7 @@
-       }
-     }
-   },
--  "id": "libvirt-5"
-+  "id": "libvirt-4"
- }
- 
- {
-@@ -24403,494 +22936,5 @@
-       }
-     }
-   },
--  "id": "libvirt-5"
--}
--
--{
--  "execute": "query-cpu-model-expansion",
--  "arguments": {
--    "type": "full",
--    "model": {
--      "name": "base",
--      "props": {
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": false,
--        "intel-pt": false,
--        "kvm-asyncpf": false,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "avx512cd": false,
--        "decodeassists": false,
--        "sse4.1": true,
--        "family": 6,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "xcrypt": false,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": false,
--        "avx512vbmi2": false,
--        "cr8legacy": true,
--        "stibp": false,
--        "xcrypt-en": false,
--        "pn": false,
--        "rsba": false,
--        "dca": false,
--        "vendor": "AuthenticAMD",
--        "pku": true,
--        "smx": false,
--        "cmp-legacy": false,
--        "avx512-4fmaps": false,
--        "vmcb-clean": false,
--        "hle": false,
--        "3dnowext": true,
--        "amd-no-ssb": false,
--        "npt": true,
--        "rdctl-no": false,
--        "clwb": true,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm-lock": false,
--        "smep": true,
--        "smap": true,
--        "pfthreshold": false,
--        "x2apic": false,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "flushbyasid": false,
--        "f16c": false,
--        "ace2-en": false,
--        "pae": true,
--        "pat": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm-nopiodelay": false,
--        "tm": false,
--        "kvmclock-stable-bit": false,
--        "hypervisor": true,
--        "mds-no": false,
--        "pcommit": true,
--        "syscall": true,
--        "avx512dq": false,
--        "svm": true,
--        "invtsc": false,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-eoi": false,
--        "kvm-pv-ipi": false,
--        "cx8": true,
--        "cldemote": false,
--        "kvm-mmu": false,
--        "sse4.2": true,
--        "pge": true,
--        "avx512bitalg": false,
--        "pdcm": false,
--        "model": 6,
--        "movbe": true,
--        "nrip-save": false,
--        "ssse3": true,
--        "sse4a": true,
--        "invpcid": false,
--        "pdpe1gb": true,
--        "tsc-deadline": false,
--        "skip-l1dfl-vmentry": false,
--        "fma": false,
--        "cx16": true,
--        "de": true,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ds-cpl": false,
--        "ibs": false,
--        "fma4": false,
--        "la57": true,
--        "osvw": false,
--        "apic": true,
--        "pmm": false,
--        "spec-ctrl": false,
--        "tsc-adjust": false,
--        "kvm-steal-time": false,
--        "kvmclock": false,
--        "lwp": false,
--        "amd-ssbd": false,
--        "xop": false,
--        "ibpb": false,
--        "avx": false,
--        "movdiri": false,
--        "acpi": true,
--        "avx512bw": false,
--        "ace2": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": true,
--        "popcnt": true,
--        "vaes": false,
--        "movdir64b": false,
--        "xsaves": false,
--        "lm": true,
--        "umip": false,
--        "pse": true,
--        "avx2": false,
--        "sep": true,
--        "virt-ssbd": false,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "misalignsse": false,
--        "min-xlevel": 2147483658,
--        "bmi1": true,
--        "bmi2": true,
--        "kvm-pv-unhalt": false,
--        "tsc-scale": false,
--        "topoext": false,
--        "clflushopt": true,
--        "monitor": true,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": false,
--        "arch-capabilities": false,
--        "3dnow": true,
--        "erms": true,
--        "lahf-lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "xstore": false,
--        "rtm": false,
--        "kvm-hint-dedicated": false,
--        "lmce": false,
--        "perfctr-nb": false,
--        "rdrand": true,
--        "rdseed": false,
--        "avx512-4vnniw": false,
--        "vme": false,
--        "vmx": false,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": false,
--        "tbm": false,
--        "wdt": false,
--        "model-id": "QEMU TCG CPU version 2.5+",
--        "sha-ni": false,
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-6"
--}
--
--{
--  "return": {
--    "model": {
--      "name": "base",
--      "props": {
--        "phys-bits": 0,
--        "core-id": -1,
--        "xlevel": 2147483658,
--        "cmov": true,
--        "ia64": false,
--        "ssb-no": false,
--        "aes": true,
--        "mmx": true,
--        "rdpid": false,
--        "arat": true,
--        "gfni": false,
--        "ibrs-all": false,
--        "pause-filter": false,
--        "xsavec": false,
--        "intel-pt": false,
--        "hv-frequencies": false,
--        "tsc-frequency": 0,
--        "xd": true,
--        "x-intel-pt-auto-level": true,
--        "hv-vendor-id": "",
--        "kvm-asyncpf": false,
--        "kvm_asyncpf": false,
--        "perfctr_core": false,
--        "perfctr-core": false,
--        "mpx": true,
--        "pbe": false,
--        "decodeassists": false,
--        "avx512cd": false,
--        "sse4_1": true,
--        "sse4.1": true,
--        "sse4-1": true,
--        "family": 6,
--        "legacy-cache": true,
--        "host-phys-bits-limit": 0,
--        "vmware-cpuid-freq": true,
--        "wbnoinvd": false,
--        "avx512f": false,
--        "msr": true,
--        "mce": true,
--        "mca": true,
--        "hv-runtime": false,
--        "xcrypt": false,
--        "thread-id": -1,
--        "min-level": 13,
--        "xgetbv1": true,
--        "cid": false,
--        "hv-relaxed": false,
--        "hv-crash": false,
--        "ds": false,
--        "fxsr": true,
--        "xsaveopt": true,
--        "xtpr": false,
--        "hv-evmcs": false,
--        "avx512vl": false,
--        "avx512-vpopcntdq": false,
--        "phe": false,
--        "extapic": false,
--        "3dnowprefetch": false,
--        "avx512vbmi2": false,
--        "cr8legacy": true,
--        "stibp": false,
--        "cpuid-0xb": true,
--        "xcrypt-en": false,
--        "kvm_pv_eoi": false,
--        "apic-id": 4294967295,
--        "rsba": false,
--        "pn": false,
--        "dca": false,
--        "vendor": "AuthenticAMD",
--        "hv-ipi": false,
--        "pku": true,
--        "smx": false,
--        "cmp_legacy": false,
--        "cmp-legacy": false,
--        "node-id": -1,
--        "avx512-4fmaps": false,
--        "vmcb_clean": false,
--        "vmcb-clean": false,
--        "3dnowext": true,
--        "amd-no-ssb": false,
--        "hle": false,
--        "npt": true,
--        "rdctl-no": false,
--        "memory": "/machine/unattached/system[0]",
--        "clwb": true,
--        "lbrv": false,
--        "adx": true,
--        "ss": true,
--        "pni": true,
--        "svm_lock": false,
--        "svm-lock": false,
--        "pfthreshold": false,
--        "smep": true,
--        "smap": true,
--        "x2apic": false,
--        "avx512vbmi": false,
--        "avx512vnni": false,
--        "hv-stimer": false,
--        "x-hv-synic-kvm-only": false,
--        "i64": true,
--        "flushbyasid": false,
--        "f16c": false,
--        "ace2-en": false,
--        "pat": true,
--        "pae": true,
--        "sse": true,
--        "phe-en": false,
--        "kvm_nopiodelay": false,
--        "kvm-nopiodelay": false,
--        "tm": false,
--        "kvmclock-stable-bit": false,
--        "hypervisor": true,
--        "socket-id": -1,
--        "mds-no": false,
--        "pcommit": true,
--        "syscall": true,
--        "level": 13,
--        "avx512dq": false,
--        "x-migrate-smi-count": true,
--        "svm": true,
--        "full-cpuid-auto-level": true,
--        "hv-reset": false,
--        "invtsc": false,
--        "sse3": true,
--        "sse2": true,
--        "ssbd": false,
--        "est": false,
--        "avx512ifma": false,
--        "tm2": false,
--        "kvm-pv-ipi": false,
--        "kvm-pv-eoi": false,
--        "cx8": true,
--        "cldemote": false,
--        "hv-reenlightenment": false,
--        "kvm_mmu": false,
--        "kvm-mmu": false,
--        "sse4_2": true,
--        "sse4.2": true,
--        "sse4-2": true,
--        "pge": true,
--        "fill-mtrr-mask": true,
--        "avx512bitalg": false,
--        "nodeid_msr": false,
--        "pdcm": false,
--        "movbe": true,
--        "model": 6,
--        "nrip_save": false,
--        "nrip-save": false,
--        "kvm_pv_unhalt": false,
--        "ssse3": true,
--        "sse4a": true,
--        "invpcid": false,
--        "pdpe1gb": true,
--        "tsc-deadline": false,
--        "skip-l1dfl-vmentry": false,
--        "fma": false,
--        "cx16": true,
--        "de": true,
--        "enforce": false,
--        "stepping": 3,
--        "xsave": true,
--        "clflush": true,
--        "skinit": false,
--        "tsc": true,
--        "tce": false,
--        "fpu": true,
--        "ibs": false,
--        "ds_cpl": false,
--        "ds-cpl": false,
--        "host-phys-bits": false,
--        "fma4": false,
--        "la57": true,
--        "osvw": false,
--        "check": true,
--        "hv-spinlocks": -1,
--        "pmm": false,
--        "pmu": false,
--        "apic": true,
--        "spec-ctrl": false,
--        "min-xlevel2": 0,
--        "tsc-adjust": false,
--        "tsc_adjust": false,
--        "kvm-steal-time": false,
--        "kvm_steal_time": false,
--        "kvmclock": false,
--        "l3-cache": true,
--        "lwp": false,
--        "amd-ssbd": false,
--        "ibpb": false,
--        "xop": false,
--        "avx": false,
--        "movdiri": false,
--        "ace2": false,
--        "avx512bw": false,
--        "acpi": true,
--        "hv-vapic": false,
--        "fsgsbase": true,
--        "ht": false,
--        "nx": true,
--        "pclmulqdq": true,
--        "mmxext": true,
--        "vaes": false,
--        "popcnt": true,
--        "xsaves": false,
--        "movdir64b": false,
--        "tcg-cpuid": true,
--        "lm": true,
--        "umip": false,
--        "pse": true,
--        "avx2": false,
--        "sep": true,
--        "pclmuldq": true,
--        "virt-ssbd": false,
--        "x-hv-max-vps": -1,
--        "nodeid-msr": false,
--        "md-clear": false,
--        "kvm": true,
--        "misalignsse": false,
--        "min-xlevel": 2147483658,
--        "kvm-pv-unhalt": false,
--        "bmi2": true,
--        "bmi1": true,
--        "realized": false,
--        "tsc_scale": false,
--        "tsc-scale": false,
--        "topoext": false,
--        "hv-vpindex": false,
--        "xlevel2": 0,
--        "clflushopt": true,
--        "kvm-no-smi-migration": false,
--        "monitor": true,
--        "avx512er": false,
--        "pmm-en": false,
--        "pcid": false,
--        "arch-capabilities": false,
--        "3dnow": true,
--        "erms": true,
--        "lahf-lm": true,
--        "lahf_lm": true,
--        "vpclmulqdq": false,
--        "fxsr-opt": false,
--        "hv-synic": false,
--        "xstore": false,
--        "fxsr_opt": false,
--        "kvm-hint-dedicated": false,
--        "rtm": false,
--        "lmce": false,
--        "hv-time": false,
--        "perfctr-nb": false,
--        "perfctr_nb": false,
--        "ffxsr": false,
--        "hv-tlbflush": false,
--        "rdrand": true,
--        "rdseed": false,
--        "avx512-4vnniw": false,
--        "vmx": false,
--        "vme": false,
--        "dtes64": false,
--        "mtrr": true,
--        "rdtscp": true,
--        "pse36": true,
--        "kvm-pv-tlb-flush": false,
--        "tbm": false,
--        "wdt": false,
--        "pause_filter": false,
--        "sha-ni": false,
--        "model-id": "QEMU TCG CPU version 2.5+",
--        "abm": true,
--        "avx512pf": false,
--        "xstore-en": false
--      }
--    }
--  },
--  "id": "libvirt-6"
-+  "id": "libvirt-4"
- }
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-index 9245641df8..33de2ed5a1 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -219,13 +219,10 @@
-   <flag name='canonical-cpu-features'/>
-   <version>4000050</version>
-   <kvmVersion>0</kvmVersion>
--  <microcodeVersion>473743</microcodeVersion>
-+  <microcodeVersion>424759</microcodeVersion>
-   <package>v4.0.0-1173-g9c70209b63</package>
-   <arch>x86_64</arch>
-   <hostCPU type='kvm' model='base' migratability='yes'>
--    <property name='phys-bits' type='number' value='0'/>
--    <property name='core-id' type='number' value='-1'/>
--    <property name='xlevel' type='number' value='2147483656'/>
-     <property name='cmov' type='boolean' value='true' migratable='yes'/>
-     <property name='ia64' type='boolean' value='false'/>
-     <property name='ssb-no' type='boolean' value='false'/>
-@@ -238,44 +235,27 @@
-     <property name='pause-filter' type='boolean' value='false'/>
-     <property name='xsavec' type='boolean' value='true' migratable='yes'/>
-     <property name='intel-pt' type='boolean' value='false'/>
--    <property name='hv-frequencies' type='boolean' value='false'/>
--    <property name='tsc-frequency' type='number' value='0'/>
--    <property name='xd' type='boolean' value='true' migratable='yes'/>
--    <property name='x-intel-pt-auto-level' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-vendor-id' type='string' value=''/>
-     <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
--    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
--    <property name='perfctr_core' type='boolean' value='false'/>
-     <property name='perfctr-core' type='boolean' value='false'/>
-     <property name='mpx' type='boolean' value='true' migratable='yes'/>
-     <property name='pbe' type='boolean' value='false'/>
--    <property name='decodeassists' type='boolean' value='false'/>
-     <property name='avx512cd' type='boolean' value='false'/>
--    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
--    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-     <property name='family' type='number' value='6'/>
--    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
--    <property name='host-phys-bits-limit' type='number' value='0'/>
--    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-     <property name='wbnoinvd' type='boolean' value='false'/>
-     <property name='avx512f' type='boolean' value='false'/>
-     <property name='msr' type='boolean' value='true' migratable='yes'/>
-     <property name='mce' type='boolean' value='true' migratable='yes'/>
-     <property name='mca' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-runtime' type='boolean' value='false'/>
-     <property name='xcrypt' type='boolean' value='false'/>
--    <property name='thread-id' type='number' value='-1'/>
-     <property name='min-level' type='number' value='13'/>
-     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-     <property name='cid' type='boolean' value='false'/>
--    <property name='hv-relaxed' type='boolean' value='false'/>
--    <property name='hv-crash' type='boolean' value='false'/>
-     <property name='ds' type='boolean' value='false'/>
-     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-     <property name='xtpr' type='boolean' value='false'/>
--    <property name='hv-evmcs' 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'/>
-@@ -284,94 +264,67 @@
-     <property name='avx512vbmi2' type='boolean' value='false'/>
-     <property name='cr8legacy' type='boolean' value='false'/>
-     <property name='stibp' type='boolean' value='false'/>
--    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-     <property name='xcrypt-en' type='boolean' value='false'/>
--    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
--    <property name='apic-id' type='number' value='4294967295'/>
--    <property name='rsba' 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='GenuineIntel'/>
--    <property name='hv-ipi' type='boolean' value='false'/>
-     <property name='pku' type='boolean' value='false'/>
-     <property name='smx' type='boolean' value='false'/>
--    <property name='cmp_legacy' type='boolean' value='false'/>
-     <property name='cmp-legacy' type='boolean' value='false'/>
--    <property name='node-id' type='number' value='-1'/>
-     <property name='avx512-4fmaps' type='boolean' value='false'/>
--    <property name='vmcb_clean' type='boolean' value='false'/>
-     <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='true' migratable='yes'/>
-     <property name='3dnowext' type='boolean' value='false'/>
-     <property name='amd-no-ssb' type='boolean' value='false'/>
--    <property name='hle' type='boolean' value='true' migratable='yes'/>
-     <property name='npt' type='boolean' value='false'/>
-     <property name='rdctl-no' type='boolean' value='false'/>
--    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-     <property name='clwb' 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='svm_lock' type='boolean' value='false'/>
-     <property name='svm-lock' type='boolean' value='false'/>
--    <property name='pfthreshold' 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='x2apic' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512vbmi' type='boolean' value='false'/>
-     <property name='avx512vnni' type='boolean' value='false'/>
--    <property name='hv-stimer' type='boolean' value='false'/>
--    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
--    <property name='i64' type='boolean' value='true' migratable='yes'/>
-     <property name='flushbyasid' type='boolean' value='false'/>
-     <property name='f16c' type='boolean' value='true' migratable='yes'/>
-     <property name='ace2-en' type='boolean' value='false'/>
--    <property name='pat' type='boolean' value='true' migratable='yes'/>
-     <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='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
-     <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
-     <property name='tm' type='boolean' value='false'/>
-     <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
-     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
--    <property name='socket-id' type='number' value='-1'/>
-     <property name='mds-no' type='boolean' value='false'/>
-     <property name='pcommit' type='boolean' value='false'/>
-     <property name='syscall' type='boolean' value='true' migratable='yes'/>
--    <property name='level' type='number' value='13'/>
-     <property name='avx512dq' type='boolean' value='false'/>
--    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
-     <property name='svm' type='boolean' value='false'/>
--    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-reset' type='boolean' value='false'/>
-     <property name='invtsc' type='boolean' value='false'/>
--    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-     <property name='sse2' type='boolean' value='true' migratable='yes'/>
-     <property name='ssbd' type='boolean' value='false'/>
-     <property name='est' type='boolean' value='false'/>
-     <property name='avx512ifma' type='boolean' value='false'/>
-     <property name='tm2' type='boolean' value='false'/>
--    <property name='kvm-pv-ipi' type='boolean' value='true' migratable='yes'/>
-     <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='cldemote' type='boolean' value='false'/>
--    <property name='hv-reenlightenment' type='boolean' value='false'/>
--    <property name='kvm_mmu' type='boolean' value='false'/>
-     <property name='kvm-mmu' type='boolean' value='false'/>
--    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
--    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-     <property name='pge' type='boolean' value='true' migratable='yes'/>
--    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512bitalg' type='boolean' value='false'/>
--    <property name='nodeid_msr' type='boolean' value='false'/>
-     <property name='pdcm' type='boolean' value='false'/>
--    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-     <property name='model' type='number' value='94'/>
--    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-     <property name='nrip-save' type='boolean' value='false'/>
--    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
-     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-     <property name='sse4a' type='boolean' value='false'/>
-     <property name='invpcid' type='boolean' value='true' migratable='yes'/>
-@@ -381,7 +334,6 @@
-     <property name='fma' type='boolean' value='true' migratable='yes'/>
-     <property name='cx16' type='boolean' value='true' migratable='yes'/>
-     <property name='de' type='boolean' value='true' migratable='yes'/>
--    <property name='enforce' type='boolean' value='false'/>
-     <property name='stepping' type='number' value='3'/>
-     <property name='xsave' type='boolean' value='true' migratable='yes'/>
-     <property name='clflush' type='boolean' value='true' migratable='yes'/>
-@@ -389,70 +341,51 @@
-     <property name='tsc' type='boolean' value='true' migratable='yes'/>
-     <property name='tce' type='boolean' value='false'/>
-     <property name='fpu' type='boolean' value='true' migratable='yes'/>
--    <property name='ibs' type='boolean' value='false'/>
--    <property name='ds_cpl' type='boolean' value='false'/>
-     <property name='ds-cpl' type='boolean' value='false'/>
--    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='ibs' type='boolean' value='false'/>
-     <property name='fma4' type='boolean' value='false'/>
-     <property name='la57' type='boolean' value='false'/>
-     <property name='osvw' type='boolean' value='false'/>
--    <property name='check' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-spinlocks' type='number' value='-1'/>
--    <property name='pmm' type='boolean' value='false'/>
--    <property name='pmu' type='boolean' value='false'/>
-     <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='pmm' type='boolean' value='false'/>
-     <property name='spec-ctrl' type='boolean' value='false'/>
--    <property name='min-xlevel2' type='number' value='0'/>
-     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
--    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
-     <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
--    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
-     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
--    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-     <property name='lwp' type='boolean' value='false'/>
-     <property name='amd-ssbd' type='boolean' value='false'/>
--    <property name='ibpb' type='boolean' value='false'/>
-     <property name='xop' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
-     <property name='avx' type='boolean' value='true' migratable='yes'/>
-     <property name='movdiri' type='boolean' value='false'/>
--    <property name='ace2' type='boolean' value='false'/>
--    <property name='avx512bw' type='boolean' value='false'/>
-     <property name='acpi' type='boolean' value='false'/>
--    <property name='hv-vapic' 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='ht' 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='false'/>
--    <property name='vaes' type='boolean' value='false'/>
-     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
--    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-+    <property name='vaes' type='boolean' value='false'/>
-     <property name='movdir64b' type='boolean' value='false'/>
--    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-     <property name='lm' type='boolean' value='true' migratable='yes'/>
-     <property name='umip' type='boolean' value='true' migratable='yes'/>
-     <property name='pse' type='boolean' value='true' migratable='yes'/>
-     <property name='avx2' type='boolean' value='true' migratable='yes'/>
-     <property name='sep' type='boolean' value='true' migratable='yes'/>
--    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-     <property name='virt-ssbd' type='boolean' value='false'/>
--    <property name='x-hv-max-vps' type='number' value='-1'/>
-     <property name='nodeid-msr' type='boolean' value='false'/>
-     <property name='md-clear' type='boolean' value='false'/>
--    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-     <property name='misalignsse' type='boolean' value='false'/>
-     <property name='min-xlevel' type='number' value='2147483656'/>
--    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
--    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
--    <property name='realized' type='boolean' value='false'/>
--    <property name='tsc_scale' type='boolean' value='false'/>
-+    <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='false'/>
-     <property name='topoext' type='boolean' value='false'/>
--    <property name='hv-vpindex' type='boolean' value='false'/>
--    <property name='xlevel2' type='number' value='0'/>
-     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
--    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-     <property name='monitor' type='boolean' value='false'/>
-     <property name='avx512er' type='boolean' value='false'/>
-     <property name='pmm-en' type='boolean' value='false'/>
-@@ -461,25 +394,18 @@
-     <property name='3dnow' type='boolean' value='false'/>
-     <property name='erms' type='boolean' value='true' migratable='yes'/>
-     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
--    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-     <property name='vpclmulqdq' type='boolean' value='false'/>
-     <property name='fxsr-opt' type='boolean' value='false'/>
--    <property name='hv-synic' type='boolean' value='false'/>
-     <property name='xstore' type='boolean' value='false'/>
--    <property name='fxsr_opt' type='boolean' value='false'/>
--    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-     <property name='rtm' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-     <property name='lmce' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-time' type='boolean' value='false'/>
-     <property name='perfctr-nb' type='boolean' value='false'/>
--    <property name='perfctr_nb' type='boolean' value='false'/>
--    <property name='ffxsr' type='boolean' value='false'/>
--    <property name='hv-tlbflush' type='boolean' value='false'/>
-     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512-4vnniw' type='boolean' value='false'/>
--    <property name='vmx' type='boolean' value='true' migratable='yes'/>
-     <property name='vme' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
-     <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'/>
-@@ -487,17 +413,13 @@
-     <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
-     <property name='tbm' type='boolean' value='false'/>
-     <property name='wdt' type='boolean' value='false'/>
--    <property name='pause_filter' type='boolean' value='false'/>
--    <property name='sha-ni' type='boolean' value='false'/>
-     <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
-     <property name='abm' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512pf' type='boolean' value='false'/>
-     <property name='xstore-en' type='boolean' value='false'/>
-   </hostCPU>
-   <hostCPU type='tcg' model='base' migratability='yes'>
--    <property name='phys-bits' type='number' value='0'/>
--    <property name='core-id' type='number' value='-1'/>
--    <property name='xlevel' type='number' value='2147483658'/>
-     <property name='cmov' type='boolean' value='true' migratable='yes'/>
-     <property name='ia64' type='boolean' value='false'/>
-     <property name='ssb-no' type='boolean' value='false'/>
-@@ -510,44 +432,27 @@
-     <property name='pause-filter' type='boolean' value='false'/>
-     <property name='xsavec' type='boolean' value='false'/>
-     <property name='intel-pt' type='boolean' value='false'/>
--    <property name='hv-frequencies' type='boolean' value='false'/>
--    <property name='tsc-frequency' type='number' value='0'/>
--    <property name='xd' type='boolean' value='true' migratable='yes'/>
--    <property name='x-intel-pt-auto-level' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-vendor-id' type='string' value=''/>
-     <property name='kvm-asyncpf' type='boolean' value='false'/>
--    <property name='kvm_asyncpf' type='boolean' value='false'/>
--    <property name='perfctr_core' type='boolean' value='false'/>
-     <property name='perfctr-core' type='boolean' value='false'/>
-     <property name='mpx' type='boolean' value='true' migratable='yes'/>
-     <property name='pbe' type='boolean' value='false'/>
--    <property name='decodeassists' type='boolean' value='false'/>
-     <property name='avx512cd' type='boolean' value='false'/>
--    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-     <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
--    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-     <property name='family' type='number' value='6'/>
--    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
--    <property name='host-phys-bits-limit' type='number' value='0'/>
--    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-     <property name='wbnoinvd' type='boolean' value='false'/>
-     <property name='avx512f' type='boolean' value='false'/>
-     <property name='msr' type='boolean' value='true' migratable='yes'/>
-     <property name='mce' type='boolean' value='true' migratable='yes'/>
-     <property name='mca' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-runtime' type='boolean' value='false'/>
-     <property name='xcrypt' type='boolean' value='false'/>
--    <property name='thread-id' type='number' value='-1'/>
-     <property name='min-level' type='number' value='13'/>
-     <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-     <property name='cid' type='boolean' value='false'/>
--    <property name='hv-relaxed' type='boolean' value='false'/>
--    <property name='hv-crash' type='boolean' value='false'/>
-     <property name='ds' type='boolean' value='false'/>
-     <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-     <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-     <property name='xtpr' type='boolean' value='false'/>
--    <property name='hv-evmcs' 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'/>
-@@ -556,94 +461,67 @@
-     <property name='avx512vbmi2' type='boolean' value='false'/>
-     <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-     <property name='stibp' type='boolean' value='false'/>
--    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-     <property name='xcrypt-en' type='boolean' value='false'/>
--    <property name='kvm_pv_eoi' type='boolean' value='false'/>
--    <property name='apic-id' type='number' value='4294967295'/>
--    <property name='rsba' 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='hv-ipi' type='boolean' value='false'/>
-     <property name='pku' type='boolean' value='true' migratable='yes'/>
-     <property name='smx' type='boolean' value='false'/>
--    <property name='cmp_legacy' type='boolean' value='false'/>
-     <property name='cmp-legacy' type='boolean' value='false'/>
--    <property name='node-id' type='number' value='-1'/>
-     <property name='avx512-4fmaps' type='boolean' value='false'/>
--    <property name='vmcb_clean' type='boolean' value='false'/>
-     <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='false'/>
-     <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-     <property name='amd-no-ssb' type='boolean' value='false'/>
--    <property name='hle' type='boolean' value='false'/>
-     <property name='npt' type='boolean' value='true' migratable='yes'/>
-     <property name='rdctl-no' type='boolean' value='false'/>
--    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-     <property name='clwb' type='boolean' value='true' migratable='yes'/>
-     <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='svm_lock' type='boolean' value='false'/>
-     <property name='svm-lock' type='boolean' value='false'/>
--    <property name='pfthreshold' 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='x2apic' type='boolean' value='false'/>
-     <property name='avx512vbmi' type='boolean' value='false'/>
-     <property name='avx512vnni' type='boolean' value='false'/>
--    <property name='hv-stimer' type='boolean' value='false'/>
--    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
--    <property name='i64' type='boolean' value='true' migratable='yes'/>
-     <property name='flushbyasid' type='boolean' value='false'/>
-     <property name='f16c' type='boolean' value='false'/>
-     <property name='ace2-en' type='boolean' value='false'/>
--    <property name='pat' type='boolean' value='true' migratable='yes'/>
-     <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='kvm_nopiodelay' type='boolean' value='false'/>
-     <property name='kvm-nopiodelay' type='boolean' value='false'/>
-     <property name='tm' type='boolean' value='false'/>
-     <property name='kvmclock-stable-bit' type='boolean' value='false'/>
-     <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
--    <property name='socket-id' type='number' value='-1'/>
-     <property name='mds-no' type='boolean' value='false'/>
-     <property name='pcommit' type='boolean' value='true' migratable='yes'/>
-     <property name='syscall' type='boolean' value='true' migratable='yes'/>
--    <property name='level' type='number' value='13'/>
-     <property name='avx512dq' type='boolean' value='false'/>
--    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
-     <property name='svm' type='boolean' value='true' migratable='yes'/>
--    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-reset' type='boolean' value='false'/>
-     <property name='invtsc' type='boolean' value='false'/>
--    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-     <property name='sse2' type='boolean' value='true' migratable='yes'/>
-     <property name='ssbd' type='boolean' value='false'/>
-     <property name='est' type='boolean' value='false'/>
-     <property name='avx512ifma' type='boolean' value='false'/>
-     <property name='tm2' type='boolean' value='false'/>
--    <property name='kvm-pv-ipi' 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='cldemote' type='boolean' value='false'/>
--    <property name='hv-reenlightenment' type='boolean' value='false'/>
--    <property name='kvm_mmu' type='boolean' value='false'/>
-     <property name='kvm-mmu' type='boolean' value='false'/>
--    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
--    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-     <property name='pge' type='boolean' value='true' migratable='yes'/>
--    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512bitalg' type='boolean' value='false'/>
--    <property name='nodeid_msr' type='boolean' value='false'/>
-     <property name='pdcm' type='boolean' value='false'/>
--    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-     <property name='model' type='number' value='6'/>
--    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-     <property name='nrip-save' type='boolean' value='false'/>
--    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
-     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-     <property name='invpcid' type='boolean' value='false'/>
-@@ -653,7 +531,6 @@
-     <property name='fma' type='boolean' value='false'/>
-     <property name='cx16' type='boolean' value='true' migratable='yes'/>
-     <property name='de' type='boolean' value='true' migratable='yes'/>
--    <property name='enforce' type='boolean' value='false'/>
-     <property name='stepping' type='number' value='3'/>
-     <property name='xsave' type='boolean' value='true' migratable='yes'/>
-     <property name='clflush' type='boolean' value='true' migratable='yes'/>
-@@ -661,70 +538,51 @@
-     <property name='tsc' type='boolean' value='true' migratable='yes'/>
-     <property name='tce' type='boolean' value='false'/>
-     <property name='fpu' type='boolean' value='true' migratable='yes'/>
--    <property name='ibs' type='boolean' value='false'/>
--    <property name='ds_cpl' type='boolean' value='false'/>
-     <property name='ds-cpl' type='boolean' value='false'/>
--    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='ibs' type='boolean' value='false'/>
-     <property name='fma4' type='boolean' value='false'/>
-     <property name='la57' type='boolean' value='true' migratable='yes'/>
-     <property name='osvw' type='boolean' value='false'/>
--    <property name='check' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-spinlocks' type='number' value='-1'/>
--    <property name='pmm' type='boolean' value='false'/>
--    <property name='pmu' type='boolean' value='false'/>
-     <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='pmm' type='boolean' value='false'/>
-     <property name='spec-ctrl' type='boolean' value='false'/>
--    <property name='min-xlevel2' type='number' value='0'/>
-     <property name='tsc-adjust' type='boolean' value='false'/>
--    <property name='tsc_adjust' type='boolean' value='false'/>
-     <property name='kvm-steal-time' type='boolean' value='false'/>
--    <property name='kvm_steal_time' type='boolean' value='false'/>
-     <property name='kvmclock' type='boolean' value='false'/>
--    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-     <property name='lwp' type='boolean' value='false'/>
-     <property name='amd-ssbd' type='boolean' value='false'/>
--    <property name='ibpb' type='boolean' value='false'/>
-     <property name='xop' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
-     <property name='avx' type='boolean' value='false'/>
-     <property name='movdiri' type='boolean' value='false'/>
--    <property name='ace2' type='boolean' value='false'/>
--    <property name='avx512bw' type='boolean' value='false'/>
-     <property name='acpi' type='boolean' value='true' migratable='yes'/>
--    <property name='hv-vapic' 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='ht' 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='vaes' type='boolean' value='false'/>
-     <property name='popcnt' type='boolean' value='true' migratable='yes'/>
--    <property name='xsaves' type='boolean' value='false'/>
-+    <property name='vaes' type='boolean' value='false'/>
-     <property name='movdir64b' type='boolean' value='false'/>
--    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='false'/>
-     <property name='lm' type='boolean' value='true' migratable='yes'/>
-     <property name='umip' type='boolean' value='false'/>
-     <property name='pse' type='boolean' value='true' migratable='yes'/>
-     <property name='avx2' type='boolean' value='false'/>
-     <property name='sep' type='boolean' value='true' migratable='yes'/>
--    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-     <property name='virt-ssbd' type='boolean' value='false'/>
--    <property name='x-hv-max-vps' type='number' value='-1'/>
-     <property name='nodeid-msr' type='boolean' value='false'/>
-     <property name='md-clear' type='boolean' value='false'/>
--    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-     <property name='misalignsse' type='boolean' value='false'/>
-     <property name='min-xlevel' type='number' value='2147483658'/>
--    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
--    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
--    <property name='realized' type='boolean' value='false'/>
--    <property name='tsc_scale' type='boolean' value='false'/>
-+    <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='hv-vpindex' type='boolean' value='false'/>
--    <property name='xlevel2' type='number' value='0'/>
-     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
--    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-     <property name='monitor' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512er' type='boolean' value='false'/>
-     <property name='pmm-en' type='boolean' value='false'/>
-@@ -733,25 +591,18 @@
-     <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-     <property name='erms' type='boolean' value='true' migratable='yes'/>
-     <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
--    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-     <property name='vpclmulqdq' type='boolean' value='false'/>
-     <property name='fxsr-opt' type='boolean' value='false'/>
--    <property name='hv-synic' type='boolean' value='false'/>
-     <property name='xstore' type='boolean' value='false'/>
--    <property name='fxsr_opt' type='boolean' value='false'/>
--    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-     <property name='rtm' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-     <property name='lmce' type='boolean' value='false'/>
--    <property name='hv-time' type='boolean' value='false'/>
-     <property name='perfctr-nb' type='boolean' value='false'/>
--    <property name='perfctr_nb' type='boolean' value='false'/>
--    <property name='ffxsr' type='boolean' value='false'/>
--    <property name='hv-tlbflush' type='boolean' value='false'/>
-     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-     <property name='rdseed' type='boolean' value='false'/>
-     <property name='avx512-4vnniw' type='boolean' value='false'/>
--    <property name='vmx' 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'/>
-@@ -759,9 +610,8 @@
-     <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-     <property name='tbm' type='boolean' value='false'/>
-     <property name='wdt' type='boolean' value='false'/>
--    <property name='pause_filter' type='boolean' value='false'/>
--    <property name='sha-ni' type='boolean' value='false'/>
-     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
-     <property name='abm' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512pf' type='boolean' value='false'/>
-     <property name='xstore-en' type='boolean' value='false'/>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Don-t-use-mem-prealloc-among-with-.prealloc-yes.patch b/SOURCES/libvirt-qemu-Don-t-use-mem-prealloc-among-with-.prealloc-yes.patch
deleted file mode 100644
index 9022eec..0000000
--- a/SOURCES/libvirt-qemu-Don-t-use-mem-prealloc-among-with-.prealloc-yes.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From af079d99de7c556c3b9bb10037dae90e0f23f38a Mon Sep 17 00:00:00 2001
-Message-Id: <af079d99de7c556c3b9bb10037dae90e0f23f38a@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Dec 2018 11:47:36 +0100
-Subject: [PATCH] qemu: Don't use -mem-prealloc among with .prealloc=yes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624223
-
-There are two ways to request memory preallocation on cmd line:
--mem-prealloc and .prealloc attribute for a memory-backend-file.
-However, as it turns out it's not safe to use both at the same
-time. If -mem-prealloc is used then qemu will fully allocate the
-memory (this is done by actually touching every page that has
-been allocated). Then, if .prealloc=yes is specified,
-mbind(flags = MPOL_MF_STRICT | MPOL_MF_MOVE) is called which:
-
-a) has to (possibly) move the memory to a different NUMA node,
-b) can have no effect when hugepages are in play (thus ignoring user
-request to place memory on desired NUMA nodes).
-
-Prefer -mem-prealloc as it is more backward compatible
-compared to switching to "-numa node,memdev=  + -object
-memory-backend-file".
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit c658764decf357ef2a064f09235fb6b8bd027f8b)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-
-Conflicts:
-src/qemu/qemu_command.c:
-src/qemu/qemu_domain.c:
-src/qemu/qemu_domain.h: Context mostly, the upstream code
-                        diverged.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <37771aafbb9d1855721efde7ade34c7b98fb1fc7.1545129996.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                       | 26 ++++++++++++-------
- src/qemu/qemu_domain.c                        |  7 +++++
- src/qemu/qemu_domain.h                        |  3 +++
- .../hugepages-numa-default-dimm.args          |  2 +-
- 4 files changed, 28 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index fa2b904239..7ffc4358e3 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3185,11 +3185,13 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-         if (useHugepage) {
-             if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0)
-                 goto cleanup;
--            prealloc = true;
-+            if (!priv->memPrealloc)
-+                prealloc = true;
-         } else if (mem->nvdimmPath) {
-             if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0)
-                 goto cleanup;
--            prealloc = true;
-+            if (!priv->memPrealloc)
-+                prealloc = true;
-         } else {
-             /* We can have both pagesize and mem source. If that's the case,
-              * prefer hugepages as those are more specific. */
-@@ -7603,7 +7605,8 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
- static int
- qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
-                     const virDomainDef *def,
--                    virCommandPtr cmd)
-+                    virCommandPtr cmd,
-+                    qemuDomainObjPrivatePtr priv)
- {
-     const long system_page_size = virGetSystemPageSizeKB();
-     char *mem_path = NULL;
-@@ -7624,8 +7627,10 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
-     if (qemuGetDomainHupageMemPath(def, cfg, def->mem.hugepages[0].size, &mem_path) < 0)
-         return -1;
- 
--    if (def->mem.allocation != VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE)
-+    if (def->mem.allocation != VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE) {
-         virCommandAddArgList(cmd, "-mem-prealloc", NULL);
-+        priv->memPrealloc = true;
-+    }
- 
-     virCommandAddArgList(cmd, "-mem-path", mem_path, NULL);
-     VIR_FREE(mem_path);
-@@ -7638,7 +7643,8 @@ static int
- qemuBuildMemCommandLine(virCommandPtr cmd,
-                         virQEMUDriverConfigPtr cfg,
-                         const virDomainDef *def,
--                        virQEMUCapsPtr qemuCaps)
-+                        virQEMUCapsPtr qemuCaps,
-+                        qemuDomainObjPrivatePtr priv)
- {
-     if (qemuDomainDefValidateMemoryHotplug(def, qemuCaps, NULL) < 0)
-         return -1;
-@@ -7657,15 +7663,17 @@ qemuBuildMemCommandLine(virCommandPtr cmd,
-                               virDomainDefGetMemoryInitial(def) / 1024);
-     }
- 
--    if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE)
-+    if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE) {
-         virCommandAddArgList(cmd, "-mem-prealloc", NULL);
-+        priv->memPrealloc = true;
-+    }
- 
-     /*
-      * Add '-mem-path' (and '-mem-prealloc') parameter here if
-      * the hugepages and no numa node is specified.
-      */
-     if (!virDomainNumaGetNodeCount(def->numa) &&
--        qemuBuildMemPathStr(cfg, def, cmd) < 0)
-+        qemuBuildMemPathStr(cfg, def, cmd, priv) < 0)
-         return -1;
- 
-     if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_REALTIME_MLOCK)) {
-@@ -7772,7 +7780,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
-     }
- 
-     if (!needBackend &&
--        qemuBuildMemPathStr(cfg, def, cmd) < 0)
-+        qemuBuildMemPathStr(cfg, def, cmd, priv) < 0)
-         goto cleanup;
- 
-     for (i = 0; i < ncells; i++) {
-@@ -10445,7 +10453,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-     if (!migrateURI && !snapshot && qemuDomainAlignMemorySizes(def) < 0)
-         goto error;
- 
--    if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps) < 0)
-+    if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps, priv) < 0)
-         goto error;
- 
-     if (qemuBuildSmpCommandLine(cmd, def) < 0)
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 8604385aa2..95b84af78a 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -1936,6 +1936,8 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv)
-     VIR_FREE(priv->libDir);
-     VIR_FREE(priv->channelTargetDir);
- 
-+    priv->memPrealloc = false;
-+
-     /* remove automatic pinning data */
-     virBitmapFree(priv->autoNodeset);
-     priv->autoNodeset = NULL;
-@@ -2439,6 +2441,9 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
- 
-     qemuDomainObjPrivateXMLFormatPR(buf, priv);
- 
-+    if (priv->memPrealloc)
-+        virBufferAddLit(buf, "<memPrealloc/>\n");
-+
-     if (qemuDomainObjPrivateXMLFormatBlockjobs(buf, vm) < 0)
-         return -1;
- 
-@@ -2934,6 +2939,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
-     if (qemuDomainObjPrivateXMLParseBlockjobs(priv, ctxt) < 0)
-         goto error;
- 
-+    priv->memPrealloc = virXPathBoolean("boolean(./memPrealloc)", ctxt) == 1;
-+
-     return 0;
- 
-  error:
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index cc406e3ca0..8463a8b706 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -367,6 +367,9 @@ struct _qemuDomainObjPrivate {
-     /* qemuProcessStartCPUs stores the reason for starting vCPUs here for the
-      * RESUME event handler to use it */
-     virDomainRunningReason runningReason;
-+
-+    /* true if global -mem-prealloc appears on cmd line */
-+    bool memPrealloc;
- };
- 
- # define QEMU_DOMAIN_PRIVATE(vm) \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-index 855966a137..e7294a0882 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
- -mem-prealloc \
- -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
- -numa node,nodeid=0,cpus=0-1,mem=1024 \
---object memory-backend-file,id=memdimm0,prealloc=yes,\
-+-object memory-backend-file,id=memdimm0,\
- mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\
- host-nodes=1-3,policy=bind \
- -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Drop-MSR-features-from-host-model-with-old-QEMU.patch b/SOURCES/libvirt-qemu-Drop-MSR-features-from-host-model-with-old-QEMU.patch
deleted file mode 100644
index da33e42..0000000
--- a/SOURCES/libvirt-qemu-Drop-MSR-features-from-host-model-with-old-QEMU.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 360c3ee173809822e9363ec210a8197b66511a03 Mon Sep 17 00:00:00 2001
-Message-Id: <360c3ee173809822e9363ec210a8197b66511a03@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:12 +0200
-Subject: [PATCH] qemu: Drop MSR features from host-model with old QEMU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With QEMU versions which lack "unavailable-features" we use CPUID based
-detection of features which were enabled or disabled once QEMU starts.
-Thus using MSR features with host-model would result in all of them
-being marked as disabled in the active domain definition even though
-QEMU did not actually disable them.
-
-Let's make sure we add MSR features to host-model only when
-"unavailable-features" property is supported by QEMU.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2674d00ed484091faf2b6e6b1efe58ee9a72b96b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
-	tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
-            - missing
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <b7d9dd2f26053edb58fb8c3079334c2a494d07f9.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 4be0ec305f..fbfe74d45b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3114,6 +3114,21 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-             goto error;
-     }
- 
-+    if (ARCH_IS_X86(qemuCaps->arch) &&
-+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) {
-+        if (cpu &&
-+            virCPUDefFilterFeatures(cpu, virCPUx86FeatureFilterDropMSR, NULL) < 0)
-+            goto error;
-+
-+        if (migCPU &&
-+            virCPUDefFilterFeatures(migCPU, virCPUx86FeatureFilterDropMSR, NULL) < 0)
-+            goto error;
-+
-+        if (fullCPU &&
-+            virCPUDefFilterFeatures(fullCPU, virCPUx86FeatureFilterDropMSR, NULL) < 0)
-+            goto error;
-+    }
-+
-     virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU, fullCPU);
- 
-  cleanup:
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Drop-QEMU_CAPS_ENABLE_KVM.patch b/SOURCES/libvirt-qemu-Drop-QEMU_CAPS_ENABLE_KVM.patch
deleted file mode 100644
index 232cc8c..0000000
--- a/SOURCES/libvirt-qemu-Drop-QEMU_CAPS_ENABLE_KVM.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From ab9d2e264ba8a544eadb9e1b72a4a5d0f4789815 Mon Sep 17 00:00:00 2001
-Message-Id: <ab9d2e264ba8a544eadb9e1b72a4a5d0f4789815@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:50 +0200
-Subject: [PATCH] qemu: Drop QEMU_CAPS_ENABLE_KVM
-
-It was already available in 1.5.0.
-
-Moreover, we're not even formatting it on the QEMU command
-line, ever: we just use it as part of some logic that decides
-whether KVM support should be advertised, and as it turns out
-that logic is actually buggy and dropping this capability
-fixes it.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1628469
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 88983855d5496a74b97551860db737c2b17b100e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_capabilities.c |  3 ---
- src/qemu/qemu_capabilities.h |  2 +-
- tests/qemuxml2argvtest.c     | 11 +++++------
- 3 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 1321696d11..14d7b8fbf7 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -834,7 +834,6 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
- 
-     if (virFileExists("/dev/kvm") &&
-         (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
--         virQEMUCapsGet(qemubinCaps, QEMU_CAPS_ENABLE_KVM) ||
-          kvmbin))
-         haskvm = true;
- 
-@@ -2603,7 +2602,6 @@ virQEMUCapsProbeQMPKVMState(virQEMUCapsPtr qemuCaps,
-         virQEMUCapsClear(qemuCaps, QEMU_CAPS_KVM);
-     } else if (!enabled) {
-         virQEMUCapsClear(qemuCaps, QEMU_CAPS_KVM);
--        virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM);
-     }
- 
-     return 0;
-@@ -3911,7 +3909,6 @@ virQEMUCapsIsValid(void *data,
-                                     priv->runUid, priv->runGid) == 0;
- 
-     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) &&
--        virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_KVM) &&
-         kvmUsable) {
-         VIR_DEBUG("KVM was not enabled when probing '%s', "
-                   "but it should be usable now",
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 9e8ad5f5c3..98668115d6 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -79,7 +79,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */
-     X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */
-     X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
--    QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
-+    X_QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
-     X_QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
- 
-     /* 25 */
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index ebe9c8a131..13e95fe28a 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -912,16 +912,15 @@ mymain(void)
-     DO_TEST("clock-france", NONE);
-     DO_TEST("clock-hpet-off", NONE);
-     DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
--    DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM);
--    DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM);
-+    DO_TEST("cpu-kvmclock", NONE);
-+    DO_TEST("cpu-host-kvmclock", NONE);
-     DO_TEST("kvmclock", QEMU_CAPS_KVM);
-     DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM);
- 
--    DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM);
--    DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM);
-+    DO_TEST("cpu-eoi-disabled", NONE);
-+    DO_TEST("cpu-eoi-enabled", NONE);
-     DO_TEST("controller-order",
-             QEMU_CAPS_KVM,
--            QEMU_CAPS_ENABLE_KVM,
-             QEMU_CAPS_PIIX3_USB_UHCI,
-             QEMU_CAPS_CCID_PASSTHRU,
-             QEMU_CAPS_SPICE,
-@@ -933,7 +932,7 @@ mymain(void)
-     DO_TEST("eoi-enabled", NONE);
-     DO_TEST("pv-spinlock-disabled", NONE);
-     DO_TEST("pv-spinlock-enabled", NONE);
--    DO_TEST("kvmclock+eoi-disabled", QEMU_CAPS_ENABLE_KVM);
-+    DO_TEST("kvmclock+eoi-disabled", NONE);
- 
-     DO_TEST("hyperv", NONE);
-     DO_TEST("hyperv-off", NONE);
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Drop-cleanup-label-from-qemuProcessInitCpuAffinity.patch b/SOURCES/libvirt-qemu-Drop-cleanup-label-from-qemuProcessInitCpuAffinity.patch
deleted file mode 100644
index 1923e7f..0000000
--- a/SOURCES/libvirt-qemu-Drop-cleanup-label-from-qemuProcessInitCpuAffinity.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From fa5cf4f38c5310ac24adf2011777c21827c3a727 Mon Sep 17 00:00:00 2001
-Message-Id: <fa5cf4f38c5310ac24adf2011777c21827c3a727@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:55:05 +0200
-Subject: [PATCH] qemu: Drop cleanup label from qemuProcessInitCpuAffinity()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We're using VIR_AUTOPTR() for everything now, plus the
-cleanup section was not doing anything useful anyway.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit de563ebcf9d72e5815933a0d715aa9c462bf50cc)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716908
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611085506.12564-6-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 0b2b7964e1..d0945b9c65 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2356,7 +2356,6 @@ qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet)
- static int
- qemuProcessInitCpuAffinity(virDomainObjPtr vm)
- {
--    int ret = -1;
-     VIR_AUTOPTR(virBitmap) cpumapToSet = NULL;
-     virDomainNumatuneMemMode mem_mode;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-@@ -2387,25 +2386,24 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
-                                              priv->autoNodeset,
-                                              &nodeset,
-                                              -1) < 0)
--            goto cleanup;
-+            return -1;
- 
-         if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0)
--            goto cleanup;
-+            return -1;
-     } else if (vm->def->cputune.emulatorpin) {
-         if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0)
--            goto cleanup;
-+            return -1;
-     } else {
-         if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0)
--            goto cleanup;
-+            return -1;
-     }
- 
-     if (cpumapToSet &&
--        virProcessSetAffinity(vm->pid, cpumapToSet) < 0)
--        goto cleanup;
-+        virProcessSetAffinity(vm->pid, cpumapToSet) < 0) {
-+        return -1;
-+    }
- 
--    ret = 0;
-- cleanup:
--    return ret;
-+    return 0;
- }
- 
- /* set link states to down on interfaces at qemu start */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Drop-disabled-CPU-features-unknown-to-QEMU.patch b/SOURCES/libvirt-qemu-Drop-disabled-CPU-features-unknown-to-QEMU.patch
deleted file mode 100644
index 5429b29..0000000
--- a/SOURCES/libvirt-qemu-Drop-disabled-CPU-features-unknown-to-QEMU.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 6227a5d2d70dd396c428af4864ab38b1a32ef0f5 Mon Sep 17 00:00:00 2001
-Message-Id: <6227a5d2d70dd396c428af4864ab38b1a32ef0f5@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Nov 2019 17:52:34 +0100
-Subject: [PATCH] qemu: Drop disabled CPU features unknown to QEMU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When a CPU definition wants to explicitly disable some features that are
-unknown to QEMU, we can safely drop them from the definition before
-starting QEMU. Naturally QEMU won't enable such features implicitly.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit ac34e141596fab70fbe91a396311f80db6cb57c5)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749672
-https://bugzilla.redhat.com/show_bug.cgi?id=1756156
-https://bugzilla.redhat.com/show_bug.cgi?id=1721608
-
-Conflicts:
-	src/qemu/qemu_process.c
-            - downstream still uses cleanup label
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <92f146f8754300266d688dd92dfe95e737dda7da.1573836581.git.jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_process.c                       | 32 +++++++++++++++++++
- ...-Icelake-Server-pconfig.x86_64-latest.args |  2 +-
- 2 files changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 0cd61f02bb..0700b054f3 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5730,6 +5730,26 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr driver,
- }
- 
- 
-+static bool
-+qemuProcessDropUnknownCPUFeatures(const char *name,
-+                                  virCPUFeaturePolicy policy,
-+                                  void *opaque)
-+{
-+    const char **features = opaque;
-+
-+    if (policy != VIR_CPU_FEATURE_DISABLE &&
-+        policy != VIR_CPU_FEATURE_FORBID)
-+        return true;
-+
-+    if (virStringListHasString(features, name))
-+        return true;
-+
-+    /* Features unknown to QEMU are implicitly disabled, we can just drop them
-+     * from the definition. */
-+    return false;
-+}
-+
-+
- static int
- qemuProcessUpdateGuestCPU(virDomainDefPtr def,
-                           virQEMUCapsPtr qemuCaps,
-@@ -5792,6 +5812,18 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
-                         virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType)) < 0)
-         goto cleanup;
- 
-+    if (ARCH_IS_X86(def->os.arch)) {
-+        VIR_AUTOSTRINGLIST features = NULL;
-+
-+        if (virQEMUCapsGetCPUFeatures(qemuCaps, def->virtType, false, &features) < 0)
-+            goto cleanup;
-+
-+        if (features &&
-+            virCPUDefFilterFeatures(def->cpu, qemuProcessDropUnknownCPUFeatures,
-+                                    features) < 0)
-+            goto cleanup;
-+    }
-+
-     def->cpu->fallback = VIR_CPU_FALLBACK_FORBID;
-     ret = 0;
- 
-diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-index 664db44e7b..de737bfed7 100644
---- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
- -machine pc,accel=kvm,usb=off,dump-guest-core=off \
---cpu Icelake-Server,pconfig=off \
-+-cpu Icelake-Server \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
--- 
-2.24.0
-
diff --git a/SOURCES/libvirt-qemu-Drop-duplicated-code-from-qemuDomainDefValidateFeatures.patch b/SOURCES/libvirt-qemu-Drop-duplicated-code-from-qemuDomainDefValidateFeatures.patch
deleted file mode 100644
index 83ea0df..0000000
--- a/SOURCES/libvirt-qemu-Drop-duplicated-code-from-qemuDomainDefValidateFeatures.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From cc56efa7f1681ae29b8a5de14bd31d35029a249a Mon Sep 17 00:00:00 2001
-Message-Id: <cc56efa7f1681ae29b8a5de14bd31d35029a249a@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 4 Dec 2018 16:46:16 +0100
-Subject: [PATCH] qemu: Drop duplicated code from
- qemuDomainDefValidateFeatures()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both VIR_DOMAIN_FEATURE_HPT and VIR_DOMAIN_FEATURE_HTM are
-handled in the exact same way, so we can remove some duplicated
-code without losing any functionality.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 094c97ffadda41bb2ce2dfe699710630218975f2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1647822
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.c | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 08f479fa1d..4fcca1e05a 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3818,6 +3818,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
-             break;
- 
-         case VIR_DOMAIN_FEATURE_HPT:
-+        case VIR_DOMAIN_FEATURE_HTM:
-             if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
-                 !qemuDomainIsPSeries(def)) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-@@ -3852,19 +3853,6 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
-             }
-             break;
- 
--        case VIR_DOMAIN_FEATURE_HTM:
--            if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
--                !qemuDomainIsPSeries(def)) {
--                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                               _("The '%s' feature is not supported for "
--                                 "architecture '%s' or machine type '%s'"),
--                               featureName,
--                               virArchToString(def->os.arch),
--                               def->os.machine);
--                return -1;
--            }
--            break;
--
-         case VIR_DOMAIN_FEATURE_ACPI:
-         case VIR_DOMAIN_FEATURE_APIC:
-         case VIR_DOMAIN_FEATURE_PAE:
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-Drop-user-prefix-for-guestfwd-netdev.patch b/SOURCES/libvirt-qemu-Drop-user-prefix-for-guestfwd-netdev.patch
deleted file mode 100644
index d953baa..0000000
--- a/SOURCES/libvirt-qemu-Drop-user-prefix-for-guestfwd-netdev.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 582d5e7db59ec7897dc0a2a78823860963be9855 Mon Sep 17 00:00:00 2001
-Message-Id: <582d5e7db59ec7897dc0a2a78823860963be9855@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 14:44:45 +0200
-Subject: [PATCH] qemu: Drop "user-" prefix for guestfwd netdev
-
-Introduced by d86c876a66e3.
-
-There is no real need to have "user-" prefix for chardev.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 18b8f677456714f04b87525602fa2b62cd4224e1)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624204
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <f9a2801659530438c1253c63a9d754bf46825bfe.1561639408.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_command.c                      | 2 +-
- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
- tests/qemuxml2argvdata/name-escape.args      | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index b5c0588e3c..2b885e98dd 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -10737,7 +10737,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr,
-         port = virSocketAddrGetPort(chr->target.addr);
- 
-         if (virAsprintf(deviceStr,
--                        "user,guestfwd=tcp:%s:%i-chardev:char%s,id=user-%s",
-+                        "user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s",
-                         addr, port, chr->info.alias, chr->info.alias) < 0)
-             goto cleanup;
-         break;
-diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
-index 6a660f7796..b4c857a6d7 100644
---- a/tests/qemuxml2argvdata/channel-guestfwd.args
-+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
-@@ -25,5 +25,5 @@ server,nowait \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
- -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
- -chardev pipe,id=charchannel0,path=/tmp/guestfwd \
---netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \
-+-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
- -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args
-index 382b8a1a9e..cbf594e808 100644
---- a/tests/qemuxml2argvdata/name-escape.args
-+++ b/tests/qemuxml2argvdata/name-escape.args
-@@ -37,7 +37,7 @@ cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \
- -chardev file,id=charserial1,path=/tmp/serial.log,,foo,append=on \
- -device isa-serial,chardev=charserial1,id=serial1 \
- -chardev pipe,id=charchannel0,path=/tmp/guestfwd,,foo \
---netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \
-+-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
- -vnc unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \
- -spice unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,\
- rendernode=/dev/dri/foo,,bar \
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Enable-PCI-multi-bus-for-S390-guests.patch b/SOURCES/libvirt-qemu-Enable-PCI-multi-bus-for-S390-guests.patch
deleted file mode 100644
index c0f103b..0000000
--- a/SOURCES/libvirt-qemu-Enable-PCI-multi-bus-for-S390-guests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2c4fb8fc19d1dd6ef8fafdfb1e48998020a368cd Mon Sep 17 00:00:00 2001
-Message-Id: <2c4fb8fc19d1dd6ef8fafdfb1e48998020a368cd@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:20 +0200
-Subject: [PATCH] qemu: Enable PCI multi bus for S390 guests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU on s390 supports PCI multibus since forever.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit f49a5e3bf4c275ddb8a60274d6ab941b2f99f553)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_capabilities.c
-    + context
-      - missing fa95035bd4c9
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-4-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 8ca53abf2b..5539d168cd 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -1803,6 +1803,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-         return false;
-     }
- 
-+    /* S390 supports PCI-multibus. */
-+    if (ARCH_IS_S390(def->os.arch))
-+        return true;
-+
-     /* If 'virt' supports PCI, it supports multibus.
-      * No extra conditions here for simplicity.
-      */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Exempt-video-model-none-from-getting-a-PCI-address-on-Q35.patch b/SOURCES/libvirt-qemu-Exempt-video-model-none-from-getting-a-PCI-address-on-Q35.patch
deleted file mode 100644
index a25df7a..0000000
--- a/SOURCES/libvirt-qemu-Exempt-video-model-none-from-getting-a-PCI-address-on-Q35.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2ef60f04d9beea2d46cfd4344a8c5482276979c2 Mon Sep 17 00:00:00 2001
-Message-Id: <2ef60f04d9beea2d46cfd4344a8c5482276979c2@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Tue, 31 Jul 2018 10:38:54 +0200
-Subject: [PATCH] qemu: Exempt video model 'none' from getting a PCI address on
- Q35
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit d48813e8 made sure we wouldn't get one for i440fx, but not for Q35
-machine type. If the primary video didn't get the assumed 0:0:1.0 PCI
-address, the evaluation then failed with: "Cannot automatically add a
-new PCI bus for a device with connect flags 00"
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1609087
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit e9024b0cec3a66ac11784034bb62abe8ec7b46a1)
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain_address.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index e6996934b8..0cb5af4a87 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -1723,10 +1723,11 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
-            goto cleanup;
-     }
- 
--    if (def->nvideos > 0) {
-+    if (def->nvideos > 0 &&
-+        def->videos[0]->type != VIR_DOMAIN_VIDEO_TYPE_NONE) {
-         /* NB: unlike the pc machinetypes, on q35 machinetypes the
-          * integrated devices are at slot 0x1f, so when qemu looks for
--         * the first free lot for the first VGA, it will always be at
-+         * the first free slot for the first VGA, it will always be at
-          * slot 1 (which was used up by the integrated PIIX3 devices
-          * on pc machinetypes).
-          */
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Extract-MDEV-VFIO-PCI-validation-code-into-a-separate-helper.patch b/SOURCES/libvirt-qemu-Extract-MDEV-VFIO-PCI-validation-code-into-a-separate-helper.patch
deleted file mode 100644
index a9b56c3..0000000
--- a/SOURCES/libvirt-qemu-Extract-MDEV-VFIO-PCI-validation-code-into-a-separate-helper.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 46dc4f557546c024c273e0e21110698cdfffe8ae Mon Sep 17 00:00:00 2001
-Message-Id: <46dc4f557546c024c273e0e21110698cdfffe8ae@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 30 Nov 2018 15:49:25 +0100
-Subject: [PATCH] qemu: Extract MDEV VFIO PCI validation code into a separate
- helper
-
-Since we'll need to validate other models apart from VFIO PCI too,
-having a helper for each model should keep the code base cleaner.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit 208d6e6f5aafa102d04ce300c6338b0736bb52df)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508146
-
-Signed-off-by: Pino Toscano <ptoscano@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_domain.c | 35 +++++++++++++++++++++++++++++------
- 1 file changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index d80f9b393e..4898d58733 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4451,11 +4451,11 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net)
- 
- 
- static int
--qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
--                          const virDomainDef *def,
--                          virQEMUCapsPtr qemuCaps)
-+qemuDomainMdevDefVFIOPCIValidate(const virDomainHostdevSubsysMediatedDev *dev,
-+                                 const virDomainDef *def,
-+                                 virQEMUCapsPtr qemuCaps)
- {
--    if (mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
-+    if (dev->display == VIR_TRISTATE_SWITCH_ABSENT)
-         return 0;
- 
-     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY)) {
-@@ -4465,7 +4465,7 @@ qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
-         return -1;
-     }
- 
--    if (mdevsrc->model != VIR_MDEV_MODEL_TYPE_VFIO_PCI) {
-+    if (dev->model != VIR_MDEV_MODEL_TYPE_VFIO_PCI) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("<hostdev> attribute 'display' is only supported"
-                          " with model='vfio-pci'"));
-@@ -4473,7 +4473,7 @@ qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
-         return -1;
-     }
- 
--    if (mdevsrc->display == VIR_TRISTATE_SWITCH_ON) {
-+    if (dev->display == VIR_TRISTATE_SWITCH_ON) {
-         if (def->ngraphics == 0) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                            _("graphics device is needed for attribute value "
-@@ -4486,6 +4486,29 @@ qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
- }
- 
- 
-+static int
-+qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc,
-+                          const virDomainDef *def,
-+                          virQEMUCapsPtr qemuCaps)
-+{
-+    switch ((virMediatedDeviceModelType) mdevsrc->model) {
-+    case VIR_MDEV_MODEL_TYPE_VFIO_PCI:
-+        return qemuDomainMdevDefVFIOPCIValidate(mdevsrc, def, qemuCaps);
-+    case VIR_MDEV_MODEL_TYPE_VFIO_AP:
-+        break;
-+    case VIR_MDEV_MODEL_TYPE_VFIO_CCW:
-+        break;
-+    case VIR_MDEV_MODEL_TYPE_LAST:
-+    default:
-+        virReportEnumRangeError(virMediatedDeviceModelType,
-+                                mdevsrc->model);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
-                                    const virDomainDef *def,
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-qemu-Fetch-pr-helper-process-info-on-reconnect.patch b/SOURCES/libvirt-qemu-Fetch-pr-helper-process-info-on-reconnect.patch
deleted file mode 100644
index 9a7801a..0000000
--- a/SOURCES/libvirt-qemu-Fetch-pr-helper-process-info-on-reconnect.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From deb8789da55b84c99df417f3cd07db52cac8f89b Mon Sep 17 00:00:00 2001
-Message-Id: <deb8789da55b84c99df417f3cd07db52cac8f89b@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 11 Jul 2018 17:27:28 +0200
-Subject: [PATCH] qemu: Fetch pr-helper process info on reconnect
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1470007
-
-If qemu-pr-helper process died while libvirtd was not running no
-event is emitted. Therefore, when reconnecting to the monitor we
-must check the qemu-pr-helper process status and act accordingly.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit ab435a4be4673a9a38e0315864b9cf4f9bee03e7)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 60 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index fbc8529f3b..c903a8e5c8 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2071,6 +2071,63 @@ qemuRefreshVirtioChannelState(virQEMUDriverPtr driver,
-     return ret;
- }
- 
-+
-+static int
-+qemuProcessRefreshPRManagerState(virDomainObjPtr vm,
-+                                 virHashTablePtr info)
-+{
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-+    qemuMonitorPRManagerInfoPtr prManagerInfo;
-+    const char *managedAlias = qemuDomainGetManagedPRAlias();
-+    int ret = -1;
-+
-+    if (!(prManagerInfo = virHashLookup(info, managedAlias))) {
-+        virReportError(VIR_ERR_OPERATION_FAILED,
-+                       _("missing info on pr-manager %s"),
-+                       managedAlias);
-+        goto cleanup;
-+    }
-+
-+    priv->prDaemonRunning = prManagerInfo->connected;
-+
-+    if (!priv->prDaemonRunning &&
-+        qemuProcessStartManagedPRDaemon(vm) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+ cleanup:
-+    return ret;
-+}
-+
-+
-+static int
-+qemuRefreshPRManagerState(virQEMUDriverPtr driver,
-+                          virDomainObjPtr vm)
-+{
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-+    virHashTablePtr info = NULL;
-+    int ret = -1;
-+
-+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER) ||
-+        !virDomainDefHasManagedPR(vm->def))
-+        return 0;
-+
-+    qemuDomainObjEnterMonitor(driver, vm);
-+    ret = qemuMonitorGetPRManagerInfo(priv->mon, &info);
-+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+        ret = -1;
-+
-+    if (ret < 0)
-+        goto cleanup;
-+
-+    ret = qemuProcessRefreshPRManagerState(vm, info);
-+
-+ cleanup:
-+    virHashFree(info);
-+    return ret;
-+}
-+
-+
- static void
- qemuRefreshRTC(virQEMUDriverPtr driver,
-                virDomainObjPtr vm)
-@@ -7736,6 +7793,9 @@ qemuProcessReconnect(void *opaque)
-     if (qemuProcessUpdateDevices(driver, obj) < 0)
-         goto error;
- 
-+    if (qemuRefreshPRManagerState(driver, obj) < 0)
-+        goto error;
-+
-     qemuProcessReconnectCheckMemAliasOrderMismatch(obj);
- 
-     if (qemuConnectAgent(driver, obj) < 0)
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Filter-non-SCSI-hostdevs-in-qemuHostdevPrepareSCSIDevices.patch b/SOURCES/libvirt-qemu-Filter-non-SCSI-hostdevs-in-qemuHostdevPrepareSCSIDevices.patch
deleted file mode 100644
index 9414a02..0000000
--- a/SOURCES/libvirt-qemu-Filter-non-SCSI-hostdevs-in-qemuHostdevPrepareSCSIDevices.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 057c1927b6d652591931d1cf2bc0217834b30e12 Mon Sep 17 00:00:00 2001
-Message-Id: <057c1927b6d652591931d1cf2bc0217834b30e12@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 11 Jan 2019 09:15:38 -0500
-Subject: [PATCH] qemu: Filter non SCSI hostdevs in
- qemuHostdevPrepareSCSIDevices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1665244
-
-When commit 1d94b3e7 added code to walk the [n]hostdevs list looking
-to add shared hostdevs, it should've filtered any hostdevs that were
-not SCSI hostdev's.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f30ac207ad96a567ade0d8a49023ade9233b2b72)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hostdev.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
-index 1e040f98b7..8b1ad6b447 100644
---- a/src/qemu/qemu_hostdev.c
-+++ b/src/qemu/qemu_hostdev.c
-@@ -278,6 +278,9 @@ qemuHostdevPrepareSCSIDevices(virQEMUDriverPtr driver,
-     for (i = 0; i < nhostdevs; i++) {
-         virDomainDeviceDef dev;
- 
-+        if (!virHostdevIsSCSIDevice(hostdevs[i]))
-+            continue;
-+
-         dev.type = VIR_DOMAIN_DEVICE_HOSTDEV;
-         dev.data.hostdev = hostdevs[i];
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-Fix-ATTRIBUTE_NONNULL-for-qemuMonitorAddObject.patch b/SOURCES/libvirt-qemu-Fix-ATTRIBUTE_NONNULL-for-qemuMonitorAddObject.patch
deleted file mode 100644
index 130dc62..0000000
--- a/SOURCES/libvirt-qemu-Fix-ATTRIBUTE_NONNULL-for-qemuMonitorAddObject.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ea272bb13a0ef6ab04c78ca671f009506211523b Mon Sep 17 00:00:00 2001
-Message-Id: <ea272bb13a0ef6ab04c78ca671f009506211523b@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 13 Jul 2018 10:02:34 +0200
-Subject: [PATCH] qemu: Fix ATTRIBUTE_NONNULL for qemuMonitorAddObject
-
-Commit id fac0dacd was trying to make things more robust;
-however, the ATTRIBUTE_NONNULL(1) would be for the @mon,
-not the intended (2) and the @props argument as described
-in the commit message.
-
-Found by Coverity build.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 7406ab691ffe0fbe051f6ae57614737e193df6a5)
-
-The broken commit described in the original commit message was
-backported as 1d60f6832c8b14c9a
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1598015
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_monitor.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index e8ed2d044c..81474a04f6 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -824,7 +824,7 @@ int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret,
- int qemuMonitorAddObject(qemuMonitorPtr mon,
-                          virJSONValuePtr *props,
-                          char **alias)
--    ATTRIBUTE_NONNULL(1);
-+    ATTRIBUTE_NONNULL(2);
- 
- int qemuMonitorDelObject(qemuMonitorPtr mon,
-                          const char *objalias);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-KVM-features-with-QEMU-4.1.patch b/SOURCES/libvirt-qemu-Fix-KVM-features-with-QEMU-4.1.patch
deleted file mode 100644
index d959e62..0000000
--- a/SOURCES/libvirt-qemu-Fix-KVM-features-with-QEMU-4.1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b77f7c1c1424a758295105b92c5f95ff82d54904 Mon Sep 17 00:00:00 2001
-Message-Id: <b77f7c1c1424a758295105b92c5f95ff82d54904@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Feb 2020 10:41:45 +0100
-Subject: [PATCH] qemu: Fix KVM features with QEMU 4.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Originally the names of the KVM CPU features were only used internally
-for looking up their CPUID bits. So we used "__kvm_" prefix for them to
-make sure the names do not collide with normal CPU features stored in
-our CPU map.
-
-But with QEMU 4.1 we check which features were enabled or disabled by a
-freshly started QEMU process using their names rather than their CPUID
-bits (mostly because of MSR features). Thus we need to change our made
-up internal names into the actual names used by QEMU.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Tested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4c62ed606895018aaf9f9f1d2137fcea3918756a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1794868
-
-Conflicts:
-	src/cpu/cpu_x86_data.h
-            - all defines are indented as downstream lacks #pragma once
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <c565def49ee0f02b19d58717383661a277b770f0.1581064395.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86_data.h  | 2 +-
- src/qemu/qemu_command.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index 8a189f854e..0087fd2f85 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -49,7 +49,7 @@ struct _virCPUx86MSR {
- # define CPUX86_KVM      0x40000000
- # define CPUX86_EXTENDED 0x80000000
- 
--# define VIR_CPU_x86_KVM_PV_UNHALT    "__kvm_pv_unhalt"
-+# define VIR_CPU_x86_KVM_PV_UNHALT  "kvm_pv_unhalt"
- 
- /*
-  * The following HyperV feature names suffixes must exactly match corresponding
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 71e102747c..a411d214df 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7008,7 +7008,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-     }
- 
-     if (def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK]) {
--        qemuBuildCpuFeature(qemuCaps, &buf, "kvm_pv_unhalt",
-+        qemuBuildCpuFeature(qemuCaps, &buf, VIR_CPU_x86_KVM_PV_UNHALT,
-                             def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK] == VIR_TRISTATE_SWITCH_ON);
-     }
- 
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-NULL-pointer-access-in-qemuProcessInitCpuAffinity.patch b/SOURCES/libvirt-qemu-Fix-NULL-pointer-access-in-qemuProcessInitCpuAffinity.patch
deleted file mode 100644
index 40014e2..0000000
--- a/SOURCES/libvirt-qemu-Fix-NULL-pointer-access-in-qemuProcessInitCpuAffinity.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From aa0f66af1237656b217f640a9877d5f1aa31cb41 Mon Sep 17 00:00:00 2001
-Message-Id: <aa0f66af1237656b217f640a9877d5f1aa31cb41@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:55:06 +0200
-Subject: [PATCH] qemu: Fix NULL pointer access in qemuProcessInitCpuAffinity()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 2f2254c7f4e5 attempted to fix a memory leak by ensuring
-cpumapToSet is always a freshly allocated bitmap, but regrettably
-introduced a NULL pointer access while doing so, because it called
-virBitmapCopy() without allocating the destination bitmap first.
-
-Solve the issue by using virBitmapNewCopy() instead.
-
-Reported-by: John Ferlan <jferlan@redhat.com>
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit a84922c09e9e1a0ca4f8fb1e8b4b1c7b55bd79e9)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716908
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611085506.12564-7-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index d0945b9c65..c220accfaf 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2391,7 +2391,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
-         if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0)
-             return -1;
-     } else if (vm->def->cputune.emulatorpin) {
--        if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0)
-+        if (!(cpumapToSet = virBitmapNewCopy(vm->def->cputune.emulatorpin)))
-             return -1;
-     } else {
-         if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-NULL-ptr-dereference-caused-by-qemuDomainDefFormatBufInternal.patch b/SOURCES/libvirt-qemu-Fix-NULL-ptr-dereference-caused-by-qemuDomainDefFormatBufInternal.patch
deleted file mode 100644
index e09e869..0000000
--- a/SOURCES/libvirt-qemu-Fix-NULL-ptr-dereference-caused-by-qemuDomainDefFormatBufInternal.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 63d6271b0ed420fe4ef986209ea71fda23e7795a Mon Sep 17 00:00:00 2001
-Message-Id: <63d6271b0ed420fe4ef986209ea71fda23e7795a@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Mon, 18 Nov 2019 15:18:11 +0100
-Subject: [PATCH] qemu: Fix NULL ptr dereference caused by
- qemuDomainDefFormatBufInternal
-
-qemuDomainDefFormatBufInternal function wasn't testing whether the CPU
-was actually defined in the XML and saving such a domain resulted in the
-following backtrace:
-
-0 in qemuDomainMakeCPUMigratable (cpu=0x0)
-1 in qemuDomainDefFormatBufInternal()
-2 in qemuDomainDefFormatXMLInternal()
-3 in qemuDomainDefFormatLive()
-4 in qemuDomainSaveInternal()
-5 in qemuDomainSaveFlags()
-6 in qemuDomainSave()
-7 in virDomainSave()
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit 2816fe2e846ab3bd2bfbef123c426a17f1e1df98)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749672
-https://bugzilla.redhat.com/show_bug.cgi?id=1756156
-https://bugzilla.redhat.com/show_bug.cgi?id=1721608
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <bfa9a6fe0d0cb0ea7ccfa3270c3eaed47d206cb0.1574086659.git.jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f45d7d427e..6b867ad669 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -7543,7 +7543,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
-                 goto cleanup;
-         }
- 
--        if (qemuDomainMakeCPUMigratable(def->cpu) < 0)
-+        if (def->cpu && qemuDomainMakeCPUMigratable(def->cpu) < 0)
-             goto cleanup;
-     }
- 
--- 
-2.24.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-hyperv-features-with-QEMU-4.1.patch b/SOURCES/libvirt-qemu-Fix-hyperv-features-with-QEMU-4.1.patch
deleted file mode 100644
index 2340545..0000000
--- a/SOURCES/libvirt-qemu-Fix-hyperv-features-with-QEMU-4.1.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From bc74a9da7d6b5c747655468022fdcdd9f9f5f25d Mon Sep 17 00:00:00 2001
-Message-Id: <bc74a9da7d6b5c747655468022fdcdd9f9f5f25d@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Feb 2020 10:41:41 +0100
-Subject: [PATCH] qemu: Fix hyperv features with QEMU 4.1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Originally the names of the hyperv CPU features were only used
-internally for looking up their CPUID bits. So we used "__kvm_hv_"
-prefix for them to make sure the names do not collide with normal CPU
-features stored in our CPU map.
-
-But with QEMU 4.1 we check which features were enabled or disabled by a
-freshly started QEMU process using their names rather than their CPUID
-bits (mostly because of MSR features). Thus we need to change our made
-up internal names into the actual names used by QEMU. Most of the names
-are only used with QEMU 4.1 and newer and the reset was introduced with
-QEMU recently enough to already support spelling with "-". Thus we don't
-need to define them as "hv_*" with a translation to "hv-*" for new QEMU.
-
-Without this patch libvirt would mistakenly report all hyperv features
-as unavailable and refuse to start any domain using them with QEMU 4.1.
-
-Reported-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Tested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0ccdd476bb329f1486438b896255e5c44a91ff4a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1794868
-
-Conflicts:
-	src/cpu/cpu_x86_data.h
-            - a few extra features were added upstream between 4.5.0 and
-              5.5.0
-            - downstream lacks #pragma once and thus all defines have to
-              be indented
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <8e882b79ff88eccdb68ede1c5afd4550fcd554b6.1581064395.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/cpu/cpu_x86_data.h  | 24 ++++++++++++------------
- src/qemu/qemu_process.c |  2 +-
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
-index 454345b688..77797f633c 100644
---- a/src/cpu/cpu_x86_data.h
-+++ b/src/cpu/cpu_x86_data.h
-@@ -62,19 +62,19 @@ struct _virCPUx86MSR {
- /*
-  * The following HyperV feature names suffixes must exactly match corresponding
-  * ones defined for virDomainHyperv in domain_conf.c.
-- * E.g "__kvm_runtime" -> "runtime", "__kvm_hv_spinlocks" -> "spinlocks" etc.
-+ * E.g "hv-runtime" -> "runtime", "hv-spinlocks" -> "spinlocks" etc.
- */
--# define VIR_CPU_x86_KVM_HV_RUNTIME   "__kvm_hv_runtime"
--# define VIR_CPU_x86_KVM_HV_SYNIC     "__kvm_hv_synic"
--# define VIR_CPU_x86_KVM_HV_STIMER    "__kvm_hv_stimer"
--# define VIR_CPU_x86_KVM_HV_RELAXED   "__kvm_hv_relaxed"
--# define VIR_CPU_x86_KVM_HV_SPINLOCKS  "__kvm_hv_spinlocks"
--# define VIR_CPU_x86_KVM_HV_VAPIC     "__kvm_hv_vapic"
--# define VIR_CPU_x86_KVM_HV_VPINDEX   "__kvm_hv_vpindex"
--# define VIR_CPU_x86_KVM_HV_RESET     "__kvm_hv_reset"
--# define VIR_CPU_x86_KVM_HV_FREQUENCIES "__kvm_hv_frequencies"
--# define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "__kvm_hv_reenlightenment"
--# define VIR_CPU_x86_KVM_HV_TLBFLUSH  "__kvm_hv_tlbflush"
-+# define VIR_CPU_x86_KVM_HV_RUNTIME   "hv-runtime"
-+# define VIR_CPU_x86_KVM_HV_SYNIC     "hv-synic"
-+# define VIR_CPU_x86_KVM_HV_STIMER    "hv-stimer"
-+# define VIR_CPU_x86_KVM_HV_RELAXED   "hv-relaxed"
-+# define VIR_CPU_x86_KVM_HV_SPINLOCKS "hv-spinlocks"
-+# define VIR_CPU_x86_KVM_HV_VAPIC     "hv-vapic"
-+# define VIR_CPU_x86_KVM_HV_VPINDEX   "hv-vpindex"
-+# define VIR_CPU_x86_KVM_HV_RESET     "hv-reset"
-+# define VIR_CPU_x86_KVM_HV_FREQUENCIES "hv-frequencies"
-+# define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "hv-reenlightenment"
-+# define VIR_CPU_x86_KVM_HV_TLBFLUSH  "hv-tlbflush"
- 
- 
- # define VIR_CPU_X86_DATA_INIT { 0 }
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 0700b054f3..312ce69ba5 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3923,7 +3923,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
-         if (def->hyperv_features[i] != VIR_TRISTATE_SWITCH_ON)
-             continue;
- 
--        if (virAsprintf(&cpuFeature, "__kvm_hv_%s",
-+        if (virAsprintf(&cpuFeature, "hv-%s",
-                         virDomainHypervTypeToString(i)) < 0)
-             return -1;
- 
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-leak-in-qemuProcessInitCpuAffinity.patch b/SOURCES/libvirt-qemu-Fix-leak-in-qemuProcessInitCpuAffinity.patch
deleted file mode 100644
index b40ca14..0000000
--- a/SOURCES/libvirt-qemu-Fix-leak-in-qemuProcessInitCpuAffinity.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4c58428a2aebd952f7412ec1f4afa3045a09dff7 Mon Sep 17 00:00:00 2001
-Message-Id: <4c58428a2aebd952f7412ec1f4afa3045a09dff7@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:55:04 +0200
-Subject: [PATCH] qemu: Fix leak in qemuProcessInitCpuAffinity()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In two out of three scenarios we are cleaning up properly after
-ourselves, but commit 5f2212c062c7 has changed the remaining one
-in a way that caused it to start leaking cpumapToSet.
-
-Refactor the logic so that cpumapToSet is always a freshly
-allocated bitmap that gets cleaned up automatically thanks to
-VIR_AUTOPTR(); this also allows us to remove the hostcpumap
-variable.
-
-Reported-by: John Ferlan <jferlan@redhat.com>
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2f2254c7f4e5bff52ea62a77831230bebc076bab)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716908
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611085506.12564-5-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index a3b71354e1..0b2b7964e1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2357,8 +2357,7 @@ static int
- qemuProcessInitCpuAffinity(virDomainObjPtr vm)
- {
-     int ret = -1;
--    virBitmapPtr cpumapToSet = NULL;
--    VIR_AUTOPTR(virBitmap) hostcpumap = NULL;
-+    VIR_AUTOPTR(virBitmap) cpumapToSet = NULL;
-     virDomainNumatuneMemMode mem_mode;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
- 
-@@ -2393,11 +2392,11 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
-         if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0)
-             goto cleanup;
-     } else if (vm->def->cputune.emulatorpin) {
--        cpumapToSet = vm->def->cputune.emulatorpin;
--    } else {
--        if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0)
-+        if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0)
-+            goto cleanup;
-+    } else {
-+        if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0)
-             goto cleanup;
--        cpumapToSet = hostcpumap;
-     }
- 
-     if (cpumapToSet &&
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-post-copy-migration-on-the-source.patch b/SOURCES/libvirt-qemu-Fix-post-copy-migration-on-the-source.patch
deleted file mode 100644
index 322dbca..0000000
--- a/SOURCES/libvirt-qemu-Fix-post-copy-migration-on-the-source.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 91a37e3641afbd29067cd945ca14a6572e4d4897 Mon Sep 17 00:00:00 2001
-Message-Id: <91a37e3641afbd29067cd945ca14a6572e4d4897@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 15 Nov 2018 11:16:43 +0100
-Subject: [PATCH] qemu: Fix post-copy migration on the source
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Post-copy migration has been broken on the source since commit
-v3.8.0-245-g32c29f10db which implemented support for
-pause-before-switchover QEMU migration capability.
-
-Even though the migration itself went well, the source did not really
-know when it switched to the post-copy mode despite the messages logged
-by MIGRATION event handler. As a result of this, the events emitted by
-source libvirtd were not accurate and statistics of the completed
-migration would cover only the pre-copy part of migration. Moreover, if
-migration failed during the post-copy phase for some reason, the source
-libvirtd would just happily resume the domain, which could lead to disk
-corruption.
-
-With the pause-before-switchover capability enabled, the order of events
-emitted by QEMU changed:
-
-                    pause-before-switchover
-           disabled                        enabled
-    MIGRATION, postcopy-active      STOP
-    STOP                            MIGRATION, pre-switchover
-                                    MIGRATION, postcopy-active
-
-The STOP even handler checks the migration status (postcopy-active) and
-sets the domain state accordingly. Which is sufficient when
-pause-before-switchover is disabled, but once we enable it, the
-migration status is still active when we get STOP from QEMU. Thus the
-domain state set in the STOP handler has to be corrected once we are
-notified that migration changed to postcopy-active.
-
-This results in two SUSPENDED events to be emitted by the source
-libvirtd during post-copy migration. The first one with
-VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED detail, while the second one reports
-the corrected VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY detail. This is
-inevitable because we don't know whether migration will eventually
-switch to post-copy at the time we emit the first event.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1647365
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit eca9d21e6cc8129ec4426fbf1ace30e215b9cfbc)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1649169
-https://bugzilla.redhat.com/show_bug.cgi?id=1654732
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_process.c | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 4b99fbd835..2d2954ba18 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -1522,9 +1522,13 @@ static int
- qemuProcessHandleMigrationStatus(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-                                  virDomainObjPtr vm,
-                                  int status,
--                                 void *opaque ATTRIBUTE_UNUSED)
-+                                 void *opaque)
- {
-     qemuDomainObjPrivatePtr priv;
-+    virQEMUDriverPtr driver = opaque;
-+    virObjectEventPtr event = NULL;
-+    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-+    int reason;
- 
-     virObjectLock(vm);
- 
-@@ -1541,8 +1545,28 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-     priv->job.current->stats.mig.status = status;
-     virDomainObjBroadcast(vm);
- 
-+    if (status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY &&
-+        virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED &&
-+        reason == VIR_DOMAIN_PAUSED_MIGRATION) {
-+        VIR_DEBUG("Correcting paused state reason for domain %s to %s",
-+                  vm->def->name,
-+                  virDomainPausedReasonTypeToString(VIR_DOMAIN_PAUSED_POSTCOPY));
-+
-+        virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_POSTCOPY);
-+        event = virDomainEventLifecycleNewFromObj(vm,
-+                                                  VIR_DOMAIN_EVENT_SUSPENDED,
-+                                                  VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY);
-+
-+        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) {
-+            VIR_WARN("Unable to save status on vm %s after state change",
-+                     vm->def->name);
-+        }
-+    }
-+
-  cleanup:
-     virObjectUnlock(vm);
-+    virObjectEventStateQueue(driver->domainEventState, event);
-+    virObjectUnref(cfg);
-     return 0;
- }
- 
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-qemu-Fix-probing-of-AMD-SEV-support.patch b/SOURCES/libvirt-qemu-Fix-probing-of-AMD-SEV-support.patch
deleted file mode 100644
index 41992b4..0000000
--- a/SOURCES/libvirt-qemu-Fix-probing-of-AMD-SEV-support.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From fb28fc398e318509452a50f59d78d90584ca0c27 Mon Sep 17 00:00:00 2001
-Message-Id: <fb28fc398e318509452a50f59d78d90584ca0c27@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Mon, 20 Aug 2018 17:18:52 +0200
-Subject: [PATCH] qemu: Fix probing of AMD SEV support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So the procedure to detect SEV support works like this:
-1) we detect that sev-guest is among the QOM types and set the cap flag
-2) we probe the monitor for SEV support
-    - this is tricky, because QEMU with compiled SEV support will always
-    report -object sev-guest and query-sev-capabilities command, that
-    however doesn't mean SEV is supported
-3) depending on what the monitor returned, we either keep or clear the
-capability flag for SEV
-
-Commit a349c6c21c6 added an explicit check for "GenericError" in the
-monitor reply to prevent libvirtd to spam logs about missing
-'query-sev-capabilities' command. At the same time though, it returned
-success in this case which means that we didn't clear the capability
-flag afterwards and happily formatted SEV into qemuCaps. Therefore,
-adjust all the relevant callers to handle -1 on errors, 0 on SEV being
-unsupported and 1 on SEV being supported.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Acked-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 764491c9dddf063292adf1433769ccccb1a50db6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1612009
-https://bugzilla.redhat.com/show_bug.cgi?id=1619150
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                  | 15 ++++++++++----
- src/qemu/qemu_monitor_json.c                  | 20 +++++++++++++++----
- .../caps_3.0.0.x86_64.xml                     |  1 -
- 3 files changed, 27 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 0fb800589a..55024ad735 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2695,18 +2695,20 @@ virQEMUCapsProbeQMPGICCapabilities(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+/* Returns -1 on error, 0 if SEV is not supported, 1 if SEV is supported */
- static int
- virQEMUCapsProbeQMPSEVCapabilities(virQEMUCapsPtr qemuCaps,
-                                    qemuMonitorPtr mon)
- {
-+    int rc = -1;
-     virSEVCapability *caps = NULL;
- 
--    if (qemuMonitorGetSEVCapabilities(mon, &caps) < 0)
--        return -1;
-+    if ((rc = qemuMonitorGetSEVCapabilities(mon, &caps)) <= 0)
-+        return rc;
- 
-     virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
-     qemuCaps->sevCapabilities = caps;
--    return 0;
-+    return rc;
- }
- 
- 
-@@ -4116,7 +4118,12 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
- 
-     /* Probe for SEV capabilities */
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) {
--        if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
-+        int rc = virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon);
-+
-+        if (rc < 0)
-+            goto cleanup;
-+
-+        if (rc == 0)
-             virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_GUEST);
-     }
- 
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 66c525ed0c..8199556166 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -6425,6 +6425,20 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon,
- }
- 
- 
-+/**
-+ * qemuMonitorJSONGetSEVCapabilities:
-+ * @mon: qemu monitor object
-+ * @capabilities: pointer to pointer to a SEV capability structure to be filled
-+ *
-+ * This function queries and fills in AMD's SEV platform-specific data.
-+ * Note that from QEMU's POV both -object sev-guest and query-sev-capabilities
-+ * can be present even if SEV is not available, which basically leaves us with
-+ * checking for JSON "GenericError" in order to differentiate between
-+ * compiled-in support and actual SEV support on the platform.
-+ *
-+ * Returns -1 on error, 0 if SEV is not supported, and 1 if SEV is supported on
-+ * the platform.
-+ */
- int
- qemuMonitorJSONGetSEVCapabilities(qemuMonitorPtr mon,
-                                   virSEVCapability **capabilities)
-@@ -6446,8 +6460,7 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitorPtr mon,
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-         goto cleanup;
- 
--    /* Both -object sev-guest and query-sev-capabilities can be present
--     * even if SEV is not available */
-+    /* QEMU has only compiled-in support of SEV */
-     if (qemuMonitorJSONHasError(reply, "GenericError")) {
-         ret = 0;
-         goto cleanup;
-@@ -6499,8 +6512,7 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitorPtr mon,
-     capability->cbitpos = cbitpos;
-     capability->reduced_phys_bits = reduced_phys_bits;
-     VIR_STEAL_PTR(*capabilities, capability);
--    ret = 0;
--
-+    ret = 1;
-  cleanup:
-     virSEVCapabilitiesFree(capability);
-     virJSONValueFree(cmd);
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index 4bc7cfeebc..8992d645e7 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -212,7 +212,6 @@
-   <flag name='tpm-emulator'/>
-   <flag name='mch'/>
-   <flag name='mch.extended-tseg-mbytes'/>
--  <flag name='sev-guest'/>
-   <flag name='usb-storage.werror'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-qemuProcessInitCpuAffinity.patch b/SOURCES/libvirt-qemu-Fix-qemuProcessInitCpuAffinity.patch
deleted file mode 100644
index 23fd6a3..0000000
--- a/SOURCES/libvirt-qemu-Fix-qemuProcessInitCpuAffinity.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 607f70a5d24d2df9c63861434c4ba1991226ee34 Mon Sep 17 00:00:00 2001
-Message-Id: <607f70a5d24d2df9c63861434c4ba1991226ee34@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:55:03 +0200
-Subject: [PATCH] qemu: Fix qemuProcessInitCpuAffinity()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ever since the feature was introduced with commit 0f8e7ae33ace,
-it has contained a logic error in that it attempted to use a NUMA
-node map where a CPU map was expected.
-
-Because of that, guests using <numatune> might fail to start:
-
-  # virsh start guest
-  error: Failed to start domain guest
-  error: cannot set CPU affinity on process 40055: Invalid argument
-
-This was particularly easy to trigger on POWER 8 machines, where
-secondary threads always show up as offline in the host: having
-
-  <numatune>
-    <memory mode='strict' placement='static' nodeset='1'/>
-  </numatune>
-
-in the guest configuration, for example, would result in libvirt
-trying to set the process affinity so that it would prefer
-running on CPU 1, but since that's a secondary thread and thus
-shows up as offline, the operation would fail, and so would
-starting the guest.
-
-Use the newly introduced virNumaNodesetToCPUset() to convert the
-NUMA node map to a CPU map, which in the example above would be
-48,56,64,72,80,88 - a valid input for virProcessSetAffinity().
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1703661
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 5f2212c062c720716b7701fa0a5511311dc6e906)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716908
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611085506.12564-4-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 8b05cef80c..a3b71354e1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2382,11 +2382,16 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
-     if (virDomainNumaGetNodeCount(vm->def->numa) <= 1 &&
-         virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 &&
-         mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
-+        virBitmapPtr nodeset = NULL;
-+
-         if (virDomainNumatuneMaybeGetNodeset(vm->def->numa,
-                                              priv->autoNodeset,
--                                             &cpumapToSet,
-+                                             &nodeset,
-                                              -1) < 0)
-             goto cleanup;
-+
-+        if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0)
-+            goto cleanup;
-     } else if (vm->def->cputune.emulatorpin) {
-         cpumapToSet = vm->def->cputune.emulatorpin;
-     } else {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-setting-global_period-cputune-element.patch b/SOURCES/libvirt-qemu-Fix-setting-global_period-cputune-element.patch
deleted file mode 100644
index 095aaa1..0000000
--- a/SOURCES/libvirt-qemu-Fix-setting-global_period-cputune-element.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2f149d2853b4c8184ed75c82dd7bda1036e7f571 Mon Sep 17 00:00:00 2001
-Message-Id: <2f149d2853b4c8184ed75c82dd7bda1036e7f571@dist-git>
-From: Katerina Koukiou <kkoukiou@redhat.com>
-Date: Mon, 16 Jul 2018 15:45:17 +0200
-Subject: [PATCH] qemu: Fix setting global_period cputune element
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD is matched "cputune.global_period"
-should be updated and not "cputune.period".
-
-Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1600427
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 74b5634b77b388a454303a2be0b4d704e261305f)
-Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 868ef9d406..670651a75d 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -10570,7 +10570,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
-             }
- 
-             if (persistentDef)
--                persistentDefCopy->cputune.period = value_ul;
-+                persistentDefCopy->cputune.global_period = value_ul;
- 
-         } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA)) {
-             SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA,
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-block-commit.patch b/SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-block-commit.patch
new file mode 100644
index 0000000..b06fd40
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-block-commit.patch
@@ -0,0 +1,43 @@
+From 287db7fde2511199afa62af511acff4b00607c11 Mon Sep 17 00:00:00 2001
+Message-Id: <287db7fde2511199afa62af511acff4b00607c11@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:39 +0100
+Subject: [PATCH] qemu: Fix value of 'device' argument for block-commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When using blockdev configurations the 'device' argument of
+'blockdev-commit' must correspond to the topmost node in the block node
+graph. Libvirt didn't do this properly in case when 'copy_on_read'
+option was enabled on the disk.
+
+Use qemuDomainDiskGetTopNodename to fix it when calling block-commit.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 69908db0f62444e51bb8aae157b5ae48f45e2fe4)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1792195
+Message-Id: <0e7223fc993570a108cd849e9d65c476b2294d99.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 6a209ccb75..e651c9e819 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18815,7 +18815,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
+         jobname = job->name;
+         nodetop = topSource->nodeformat;
+         nodebase = baseSource->nodeformat;
+-        device = disk->src->nodeformat;
++        device = qemuDomainDiskGetTopNodename(disk);
+         if (!backingPath && top_parent &&
+             !(backingPath = qemuBlockGetBackingStoreString(baseSource)))
+             goto endjob;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-blockdev-mirror.patch b/SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-blockdev-mirror.patch
new file mode 100644
index 0000000..adc881f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Fix-value-of-device-argument-for-blockdev-mirror.patch
@@ -0,0 +1,58 @@
+From 3959e3ef365e95ee4f5e68eb1ab189d6e8cb189d Mon Sep 17 00:00:00 2001
+Message-Id: <3959e3ef365e95ee4f5e68eb1ab189d6e8cb189d@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:38 +0100
+Subject: [PATCH] qemu: Fix value of 'device' argument for blockdev-mirror
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When using blockdev configurations the 'device' argument of
+'blockdev-mirror' must correspond to the topmost node in the block node
+graph. Libvirt didn't do this properly in case when 'copy_on_read'
+option was enabled on the disk.
+
+Use qemuDomainDiskGetTopNodename to fix it for the blockdev-mirror calls
+in qemuDomainBlockCopy and the non-shared-storage migration.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit e3137539a9c4af25ab085506d5467ec0847b0ecc)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1792195
+Message-Id: <1b3e7edbec684588424e78ed5009bfcb0ce7e183.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c    | 2 +-
+ src/qemu/qemu_migration.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 83f24d7231..6a209ccb75 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18388,7 +18388,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+ 
+     if (blockdev) {
+         ret = qemuMonitorBlockdevMirror(priv->mon, job->name, true,
+-                                        disk->src->nodeformat,
++                                        qemuDomainDiskGetTopNodename(disk),
+                                         mirror->nodeformat, bandwidth,
+                                         granularity, buf_size, mirror_shallow);
+     } else {
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index b56ccbdc3c..03f058051d 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -931,7 +931,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr driver,
+ 
+     if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+         jobname = diskAlias;
+-        sourcename = disk->src->nodeformat;
++        sourcename = qemuDomainDiskGetTopNodename(disk);
+         persistjob = true;
+     } else {
+         jobname = NULL;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Forbid-MSR-features-with-old-QEMU.patch b/SOURCES/libvirt-qemu-Forbid-MSR-features-with-old-QEMU.patch
deleted file mode 100644
index 9370639..0000000
--- a/SOURCES/libvirt-qemu-Forbid-MSR-features-with-old-QEMU.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From e4f000025ac57ed4c731ffb0939f2e02bb84d856 Mon Sep 17 00:00:00 2001
-Message-Id: <e4f000025ac57ed4c731ffb0939f2e02bb84d856@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:11 +0200
-Subject: [PATCH] qemu: Forbid MSR features with old QEMU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without "unavailable-features" CPU property we cannot properly detect
-whether a specific MSR feature we asked for (either explicitly or
-implicitly via a CPU model) was disabled by QEMU for some reason.
-Because this could break migration, snapshots, and save/restore
-operaions, it's better to just forbid any use of MSR features with QEMU
-which lacks "unavailable-features" CPU property.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8eb4a89f5f7973f50aa8b6fa0b1a45b825dda208)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <b077794613a01d8ebd69b27afef1ad2452a4810d.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 30 +++++++++++++++++++++++++++---
- 1 file changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index d147e524ee..db14d322f5 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -53,6 +53,7 @@
- #include "qemu_extdevice.h"
- 
- #include "cpu/cpu.h"
-+#include "cpu/cpu_x86.h"
- #include "datatypes.h"
- #include "virlog.h"
- #include "virerror.h"
-@@ -5226,9 +5227,32 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
-     if (qemuProcessStartValidateShmem(vm) < 0)
-         return -1;
- 
--    if (vm->def->cpu &&
--        virCPUValidateFeatures(vm->def->os.arch, vm->def->cpu) < 0)
--        return -1;
-+    if (vm->def->cpu) {
-+        if (virCPUValidateFeatures(vm->def->os.arch, vm->def->cpu) < 0)
-+            return -1;
-+
-+        if (ARCH_IS_X86(vm->def->os.arch) &&
-+            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) {
-+            VIR_AUTOSTRINGLIST features = NULL;
-+            int n;
-+
-+            if ((n = virCPUDefCheckFeatures(vm->def->cpu,
-+                                            virCPUx86FeatureFilterSelectMSR,
-+                                            NULL,
-+                                            &features)) < 0)
-+                return -1;
-+
-+            if (n > 0) {
-+                VIR_AUTOFREE(char *) str = NULL;
-+
-+                str = virStringListJoin((const char **)features, ", ");
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("Some features cannot be reliably used "
-+                                 "with this QEMU: %s"), str);
-+                return -1;
-+            }
-+        }
-+    }
- 
-     if (qemuProcessStartValidateDisks(vm, qemuCaps) < 0)
-         return -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Format-nested-hv-feature-on-the-command-line.patch b/SOURCES/libvirt-qemu-Format-nested-hv-feature-on-the-command-line.patch
deleted file mode 100644
index 751c461..0000000
--- a/SOURCES/libvirt-qemu-Format-nested-hv-feature-on-the-command-line.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From eaa86279ad7a2a0e341b5270060f250e24d47af4 Mon Sep 17 00:00:00 2001
-Message-Id: <eaa86279ad7a2a0e341b5270060f250e24d47af4@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 4 Dec 2018 16:46:20 +0100
-Subject: [PATCH] qemu: Format nested-hv feature on the command line
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit c54d3d00ae1f9cd3f983d8e8c1def551d6ddf9b7)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1647822
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                      | 20 ++++++++++++++++++++
- tests/qemuxml2argvdata/pseries-features.args |  2 +-
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 320ecd902c..c706a4b095 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7399,6 +7399,26 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
-         virBufferAsprintf(&buf, ",cap-htm=%s", str);
-     }
- 
-+    if (def->features[VIR_DOMAIN_FEATURE_NESTED_HV] != VIR_TRISTATE_SWITCH_ABSENT) {
-+        const char *str;
-+
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("Nested HV configuration is not supported by "
-+                             "this QEMU binary"));
-+            goto cleanup;
-+        }
-+
-+        str = virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEATURE_NESTED_HV]);
-+        if (!str) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("Invalid setting for nested HV state"));
-+            goto cleanup;
-+        }
-+
-+        virBufferAsprintf(&buf, ",cap-nested-hv=%s", str);
-+    }
-+
-     if (cpu && cpu->model &&
-         cpu->mode == VIR_CPU_MODE_HOST_MODEL &&
-         qemuDomainIsPSeries(def) &&
-diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
-index 226d43df44..2b0a2aa93b 100644
---- a/tests/qemuxml2argvdata/pseries-features.args
-+++ b/tests/qemuxml2argvdata/pseries-features.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
- -name guest \
- -S \
- -machine pseries,accel=tcg,usb=off,dump-guest-core=off,resize-hpt=required,\
--cap-hpt-max-page-size=1048576k,cap-htm=on \
-+cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off \
- -m 512 \
- -smp 1,sockets=1,cores=1,threads=1 \
- -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-Format-the-HTM-pSeries-feature.patch b/SOURCES/libvirt-qemu-Format-the-HTM-pSeries-feature.patch
deleted file mode 100644
index 12ce636..0000000
--- a/SOURCES/libvirt-qemu-Format-the-HTM-pSeries-feature.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 62e42f5b6d56ac400274695dc3bd6499219e41b7 Mon Sep 17 00:00:00 2001
-Message-Id: <62e42f5b6d56ac400274695dc3bd6499219e41b7@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 3 Jul 2018 15:25:17 +0200
-Subject: [PATCH] qemu: Format the HTM pSeries feature
-
-This makes the feature fully operational.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1525599
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-
-(cherry picked from commit d4c11171076edfb2e603804e79edf7ccc3cce5dc)
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Acked-by: David Gibson <dgibson@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_command.c                      | 20 ++++++++++++++++++++
- src/qemu/qemu_domain.c                       | 14 +++++++++++++-
- tests/qemuxml2argvdata/pseries-features.args |  2 +-
- 3 files changed, 34 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index c1eefca639..4120e4f983 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7327,6 +7327,26 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
-         }
-     }
- 
-+    if (def->features[VIR_DOMAIN_FEATURE_HTM] != VIR_TRISTATE_SWITCH_ABSENT) {
-+        const char *str;
-+
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_HTM)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("HTM configuration is not supported by this "
-+                             "QEMU binary"));
-+            goto cleanup;
-+        }
-+
-+        str = virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEATURE_HTM]);
-+        if (!str) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("Invalid setting for HTM state"));
-+            goto cleanup;
-+        }
-+
-+        virBufferAsprintf(&buf, ",cap-htm=%s", str);
-+    }
-+
-     if (cpu && cpu->model &&
-         cpu->mode == VIR_CPU_MODE_HOST_MODEL &&
-         qemuDomainIsPSeries(def) &&
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 0eacad1e44..3f3bb94685 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -3852,6 +3852,19 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
-             }
-             break;
- 
-+        case VIR_DOMAIN_FEATURE_HTM:
-+            if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
-+                !qemuDomainIsPSeries(def)) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("The '%s' feature is not supported for "
-+                                 "architecture '%s' or machine type '%s'"),
-+                               featureName,
-+                               virArchToString(def->os.arch),
-+                               def->os.machine);
-+                return -1;
-+            }
-+            break;
-+
-         case VIR_DOMAIN_FEATURE_ACPI:
-         case VIR_DOMAIN_FEATURE_APIC:
-         case VIR_DOMAIN_FEATURE_PAE:
-@@ -3865,7 +3878,6 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
-         case VIR_DOMAIN_FEATURE_PMU:
-         case VIR_DOMAIN_FEATURE_VMPORT:
-         case VIR_DOMAIN_FEATURE_VMCOREINFO:
--        case VIR_DOMAIN_FEATURE_HTM:
-         case VIR_DOMAIN_FEATURE_LAST:
-             break;
-         }
-diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
-index 12c14715c6..226d43df44 100644
---- a/tests/qemuxml2argvdata/pseries-features.args
-+++ b/tests/qemuxml2argvdata/pseries-features.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
- -name guest \
- -S \
- -machine pseries,accel=tcg,usb=off,dump-guest-core=off,resize-hpt=required,\
--cap-hpt-max-page-size=1048576k \
-+cap-hpt-max-page-size=1048576k,cap-htm=on \
- -m 512 \
- -smp 1,sockets=1,cores=1,threads=1 \
- -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Format-the-armvtimer-timer-on-the-command-line.patch b/SOURCES/libvirt-qemu-Format-the-armvtimer-timer-on-the-command-line.patch
new file mode 100644
index 0000000..f0618b8
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Format-the-armvtimer-timer-on-the-command-line.patch
@@ -0,0 +1,52 @@
+From b9acfbcad6181babba50384741e0c30d6d0cc534 Mon Sep 17 00:00:00 2001
+Message-Id: <b9acfbcad6181babba50384741e0c30d6d0cc534@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 13:12:37 +0100
+Subject: [PATCH] qemu: Format the armvtimer timer on the command line
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Its behavior is controlled by a KVM-specific CPU feature.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 7c4bc108a9bd7bda1543131d232e2ccee92a9e43)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214121237.623948-7-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_command.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index e1e19e0fcc..1a5142d472 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -6633,6 +6633,19 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
+                 virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
+             break;
+         case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
++            switch (timer->tickpolicy) {
++            case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY:
++                virBufferAddLit(&buf, ",kvm-no-adjvtime=off");
++                break;
++            case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD:
++                virBufferAddLit(&buf, ",kvm-no-adjvtime=on");
++                break;
++            case -1:
++            case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP:
++            case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
++                break;
++            }
++            break;
+         case VIR_DOMAIN_TIMER_NAME_PLATFORM:
+         case VIR_DOMAIN_TIMER_NAME_PIT:
+         case VIR_DOMAIN_TIMER_NAME_RTC:
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Generate-and-use-zPCI-device-in-QEMU-command-line.patch b/SOURCES/libvirt-qemu-Generate-and-use-zPCI-device-in-QEMU-command-line.patch
deleted file mode 100644
index f403a75..0000000
--- a/SOURCES/libvirt-qemu-Generate-and-use-zPCI-device-in-QEMU-command-line.patch
+++ /dev/null
@@ -1,834 +0,0 @@
-From 37f8c26d43550986a8c6467aef4bf9d1ebe3a683 Mon Sep 17 00:00:00 2001
-Message-Id: <37f8c26d43550986a8c6467aef4bf9d1ebe3a683@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:28 +0200
-Subject: [PATCH] qemu: Generate and use zPCI device in QEMU command line
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add new functions to generate zPCI command string and append it to
-QEMU command line. And the related tests are added.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry picked from commit 9d6be3ff79b4ce7588e2842d4a6c3e713a97a7ec)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_command.c
-    + context in qemuBuildInterfaceCommandLine()
-      - missing 4de4e4bc9911
-    + context in qemuBuildDiskCommandLine()
-      - missing b8936d265518
-
-  * tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-    + no -boot in output
-      - missing caccbba64aa9
-
-Changes
-
-  * tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
-    tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
-    tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
-    + no -boot in output
-      - missing caccbba64aa9
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-12-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                       | 104 ++++++++++++++++++
- src/qemu/qemu_command.h                       |   2 +
- .../disk-virtio-s390-zpci.args                |   1 +
- .../hostdev-vfio-zpci-autogenerate.args       |  26 +++++
- .../hostdev-vfio-zpci-autogenerate.xml        |  18 +++
- .../hostdev-vfio-zpci-boundaries.args         |  30 +++++
- .../hostdev-vfio-zpci-boundaries.xml          |  30 +++++
- .../hostdev-vfio-zpci-multidomain-many.args   |  40 +++++++
- .../hostdev-vfio-zpci-multidomain-many.xml    |  79 +++++++++++++
- tests/qemuxml2argvdata/hostdev-vfio-zpci.args |   2 +
- tests/qemuxml2argvtest.c                      |  13 +++
- .../hostdev-vfio-zpci-autogenerate.xml        |  34 ++++++
- .../hostdev-vfio-zpci-boundaries.xml          |  48 ++++++++
- .../hostdev-vfio-zpci-multidomain-many.xml    |  97 ++++++++++++++++
- tests/qemuxml2xmltest.c                       |  11 ++
- 15 files changed, 535 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml
- create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml
- create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml
- create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index a8c832bad8..c06f396b44 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -2147,6 +2147,57 @@ qemuBuildDriveDevStr(const virDomainDef *def,
-     return NULL;
- }
- 
-+char *
-+qemuBuildZPCIDevStr(virDomainDeviceInfoPtr dev)
-+{
-+    virBuffer buf = VIR_BUFFER_INITIALIZER;
-+
-+    virBufferAsprintf(&buf,
-+                      "zpci,uid=%u,fid=%u,target=%s,id=zpci%u",
-+                      dev->addr.pci.zpci.uid,
-+                      dev->addr.pci.zpci.fid,
-+                      dev->alias,
-+                      dev->addr.pci.zpci.uid);
-+
-+    if (virBufferCheckError(&buf) < 0) {
-+        virBufferFreeAndReset(&buf);
-+        return NULL;
-+    }
-+
-+    return virBufferContentAndReset(&buf);
-+}
-+
-+static int
-+qemuCommandAddZPCIDevice(virCommandPtr cmd,
-+                         virDomainDeviceInfoPtr dev)
-+{
-+    char *devstr = NULL;
-+
-+    virCommandAddArg(cmd, "-device");
-+
-+    if (!(devstr = qemuBuildZPCIDevStr(dev)))
-+        return -1;
-+
-+    virCommandAddArg(cmd, devstr);
-+
-+    VIR_FREE(devstr);
-+    return 0;
-+}
-+
-+static int
-+qemuCommandAddExtDevice(virCommandPtr cmd,
-+                        virDomainDeviceInfoPtr dev)
-+{
-+    if (dev->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI ||
-+        dev->addr.pci.extFlags == VIR_PCI_ADDRESS_EXTENSION_NONE) {
-+        return 0;
-+    }
-+
-+    if (dev->addr.pci.extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI)
-+        return qemuCommandAddZPCIDevice(cmd, dev);
-+
-+    return 0;
-+}
- 
- static int
- qemuBulildFloppyCommandLineOptions(virCommandPtr cmd,
-@@ -2267,6 +2318,9 @@ qemuBuildDiskCommandLine(virCommandPtr cmd,
-                                                    bootindex) < 0)
-                 return -1;
-         } else {
-+            if (qemuCommandAddExtDevice(cmd, &disk->info) < 0)
-+                return -1;
-+
-             virCommandAddArg(cmd, "-device");
- 
-             if (!(optstr = qemuBuildDriveDevStr(def, disk, bootindex,
-@@ -2466,6 +2520,9 @@ qemuBuildFSDevCommandLine(virCommandPtr cmd,
-         virCommandAddArg(cmd, optstr);
-         VIR_FREE(optstr);
- 
-+        if (qemuCommandAddExtDevice(cmd, &fs->info) < 0)
-+            return -1;
-+
-         virCommandAddArg(cmd, "-device");
-         if (!(optstr = qemuBuildFSDevStr(def, fs, qemuCaps)))
-             return -1;
-@@ -2950,6 +3007,11 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
-                 goto cleanup;
- 
-             if (devstr) {
-+                if (qemuCommandAddExtDevice(cmd, &cont->info) < 0) {
-+                    VIR_FREE(devstr);
-+                    goto cleanup;
-+                }
-+
-                 virCommandAddArg(cmd, "-device");
-                 virCommandAddArg(cmd, devstr);
-                 VIR_FREE(devstr);
-@@ -3753,6 +3815,9 @@ qemuBuildWatchdogCommandLine(virCommandPtr cmd,
-     if (!def->watchdog)
-         return 0;
- 
-+    if (qemuCommandAddExtDevice(cmd, &def->watchdog->info) < 0)
-+        return -1;
-+
-     virCommandAddArg(cmd, "-device");
- 
-     optstr = qemuBuildWatchdogDevStr(def, watchdog, qemuCaps);
-@@ -3837,6 +3902,9 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
-     if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio, qemuCaps) < 0)
-         goto error;
- 
-+    if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0)
-+        goto error;
-+
-     virCommandAddArg(cmd, "-device");
-     virCommandAddArgBuffer(cmd, &buf);
-     return 0;
-@@ -4059,6 +4127,9 @@ qemuBuildInputCommandLine(virCommandPtr cmd,
-         virDomainInputDefPtr input = def->inputs[i];
-         char *devstr = NULL;
- 
-+        if (qemuCommandAddExtDevice(cmd, &input->info) < 0)
-+            return -1;
-+
-         if (qemuBuildInputDevStr(&devstr, def, input, qemuCaps) < 0)
-             return -1;
- 
-@@ -4200,6 +4271,9 @@ qemuBuildSoundCommandLine(virCommandPtr cmd,
-         if (sound->model == VIR_DOMAIN_SOUND_MODEL_PCSPK) {
-             virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL);
-         } else {
-+            if (qemuCommandAddExtDevice(cmd, &sound->info) < 0)
-+                return -1;
-+
-             virCommandAddArg(cmd, "-device");
-             if (!(str = qemuBuildSoundDevStr(def, sound, qemuCaps)))
-                 return -1;
-@@ -4439,6 +4513,10 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
-         if (video->primary) {
-             if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY)) {
- 
-+                if (qemuCommandAddExtDevice(cmd,
-+                                            &def->videos[i]->info) < 0)
-+                    return -1;
-+
-                 virCommandAddArg(cmd, "-device");
- 
-                 if (!(str = qemuBuildDeviceVideoStr(def, video, qemuCaps)))
-@@ -4451,6 +4529,9 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
-                     return -1;
-             }
-         } else {
-+            if (qemuCommandAddExtDevice(cmd, &def->videos[i]->info) < 0)
-+                return -1;
-+
-             virCommandAddArg(cmd, "-device");
- 
-             if (!(str = qemuBuildDeviceVideoStr(def, video, qemuCaps)))
-@@ -5328,6 +5409,10 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
-                                      VIR_COMMAND_PASS_FD_CLOSE_PARENT);
-                 }
-             }
-+
-+            if (qemuCommandAddExtDevice(cmd, hostdev->info) < 0)
-+                return -1;
-+
-             virCommandAddArg(cmd, "-device");
-             devstr = qemuBuildPCIHostdevDevStr(def, hostdev, bootIndex,
-                                                configfd_name, qemuCaps);
-@@ -5802,6 +5887,9 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager,
-         virCommandAddArgBuffer(cmd, &buf);
- 
-         /* add the device */
-+        if (qemuCommandAddExtDevice(cmd, &rng->info) < 0)
-+            return -1;
-+
-         if (!(tmp = qemuBuildRNGDevStr(def, rng, qemuCaps)))
-             return -1;
-         virCommandAddArgList(cmd, "-device", tmp, NULL);
-@@ -8654,11 +8742,17 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-      *   New way: -netdev type=tap,id=netdev1 -device e1000,id=netdev1
-      */
-     if (qemuDomainSupportsNicdev(def, net)) {
-+        if (qemuCommandAddExtDevice(cmd, &net->info) < 0)
-+            goto cleanup;
-+
-         if (!(nic = qemuBuildNicDevStr(def, net, bootindex,
-                                        vhostfdSize, qemuCaps)))
-             goto cleanup;
-         virCommandAddArgList(cmd, "-device", nic, NULL);
-     } else {
-+        if (qemuCommandAddExtDevice(cmd, &net->info) < 0)
-+            goto cleanup;
-+
-         if (!(nic = qemuBuildLegacyNicStr(net)))
-             goto cleanup;
-         virCommandAddArgList(cmd, "-net", nic, NULL);
-@@ -9105,6 +9199,12 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
- 
-     if (!devstr)
-         return -1;
-+
-+    if (qemuCommandAddExtDevice(cmd, &shmem->info) < 0) {
-+        VIR_FREE(devstr);
-+        return -1;
-+    }
-+
-     virCommandAddArgList(cmd, "-device", devstr, NULL);
-     VIR_FREE(devstr);
- 
-@@ -10259,6 +10359,10 @@ qemuBuildVsockCommandLine(virCommandPtr cmd,
- 
-     virCommandPassFD(cmd, priv->vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
-     priv->vhostfd = -1;
-+
-+    if (qemuCommandAddExtDevice(cmd, &vsock->info) < 0)
-+        goto cleanup;
-+
-     virCommandAddArgList(cmd, "-device", devstr, NULL);
- 
-     ret = 0;
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 4f1b360130..e8cd8ed04e 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -174,6 +174,8 @@ char *qemuBuildRedirdevDevStr(const virDomainDef *def,
-                               virDomainRedirdevDefPtr dev,
-                               virQEMUCapsPtr qemuCaps);
- 
-+char *qemuBuildZPCIDevStr(virDomainDeviceInfoPtr dev);
-+
- int qemuNetworkPrepareDevices(virDomainDefPtr def);
- 
- int qemuGetDriveSourceString(virStorageSourcePtr src,
-diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-index 20e63a15b5..ffb5d1597e 100644
---- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-@@ -21,6 +21,7 @@ server,nowait \
- -no-shutdown \
- -boot c \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-+-device zpci,uid=25,fid=31,target=virtio-disk0,id=zpci25 \
- -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk0,\
- id=virtio-disk0 \
- -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
-new file mode 100644
-index 0000000000..e5987e1053
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
-@@ -0,0 +1,26 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name QEMUGuest1 \
-+-S \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot c \
-+-device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
-+-device vfio-pci,host=00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
-+-device zpci,uid=2,fid=1,target=balloon0,id=zpci2 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml
-new file mode 100644
-index 0000000000..36161006ab
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml
-@@ -0,0 +1,18 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219100</memory>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci'/>
-+    </hostdev>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
-new file mode 100644
-index 0000000000..dcbb179a7d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
-@@ -0,0 +1,30 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name QEMUGuest1 \
-+-S \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot c \
-+-device zpci,uid=3,fid=2,target=pci.1,id=zpci3 \
-+-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x1 \
-+-device zpci,uid=65535,fid=4294967295,target=hostdev0,id=zpci65535 \
-+-device vfio-pci,host=ffff:00:00.0,id=hostdev0,bus=pci.1,addr=0x1f \
-+-device zpci,uid=1,fid=0,target=hostdev1,id=zpci1 \
-+-device vfio-pci,host=00:00.0,id=hostdev1,bus=pci.0,addr=0x2 \
-+-device zpci,uid=2,fid=1,target=balloon0,id=zpci2 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml
-new file mode 100644
-index 0000000000..1e6060345b
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml
-@@ -0,0 +1,30 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219100</memory>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0xffff' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x01' slot='0x1f' function='0x0'>
-+        <zpci uid='0xffff' fid='0xffffffff'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci'>
-+        <zpci uid='0x0001' fid='0x00000000'/>
-+      </address>
-+    </hostdev>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
-new file mode 100644
-index 0000000000..11a2e50f1e
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
-@@ -0,0 +1,40 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-s390x \
-+-name QEMUGuest1 \
-+-S \
-+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot c \
-+-device zpci,uid=35,fid=63,target=hostdev0,id=zpci35 \
-+-device vfio-pci,host=0001:00:00.0,id=hostdev0,bus=pci.0,addr=0x3 \
-+-device zpci,uid=53,fid=104,target=hostdev1,id=zpci53 \
-+-device vfio-pci,host=0002:00:00.0,id=hostdev1,bus=pci.0,addr=0x1 \
-+-device zpci,uid=1,fid=1,target=hostdev2,id=zpci1 \
-+-device vfio-pci,host=0003:00:00.0,id=hostdev2,bus=pci.0,addr=0x2 \
-+-device zpci,uid=2,fid=2,target=hostdev3,id=zpci2 \
-+-device vfio-pci,host=0004:00:00.0,id=hostdev3,bus=pci.0,addr=0x5 \
-+-device zpci,uid=83,fid=0,target=hostdev4,id=zpci83 \
-+-device vfio-pci,host=0005:00:00.0,id=hostdev4,bus=pci.0,addr=0x7 \
-+-device zpci,uid=3,fid=114,target=hostdev5,id=zpci3 \
-+-device vfio-pci,host=0006:00:00.0,id=hostdev5,bus=pci.0,addr=0x9 \
-+-device zpci,uid=23,fid=3,target=hostdev6,id=zpci23 \
-+-device vfio-pci,host=0007:00:00.0,id=hostdev6,bus=pci.0,addr=0x4 \
-+-device zpci,uid=4,fid=40,target=hostdev7,id=zpci4 \
-+-device vfio-pci,host=0008:00:00.0,id=hostdev7,bus=pci.0,addr=0x6 \
-+-device zpci,uid=5,fid=4,target=balloon0,id=zpci5 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml
-new file mode 100644
-index 0000000000..da8305dd6d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml
-@@ -0,0 +1,79 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219100</memory>
-+  <os>
-+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
-+        <zpci uid='0x0023' fid='0x0000003f'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0002' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci'>
-+        <zpci uid='0x0035' fid='0x00000068'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0003' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0004' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0005' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'>
-+        <zpci uid='0x0053'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0006' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'>
-+        <zpci uid='0x0003' fid='0x00000072'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0007' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci'>
-+        <zpci uid='0x0017' fid='0x00000003'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0008' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci'>
-+        <zpci uid='0x0004' fid='0x00000028'/>
-+      </address>
-+    </hostdev>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-index 622c504da0..80de60acaa 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-@@ -20,5 +20,7 @@ server,nowait \
- -rtc base=utc \
- -no-shutdown \
- -boot c \
-+-device zpci,uid=25,fid=31,target=hostdev0,id=zpci25 \
- -device vfio-pci,host=00:00.0,id=hostdev0,bus=pci.0,addr=0x8 \
-+-device zpci,uid=1,fid=0,target=balloon0,id=zpci1 \
- -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x1
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 1066de8bc4..9de0cbf7e9 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1637,6 +1637,19 @@ mymain(void)
-     DO_TEST("hostdev-vfio-zpci",
-             QEMU_CAPS_DEVICE_VFIO_PCI,
-             QEMU_CAPS_DEVICE_ZPCI);
-+    DO_TEST("hostdev-vfio-zpci-multidomain-many",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_ZPCI);
-+    DO_TEST("hostdev-vfio-zpci-autogenerate",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_ZPCI);
-+    DO_TEST("hostdev-vfio-zpci-boundaries",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_ZPCI);
-+    DO_TEST_PARSE_ERROR("hostdev-vfio-zpci",
-+                        QEMU_CAPS_DEVICE_VFIO_PCI);
-     DO_TEST("pci-rom", NONE);
-     DO_TEST("pci-rom-disabled", NONE);
-     DO_TEST("pci-rom-disabled-invalid", NONE);
-diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml
-new file mode 100644
-index 0000000000..e94e63bd0a
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml
-@@ -0,0 +1,34 @@
-+<domain type='qemu'>
-+  <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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'>
-+        <zpci uid='0x0001' fid='0x00000000'/>
-+      </address>
-+    </hostdev>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'>
-+        <zpci uid='0x0002' fid='0x00000001'/>
-+      </address>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml
-new file mode 100644
-index 0000000000..81d2146188
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml
-@@ -0,0 +1,48 @@
-+<domain type='qemu'>
-+  <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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
-+    <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'/>
-+    </controller>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0xffff' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x01' slot='0x1f' function='0x0'>
-+        <zpci uid='0xffff' fid='0xffffffff'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'>
-+        <zpci uid='0x0001' fid='0x00000000'/>
-+      </address>
-+    </hostdev>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
-+        <zpci uid='0x0002' fid='0x00000001'/>
-+      </address>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml
-new file mode 100644
-index 0000000000..e56106d103
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml
-@@ -0,0 +1,97 @@
-+<domain type='qemu'>
-+  <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='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
-+        <zpci uid='0x0023' fid='0x0000003f'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0002' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'>
-+        <zpci uid='0x0035' fid='0x00000068'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0003' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'>
-+        <zpci uid='0x0001' fid='0x00000001'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0004' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'>
-+        <zpci uid='0x0002' fid='0x00000002'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0005' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'>
-+        <zpci uid='0x0053' fid='0x00000000'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0006' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'>
-+        <zpci uid='0x0003' fid='0x00000072'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0007' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'>
-+        <zpci uid='0x0017' fid='0x00000003'/>
-+      </address>
-+    </hostdev>
-+    <hostdev mode='subsystem' type='pci' managed='no'>
-+      <driver name='vfio'/>
-+      <source>
-+        <address domain='0x0008' bus='0x00' slot='0x00' function='0x0'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'>
-+        <zpci uid='0x0004' fid='0x00000028'/>
-+      </address>
-+    </hostdev>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'>
-+        <zpci uid='0x0005' fid='0x00000004'/>
-+      </address>
-+    </memballoon>
-+    <panic model='s390'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index a787f4f4a3..b2afc8a8ba 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -488,6 +488,17 @@ mymain(void)
-     DO_TEST("hostdev-vfio-zpci",
-             QEMU_CAPS_DEVICE_ZPCI,
-             QEMU_CAPS_CCW);
-+    DO_TEST("hostdev-vfio-zpci-multidomain-many",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_ZPCI);
-+    DO_TEST("hostdev-vfio-zpci-autogenerate",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_ZPCI);
-+    DO_TEST("hostdev-vfio-zpci-boundaries",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_ZPCI);
-     DO_TEST("hostdev-mdev-precreated", NONE);
-     DO_TEST("hostdev-mdev-display", QEMU_CAPS_VFIO_PCI_DISPLAY);
-     DO_TEST("pci-rom", NONE);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Handle-hotplug-and-commandline-for-secret-objects-for-http-cookies.patch b/SOURCES/libvirt-qemu-Handle-hotplug-and-commandline-for-secret-objects-for-http-cookies.patch
new file mode 100644
index 0000000..7a3ea28
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Handle-hotplug-and-commandline-for-secret-objects-for-http-cookies.patch
@@ -0,0 +1,117 @@
+From 45181b943720b46caf3263c2edbc5c0427870369 Mon Sep 17 00:00:00 2001
+Message-Id: <45181b943720b46caf3263c2edbc5c0427870369@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:04 +0100
+Subject: [PATCH] qemu: Handle hotplug and commandline for secret objects for
+ http cookies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Implement both commandline support and hotplug by adding the http cookie
+handling to 'qemuBlockStorageSourceAttachData' handling functions for
+it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b512935b17d991dcdd1a14e39e5f13ca828bd416)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <40869b86260516bd56253a39e5dfb54519e5313e.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c   | 13 +++++++++++++
+ src/qemu/qemu_block.h   |  3 +++
+ src/qemu/qemu_command.c |  5 +++++
+ 3 files changed, 21 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index e60975a142..f07420b6e2 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1499,11 +1499,13 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data)
+     virJSONValueFree(data->formatProps);
+     virJSONValueFree(data->prmgrProps);
+     virJSONValueFree(data->authsecretProps);
++    virJSONValueFree(data->httpcookiesecretProps);
+     virJSONValueFree(data->encryptsecretProps);
+     virJSONValueFree(data->tlsProps);
+     VIR_FREE(data->tlsAlias);
+     VIR_FREE(data->authsecretAlias);
+     VIR_FREE(data->encryptsecretAlias);
++    VIR_FREE(data->httpcookiesecretAlias);
+     VIR_FREE(data->driveCmd);
+     VIR_FREE(data->driveAlias);
+     VIR_FREE(data);
+@@ -1570,6 +1572,11 @@ qemuBlockStorageSourceAttachApplyStorageDeps(qemuMonitorPtr mon,
+                              &data->authsecretAlias) < 0)
+         return -1;
+ 
++    if (data->httpcookiesecretProps &&
++        qemuMonitorAddObject(mon, &data->httpcookiesecretProps,
++                             &data->httpcookiesecretAlias) < 0)
++        return -1;
++
+     if (data->tlsProps &&
+         qemuMonitorAddObject(mon, &data->tlsProps, &data->tlsAlias) < 0)
+         return -1;
+@@ -1713,6 +1720,9 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon,
+     if (data->encryptsecretAlias)
+         ignore_value(qemuMonitorDelObject(mon, data->encryptsecretAlias));
+ 
++    if (data->httpcookiesecretAlias)
++        ignore_value(qemuMonitorDelObject(mon, data->httpcookiesecretAlias));
++
+     if (data->tlsAlias)
+         ignore_value(qemuMonitorDelObject(mon, data->tlsAlias));
+ 
+@@ -1768,6 +1778,9 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src,
+ 
+         if (srcpriv->encinfo && srcpriv->encinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES)
+             data->encryptsecretAlias = g_strdup(srcpriv->encinfo->s.aes.alias);
++
++        if (srcpriv->httpcookie)
++            data->httpcookiesecretAlias = g_strdup(srcpriv->httpcookie->s.aes.alias);
+     }
+ 
+     return g_steal_pointer(&data);
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index eab0128d5d..197f5dae97 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -100,6 +100,9 @@ struct qemuBlockStorageSourceAttachData {
+     virJSONValuePtr encryptsecretProps;
+     char *encryptsecretAlias;
+ 
++    virJSONValuePtr httpcookiesecretProps;
++    char *httpcookiesecretAlias;
++
+     virJSONValuePtr tlsProps;
+     char *tlsAlias;
+ };
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index fc5366d88d..de97504ce1 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -2413,6 +2413,7 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd,
+     if (qemuBuildObjectCommandline(cmd, data->prmgrProps) < 0 ||
+         qemuBuildObjectCommandline(cmd, data->authsecretProps) < 0 ||
+         qemuBuildObjectCommandline(cmd, data->encryptsecretProps) < 0 ||
++        qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps) < 0 ||
+         qemuBuildObjectCommandline(cmd, data->tlsProps) < 0)
+         return -1;
+ 
+@@ -10349,6 +10350,10 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src,
+         if (srcpriv->encinfo &&
+             qemuBuildSecretInfoProps(srcpriv->encinfo, &data->encryptsecretProps) < 0)
+             return -1;
++
++        if (srcpriv->httpcookie &&
++            qemuBuildSecretInfoProps(srcpriv->httpcookie, &data->httpcookiesecretProps) < 0)
++            return -1;
+     }
+ 
+     if (src->haveTLS == VIR_TRISTATE_BOOL_YES &&
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Ignore-nwfilter-binding-instantiation-issues-during-reconnect.patch b/SOURCES/libvirt-qemu-Ignore-nwfilter-binding-instantiation-issues-during-reconnect.patch
deleted file mode 100644
index 1832b8d..0000000
--- a/SOURCES/libvirt-qemu-Ignore-nwfilter-binding-instantiation-issues-during-reconnect.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d749a84b9728b4c1a46c9e6efbab5732688d03c2 Mon Sep 17 00:00:00 2001
-Message-Id: <d749a84b9728b4c1a46c9e6efbab5732688d03c2@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Sat, 10 Nov 2018 08:50:06 -0500
-Subject: [PATCH] qemu: Ignore nwfilter binding instantiation issues during
- reconnect
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1648544 (RHEL8)
-https://bugzilla.redhat.com/show_bug.cgi?id=1607202 (RHEL7)
-
-It's essentially stated in the nwfilterBindingDelete that we
-will allow the admin to shoot themselves in the foot by deleting
-the nwfilter binding which then allows them to undefine the
-nwfilter that is in use for the running guest...
-
-However, by allowing this we cause a problem for libvirtd
-restart reconnect processing which would then try to recreate
-the missing binding attempting to use the deleted filter
-resulting in an error and thus shutting the guest down.
-
-So rather than keep adding virDomainConfNWFilterInstantiate
-flags to "ignore" specific error conditions, modify the logic
-to ignore, but VIR_WARN errors other than ignoreExists. This
-will at least allow the guest to not shutdown for only nwfilter
-binding errors that we can now perhaps recover from since we
-have the binding create/delete capability.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 9e52c6496650d1412662a9e6cf98301141fbbbca)
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_process.c | 24 ++++++++++++++++--------
- 1 file changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index e4b19b938c..8ba14abfa4 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3136,20 +3136,29 @@ qemuProcessNotifyNets(virDomainDefPtr def)
-     }
- }
- 
--static int
--qemuProcessFiltersInstantiate(virDomainDefPtr def, bool ignoreExists)
-+/* Attempt to instantiate the filters. Ignore failures because it's
-+ * possible that someone deleted a filter binding and the associated
-+ * filter while the guest was running and we don't want that action
-+ * to cause failure to keep the guest running during the reconnection
-+ * processing. Nor do we necessarily want other failures to do the
-+ * same. We'll just log the error conditions other than of course
-+ * ignoreExists possibility (e.g. the true flag) */
-+static void
-+qemuProcessFiltersInstantiate(virDomainDefPtr def)
- {
-     size_t i;
- 
-     for (i = 0; i < def->nnets; i++) {
-         virDomainNetDefPtr net = def->nets[i];
-         if ((net->filter) && (net->ifname)) {
--            if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, ignoreExists) < 0)
--                return 1;
-+            if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net,
-+                                                 true) < 0) {
-+                VIR_WARN("filter '%s' instantiation for '%s' failed '%s'",
-+                         net->filter, net->ifname, virGetLastErrorMessage());
-+                virResetLastError();
-+            }
-         }
-     }
--
--    return 0;
- }
- 
- static int
-@@ -7782,8 +7791,7 @@ qemuProcessReconnect(void *opaque)
- 
-     qemuProcessNotifyNets(obj->def);
- 
--    if (qemuProcessFiltersInstantiate(obj->def, true))
--        goto error;
-+    qemuProcessFiltersInstantiate(obj->def);
- 
-     if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0)
-         goto error;
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV.patch b/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV.patch
deleted file mode 100644
index e426f4b..0000000
--- a/SOURCES/libvirt-qemu-Introduce-QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 445b61e0c0f68d91a5e7bad7fb12b82005dd0e85 Mon Sep 17 00:00:00 2001
-Message-Id: <445b61e0c0f68d91a5e7bad7fb12b82005dd0e85@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 4 Dec 2018 16:46:18 +0100
-Subject: [PATCH] qemu: Introduce QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 0029eace520bfc0cbb1b176611304401ea9eae8f)
-
-Conflicts in
-
-  src/qemu/qemu_capabilities.c
-  src/qemu/qemu_capabilities.h
-
-because we're missing
-
-  29ad952f7e qemu: Introduce zPCI capability
-  21b18ea5d9 qemu: add memory-backend-memfd capability check
-  a6fd5b596a qemu: check memory-backend-memfd.hugetlb capability
-  9aec374b01 qemu: Detect whether iothread polling is supported
-
-downstream.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1647822
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                    | 2 ++
- src/qemu/qemu_capabilities.h                    | 1 +
- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
- tests/qemuxml2argvtest.c                        | 1 +
- tests/qemuxml2xmltest.c                         | 1 +
- 5 files changed, 6 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index feef102874..57b1b99076 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -508,6 +508,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               /* 315 */
-               "vfio-pci.display",
-               "vfio-ap",
-+              "machine.pseries.cap-nested-hv",
-     );
- 
- 
-@@ -1439,6 +1440,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] =
- static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = {
-     { "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE },
-     { "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM },
-+    { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV },
- };
- 
- static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 1a9e5386a8..0c06081107 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -492,6 +492,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     /* 315 */
-     QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
-     QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
-+    QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-index bdd339c54a..279e946e2a 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-@@ -171,6 +171,7 @@
-   <flag name='usb-storage.werror'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-+  <flag name='machine.pseries.cap-nested-hv'/>
-   <version>3000091</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>439018</microcodeVersion>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 13e95fe28a..0908bc5d08 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1886,6 +1886,7 @@ mymain(void)
-             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-             QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
-             QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
-+            QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
-             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-     DO_TEST_FAILURE("pseries-features",
-                     QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index b76410b2c1..db088fff6b 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -627,6 +627,7 @@ mymain(void)
-             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-             QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
-             QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
-+            QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
-             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
- 
-     DO_TEST("pseries-serial-native",
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-Introduce-a-new-graphics-display-type-headless.patch b/SOURCES/libvirt-qemu-Introduce-a-new-graphics-display-type-headless.patch
deleted file mode 100644
index b0d7919..0000000
--- a/SOURCES/libvirt-qemu-Introduce-a-new-graphics-display-type-headless.patch
+++ /dev/null
@@ -1,908 +0,0 @@
-From d6226c73df11563b6ea1ae1454ca57561b3ea665 Mon Sep 17 00:00:00 2001
-Message-Id: <d6226c73df11563b6ea1ae1454ca57561b3ea665@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:58 +0200
-Subject: [PATCH] qemu: Introduce a new graphics display type 'headless'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since 2.10 QEMU supports a new display type egl-headless which uses the
-drm nodes for OpenGL rendering copying back the rendered bits back to
-QEMU into a dma-buf which can be accessed by standard "display" apps
-like VNC or SPICE. Although this display type can be used on its own,
-for any practical use case it makes sense to pair it with either VNC or
-SPICE display. The clear benefit of this display is that VNC gains
-OpenGL support, which it natively doesn't have, and SPICE gains remote
-OpenGL support (native OpenGL support only works locally through a UNIX
-socket, i.e. listen type=socket/none).
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d8266ebe1615c4b043db6b8d486465722cdd0ef8)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/formatdomain.html.in                     | 33 +++++++++-
- docs/schemas/domaincommon.rng                 |  3 +
- src/conf/domain_conf.c                        |  6 +-
- src/conf/domain_conf.h                        |  1 +
- src/libxl/libxl_conf.c                        |  1 +
- src/qemu/qemu_command.c                       | 14 ++++-
- src/qemu/qemu_domain.c                        | 60 ++++++++++++++++++-
- src/qemu/qemu_driver.c                        |  2 +
- src/qemu/qemu_hotplug.c                       |  1 +
- src/qemu/qemu_process.c                       |  4 ++
- src/vmx/vmx.c                                 |  1 +
- tests/domaincapsschemadata/full.xml           |  1 +
- .../graphics-egl-headless.args                | 26 ++++++++
- .../graphics-egl-headless.xml                 | 31 ++++++++++
- .../graphics-sdl-egl-headless.xml             | 35 +++++++++++
- .../graphics-spice-egl-headless.args          | 31 ++++++++++
- .../graphics-spice-egl-headless.xml           | 36 +++++++++++
- .../graphics-spice-invalid-egl-headless.xml   | 37 ++++++++++++
- .../graphics-vnc-egl-headless.args            | 28 +++++++++
- .../graphics-vnc-egl-headless.xml             | 37 ++++++++++++
- tests/qemuxml2argvtest.c                      | 17 ++++++
- .../graphics-spice-egl-headless.xml           | 44 ++++++++++++++
- .../graphics-vnc-egl-headless.xml             | 42 +++++++++++++
- tests/qemuxml2xmltest.c                       |  2 +
- 24 files changed, 488 insertions(+), 5 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args
- create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.xml
- create mode 100644 tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
- create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args
- create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
- create mode 100644 tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
- create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
- create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
- create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
- create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index a3afe137bf..9dd22554ad 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -6299,7 +6299,8 @@ qemu-kvm -net nic,model=? /dev/null
-         <p>
-           The <code>graphics</code> element has a mandatory <code>type</code>
-           attribute which takes the value <code>sdl</code>, <code>vnc</code>,
--          <code>spice</code>, <code>rdp</code> or <code>desktop</code>:
-+          <code>spice</code>, <code>rdp</code>, <code>desktop</code> or
-+          <code>egl-headless</code>:
-         </p>
-         <dl>
-           <dt><code>sdl</code></dt>
-@@ -6358,6 +6359,11 @@ qemu-kvm -net nic,model=? /dev/null
-               auto-allocation and <code>autoport</code> having no effect due to
-               security reasons) <span class="since">Since 1.0.6</span>.
-             </p>
-+            <p>
-+              Although VNC doesn't support OpenGL natively, it can be paired
-+              with graphics type <code>egl-headless</code> (see below) which
-+              will instruct QEMU to open and use drm nodes for OpenGL rendering.
-+            </p>
-           </dd>
-           <dt><code>spice</code> <span class="since">Since 0.8.6</span></dt>
-           <dd>
-@@ -6463,6 +6469,12 @@ qemu-kvm -net nic,model=? /dev/null
-               You can enable or disable OpenGL support explicitly with
-               the <code>gl</code> element, by setting the <code>enable</code>
-               property. (QEMU only, <span class="since">since 1.3.3</span>).
-+              Note that this only works locally, since this requires usage of
-+              UNIX sockets, i.e. using <code>listen</code> types 'socket' or
-+              'none'. For accelerated OpenGL with remote support, consider
-+              pairing this element with type <code>egl-headless</code>
-+              (see below). However, this will deliver weaker performance
-+              compared to native Spice OpenGL support.
-             </p>
-             <p>
-               By default, QEMU will pick the first available GPU DRM render node.
-@@ -6498,6 +6510,25 @@ qemu-kvm -net nic,model=? /dev/null
-               <code>fullscreen</code>.
-             </p>
-           </dd>
-+          <dt><code>egl-headless</code><span class="since">Since 4.6.0</span></dt>
-+          <dd>
-+            <p>
-+              This display type provides support for an OpenGL accelerated
-+              display accessible both locally and remotely (for comparison,
-+              Spice's native OpenGL support only works locally using UNIX
-+              sockets at the moment, but has better performance). Since this
-+              display type doesn't provide any window or graphical console like
-+              the other types, for practical reasons it should be paired with
-+              either <code>vnc</code> or <code>spice</code> graphics types.
-+              This display type is only supported by QEMU domains
-+              (needs QEMU <span class="since">2.10</span> or newer) and doesn't
-+              accept any attributes.
-+            </p>
-+            <pre>
-+&lt;graphics type='spice' autoport='yes'/&gt;
-+&lt;graphics type='egl-headless'/&gt;
-+            </pre>
-+          </dd>
-         </dl>
-       </dd>
-     </dl>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index f24a56392a..157726752c 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -3366,6 +3366,9 @@
-             </attribute>
-           </optional>
-         </group>
-+        <attribute name="type">
-+          <value>egl-headless</value>
-+        </attribute>
-       </choice>
-     </element>
-   </define>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index db8e17dac4..fa4dfafcff 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -615,7 +615,8 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST,
-               "vnc",
-               "rdp",
-               "desktop",
--              "spice")
-+              "spice",
-+              "egl-headless")
- 
- VIR_ENUM_IMPL(virDomainGraphicsListen, VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST,
-               "none",
-@@ -1426,6 +1427,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def)
-         virDomainGraphicsAuthDefClear(&def->data.spice.auth);
-         break;
- 
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-         break;
-     }
-@@ -14172,6 +14174,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
-         if (virDomainGraphicsDefParseXMLSpice(def, node, ctxt, flags) < 0)
-             goto error;
-         break;
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-         break;
-     }
-@@ -26404,6 +26407,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
-         virDomainGraphicsAuthDefFormatAttr(buf, &def->data.spice.auth, flags);
-         break;
- 
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-         break;
-     }
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 0f10e242fd..26f75b15d0 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1473,6 +1473,7 @@ typedef enum {
-     VIR_DOMAIN_GRAPHICS_TYPE_RDP,
-     VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP,
-     VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
-+    VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS,
- 
-     VIR_DOMAIN_GRAPHICS_TYPE_LAST
- } virDomainGraphicsType;
-diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 452a77f3b8..cda4eb9d31 100644
---- a/src/libxl/libxl_conf.c
-+++ b/src/libxl/libxl_conf.c
-@@ -1441,6 +1441,7 @@ libxlMakeVfb(virPortAllocatorRangePtr graphicsports,
-         case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-         case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-         case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
-+        case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-         case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-             break;
-     }
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index fed4f8faf9..8915040c6a 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8212,6 +8212,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
-     return -1;
- }
- 
-+
- static int
- qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
-                              virCommandPtr cmd,
-@@ -8241,6 +8242,11 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
-                                                   qemuCaps, graphics) < 0)
-                 return -1;
- 
-+            break;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-+            virCommandAddArg(cmd, "-display");
-+            virCommandAddArg(cmd, "egl-headless");
-+
-             break;
-         case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-         case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-@@ -10068,6 +10074,7 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver,
-     int sdl = 0;
-     int vnc = 0;
-     int spice = 0;
-+    int egl_headless = 0;
- 
-     if (!virQEMUDriverIsPrivileged(driver)) {
-         /* If we have no cgroups then we can have no tunings that
-@@ -10109,6 +10116,9 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver,
-         case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
-             ++spice;
-             break;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-+            ++egl_headless;
-+            break;
-         case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-         case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-         case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-@@ -10116,10 +10126,10 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver,
-         }
-     }
- 
--    if (sdl > 1 || vnc > 1 || spice > 1) {
-+    if (sdl > 1 || vnc > 1 || spice > 1 || egl_headless > 1) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("only 1 graphics device of each type "
--                         "(sdl, vnc, spice) is supported"));
-+                         "(sdl, vnc, spice, headless) is supported"));
-         return -1;
-     }
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index a42a6df91b..9498594857 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -5502,6 +5502,60 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm,
- }
- 
- 
-+static int
-+qemuDomainDeviceDefValidateGraphics(const virDomainGraphicsDef *graphics,
-+                                    const virDomainDef *def,
-+                                    virQEMUCapsPtr qemuCaps)
-+{
-+    bool have_egl_headless = false;
-+    size_t i;
-+
-+    for (i = 0; i < def->ngraphics; i++) {
-+        graphics = def->graphics[i];
-+
-+        if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS) {
-+            have_egl_headless = true;
-+            break;
-+        }
-+    }
-+
-+    /* Only VNC and SPICE can be paired with egl-headless, the other types
-+     * either don't make sense to pair with egl-headless or aren't even
-+     * supported by QEMU.
-+     */
-+    if (have_egl_headless) {
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_EGL_HEADLESS)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("egl-headless display is not supported with this "
-+                             "QEMU binary"));
-+            return -1;
-+        }
-+
-+        if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS &&
-+            graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
-+            graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("graphics type 'egl-headless' is only supported "
-+                             "with one of: 'vnc', 'spice' graphics types"));
-+            return -1;
-+        }
-+
-+        /* '-spice gl=on' and '-display egl-headless' are mutually
-+         * exclusive
-+         */
-+        if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
-+            graphics->data.spice.gl == VIR_TRISTATE_BOOL_YES) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("multiple OpenGL displays are not supported "
-+                             "by QEMU"));
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-                             const virDomainDef *def,
-@@ -5569,11 +5623,15 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
-         ret = qemuDomainDeviceDefValidateTPM(dev->data.tpm, def);
-         break;
- 
-+    case VIR_DOMAIN_DEVICE_GRAPHICS:
-+        ret = qemuDomainDeviceDefValidateGraphics(dev->data.graphics, def,
-+                                                  qemuCaps);
-+        break;
-+
-     case VIR_DOMAIN_DEVICE_LEASE:
-     case VIR_DOMAIN_DEVICE_FS:
-     case VIR_DOMAIN_DEVICE_INPUT:
-     case VIR_DOMAIN_DEVICE_SOUND:
--    case VIR_DOMAIN_DEVICE_GRAPHICS:
-     case VIR_DOMAIN_DEVICE_HUB:
-     case VIR_DOMAIN_DEVICE_MEMBALLOON:
-     case VIR_DOMAIN_DEVICE_NVRAM:
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 670651a75d..3158f217fa 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -18118,6 +18118,7 @@ qemuDomainOpenGraphics(virDomainPtr dom,
-     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("Can only open VNC or SPICE graphics backends, not %s"),
-                        virDomainGraphicsTypeToString(vm->def->graphics[idx]->type));
-@@ -18186,6 +18187,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom,
-     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("Can only open VNC or SPICE graphics backends, not %s"),
-                        virDomainGraphicsTypeToString(vm->def->graphics[idx]->type));
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 91a751a2fe..053ddb14ec 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -3699,6 +3699,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
-     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unable to change config on '%s' graphics type"), type);
-         break;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c903a8e5c8..a4b1f97df5 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4467,6 +4467,7 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDefPtr graphics,
-     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-         break;
-     }
-@@ -4505,6 +4506,7 @@ qemuProcessGraphicsAllocatePorts(virQEMUDriverPtr driver,
-     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-         break;
-     }
-@@ -4657,6 +4659,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver,
-     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-     case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+    case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-     case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-         break;
-     }
-@@ -4944,6 +4947,7 @@ qemuProcessStartValidateGraphics(virDomainObjPtr vm)
-         case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-         case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-         case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+        case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-         case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-             break;
-         }
-diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
-index fe24b060d7..937bf0c96b 100644
---- a/src/vmx/vmx.c
-+++ b/src/vmx/vmx.c
-@@ -3282,6 +3282,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
-           case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-           case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-           case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
-+          case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                            _("Unsupported graphics type '%s'"),
-                            virDomainGraphicsTypeToString(def->graphics[i]->type));
-diff --git a/tests/domaincapsschemadata/full.xml b/tests/domaincapsschemadata/full.xml
-index d3faf38da0..154c4a6fe9 100644
---- a/tests/domaincapsschemadata/full.xml
-+++ b/tests/domaincapsschemadata/full.xml
-@@ -59,6 +59,7 @@
-         <value>rdp</value>
-         <value>desktop</value>
-         <value>spice</value>
-+        <value>egl-headless</value>
-       </enum>
-     </graphics>
-     <video supported='yes'>
-diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
-new file mode 100644
-index 0000000000..fdf540ddfc
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
-@@ -0,0 +1,26 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+/usr/bin/qemu-system-i686 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-+-display egl-headless \
-+-vga cirrus
-diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.xml b/tests/qemuxml2argvdata/graphics-egl-headless.xml
-new file mode 100644
-index 0000000000..7b001cd2eb
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-egl-headless.xml
-@@ -0,0 +1,31 @@
-+<domain type='qemu'>
-+  <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='i686' 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-i686</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'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='egl-headless'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml b/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
-new file mode 100644
-index 0000000000..955dfeb3c2
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
-@@ -0,0 +1,35 @@
-+<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='i686' 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-i686</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'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>
-+    <graphics type='egl-headless'/>
-+    <video>
-+      <model type='vga' vram='16384' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
-new file mode 100644
-index 0000000000..4886ee05f6
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
-@@ -0,0 +1,31 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=spice \
-+/usr/bin/qemu-system-i686 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-+-spice port=5903,addr=127.0.0.1 \
-+-display egl-headless \
-+-vga qxl \
-+-global qxl-vga.ram_size=67108864 \
-+-global qxl-vga.vram_size=33554432 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
-new file mode 100644
-index 0000000000..fafae13a0f
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
-@@ -0,0 +1,36 @@
-+<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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <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'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='spice' port='5903' autoport='no' listen='127.0.0.1'>
-+      <listen type='address' address='127.0.0.1'/>
-+    </graphics>
-+    <graphics type='egl-headless'/>
-+    <video>
-+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
-+    </video>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
-new file mode 100644
-index 0000000000..25ae61cef6
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
-@@ -0,0 +1,37 @@
-+<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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <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'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='spice'>
-+      <listen type='none'/>
-+      <gl enable='yes'/>
-+    </graphics>
-+    <graphics type='egl-headless'/>
-+    <video>
-+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
-+    </video>
-+    <memballoon model='virtio'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
-new file mode 100644
-index 0000000000..2d2b3cf0fb
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
-@@ -0,0 +1,28 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-+-vnc '[2001:1:2:3:4:5:1234:1234]:3' \
-+-display egl-headless \
-+-vga cirrus
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
-new file mode 100644
-index 0000000000..570cf2e50f
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
-@@ -0,0 +1,37 @@
-+<domain type='qemu'>
-+  <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='i686' 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-i686</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'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'>
-+      <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
-+    </graphics>
-+    <graphics type='egl-headless'/>
-+    <video>
-+      <model type='cirrus' vram='16384' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 3be5af03aa..848e40440a 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1167,6 +1167,10 @@ mymain(void)
-     DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address",
-                         QEMU_CAPS_VIRTIO_SCSI);
- 
-+    DO_TEST("graphics-egl-headless",
-+            QEMU_CAPS_EGL_HEADLESS,
-+            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-+
-     DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
-     DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
-     DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET,
-@@ -1198,9 +1202,14 @@ mymain(void)
-     driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0;
-     VIR_FREE(driver.config->vncSASLdir);
-     VIR_FREE(driver.config->vncTLSx509certdir);
-+    DO_TEST("graphics-vnc-egl-headless",
-+            QEMU_CAPS_VNC,
-+            QEMU_CAPS_EGL_HEADLESS,
-+            QEMU_CAPS_DEVICE_CIRRUS_VGA);
- 
-     DO_TEST("graphics-sdl",
-             QEMU_CAPS_DEVICE_VGA);
-+    DO_TEST_FAILURE("graphics-sdl-egl-headless", NONE);
-     DO_TEST("graphics-sdl-fullscreen",
-             QEMU_CAPS_DEVICE_CIRRUS_VGA);
-     DO_TEST("graphics-spice",
-@@ -1255,6 +1264,14 @@ mymain(void)
-             QEMU_CAPS_SPICE_UNIX,
-             QEMU_CAPS_DEVICE_CIRRUS_VGA);
-     driver.config->spiceAutoUnixSocket = false;
-+    DO_TEST("graphics-spice-egl-headless",
-+            QEMU_CAPS_SPICE,
-+            QEMU_CAPS_EGL_HEADLESS,
-+            QEMU_CAPS_DEVICE_QXL);
-+    DO_TEST_FAILURE("graphics-spice-invalid-egl-headless",
-+                    QEMU_CAPS_SPICE,
-+                    QEMU_CAPS_EGL_HEADLESS,
-+                    QEMU_CAPS_DEVICE_QXL);
- 
-     DO_TEST("input-usbmouse", NONE);
-     DO_TEST("input-usbtablet", NONE);
-diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
-new file mode 100644
-index 0000000000..6d96264914
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
-@@ -0,0 +1,44 @@
-+<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='i686' 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-i686</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'>
-+      <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'/>
-+    <graphics type='spice' port='5903' autoport='no' listen='127.0.0.1'>
-+      <listen type='address' address='127.0.0.1'/>
-+    </graphics>
-+    <graphics type='egl-headless'/>
-+    <video>
-+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </video>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </memballoon>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
-new file mode 100644
-index 0000000000..4155c10397
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
-@@ -0,0 +1,42 @@
-+<domain type='qemu'>
-+  <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='i686' 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-i686</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'>
-+      <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'/>
-+    <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'>
-+      <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
-+    </graphics>
-+    <graphics type='egl-headless'/>
-+    <video>
-+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index bbb995656e..fa57221d62 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -417,6 +417,7 @@ mymain(void)
-     cfg->vncAutoUnixSocket = false;
-     DO_TEST("graphics-vnc-socket", NONE);
-     DO_TEST("graphics-vnc-auto-socket", NONE);
-+    DO_TEST("graphics-vnc-egl-headless", NONE);
- 
-     DO_TEST("graphics-sdl", NONE);
-     DO_TEST("graphics-sdl-fullscreen", NONE);
-@@ -428,6 +429,7 @@ mymain(void)
-     cfg->spiceAutoUnixSocket = true;
-     DO_TEST("graphics-spice-auto-socket-cfg", NONE);
-     cfg->spiceAutoUnixSocket = false;
-+    DO_TEST("graphics-spice-egl-headless", NONE);
- 
-     DO_TEST("input-usbmouse", NONE);
-     DO_TEST("input-usbtablet", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Introduce-another-helper-for-creating-alias-for-a-secret-object.patch b/SOURCES/libvirt-qemu-Introduce-another-helper-for-creating-alias-for-a-secret-object.patch
new file mode 100644
index 0000000..2effaf8
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Introduce-another-helper-for-creating-alias-for-a-secret-object.patch
@@ -0,0 +1,70 @@
+From 2ca069dae766b266e12f1feb9f9ca9d3f2deb7bb Mon Sep 17 00:00:00 2001
+Message-Id: <2ca069dae766b266e12f1feb9f9ca9d3f2deb7bb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:49 +0100
+Subject: [PATCH] qemu: Introduce another helper for creating alias for a
+ 'secret' object
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+qemuAliasForSecret is meant as a replacement qemuDomainGetSecretAESAlias
+with saner API. The sub-type we are creating the alias for is passed in
+as a string rather than the unflexible 'isLuks' boolean.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bb2a81df21710ed8258854e0dc2b3c2e923831f2)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <fe8144c851d9e849617ae66b99a8605e75697809.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_alias.c | 17 +++++++++++++++++
+ src/qemu/qemu_alias.h |  3 +++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
+index 93bdcb7548..50ad054c6c 100644
+--- a/src/qemu/qemu_alias.c
++++ b/src/qemu/qemu_alias.c
+@@ -792,6 +792,23 @@ qemuDomainGetSecretAESAlias(const char *srcalias,
+ }
+ 
+ 
++/* qemuAliasForSecret:
++ * @parentalias: alias of the parent object
++ * @obj: optional sub-object of the parent device the secret is for
++ *
++ * Generate alias for a secret object used by @parentalias device or one of
++ * the dependencies of the device described by @obj.
++ */
++char *
++qemuAliasForSecret(const char *parentalias,
++                   const char *obj)
++{
++    if (obj)
++        return g_strdup_printf("%s-%s-secret0", parentalias, obj);
++    else
++        return g_strdup_printf("%s-secret0", parentalias);
++}
++
+ /* qemuAliasTLSObjFromSrcAlias
+  * @srcAlias: Pointer to a source alias string
+  *
+diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
+index ae2fce16bc..645956d024 100644
+--- a/src/qemu/qemu_alias.h
++++ b/src/qemu/qemu_alias.h
+@@ -86,6 +86,9 @@ char *qemuDomainGetMasterKeyAlias(void);
+ char *qemuDomainGetSecretAESAlias(const char *srcalias,
+                                   bool isLuks);
+ 
++char *qemuAliasForSecret(const char *parentalias,
++                         const char *obj);
++
+ char *qemuAliasTLSObjFromSrcAlias(const char *srcAlias)
+     ATTRIBUTE_NONNULL(1);
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Introduce-generic-qemuMonitorGetGuestCPU.patch b/SOURCES/libvirt-qemu-Introduce-generic-qemuMonitorGetGuestCPU.patch
deleted file mode 100644
index 39ca791..0000000
--- a/SOURCES/libvirt-qemu-Introduce-generic-qemuMonitorGetGuestCPU.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-From b61b68abeb8c2c93740698b81d59d2030eea8189 Mon Sep 17 00:00:00 2001
-Message-Id: <b61b68abeb8c2c93740698b81d59d2030eea8189@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:03 +0200
-Subject: [PATCH] qemu: Introduce generic qemuMonitorGetGuestCPU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Unlike the old version (which is now called qemuMonitorGetGuestCPUx86),
-this monitor API checks for individual features by their names rather
-than processing CPUID bits. Thus we can get the list of enabled and
-disabled features for both CPUID and MSR features.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit cc6d6b3cb995110a1d9da97f31ce68c2290f4332)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <29634994c64ffbf3509238ccbe1937b599e55838.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor.c      |  36 +++++++
- src/qemu/qemu_monitor.h      |  10 ++
- src/qemu/qemu_monitor_json.c | 186 +++++++++++++++++++++++++++++++++++
- src/qemu/qemu_monitor_json.h |   7 ++
- 4 files changed, 239 insertions(+)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index b35187b66d..ae666ce633 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4074,6 +4074,42 @@ qemuMonitorGetGuestCPUx86(qemuMonitorPtr mon,
- }
- 
- 
-+/**
-+ * qemuMonitorGetGuestCPU:
-+ * @mon: Pointer to the monitor
-+ * @arch: CPU architecture
-+ * @translate: callback for translating CPU feature names from QEMU to libvirt
-+ * @opaque: data for @translate callback
-+ * @enabled: returns the CPU data for all enabled features
-+ * @disabled: returns the CPU data for features which we asked for
-+ *      (either explicitly or via a named CPU model) but QEMU disabled them
-+ *
-+ * Retrieve the definition of the guest CPU from a running QEMU instance.
-+ *
-+ * Returns 0 on success, -1 on error.
-+ */
-+int
-+qemuMonitorGetGuestCPU(qemuMonitorPtr mon,
-+                       virArch arch,
-+                       qemuMonitorCPUFeatureTranslationCallback translate,
-+                       void *opaque,
-+                       virCPUDataPtr *enabled,
-+                       virCPUDataPtr *disabled)
-+{
-+    VIR_DEBUG("arch=%s translate=%p opaque=%p enabled=%p disabled=%p",
-+              virArchToString(arch), translate, opaque, enabled, disabled);
-+
-+    QEMU_CHECK_MONITOR(mon);
-+
-+    *enabled = NULL;
-+    if (disabled)
-+        *disabled = NULL;
-+
-+    return qemuMonitorJSONGetGuestCPU(mon, arch, translate, opaque,
-+                                      enabled, disabled);
-+}
-+
-+
- /**
-  * qemuMonitorRTCResetReinjection:
-  * @mon: Pointer to the monitor
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index b4d484c703..8d4f6e6062 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1099,6 +1099,16 @@ int qemuMonitorGetGuestCPUx86(qemuMonitorPtr mon,
-                               virCPUDataPtr *data,
-                               virCPUDataPtr *disabled);
- 
-+typedef const char *(*qemuMonitorCPUFeatureTranslationCallback)(const char *name,
-+                                                                void *opaque);
-+
-+int qemuMonitorGetGuestCPU(qemuMonitorPtr mon,
-+                           virArch arch,
-+                           qemuMonitorCPUFeatureTranslationCallback translate,
-+                           void *opaque,
-+                           virCPUDataPtr *enabled,
-+                           virCPUDataPtr *disabled);
-+
- int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon);
- 
- typedef struct _qemuMonitorIOThreadInfo qemuMonitorIOThreadInfo;
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index abf952cd34..00a0578809 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -5998,6 +5998,57 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitorPtr mon,
- }
- 
- 
-+static int
-+qemuMonitorJSONGetStringListProperty(qemuMonitorPtr mon,
-+                                     const char *path,
-+                                     const char *property,
-+                                     char ***strList)
-+{
-+    VIR_AUTOPTR(virJSONValue) cmd = NULL;
-+    VIR_AUTOPTR(virJSONValue) reply = NULL;
-+    VIR_AUTOSTRINGLIST list = NULL;
-+    virJSONValuePtr data;
-+    size_t n;
-+    size_t i;
-+
-+    *strList = NULL;
-+
-+    if (!(cmd = qemuMonitorJSONMakeCommand("qom-get",
-+                                           "s:path", path,
-+                                           "s:property", property,
-+                                           NULL)))
-+        return -1;
-+
-+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-+        return -1;
-+
-+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
-+        return -1;
-+
-+    data = virJSONValueObjectGetArray(reply, "return");
-+    n = virJSONValueArraySize(data);
-+
-+    if (VIR_ALLOC_N(list, n + 1) < 0)
-+        return -1;
-+
-+    for (i = 0; i < n; i++) {
-+        virJSONValuePtr item = virJSONValueArrayGet(data, i);
-+
-+        if (virJSONValueGetType(item) != VIR_JSON_TYPE_STRING) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("unexpected value in %s array"), property);
-+            return -1;
-+        }
-+
-+        if (VIR_STRDUP(list[i], virJSONValueGetString(item)) < 0)
-+            return -1;
-+    }
-+
-+    VIR_STEAL_PTR(*strList, list);
-+    return n;
-+}
-+
-+
- #define MAKE_SET_CMD(STRING, VALUE) \
-     cmd = qemuMonitorJSONMakeCommand("qom-set", \
-                                       "s:path", path, \
-@@ -7207,6 +7258,141 @@ qemuMonitorJSONGetGuestCPUx86(qemuMonitorPtr mon,
-     return -1;
- }
- 
-+
-+static int
-+qemuMonitorJSONGetCPUProperties(qemuMonitorPtr mon,
-+                                char ***props)
-+{
-+    VIR_AUTOPTR(virJSONValue) cmd = NULL;
-+    VIR_AUTOPTR(virJSONValue) reply = NULL;
-+
-+    *props = NULL;
-+
-+    if (!(cmd = qemuMonitorJSONMakeCommand("qom-list",
-+                                           "s:path", QOM_CPU_PATH,
-+                                           NULL)))
-+        return -1;
-+
-+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-+        return -1;
-+
-+    if (qemuMonitorJSONHasError(reply, "DeviceNotFound"))
-+        return 0;
-+
-+    return qemuMonitorJSONParsePropsList(cmd, reply, "bool", props);
-+}
-+
-+
-+static int
-+qemuMonitorJSONGetCPUData(qemuMonitorPtr mon,
-+                          qemuMonitorCPUFeatureTranslationCallback translate,
-+                          void *opaque,
-+                          virCPUDataPtr data)
-+{
-+    qemuMonitorJSONObjectProperty prop = { .type = QEMU_MONITOR_OBJECT_PROPERTY_BOOLEAN };
-+    VIR_AUTOSTRINGLIST props = NULL;
-+    char **p;
-+
-+    if (qemuMonitorJSONGetCPUProperties(mon, &props) < 0)
-+        return -1;
-+
-+    for (p = props; p && *p; p++) {
-+        const char *name = *p;
-+
-+        if (qemuMonitorJSONGetObjectProperty(mon, QOM_CPU_PATH, name, &prop) < 0)
-+            return -1;
-+
-+        if (!prop.val.b)
-+            continue;
-+
-+        if (translate)
-+            name = translate(name, opaque);
-+
-+        if (virCPUDataAddFeature(data, name) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+qemuMonitorJSONGetCPUDataDisabled(qemuMonitorPtr mon,
-+                                  qemuMonitorCPUFeatureTranslationCallback translate,
-+                                  void *opaque,
-+                                  virCPUDataPtr data)
-+{
-+    VIR_AUTOSTRINGLIST props = NULL;
-+    char **p;
-+
-+    if (qemuMonitorJSONGetStringListProperty(mon, QOM_CPU_PATH,
-+                                             "unavailable-features", &props) < 0)
-+        return -1;
-+
-+    for (p = props; p && *p; p++) {
-+        const char *name = *p;
-+
-+        if (translate)
-+            name = translate(name, opaque);
-+
-+        if (virCPUDataAddFeature(data, name) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+/**
-+ * qemuMonitorJSONGetGuestCPU:
-+ * @mon: Pointer to the monitor
-+ * @arch: CPU architecture
-+ * @translate: callback for translating CPU feature names from QEMU to libvirt
-+ * @opaque: data for @translate callback
-+ * @enabled: returns the CPU data for all enabled features
-+ * @disabled: returns the CPU data for features which we asked for
-+ *      (either explicitly or via a named CPU model) but QEMU disabled them
-+ *
-+ * Retrieve the definition of the guest CPU from a running QEMU instance.
-+ *
-+ * Returns 0 on success, -1 on error.
-+ */
-+int
-+qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
-+                           virArch arch,
-+                           qemuMonitorCPUFeatureTranslationCallback translate,
-+                           void *opaque,
-+                           virCPUDataPtr *enabled,
-+                           virCPUDataPtr *disabled)
-+{
-+    virCPUDataPtr cpuEnabled = NULL;
-+    virCPUDataPtr cpuDisabled = NULL;
-+    int ret = -1;
-+
-+    if (!(cpuEnabled = virCPUDataNew(arch)) ||
-+        !(cpuDisabled = virCPUDataNew(arch)))
-+        goto cleanup;
-+
-+    if (qemuMonitorJSONGetCPUData(mon, translate, opaque, cpuEnabled) < 0)
-+        goto cleanup;
-+
-+    if (disabled &&
-+        qemuMonitorJSONGetCPUDataDisabled(mon, translate, opaque, cpuDisabled) < 0)
-+        goto cleanup;
-+
-+    VIR_STEAL_PTR(*enabled, cpuEnabled);
-+    if (disabled)
-+        VIR_STEAL_PTR(*disabled, cpuDisabled);
-+
-+    ret = 0;
-+
-+ cleanup:
-+    virCPUDataFree(cpuEnabled);
-+    virCPUDataFree(cpuDisabled);
-+    return ret;
-+}
-+
-+
- int
- qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon)
- {
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 57bed027e2..29b10aad26 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -490,6 +490,13 @@ int qemuMonitorJSONGetGuestCPUx86(qemuMonitorPtr mon,
-                                   virCPUDataPtr *data,
-                                   virCPUDataPtr *disabled);
- 
-+int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
-+                               virArch arch,
-+                               qemuMonitorCPUFeatureTranslationCallback translate,
-+                               void *opaque,
-+                               virCPUDataPtr *enabled,
-+                               virCPUDataPtr *disabled);
-+
- int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon);
- 
- int qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Introduce-zPCI-capability.patch b/SOURCES/libvirt-qemu-Introduce-zPCI-capability.patch
deleted file mode 100644
index 2bb0270..0000000
--- a/SOURCES/libvirt-qemu-Introduce-zPCI-capability.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 3ff9abfcfa6a79c47755a6e8d9da5b1bc4bdd655 Mon Sep 17 00:00:00 2001
-Message-Id: <3ff9abfcfa6a79c47755a6e8d9da5b1bc4bdd655@dist-git>
-From: Yi Min Zhao <zyimin@linux.ibm.com>
-Date: Mon, 8 Apr 2019 10:57:19 +0200
-Subject: [PATCH] qemu: Introduce zPCI capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Let's introduce zPCI capability.
-
-Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-(cherry-picked from commit 29ad952f7e50bbbd920cbfb009a45b55fdb2f069)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_capabilities.c
-    src/qemu/qemu_capabilities.h
-    + several capabilities have not been backported
-
-Removed:
-
-  * tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-    + the file does not exist at all downstream
-      - missing d7434ae8009f
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-3-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                     | 2 ++
- src/qemu/qemu_capabilities.h                     | 1 +
- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml  | 1 +
- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml  | 1 +
- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml  | 1 +
- 8 files changed, 9 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 0d6fa02560..8ca53abf2b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -512,6 +512,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               /* 315 */
-               "vfio-pci.display",
-               "vfio-ap",
-+              "zpci",
-               "machine.pseries.cap-nested-hv",
-     );
- 
-@@ -1153,6 +1154,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "mch", QEMU_CAPS_DEVICE_MCH },
-     { "sev-guest", QEMU_CAPS_SEV_GUEST },
-     { "vfio-ap", QEMU_CAPS_DEVICE_VFIO_AP },
-+    { "zpci", QEMU_CAPS_DEVICE_ZPCI },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 9550df2cd5..bea4767f3c 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -492,6 +492,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     /* 315 */
-     QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
-     QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
-+    QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-index 7347f5683f..b46efe880d 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-@@ -120,6 +120,7 @@
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-   <flag name='egl-headless'/>
-+  <flag name='zpci'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>307899</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-index b359f9a049..3ac1fc941c 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-@@ -127,6 +127,7 @@
-   <flag name='vhost-vsock'/>
-   <flag name='tpm-emulator'/>
-   <flag name='egl-headless'/>
-+  <flag name='zpci'/>
-   <version>2011000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>346751</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-index 7121da27a0..184f115fe4 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-@@ -135,6 +135,7 @@
-   <flag name='tpm-emulator'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-+  <flag name='zpci'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>375999</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
-index 9ed25178f8..b04a9fbfd5 100644
---- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
-@@ -107,6 +107,7 @@
-   <flag name='nbd-tls'/>
-   <flag name='virtual-css-bridge'/>
-   <flag name='sdl-gl'/>
-+  <flag name='zpci'/>
-   <version>2007000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>220792</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-index 646239ff25..b2b267be8d 100644
---- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-@@ -110,6 +110,7 @@
-   <flag name='virtual-css-bridge'/>
-   <flag name='sdl-gl'/>
-   <flag name='vhost-vsock'/>
-+  <flag name='zpci'/>
-   <version>2007093</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>246206</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-index 09d68e1f18..f908ab88f3 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-@@ -114,6 +114,7 @@
-   <flag name='sdl-gl'/>
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-+  <flag name='zpci'/>
-   <version>2009000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>269625</microcodeVersion>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Make-qemuMonitorGetGuestCPU-usable-on-x86-only.patch b/SOURCES/libvirt-qemu-Make-qemuMonitorGetGuestCPU-usable-on-x86-only.patch
deleted file mode 100644
index 5440132..0000000
--- a/SOURCES/libvirt-qemu-Make-qemuMonitorGetGuestCPU-usable-on-x86-only.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 53744fa2afeb19f0ce31cb109e0b3c1f1c8b815b Mon Sep 17 00:00:00 2001
-Message-Id: <53744fa2afeb19f0ce31cb109e0b3c1f1c8b815b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:58 +0200
-Subject: [PATCH] qemu: Make qemuMonitorGetGuestCPU usable on x86 only
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It was never implemented or used for anything else anyway. Mainly
-because it uses CPUID features bits. The function is renamed as
-qemuMonitorGetGuestCPUx86 to make this explicit.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 055f8f6bb953a8a489729d6cd62e55dee058b7e6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <8e07e0a4f5f751bacf5e23fcdc6b93265b819359.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor.c      | 15 +++++-------
- src/qemu/qemu_monitor.h      |  7 +++---
- src/qemu/qemu_monitor_json.c | 47 +++++++++++++++---------------------
- src/qemu/qemu_monitor_json.h |  7 +++---
- src/qemu/qemu_process.c      |  3 +--
- tests/qemumonitorjsontest.c  | 10 +++-----
- 6 files changed, 36 insertions(+), 53 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index bc116e4e2d..b35187b66d 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4047,9 +4047,8 @@ qemuMonitorSetDomainLog(qemuMonitorPtr mon,
- 
- 
- /**
-- * qemuMonitorJSONGetGuestCPU:
-+ * qemuMonitorJSONGetGuestCPUx86:
-  * @mon: Pointer to the monitor
-- * @arch: arch of the guest
-  * @data: returns the cpu data
-  * @disabled: returns the CPU data for features which were disabled by QEMU
-  *
-@@ -4059,13 +4058,11 @@ qemuMonitorSetDomainLog(qemuMonitorPtr mon,
-  * -1 on other errors.
-  */
- int
--qemuMonitorGetGuestCPU(qemuMonitorPtr mon,
--                       virArch arch,
--                       virCPUDataPtr *data,
--                       virCPUDataPtr *disabled)
-+qemuMonitorGetGuestCPUx86(qemuMonitorPtr mon,
-+                          virCPUDataPtr *data,
-+                          virCPUDataPtr *disabled)
- {
--    VIR_DEBUG("arch=%s data=%p disabled=%p",
--              virArchToString(arch), data, disabled);
-+    VIR_DEBUG("data=%p disabled=%p", data, disabled);
- 
-     QEMU_CHECK_MONITOR(mon);
- 
-@@ -4073,7 +4070,7 @@ qemuMonitorGetGuestCPU(qemuMonitorPtr mon,
-     if (disabled)
-         *disabled = NULL;
- 
--    return qemuMonitorJSONGetGuestCPU(mon, arch, data, disabled);
-+    return qemuMonitorJSONGetGuestCPUx86(mon, data, disabled);
- }
- 
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 81474a04f6..b4d484c703 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1095,10 +1095,9 @@ void qemuMonitorSetDomainLog(qemuMonitorPtr mon,
-                              void *opaque,
-                              virFreeCallback destroy);
- 
--int qemuMonitorGetGuestCPU(qemuMonitorPtr mon,
--                           virArch arch,
--                           virCPUDataPtr *data,
--                           virCPUDataPtr *disabled);
-+int qemuMonitorGetGuestCPUx86(qemuMonitorPtr mon,
-+                              virCPUDataPtr *data,
-+                              virCPUDataPtr *disabled);
- 
- int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon);
- 
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index e6ac82e96b..8fead72ecf 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -7157,9 +7157,8 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon)
- 
- 
- /**
-- * qemuMonitorJSONGetGuestCPU:
-+ * qemuMonitorJSONGetGuestCPUx86:
-  * @mon: Pointer to the monitor
-- * @arch: arch of the guest
-  * @data: returns the cpu data of the guest
-  * @disabled: returns the CPU data for features which were disabled by QEMU
-  *
-@@ -7169,40 +7168,32 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon)
-  * -1 on other errors.
-  */
- int
--qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
--                           virArch arch,
--                           virCPUDataPtr *data,
--                           virCPUDataPtr *disabled)
-+qemuMonitorJSONGetGuestCPUx86(qemuMonitorPtr mon,
-+                              virCPUDataPtr *data,
-+                              virCPUDataPtr *disabled)
- {
-     virCPUDataPtr cpuEnabled = NULL;
-     virCPUDataPtr cpuDisabled = NULL;
-     int rc;
- 
--    if (ARCH_IS_X86(arch)) {
--        if ((rc = qemuMonitorJSONCheckCPUx86(mon)) < 0)
--            return -1;
--        else if (!rc)
--            return -2;
-+    if ((rc = qemuMonitorJSONCheckCPUx86(mon)) < 0)
-+        return -1;
-+    else if (!rc)
-+        return -2;
- 
--        if (qemuMonitorJSONGetCPUx86Data(mon, "feature-words",
--                                         &cpuEnabled) < 0)
--            goto error;
-+    if (qemuMonitorJSONGetCPUx86Data(mon, "feature-words",
-+                                     &cpuEnabled) < 0)
-+        goto error;
- 
--        if (disabled &&
--            qemuMonitorJSONGetCPUx86Data(mon, "filtered-features",
--                                         &cpuDisabled) < 0)
--            goto error;
-+    if (disabled &&
-+        qemuMonitorJSONGetCPUx86Data(mon, "filtered-features",
-+                                     &cpuDisabled) < 0)
-+        goto error;
- 
--        *data = cpuEnabled;
--        if (disabled)
--            *disabled = cpuDisabled;
--        return 0;
--    }
--
--    virReportError(VIR_ERR_INTERNAL_ERROR,
--                   _("CPU definition retrieval isn't supported for '%s'"),
--                   virArchToString(arch));
--    return -1;
-+    *data = cpuEnabled;
-+    if (disabled)
-+        *disabled = cpuDisabled;
-+    return 0;
- 
-  error:
-     virCPUDataFree(cpuEnabled);
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 66536ceb97..57bed027e2 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -486,10 +486,9 @@ int qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon,
-                                  const char *property,
-                                  virCPUDataPtr *cpudata);
- 
--int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
--                               virArch arch,
--                               virCPUDataPtr *data,
--                               virCPUDataPtr *disabled);
-+int qemuMonitorJSONGetGuestCPUx86(qemuMonitorPtr mon,
-+                                  virCPUDataPtr *data,
-+                                  virCPUDataPtr *disabled);
- 
- int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon);
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index bc573f96a4..59a739f262 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4034,8 +4034,7 @@ qemuProcessFetchGuestCPU(virQEMUDriverPtr driver,
-     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-         goto error;
- 
--    rc = qemuMonitorGetGuestCPU(priv->mon, vm->def->os.arch,
--                                &dataEnabled, &dataDisabled);
-+    rc = qemuMonitorGetGuestCPUx86(priv->mon, &dataEnabled, &dataDisabled);
- 
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto error;
-diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
-index 2eefd06b6e..ef9a549c04 100644
---- a/tests/qemumonitorjsontest.c
-+++ b/tests/qemumonitorjsontest.c
-@@ -2437,9 +2437,8 @@ testQemuMonitorJSONGetCPUData(const void *opaque)
-     if (qemuMonitorTestAddItem(test, "qom-get", jsonStr) < 0)
-         goto cleanup;
- 
--    if (qemuMonitorJSONGetGuestCPU(qemuMonitorTestGetMonitor(test),
--                                   VIR_ARCH_X86_64,
--                                   &cpuData, NULL) < 0)
-+    if (qemuMonitorJSONGetGuestCPUx86(qemuMonitorTestGetMonitor(test),
-+                                      &cpuData, NULL) < 0)
-         goto cleanup;
- 
-     if (!(actual = virCPUDataFormat(cpuData)))
-@@ -2480,9 +2479,8 @@ testQemuMonitorJSONGetNonExistingCPUData(const void *opaque)
-                                "}") < 0)
-         goto cleanup;
- 
--    rv = qemuMonitorJSONGetGuestCPU(qemuMonitorTestGetMonitor(test),
--                                   VIR_ARCH_X86_64,
--                                   &cpuData, NULL);
-+    rv = qemuMonitorJSONGetGuestCPUx86(qemuMonitorTestGetMonitor(test),
-+                                       &cpuData, NULL);
-     if (rv != -2) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        "Unexpected return value %d, expecting -2", rv);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Map-running-reason-to-resume-event-detail.patch b/SOURCES/libvirt-qemu-Map-running-reason-to-resume-event-detail.patch
deleted file mode 100644
index 2cc856c..0000000
--- a/SOURCES/libvirt-qemu-Map-running-reason-to-resume-event-detail.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 281b3fe785078497e4bb3156fe4da9af91f204c2 Mon Sep 17 00:00:00 2001
-Message-Id: <281b3fe785078497e4bb3156fe4da9af91f204c2@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 11 Sep 2018 15:13:08 +0200
-Subject: [PATCH] qemu: Map running reason to resume event detail
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to the previous commit the RESUME event handler knows what reason
-should be used when changing the domain state to VIR_DOMAIN_RUNNING, but
-the emitted VIR_DOMAIN_EVENT_RESUMED event still uses a generic
-VIR_DOMAIN_EVENT_RESUMED_UNPAUSED detail. Luckily, the event detail can
-be easily deduced from the running reason, which saves us from having to
-pass one more value to the handler.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 8ae9b49f5a4a02f57a1dfa20d4fe04c3d40a4665)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634758
-https://bugzilla.redhat.com/show_bug.cgi?id=1634759
-
-Conflicts:
-	src/qemu/qemu_domain.c
-	src/qemu/qemu_domain.h
-            - nodenames code is not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.c  | 29 +++++++++++++++++++++++++++++
- src/qemu/qemu_domain.h  |  3 +++
- src/qemu/qemu_process.c | 11 +++++++----
- 3 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 17be6e5537..d80f9b393e 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -13149,3 +13149,32 @@ qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv)
- 
-     return ret;
- }
-+
-+
-+virDomainEventResumedDetailType
-+qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason)
-+{
-+    switch (reason) {
-+    case VIR_DOMAIN_RUNNING_RESTORED:
-+    case VIR_DOMAIN_RUNNING_FROM_SNAPSHOT:
-+        return VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT;
-+
-+    case VIR_DOMAIN_RUNNING_MIGRATED:
-+    case VIR_DOMAIN_RUNNING_MIGRATION_CANCELED:
-+        return VIR_DOMAIN_EVENT_RESUMED_MIGRATED;
-+
-+    case VIR_DOMAIN_RUNNING_POSTCOPY:
-+        return VIR_DOMAIN_EVENT_RESUMED_POSTCOPY;
-+
-+    case VIR_DOMAIN_RUNNING_UNKNOWN:
-+    case VIR_DOMAIN_RUNNING_SAVE_CANCELED:
-+    case VIR_DOMAIN_RUNNING_BOOTED:
-+    case VIR_DOMAIN_RUNNING_UNPAUSED:
-+    case VIR_DOMAIN_RUNNING_WAKEUP:
-+    case VIR_DOMAIN_RUNNING_CRASHED:
-+    case VIR_DOMAIN_RUNNING_LAST:
-+        break;
-+    }
-+
-+    return VIR_DOMAIN_EVENT_RESUMED_UNPAUSED;
-+}
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 6a96f27a5f..cc406e3ca0 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -1066,4 +1066,7 @@ qemuDomainDiskCachemodeFlags(int cachemode,
- 
- char * qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv);
- 
-+virDomainEventResumedDetailType
-+qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason);
-+
- #endif /* __QEMU_DOMAIN_H__ */
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 7325bc4c90..37568165b7 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -694,6 +694,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-     qemuDomainObjPrivatePtr priv;
-     virDomainRunningReason reason = VIR_DOMAIN_RUNNING_UNPAUSED;
-+    virDomainEventResumedDetailType eventDetail;
- 
-     virObjectLock(vm);
- 
-@@ -709,14 +710,16 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-             goto unlock;
-         }
- 
-+        eventDetail = qemuDomainRunningReasonToResumeEvent(reason);
-         VIR_DEBUG("Transitioned guest %s out of paused into resumed state, "
--                  "reason '%s'",
--                  vm->def->name, virDomainRunningReasonTypeToString(reason));
-+                  "reason '%s', event detail %d",
-+                  vm->def->name, virDomainRunningReasonTypeToString(reason),
-+                  eventDetail);
- 
-         virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason);
-         event = virDomainEventLifecycleNewFromObj(vm,
--                                         VIR_DOMAIN_EVENT_RESUMED,
--                                         VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
-+                                                  VIR_DOMAIN_EVENT_RESUMED,
-+                                                  eventDetail);
- 
-         if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) {
-             VIR_WARN("Unable to save status on vm %s after state change",
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Pass-running-reason-to-RESUME-event-handler.patch b/SOURCES/libvirt-qemu-Pass-running-reason-to-RESUME-event-handler.patch
deleted file mode 100644
index 574d6a5..0000000
--- a/SOURCES/libvirt-qemu-Pass-running-reason-to-RESUME-event-handler.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From a2e308060512eb7d4ee00f7baddb7394d6e9e4e6 Mon Sep 17 00:00:00 2001
-Message-Id: <a2e308060512eb7d4ee00f7baddb7394d6e9e4e6@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Mon, 10 Sep 2018 19:41:53 +0200
-Subject: [PATCH] qemu: Pass running reason to RESUME event handler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Whenever we get the RESUME event from QEMU, we change the state of the
-affected domain to VIR_DOMAIN_RUNNING with VIR_DOMAIN_RUNNING_UNPAUSED
-reason. This is fine if the domain is resumed unexpectedly, but when we
-sent "cont" to QEMU we usually have a better reason for the state
-change. The better reason is used in qemuProcessStartCPUs which also
-sets the domain state to running if qemuMonitorStartCPUs reports
-success. Thus we may end up with two state updates in a row, but the
-final reason is correct.
-
-This patch is a preparation for dropping the state change done in
-qemuMonitorStartCPUs for which we need to pass the actual running reason
-to the RESUME event handler and use it there instead of
-VIR_DOMAIN_RUNNING_UNPAUSED.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 5dab984ed0cd0332e59d719420ab2f9d009b952f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634758
-https://bugzilla.redhat.com/show_bug.cgi?id=1634759
-
-Conflicts:
-	src/qemu/qemu_domain.h
-            - nodenames code is not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.h  |  4 ++++
- src/qemu/qemu_process.c | 23 +++++++++++++++++------
- 2 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index e748d78adb..6a96f27a5f 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -363,6 +363,10 @@ struct _qemuDomainObjPrivate {
- 
-     /* true if qemu-pr-helper process is running for the domain */
-     bool prDaemonRunning;
-+
-+    /* qemuProcessStartCPUs stores the reason for starting vCPUs here for the
-+     * RESUME event handler to use it */
-+    virDomainRunningReason runningReason;
- };
- 
- # define QEMU_DOMAIN_PRIVATE(vm) \
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 26979faa72..7325bc4c90 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -692,21 +692,28 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-     virQEMUDriverPtr driver = opaque;
-     virObjectEventPtr event = NULL;
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-+    qemuDomainObjPrivatePtr priv;
-+    virDomainRunningReason reason = VIR_DOMAIN_RUNNING_UNPAUSED;
- 
-     virObjectLock(vm);
--    if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
--        qemuDomainObjPrivatePtr priv = vm->privateData;
- 
-+    priv = vm->privateData;
-+    if (priv->runningReason != VIR_DOMAIN_RUNNING_UNKNOWN) {
-+        reason = priv->runningReason;
-+        priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN;
-+    }
-+
-+    if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
-         if (priv->gotShutdown) {
-             VIR_DEBUG("Ignoring RESUME event after SHUTDOWN");
-             goto unlock;
-         }
- 
--        VIR_DEBUG("Transitioned guest %s out of paused into resumed state",
--                  vm->def->name);
-+        VIR_DEBUG("Transitioned guest %s out of paused into resumed state, "
-+                  "reason '%s'",
-+                  vm->def->name, virDomainRunningReasonTypeToString(reason));
- 
--        virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
--                                 VIR_DOMAIN_RUNNING_UNPAUSED);
-+        virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason);
-         event = virDomainEventLifecycleNewFromObj(vm,
-                                          VIR_DOMAIN_EVENT_RESUMED,
-                                          VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
-@@ -3051,6 +3058,8 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
-     }
-     VIR_FREE(priv->lockState);
- 
-+    priv->runningReason = reason;
-+
-     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-         goto release;
- 
-@@ -3068,6 +3077,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
-     return ret;
- 
-  release:
-+    priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN;
-     if (virDomainLockProcessPause(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));
-@@ -5928,6 +5938,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
-     priv->monError = false;
-     priv->monStart = 0;
-     priv->gotShutdown = false;
-+    priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN;
- 
-     VIR_DEBUG("Updating guest CPU definition");
-     if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < 0)
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Pass-through-arguments-of-ssh-block-driver-used-by-libguestfs.patch b/SOURCES/libvirt-qemu-Pass-through-arguments-of-ssh-block-driver-used-by-libguestfs.patch
new file mode 100644
index 0000000..0734fd0
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Pass-through-arguments-of-ssh-block-driver-used-by-libguestfs.patch
@@ -0,0 +1,169 @@
+From 2c711c10712280bd4dae442bc68c8e38df3ab171 Mon Sep 17 00:00:00 2001
+Message-Id: <2c711c10712280bd4dae442bc68c8e38df3ab171@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:13 +0100
+Subject: [PATCH] qemu: Pass through arguments of 'ssh' block driver used by
+ libguestfs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We currently don't model the 'ssh' protocol properties properly and
+since it seems impossible for now (agent path passed via environment
+variable). To allow libguestfs to work as it used in pre-blockdev era we
+must carry the properties over to the command line. For this instance we
+just store it internally and format it back.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit d6db013c6e507fe45ebc07fa109e608cf7451b22)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <521e8b33432bfa847007866c631d6d6454f08ea3.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                              | 10 ++++++++++
+ src/util/virstoragefile.c                          | 13 +++++++++++++
+ src/util/virstoragefile.h                          |  5 +++++
+ tests/qemublocktest.c                              |  1 +
+ .../jsontojson/ssh-passthrough-libguestfs-in.json  |  1 +
+ .../jsontojson/ssh-passthrough-libguestfs-out.json | 14 ++++++++++++++
+ 6 files changed, 44 insertions(+)
+ create mode 100644 tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-in.json
+ create mode 100644 tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-out.json
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index b077e2e02f..141059ae81 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -911,6 +911,7 @@ qemuBlockStorageSourceGetSshProps(virStorageSourcePtr src)
+     g_autoptr(virJSONValue) serverprops = NULL;
+     virJSONValuePtr ret = NULL;
+     const char *username = NULL;
++    g_autoptr(virJSONValue) host_key_check = NULL;
+ 
+     if (src->nhosts != 1) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+@@ -924,11 +925,20 @@ qemuBlockStorageSourceGetSshProps(virStorageSourcePtr src)
+ 
+     if (src->auth)
+         username = src->auth->username;
++    else if (src->ssh_user)
++        username = src->ssh_user;
++
++    if (src->ssh_host_key_check_disabled &&
++        virJSONValueObjectCreate(&host_key_check,
++                                 "s:mode", "none",
++                                 NULL) < 0)
++        return NULL;
+ 
+     if (virJSONValueObjectCreate(&ret,
+                                  "s:path", src->path,
+                                  "a:server", &serverprops,
+                                  "S:user", username,
++                                 "A:host-key-check", &host_key_check,
+                                  NULL) < 0)
+         return NULL;
+ 
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 9eca186e99..ce126f5cba 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2464,6 +2464,10 @@ virStorageSourceCopy(const virStorageSource *src,
+             return NULL;
+     }
+ 
++    /* ssh config passthrough for libguestfs */
++    def->ssh_host_key_check_disabled = src->ssh_host_key_check_disabled;
++    def->ssh_user = g_strdup(src->ssh_user);
++
+     return g_steal_pointer(&def);
+ }
+ 
+@@ -2705,6 +2709,8 @@ virStorageSourceClear(virStorageSourcePtr def)
+     VIR_FREE(def->tlsAlias);
+     VIR_FREE(def->tlsCertdir);
+ 
++    VIR_FREE(def->ssh_user);
++
+     virStorageSourceInitiatorClear(&def->initiator);
+ 
+     /* clear everything except the class header as the object APIs
+@@ -3635,6 +3641,8 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
+     const char *path = virJSONValueObjectGetString(json, "path");
+     const char *host = virJSONValueObjectGetString(json, "host");
+     const char *port = virJSONValueObjectGetString(json, "port");
++    const char *user = virJSONValueObjectGetString(json, "user");
++    const char *host_key_check = virJSONValueObjectGetString(json, "host_key_check");
+     virJSONValuePtr server = virJSONValueObjectGetObject(json, "server");
+ 
+     if (!(host || server) || !path) {
+@@ -3665,6 +3673,11 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
+             return -1;
+     }
+ 
++    /* these two are parsed just to be passed back as we don't model them yet */
++    src->ssh_user = g_strdup(user);
++    if (STREQ_NULLABLE(host_key_check, "no"))
++        src->ssh_host_key_check_disabled = true;
++
+     return 0;
+ }
+ 
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 1abdaf89ce..c1430cadd1 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -385,6 +385,11 @@ struct _virStorageSource {
+                        as a source for floppy drive */
+ 
+     bool hostcdrom; /* backing device is a cdrom */
++
++    /* passthrough variables for the ssh driver which we don't handle properly */
++    /* these must not be used apart from formatting the output JSON in the qemu driver */
++    char *ssh_user;
++    bool ssh_host_key_check_disabled;
+ };
+ 
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageSource, virObjectUnref);
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index d8bd811b4d..f48875e16d 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1132,6 +1132,7 @@ mymain(void)
+     jsontojsondata.schemaroot = qmp_schemaroot_x86_64_blockdev_add;
+ 
+     TEST_JSON_TO_JSON("curl-libguestfs");
++    TEST_JSON_TO_JSON("ssh-passthrough-libguestfs");
+ 
+ #define TEST_IMAGE_CREATE(testname, testbacking) \
+     do { \
+diff --git a/tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-in.json b/tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-in.json
+new file mode 100644
+index 0000000000..da8fedef07
+--- /dev/null
++++ b/tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-in.json
+@@ -0,0 +1 @@
++json:{"file.driver":"ssh","file.user":"testuser","file.host":"random.host","file.port":1234,"file.path":"somewhere/something","file.host_key_check":"no"}
+diff --git a/tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-out.json b/tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-out.json
+new file mode 100644
+index 0000000000..1f6032deb4
+--- /dev/null
++++ b/tests/qemublocktestdata/jsontojson/ssh-passthrough-libguestfs-out.json
+@@ -0,0 +1,14 @@
++{
++  "driver": "ssh",
++  "path": "somewhere/something",
++  "server": {
++    "host": "random.host",
++    "port": "22"
++  },
++  "user": "testuser",
++  "host-key-check": {
++    "mode": "none"
++  },
++  "auto-read-only": true,
++  "discard": "unmap"
++}
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Prefer-dashes-for-hyperv-features.patch b/SOURCES/libvirt-qemu-Prefer-dashes-for-hyperv-features.patch
deleted file mode 100644
index c85d49e..0000000
--- a/SOURCES/libvirt-qemu-Prefer-dashes-for-hyperv-features.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 3338d2ca3f36c9f9546cbcd436c344c8a3c97285 Mon Sep 17 00:00:00 2001
-Message-Id: <3338d2ca3f36c9f9546cbcd436c344c8a3c97285@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Feb 2020 10:41:42 +0100
-Subject: [PATCH] qemu: Prefer dashes for hyperv features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with QEMU 4.1, we're using the canonical feature names on the
-command line and avoid aliases to prepare for possible deprecation of
-all aliases in QEMU. But we do so only for features from our CPU map,
-hyperv features defined in the code were unchanged and this patch fixes
-it. Some features use "hv-" prefix unconditionally because they were
-introduced recently enough to always support spelling with a dash.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Tested-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit d99e8f01c7f9b5a0f384ccaac40187091a4e6c6c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1794868
-
-Conflicts:
-	tests/qemuxml2argvdata/hyperv.args
-            - a few extra hyperv features upstream
-
-Since "unavailable-features" QOM property was backported to QEMU 2.12,
-we would effectively start using "hv-" prefix (instead of "hv_") for all
-hyperv features. This is fine because the downstream version of QEMU
-with "unavailable-features" backported defines all supported hyperv
-features with dashes.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <57ee0267b028177420edeae0edcf479de3f52820.1581064395.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                         | 17 ++++++++++++-----
- .../clock-timer-hyperv-rtc.args                 |  2 +-
- tests/qemuxml2argvdata/hyperv-panic.args        |  2 +-
- tests/qemuxml2argvdata/hyperv.args              |  4 ++--
- tests/qemuxml2argvdata/panic-double.args        |  2 +-
- 5 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 2b885e98dd..0289a907a1 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6995,7 +6995,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-                                 !!timer->present);
-         } else if (timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK &&
-                    timer->present == 1) {
--            virBufferAddLit(&buf, ",hv_time");
-+            virBufferAddLit(&buf, ",hv-time");
-         } else if (timer->name == VIR_DOMAIN_TIMER_NAME_TSC &&
-                    timer->frequency > 0) {
-             virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
-@@ -7013,6 +7013,11 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-     }
- 
-     if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) {
-+        const char *hvPrefix = "hv-";
-+
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES))
-+            hvPrefix = "hv_";
-+
-         for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) {
-             switch ((virDomainHyperv) i) {
-             case VIR_DOMAIN_HYPERV_RELAXED:
-@@ -7026,19 +7031,21 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
-             case VIR_DOMAIN_HYPERV_TLBFLUSH:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
--                    virBufferAsprintf(&buf, ",hv_%s",
-+                    virBufferAsprintf(&buf, ",%s%s",
-+                                      hvPrefix,
-                                       virDomainHypervTypeToString(i));
-                 break;
- 
-             case VIR_DOMAIN_HYPERV_SPINLOCKS:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
--                    virBufferAsprintf(&buf, ",hv_spinlocks=0x%x",
-+                    virBufferAsprintf(&buf, ",%s=0x%x",
-+                                      VIR_CPU_x86_KVM_HV_SPINLOCKS,
-                                       def->hyperv_spinlocks);
-                 break;
- 
-             case VIR_DOMAIN_HYPERV_VENDOR_ID:
-                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
--                    virBufferAsprintf(&buf, ",hv_vendor_id=%s",
-+                    virBufferAsprintf(&buf, ",hv-vendor-id=%s",
-                                       def->hyperv_vendor_id);
-                 break;
- 
-@@ -7051,7 +7058,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
- 
-     for (i = 0; i < def->npanics; i++) {
-         if (def->panics[i]->model == VIR_DOMAIN_PANIC_MODEL_HYPERV) {
--            virBufferAddLit(&buf, ",hv_crash");
-+            virBufferAddLit(&buf, ",hv-crash");
-             break;
-         }
-     }
-diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
-index 6045fbdbf2..1e36d139f9 100644
---- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
-+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
- -name QEMUGuest1 \
- -S \
- -machine pc,accel=kvm,usb=off,dump-guest-core=off \
---cpu qemu32,hv_time \
-+-cpu qemu32,hv-time \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxml2argvdata/hyperv-panic.args b/tests/qemuxml2argvdata/hyperv-panic.args
-index fca46d7371..627fb09502 100644
---- a/tests/qemuxml2argvdata/hyperv-panic.args
-+++ b/tests/qemuxml2argvdata/hyperv-panic.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
- -name QEMUGuest1 \
- -S \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
---cpu qemu32,hv_crash \
-+-cpu qemu32,hv-crash \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
-index 6ee6198fb0..a5fc6a1121 100644
---- a/tests/qemuxml2argvdata/hyperv.args
-+++ b/tests/qemuxml2argvdata/hyperv.args
-@@ -8,8 +8,8 @@ QEMU_AUDIO_DRV=none \
- -name QEMUGuest1 \
- -S \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
---cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
--hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies,\
-+-cpu 'qemu32,hv_relaxed,hv_vapic,hv-spinlocks=0x2fff,hv_vpindex,hv_runtime,\
-+hv_synic,hv_stimer,hv_reset,hv-vendor-id=KVM Hv,hv_frequencies,\
- hv_reenlightenment,hv_tlbflush' \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args
-index 7acee1ae29..8a632477b1 100644
---- a/tests/qemuxml2argvdata/panic-double.args
-+++ b/tests/qemuxml2argvdata/panic-double.args
-@@ -8,7 +8,7 @@ QEMU_AUDIO_DRV=none \
- -name QEMUGuest1 \
- -S \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
---cpu qemu32,hv_crash \
-+-cpu qemu32,hv-crash \
- -m 214 \
- -smp 6,sockets=6,cores=1,threads=1 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-qemu-Probe-for-max-x86_64-cpu-type.patch b/SOURCES/libvirt-qemu-Probe-for-max-x86_64-cpu-type.patch
deleted file mode 100644
index 35b0e23..0000000
--- a/SOURCES/libvirt-qemu-Probe-for-max-x86_64-cpu-type.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From e26a52e067bfeeab95f6cd4bb0717e202ffd7279 Mon Sep 17 00:00:00 2001
-Message-Id: <e26a52e067bfeeab95f6cd4bb0717e202ffd7279@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:52 +0200
-Subject: [PATCH] qemu: Probe for max-x86_64-cpu type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We will use it to check whether QEMU supports a specific CPU property.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2a4c23210674b453f91569f0f4b9fd5ebe8d7906)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-	src/qemu/qemu_capabilities.h
-	tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-            - several capabilities are missing
-
-	tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-            - test files are missing
-
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-            - several capabilities are missing
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5b1c1caf31b481ba608cc850463ff02b2381c382.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                      | 2 ++
- src/qemu/qemu_capabilities.h                      | 1 +
- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml  | 1 +
- 8 files changed, 9 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index d2a2f7418a..4515da4b91 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -514,6 +514,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "vfio-ap",
-               "zpci",
-               "machine.pseries.cap-nested-hv",
-+              "x86-max-cpu",
-     );
- 
- 
-@@ -1155,6 +1156,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "sev-guest", QEMU_CAPS_SEV_GUEST },
-     { "vfio-ap", QEMU_CAPS_DEVICE_VFIO_AP },
-     { "zpci", QEMU_CAPS_DEVICE_ZPCI },
-+    { "max-x86_64-cpu", QEMU_CAPS_X86_MAX_CPU },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 8a27acd8a4..25ed5064b9 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -494,6 +494,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
-     QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
-+    QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-index d69a148cd2..bb4c2abdeb 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-@@ -204,6 +204,7 @@
-   <flag name='vhost-vsock'/>
-   <flag name='mch'/>
-   <flag name='egl-headless'/>
-+  <flag name='x86-max-cpu'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>367995</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-index 210f774c4e..32268b29d2 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-@@ -208,6 +208,7 @@
-   <flag name='mch'/>
-   <flag name='mch.extended-tseg-mbytes'/>
-   <flag name='egl-headless'/>
-+  <flag name='x86-max-cpu'/>
-   <version>2011000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>371455</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index f0dc082640..f4416e7b55 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -213,6 +213,7 @@
-   <flag name='sev-guest'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-+  <flag name='x86-max-cpu'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>416196</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-index 31ce52c787..e84d153d9a 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-@@ -198,6 +198,7 @@
-   <flag name='vmgenid'/>
-   <flag name='vhost-vsock'/>
-   <flag name='mch'/>
-+  <flag name='x86-max-cpu'/>
-   <version>2009000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>343984</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index 8992d645e7..dceb719fcf 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -215,6 +215,7 @@
-   <flag name='usb-storage.werror'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-+  <flag name='x86-max-cpu'/>
-   <version>2012090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>438109</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-index 93c5da537a..4836dbb8a4 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -214,6 +214,7 @@
-   <flag name='usb-storage.werror'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-+  <flag name='x86-max-cpu'/>
-   <version>4000050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>456805</microcodeVersion>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Probe-for-unavailable-features-CPU-property.patch b/SOURCES/libvirt-qemu-Probe-for-unavailable-features-CPU-property.patch
deleted file mode 100644
index 76c7619..0000000
--- a/SOURCES/libvirt-qemu-Probe-for-unavailable-features-CPU-property.patch
+++ /dev/null
@@ -1,3972 +0,0 @@
-From 597dd548f0d5a5ddf662ad748f1b1a9f0a456dce Mon Sep 17 00:00:00 2001
-Message-Id: <597dd548f0d5a5ddf662ad748f1b1a9f0a456dce@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:53 +0200
-Subject: [PATCH] qemu: Probe for "unavailable-features" CPU property
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is similar to "filtered-features" property, which reports CPUID bits
-corresponding to disabled features, but more general. The
-"unavailable-features" property supports both CPUID and MSR features by
-listing their names.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0d254bce4ec6fd62c0277d24e28bf018a4c6cb37)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-            - several capabilities check are missing
-
-	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-            - QMP message IDs are different
-
-	tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
-	tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
-            - missing
-
-	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-            - file size based microcode version
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <2cf5c234b2b3e54250f0d8b1e12763d4f8e81247.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                  |    8 +
- src/qemu/qemu_capabilities.h                  |    1 +
- .../caps_2.12.0.x86_64.replies                | 1078 ++++++++++++++-
- .../caps_2.12.0.x86_64.xml                    |    2 +-
- .../caps_3.0.0.x86_64.replies                 | 1116 +++++++++++++++-
- .../caps_3.0.0.x86_64.xml                     |    2 +-
- .../caps_4.1.0.x86_64.replies                 | 1188 ++++++++++++++++-
- .../caps_4.1.0.x86_64.xml                     |    3 +-
- 8 files changed, 3317 insertions(+), 81 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 4515da4b91..beec9d1497 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -515,6 +515,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "zpci",
-               "machine.pseries.cap-nested-hv",
-               "x86-max-cpu",
-+              "cpu-unavailable-features",
-     );
- 
- 
-@@ -1452,6 +1453,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = {
-     { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV },
- };
- 
-+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMaxX86CPU[] = {
-+    { "unavailable-features", QEMU_CAPS_CPU_UNAVAILABLE_FEATURES },
-+};
-+
- static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
-     { "memory-backend-file", virQEMUCapsObjectPropsMemoryBackendFile,
-       ARRAY_CARDINALITY(virQEMUCapsObjectPropsMemoryBackendFile),
-@@ -1459,6 +1464,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
-     { "spapr-machine", virQEMUCapsObjectPropsSPAPRMachine,
-       ARRAY_CARDINALITY(virQEMUCapsObjectPropsSPAPRMachine),
-       -1 },
-+    { "max-x86_64-cpu", virQEMUCapsObjectPropsMaxX86CPU,
-+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsMaxX86CPU),
-+      QEMU_CAPS_X86_MAX_CPU },
- };
- 
- static void
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 25ed5064b9..5aa41efdb0 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -495,6 +495,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
-     QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */
-+    QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-index 6f37e4301e..66a5577e5e 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-@@ -5011,10 +5011,1040 @@
- }
- 
- {
--  "execute": "query-machines",
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "max-x86_64-cpu"
-+  },
-   "id": "libvirt-43"
- }
- 
-+{
-+  "return": [
-+    {
-+      "name": "min-xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "string"
-+    },
-+    {
-+      "name": "gfni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clwb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x2apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock-stable-bit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb_clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min-level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "fxsr-opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "skinit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-crash",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid_msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hypervisor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "enforce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stepping",
-+      "type": "int"
-+    },
-+    {
-+      "name": "sse4_2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4_1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-hv-max-vps",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hv-frequencies",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-hint-dedicated",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp_legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-cache-info",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vendor-id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "movbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowprefetch",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mtrr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wdt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "thread-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "aes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "apic-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "family",
-+      "type": "int"
-+    },
-+    {
-+      "name": "tsc-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pfthreshold",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ospke",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-no-smi-migration",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "filtered-features",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "hv-vpindex",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "adx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bitalg",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "i64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vaes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ia64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid-msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibpb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-synic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tcg-cpuid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nrip_save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lbrv",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdtscp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memory",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "avx512vbmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invtsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdrand",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "socket-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hotpluggable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-steal-time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "l3-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmware-cpuid-freq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xop",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-frequency",
-+      "type": "int"
-+    },
-+    {
-+      "name": "fill-mtrr-mask",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "core-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "intel-pt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sha-ni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmov",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pae",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "abm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "kvm-asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min-xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pdpe1gb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512f",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vbmi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4vnniw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmxext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "decodeassists",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ht",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsave",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "feature-words",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "migratable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnow",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "spec-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model",
-+      "type": "int"
-+    },
-+    {
-+      "name": "nrip-save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lwp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "la57",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ffxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb-clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause-filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_steal_time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm_lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse36",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-stimer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-phys-bits",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "extapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-spinlocks",
-+      "type": "int"
-+    },
-+    {
-+      "name": "pmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vpclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-vpopcntdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512er",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdcm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cr8legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma4",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "erms",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds_cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hotplugged",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-relaxed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512dq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "npt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-tlb-flush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "monitor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "f16c",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdpid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "full-cpuid-auto-level",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xtpr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pku",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vnni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4a",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf-lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaves",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflushopt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ss",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "flushbyasid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause_filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "de",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "est",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "check",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf_lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtes64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsavec",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm-lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512ifma",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdseed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512cd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaveopt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tbm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vme",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "parent_bus",
-+      "type": "link<bus>"
-+    },
-+    {
-+      "name": "lmce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-reset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-runtime",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fpu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds-cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hle",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx8",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mpx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invpcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcommit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "syscall",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hv-time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "osvw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rtm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4fmaps",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phys-bits",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "avx512pf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "osxsave",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cpuid-0xb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-deadline",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xgetbv1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr_opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "popcnt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "umip",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "realized",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pn",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model-id",
-+      "type": "string"
-+    },
-+    {
-+      "name": "crash-information",
-+      "type": "GuestPanicInformation"
-+    },
-+    {
-+      "name": "tsc-scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "node-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "cx16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "topoext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pge",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsgsbase",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmuldq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "misalignsse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-44"
-+}
-+
- {
-   "return": [
-     {
-@@ -5211,12 +6241,12 @@
-       "cpu-max": 255
-     }
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -5730,12 +6760,12 @@
-       "migration-safe": true
-     }
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -5743,12 +6773,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -5756,12 +6786,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-@@ -7048,12 +8078,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -7115,12 +8145,12 @@
-       "capability": "dirty-bitmaps"
-     }
-   ],
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-   "execute": "query-qmp-schema",
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -18488,7 +19518,7 @@
-       "meta-type": "object"
-     }
-   ],
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -18499,7 +19529,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -18689,7 +19719,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -18881,7 +19911,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -19136,7 +20166,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -19150,7 +20180,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -19340,7 +20370,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -19532,7 +20562,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -19787,12 +20817,12 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-   "execute": "query-sev-capabilities",
--  "id": "libvirt-54"
-+  "id": "libvirt-55"
- }
- 
- {
-@@ -19802,7 +20832,7 @@
-     "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
-     "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
-   },
--  "id": "libvirt-54"
-+  "id": "libvirt-55"
- }
- 
- {
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index f4416e7b55..a8a82ca110 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -216,7 +216,7 @@
-   <flag name='x86-max-cpu'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
--  <microcodeVersion>416196</microcodeVersion>
-+  <microcodeVersion>431483</microcodeVersion>
-   <package>v2.12.0-rc0</package>
-   <arch>x86_64</arch>
-   <hostCPU type='kvm' model='base' migratability='yes'>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-index b2f8377248..9f44eb4fae 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-@@ -5123,10 +5123,1072 @@
- }
- 
- {
--  "execute": "query-machines",
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "max-x86_64-cpu"
-+  },
-   "id": "libvirt-43"
- }
- 
-+{
-+  "return": [
-+    {
-+      "name": "min-xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "amd-ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "string"
-+    },
-+    {
-+      "name": "gfni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clwb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x2apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock-stable-bit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb_clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min-level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "fxsr-opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "skinit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid_msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-crash",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hypervisor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "enforce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stepping",
-+      "type": "int"
-+    },
-+    {
-+      "name": "sse4_2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4_1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-hv-max-vps",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hv-frequencies",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-hint-dedicated",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp_legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-cache-info",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vendor-id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "movbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowprefetch",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mtrr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wdt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "thread-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "aes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "apic-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "family",
-+      "type": "int"
-+    },
-+    {
-+      "name": "tsc-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pfthreshold",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-no-smi-migration",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amd-no-ssb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "filtered-features",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "hv-vpindex",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "adx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bitalg",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "i64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vaes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ia64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid-msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibpb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-synic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tcg-cpuid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nrip_save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lbrv",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdtscp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memory",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "avx512vbmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invtsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdrand",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "socket-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hotpluggable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "l3-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-steal-time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmware-cpuid-freq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "legacy-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xop",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-frequency",
-+      "type": "int"
-+    },
-+    {
-+      "name": "fill-mtrr-mask",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "core-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "intel-pt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sha-ni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmov",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pae",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virt-ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "abm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "kvm-asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdpe1gb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min-xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "kvm-mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512f",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vbmi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4vnniw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmxext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "decodeassists",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ht",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsave",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "feature-words",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "migratable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnow",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "spec-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model",
-+      "type": "int"
-+    },
-+    {
-+      "name": "nrip-save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lwp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "la57",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ffxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb-clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause-filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_steal_time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm_lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse36",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-stimer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-phys-bits",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "extapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-spinlocks",
-+      "type": "int"
-+    },
-+    {
-+      "name": "pmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vpclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-vpopcntdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512er",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdcm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cr8legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma4",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "erms",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds_cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "sep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplugged",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-relaxed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cldemote",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vnni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512dq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "npt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-tlb-flush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "monitor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "f16c",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdpid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "full-cpuid-auto-level",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xtpr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pku",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-tlbflush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4a",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf-lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaves",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflushopt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ss",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "flushbyasid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "md-clear",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause_filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "de",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "est",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "check",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf_lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtes64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsavec",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm-lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512ifma",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdseed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512cd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaveopt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tbm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vme",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "parent_bus",
-+      "type": "link<bus>"
-+    },
-+    {
-+      "name": "lmce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-migrate-smi-count",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-reset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-runtime",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fpu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds-cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hle",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx8",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mpx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invpcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcommit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "syscall",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hv-time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "osvw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rtm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4fmaps",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512pf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "phys-bits",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cpuid-0xb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-deadline",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr_opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xgetbv1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "popcnt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "umip",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "realized",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pn",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model-id",
-+      "type": "string"
-+    },
-+    {
-+      "name": "crash-information",
-+      "type": "GuestPanicInformation"
-+    },
-+    {
-+      "name": "tsc-scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "node-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hv-reenlightenment",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "topoext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pge",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsgsbase",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmuldq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "misalignsse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-44"
-+}
-+
- {
-   "return": [
-     {
-@@ -5333,12 +6395,12 @@
-       "cpu-max": 255
-     }
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -5775,12 +6837,12 @@
-       "migration-safe": true
-     }
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -5788,12 +6850,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -5801,12 +6863,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-@@ -7105,12 +8167,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -7180,12 +8242,12 @@
-       "capability": "late-block-activate"
-     }
-   ],
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-   "execute": "query-qmp-schema",
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -19425,7 +20487,7 @@
-       "meta-type": "object"
-     }
-   ],
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -19436,7 +20498,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -19629,7 +20691,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -19824,7 +20886,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -20086,7 +21148,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -20100,7 +21162,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -20293,7 +21355,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -20488,7 +21550,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -20750,16 +21812,16 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-54"
- }
- 
- {
--  "id": "libvirt-54",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-55"
-+}
-+
-+{
-+  "id": "libvirt-55",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV feature is not available"
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index dceb719fcf..22dc60d13e 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -218,7 +218,7 @@
-   <flag name='x86-max-cpu'/>
-   <version>2012090</version>
-   <kvmVersion>0</kvmVersion>
--  <microcodeVersion>438109</microcodeVersion>
-+  <microcodeVersion>453907</microcodeVersion>
-   <package>v3.0.0-rc0-31-g633e824037</package>
-   <arch>x86_64</arch>
-   <hostCPU type='kvm' model='base' migratability='yes'>
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-index ab0ac1e7bf..82b320b1d0 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-@@ -5510,10 +5510,1144 @@
- }
- 
- {
--  "execute": "query-machines",
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "max-x86_64-cpu"
-+  },
-   "id": "libvirt-43"
- }
- 
-+{
-+  "return": [
-+    {
-+      "name": "type",
-+      "type": "string"
-+    },
-+    {
-+      "name": "min-xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "amd-ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "string"
-+    },
-+    {
-+      "name": "gfni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clwb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x2apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mds-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock-stable-bit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb_clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min-level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "fxsr-opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "skinit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "unavailable-features",
-+      "type": "strList"
-+    },
-+    {
-+      "name": "3dnowext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid_msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-crash",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hypervisor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "enforce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stepping",
-+      "type": "int"
-+    },
-+    {
-+      "name": "sse4_2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4_1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-hv-max-vps",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hv-frequencies",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-hint-dedicated",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp_legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-cache-info",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-ipi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vendor-id",
-+      "type": "str"
-+    },
-+    {
-+      "name": "movbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnowprefetch",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mtrr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wdt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "thread-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "aes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "apic-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "family",
-+      "type": "int"
-+    },
-+    {
-+      "name": "tsc-adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pfthreshold",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-no-smi-migration",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "amd-no-ssb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "filtered-features",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "hv-evmcs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vpindex",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "i64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bitalg",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "adx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vaes",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ia64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nodeid-msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibpb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-synic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibs",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tcg-cpuid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "nrip_save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lbrv",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdtscp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "memory",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "avx512vbmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invtsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4.1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pbe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdrand",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "socket-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hotpluggable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "l3-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-steal-time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmware-cpuid-freq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "legacy-cache",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xop",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-frequency",
-+      "type": "int"
-+    },
-+    {
-+      "name": "fill-mtrr-mask",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "core-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "intel-pt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rsba",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4-1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sha-ni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmov",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pae",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arch-capabilities",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virt-ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "abm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_adjust",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdpe1gb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min-xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "kvm-mmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512f",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vbmi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4vnniw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmxext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "decodeassists",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ht",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsave",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "feature-words",
-+      "type": "X86CPUFeatureWordInfo"
-+    },
-+    {
-+      "name": "migratable",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "3dnow",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "spec-ctrl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model",
-+      "type": "int"
-+    },
-+    {
-+      "name": "nrip-save",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lwp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xstore-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_unhalt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bmi1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "la57",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ffxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stibp",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmcb-clean",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "wbnoinvd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause-filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_steal_time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdctl-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm_lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ibrs-all",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pse36",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-stimer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-phys-bits",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "extapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "skip-l1dfl-vmentry",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-spinlocks",
-+      "type": "int"
-+    },
-+    {
-+      "name": "pmu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vpclmulqdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-vpopcntdq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512er",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pdcm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "apic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cr8legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma4",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-phys-bits-limit",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "erms",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds_cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xlevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "xsaves",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplugged",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-relaxed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pause_filter",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cldemote",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-core",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-ipi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "smap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512dq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssse3",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pmm-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "npt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-tlb-flush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "monitor",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "f16c",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdpid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "full-cpuid-auto-level",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xtpr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sep",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512vnni",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pku",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse4a",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf-lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflushopt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ss",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "flushbyasid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-tlbflush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "lahf_lm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "de",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsavec",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "est",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "check",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "movdir64b",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dtes64",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "md-clear",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "svm-lock",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512ifma",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "clflush",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rdseed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512cd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xsaveopt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tbm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ace2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vme",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_asyncpf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-vapic",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "parent_bus",
-+      "type": "link<bus>"
-+    },
-+    {
-+      "name": "lmce",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-migrate-smi-count",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-reset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hv-runtime",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssbd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512bw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xcrypt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fpu",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "arat",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ds-cpl",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-pv-eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hle",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mpx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "invpcid",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx8",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pcommit",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "sse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "syscall",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc_scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "movdiri",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ssb-no",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xlevel2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hv-time",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm_pv_eoi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "osvw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr-nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rtm",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512-4fmaps",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx2",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "perfctr_nb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "kvm-nopiodelay",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "avx512pf",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "level",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "phys-bits",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cpuid-0xb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-deadline",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fxsr_opt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xgetbv1",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "popcnt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "umip",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "realized",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmp-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dca",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pn",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "model-id",
-+      "type": "string"
-+    },
-+    {
-+      "name": "crash-information",
-+      "type": "GuestPanicInformation"
-+    },
-+    {
-+      "name": "x-intel-pt-auto-level",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-hv-synic-kvm-only",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "tsc-scale",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "node-id",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "hv-reenlightenment",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cx16",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "topoext",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pge",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fsgsbase",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "pclmuldq",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "misalignsse",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "phe-en",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "fma",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-44"
-+}
-+
- {
-   "return": [
-     {
-@@ -5755,12 +6889,12 @@
-       "alias": "q35"
-     }
-   ],
--  "id": "libvirt-43"
-+  "id": "libvirt-44"
- }
- 
- {
-   "execute": "query-cpu-definitions",
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-@@ -6310,12 +7444,12 @@
-       "migration-safe": true
-     }
-   ],
--  "id": "libvirt-44"
-+  "id": "libvirt-45"
- }
- 
- {
-   "execute": "query-tpm-models",
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-@@ -6323,12 +7457,12 @@
-     "tpm-crb",
-     "tpm-tis"
-   ],
--  "id": "libvirt-45"
-+  "id": "libvirt-46"
- }
- 
- {
-   "execute": "query-tpm-types",
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-@@ -6336,12 +7470,12 @@
-     "passthrough",
-     "emulator"
-   ],
--  "id": "libvirt-46"
-+  "id": "libvirt-47"
- }
- 
- {
-   "execute": "query-command-line-options",
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-@@ -7611,12 +8745,12 @@
-       "option": "drive"
-     }
-   ],
--  "id": "libvirt-47"
-+  "id": "libvirt-48"
- }
- 
- {
-   "execute": "query-migrate-capabilities",
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-@@ -7690,12 +8824,12 @@
-       "capability": "x-ignore-shared"
-     }
-   ],
--  "id": "libvirt-48"
-+  "id": "libvirt-49"
- }
- 
- {
-   "execute": "query-qmp-schema",
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -20178,7 +21312,7 @@
-       ]
-     }
-   ],
--  "id": "libvirt-49"
-+  "id": "libvirt-50"
- }
- 
- {
-@@ -20189,7 +21323,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -20395,7 +21529,7 @@
-       }
-     }
-   },
--  "id": "libvirt-50"
-+  "id": "libvirt-51"
- }
- 
- {
-@@ -20603,7 +21737,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -20884,7 +22018,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -20898,7 +22032,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -21104,7 +22238,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -21312,7 +22446,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -21593,16 +22727,16 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-54"
- }
- 
- {
--  "id": "libvirt-54",
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-55"
-+}
-+
-+{
-+  "id": "libvirt-55",
-   "error": {
-     "class": "GenericError",
-     "desc": "SEV feature is not available"
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-index 4836dbb8a4..95d26dfce8 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -215,9 +215,10 @@
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-   <flag name='x86-max-cpu'/>
-+  <flag name='cpu-unavailable-features'/>
-   <version>4000050</version>
-   <kvmVersion>0</kvmVersion>
--  <microcodeVersion>456805</microcodeVersion>
-+  <microcodeVersion>473743</microcodeVersion>
-   <package>v4.0.0-1173-g9c70209b63</package>
-   <arch>x86_64</arch>
-   <hostCPU type='kvm' model='base' migratability='yes'>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Probe-host-CPU-after-capabilities.patch b/SOURCES/libvirt-qemu-Probe-host-CPU-after-capabilities.patch
deleted file mode 100644
index 6229e6b..0000000
--- a/SOURCES/libvirt-qemu-Probe-host-CPU-after-capabilities.patch
+++ /dev/null
@@ -1,403 +0,0 @@
-From d2ef598bb59e613ce4a8b969ab9836604bd72727 Mon Sep 17 00:00:00 2001
-Message-Id: <d2ef598bb59e613ce4a8b969ab9836604bd72727@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:54 +0200
-Subject: [PATCH] qemu: Probe host CPU after capabilities
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The way we call query-cpu-model-expansion will rely on some capabilities
-bits. Let's make sure all capabilities are set before probing host CPU.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6f6401fbae384c66ce6043ced30591050729a4ac)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-            - various refactors were not backported
-
-	tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-            - QMP message IDs are different
-
-	tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
-	tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
-            - missing
-
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-            - QMP message IDs are different
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <cea249ba54be2d9dca6f523a14b0af608163323f.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                  |  8 +++-
- .../caps_2.12.0.x86_64.replies                | 44 +++++++++----------
- .../caps_3.0.0.x86_64.replies                 | 40 ++++++++---------
- .../caps_4.1.0.x86_64.replies                 | 40 ++++++++---------
- 4 files changed, 68 insertions(+), 64 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index beec9d1497..fb260eae96 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -4343,8 +4343,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) &&
-         virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0)
-         goto cleanup;
--    if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, false) < 0)
--        goto cleanup;
- 
-     /* 'intel-iommu' shows up as a device since 2.2.0, but can
-      * not be used with -device until 2.7.0. Before that it
-@@ -4394,6 +4392,12 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
-             virQEMUCapsClear(qemuCaps, QEMU_CAPS_SEV_GUEST);
-     }
- 
-+    /* The following probes rely on other previously probed capabilities.
-+     * No capabilities bits should be set below this point. */
-+
-+    if (virQEMUCapsProbeQMPHostCPU(qemuCaps, mon, false) < 0)
-+        goto cleanup;
-+
-     ret = 0;
-  cleanup:
-     return ret;
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-index 66a5577e5e..ecfe3386c4 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
-@@ -19521,6 +19521,21 @@
-   "id": "libvirt-50"
- }
- 
-+{
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "return": {
-+    "reduced-phys-bits": 1,
-+    "cbitpos": 47,
-+    "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
-+    "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
-+  },
-+  "id": "libvirt-51"
-+}
-+
- {
-   "execute": "query-cpu-model-expansion",
-   "arguments": {
-@@ -19529,7 +19544,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -19719,7 +19734,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -19911,7 +19926,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -20166,7 +20181,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -20180,7 +20195,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -20370,7 +20385,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -20562,7 +20577,7 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
-+  "id": "libvirt-55"
- }
- 
- {
-@@ -20817,21 +20832,6 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
--}
--
--{
--  "execute": "query-sev-capabilities",
--  "id": "libvirt-55"
--}
--
--{
--  "return": {
--    "reduced-phys-bits": 1,
--    "cbitpos": 47,
--    "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
--    "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
--  },
-   "id": "libvirt-55"
- }
- 
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-index 9f44eb4fae..7fea8587fd 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-@@ -20490,6 +20490,19 @@
-   "id": "libvirt-50"
- }
- 
-+{
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "id": "libvirt-51",
-+  "error": {
-+    "class": "GenericError",
-+    "desc": "SEV feature is not available"
-+  }
-+}
-+
- {
-   "execute": "query-cpu-model-expansion",
-   "arguments": {
-@@ -20498,7 +20511,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -20691,7 +20704,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -20886,7 +20899,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -21148,7 +21161,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -21162,7 +21175,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -21355,7 +21368,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -21550,7 +21563,7 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
-+  "id": "libvirt-55"
- }
- 
- {
-@@ -21812,22 +21825,9 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-55"
- }
- 
--{
--  "id": "libvirt-55",
--  "error": {
--    "class": "GenericError",
--    "desc": "SEV feature is not available"
--  }
--}
--
- {
-   "execute": "qmp_capabilities",
-   "id": "libvirt-1"
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-index 82b320b1d0..5b4d7a8484 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-@@ -21315,6 +21315,19 @@
-   "id": "libvirt-50"
- }
- 
-+{
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "id": "libvirt-51",
-+  "error": {
-+    "class": "GenericError",
-+    "desc": "SEV feature is not available"
-+  }
-+}
-+
- {
-   "execute": "query-cpu-model-expansion",
-   "arguments": {
-@@ -21323,7 +21336,7 @@
-       "name": "host"
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -21529,7 +21542,7 @@
-       }
-     }
-   },
--  "id": "libvirt-51"
-+  "id": "libvirt-52"
- }
- 
- {
-@@ -21737,7 +21750,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -22018,7 +22031,7 @@
-       }
-     }
-   },
--  "id": "libvirt-52"
-+  "id": "libvirt-53"
- }
- 
- {
-@@ -22032,7 +22045,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -22238,7 +22251,7 @@
-       }
-     }
-   },
--  "id": "libvirt-53"
-+  "id": "libvirt-54"
- }
- 
- {
-@@ -22446,7 +22459,7 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
-+  "id": "libvirt-55"
- }
- 
- {
-@@ -22727,22 +22740,9 @@
-       }
-     }
-   },
--  "id": "libvirt-54"
--}
--
--{
--  "execute": "query-sev-capabilities",
-   "id": "libvirt-55"
- }
- 
--{
--  "id": "libvirt-55",
--  "error": {
--    "class": "GenericError",
--    "desc": "SEV feature is not available"
--  }
--}
--
- {
-   "execute": "qmp_capabilities",
-   "id": "libvirt-1"
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Properly-report-VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT.patch b/SOURCES/libvirt-qemu-Properly-report-VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT.patch
deleted file mode 100644
index a191515..0000000
--- a/SOURCES/libvirt-qemu-Properly-report-VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 330e6224d11cbdef798c36ee5244f3b17d95d7cf Mon Sep 17 00:00:00 2001
-Message-Id: <330e6224d11cbdef798c36ee5244f3b17d95d7cf@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Mon, 10 Sep 2018 15:10:54 +0200
-Subject: [PATCH] qemu: Properly report VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT was defined but not used anywhere
-in our event generation code. This fixes qemuDomainRevertToSnapshot to
-properly report why the domain was resumed.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 55af06187c48a01192764d8638b85739b0178fe0)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634758
-https://bugzilla.redhat.com/show_bug.cgi?id=1634759
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index f85248e3c7..ec1a43d41d 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -16323,7 +16323,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
-                                                  detail);
-             } else if (!was_running) {
-                 /* Transition 8 */
--                detail = VIR_DOMAIN_EVENT_RESUMED;
-+                detail = VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT;
-                 event = virDomainEventLifecycleNewFromObj(vm,
-                                                  VIR_DOMAIN_EVENT_RESUMED,
-                                                  detail);
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Refuse-to-use-ps2-on-machines-that-do-not-have-this-bus.patch b/SOURCES/libvirt-qemu-Refuse-to-use-ps2-on-machines-that-do-not-have-this-bus.patch
new file mode 100644
index 0000000..13e5204
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Refuse-to-use-ps2-on-machines-that-do-not-have-this-bus.patch
@@ -0,0 +1,605 @@
+From 171433e306e309374750477328de96f66410d13d Mon Sep 17 00:00:00 2001
+Message-Id: <171433e306e309374750477328de96f66410d13d@dist-git>
+From: Thomas Huth <thuth@redhat.com>
+Date: Mon, 8 Jun 2020 13:44:21 +0200
+Subject: [PATCH] qemu: Refuse to use "ps2" on machines that do not have this
+ bus
+
+The "ps2" bus is only available on certain machines like x86. On
+machines like s390x, we should refuse to add a device to this bus
+instead of silently ignoring it.
+
+Looking at the QEMU sources, PS/2 is only available if the QEMU binary
+has the "i8042" device, so let's check for that and only allow "ps2"
+devices if this QEMU device is available, or if we're on x86 anyway
+(so we don't have to fake the QEMU_CAPS_DEVICE_I8042 capability in
+all the tests that use <input ... bus='ps2'/> in their xml data).
+
+Reported-by: Sebastian Mitterle <smitterl@redhat.com>
+Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1763191
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit e7a65484ba7aa51c99ab3405117667a39b37e386)
+
+Conflicts:
+src/qemu/qemu_capabilities.c: Context, because other caps were
+                              backported meanwhile
+src/qemu/qemu_capabilities.h: ditto
+tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml: ditto
+tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml: ditto
+tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml: ditto
+tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml: ditto
+tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml: ditto
+tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml: ditto
+tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml: ditto
+tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml: ditto
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1845055
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <89c778ca322240423dd81945daa165f5d6c803a9.1591616651.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                           |  2 ++
+ src/qemu/qemu_capabilities.h                           |  1 +
+ src/qemu/qemu_domain.c                                 | 10 +++++++++-
+ tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml      |  1 +
+ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml      |  1 +
+ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml      |  1 +
+ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml        |  1 +
+ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml        |  1 +
+ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml        |  1 +
+ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml        |  1 +
+ tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml        |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml        |  1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml       |  1 +
+ tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml       |  1 +
+ .../qemuhotplug-base-ccw-live+ccw-virtio.xml           |  6 ------
+ ...cw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml |  6 ------
+ ...ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml |  6 ------
+ .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml    |  6 ------
+ ...-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml |  6 ------
+ ...plug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml |  6 ------
+ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml      |  6 ------
+ .../qemuhotplug-base-ccw-live.xml                      |  6 ------
+ 38 files changed, 39 insertions(+), 49 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 5b16796c6b..7609f44efb 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -566,6 +566,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api",
+               "storage.werror",
+               "pcie-root-port.hotplug",
++              "i8042",
+     );
+ 
+ 
+@@ -1281,6 +1282,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
+     { "ramfb", QEMU_CAPS_DEVICE_RAMFB },
+     { "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU },
+     { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
++    { "i8042", QEMU_CAPS_DEVICE_I8042 },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index aad02fcda5..15ebcb5077 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -547,6 +547,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
+     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
+     QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */
++    QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index cdf7b3e692..a92183334f 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -8340,13 +8340,21 @@ qemuDomainDeviceDefValidateGraphics(const virDomainGraphicsDef *graphics,
+ 
+ static int
+ qemuDomainDeviceDefValidateInput(const virDomainInputDef *input,
+-                                 const virDomainDef *def G_GNUC_UNUSED,
++                                 const virDomainDef *def,
+                                  virQEMUCapsPtr qemuCaps)
+ {
+     const char *baseName;
+     int cap;
+     int ccwCap;
+ 
++    if (input->bus == VIR_DOMAIN_INPUT_BUS_PS2 && !ARCH_IS_X86(def->os.arch) &&
++        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_I8042)) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                       _("%s is not supported by this QEMU binary"),
++                       virDomainInputBusTypeToString(input->bus));
++        return -1;
++    }
++
+     if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO)
+         return 0;
+ 
+diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+index f2257d6bd2..b57cb2ab59 100644
+--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+@@ -84,6 +84,7 @@
+   <flag name='isa-serial'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>1005003</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100245</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+index 3a70ec8146..5d0a14a5db 100644
+--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+@@ -89,6 +89,7 @@
+   <flag name='isa-serial'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>1006000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100243</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+index cbb29ef2de..c196fe5e45 100644
+--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+@@ -91,6 +91,7 @@
+   <flag name='isa-serial'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>1007000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100244</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+index a6d0981224..1edcaa4657 100644
+--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+@@ -107,6 +107,7 @@
+   <flag name='isa-serial'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>2001001</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+index 5a57cb7760..b95a9d42ad 100644
+--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+@@ -139,6 +139,7 @@
+   <flag name='vhost-vsock'/>
+   <flag name='egl-headless'/>
+   <flag name='iothread.poll-max-ns'/>
++  <flag name='i8042'/>
+   <version>2010000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900287</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+index 53872abf2f..7ebe97b6ab 100644
+--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+@@ -182,6 +182,7 @@
+   <flag name='egl-headless'/>
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='x86-max-cpu'/>
++  <flag name='i8042'/>
+   <version>2010000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100287</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+index f70335db8f..b8eb3abd40 100644
+--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+@@ -188,6 +188,7 @@
+   <flag name='egl-headless'/>
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='x86-max-cpu'/>
++  <flag name='i8042'/>
+   <version>2011000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100288</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+index 74c80d2fe9..38a3103c4a 100644
+--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+@@ -153,6 +153,7 @@
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='memory-backend-file.align'/>
+   <flag name='drive-nvme'/>
++  <flag name='i8042'/>
+   <version>2011090</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900289</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+index b51cee9f28..0c30cc75da 100644
+--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+@@ -197,6 +197,7 @@
+   <flag name='memory-backend-file.align'/>
+   <flag name='x86-max-cpu'/>
+   <flag name='drive-nvme'/>
++  <flag name='i8042'/>
+   <version>2011090</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100289</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+index 86d85faa73..9b486effe1 100644
+--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+@@ -133,6 +133,7 @@
+   <flag name='sdl-gl'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>2004000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+index b217238307..147b179fdb 100644
+--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+@@ -139,6 +139,7 @@
+   <flag name='sdl-gl'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>2005000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100243</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+index 862464c2f0..deb5c28790 100644
+--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+@@ -118,6 +118,7 @@
+   <flag name='nbd-tls'/>
+   <flag name='sdl-gl'/>
+   <flag name='hda-output'/>
++  <flag name='i8042'/>
+   <version>2006000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900244</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+index 6b96e37a16..fc508aba8a 100644
+--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+@@ -151,6 +151,7 @@
+   <flag name='sdl-gl'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>2006000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100244</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+index bc1359b0dd..ed199057dc 100644
+--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+@@ -156,6 +156,7 @@
+   <flag name='sdl-gl'/>
+   <flag name='hda-output'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>2007000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100245</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+index c7f3be3a1b..489b67f99a 100644
+--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+@@ -159,6 +159,7 @@
+   <flag name='hda-output'/>
+   <flag name='vhost-vsock'/>
+   <flag name='mch'/>
++  <flag name='i8042'/>
+   <version>2008000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100246</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+index a00d4b3d4c..3bc6ec8dab 100644
+--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+@@ -131,6 +131,7 @@
+   <flag name='blockdev-del'/>
+   <flag name='vhost-vsock'/>
+   <flag name='iothread.poll-max-ns'/>
++  <flag name='i8042'/>
+   <version>2009000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900247</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+index 3d96f5f5b3..83fc6cde97 100644
+--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+@@ -176,6 +176,7 @@
+   <flag name='mch'/>
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='x86-max-cpu'/>
++  <flag name='i8042'/>
+   <version>2009000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100247</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+index 3b5a021dcf..9a0b9c05c2 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+@@ -155,6 +155,7 @@
+   <flag name='bochs-display'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='i8042'/>
+   <version>2012050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900239</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+index 575b1c2a43..aa134f7da1 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+@@ -203,6 +203,7 @@
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>3000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100239</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+index 591f054193..06bcba57bc 100644
+--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+@@ -160,6 +160,7 @@
+   <flag name='bochs-display'/>
+   <flag name='drive-nvme'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>3000091</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+index 6e434579ff..aa0219816d 100644
+--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+@@ -206,6 +206,7 @@
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>3000092</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+index aa22eccc6f..9f7d322d07 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+@@ -174,6 +174,7 @@
+   <flag name='machine.pseries.cap-ccf-assist'/>
+   <flag name='drive-nvme'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+index 3c1baf9560..f54f15b23e 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+@@ -211,6 +211,7 @@
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+index d5f2673fb6..961a13818b 100644
+--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+@@ -217,6 +217,7 @@
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>4001000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100241</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+index f5121fca94..0dc7503a07 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+@@ -178,6 +178,7 @@
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+index f6df71ff3e..452753b103 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+@@ -222,6 +222,7 @@
+   <flag name='virtio-net.failover'/>
+   <flag name='vhost-user-fs'/>
+   <flag name='storage.werror'/>
++  <flag name='i8042'/>
+   <version>4002000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+index d0b5f18c02..733e6b1eb4 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+@@ -225,6 +225,7 @@
+   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
+   <flag name='storage.werror'/>
+   <flag name='pcie-root-port.hotplug'/>
++  <flag name='i8042'/>
+   <version>4002091</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100241</microcodeVersion>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+index f501cde333..59c969e0f2 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+@@ -44,12 +44,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
+index 301658178f..d10b29be7e 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
+@@ -54,12 +54,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'>
+       <alias name='balloon0'/>
+     </memballoon>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+index 223e929ad5..6eadbdcd18 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+@@ -54,12 +54,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+index c745d48558..68561b50a3 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+@@ -44,12 +44,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+index 3189294b65..0900f3c8e3 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+@@ -53,12 +53,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+index 3189294b65..0900f3c8e3 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+@@ -53,12 +53,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+index edf57fcd3f..31979c40f0 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+@@ -43,12 +43,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+index b97bba78c6..844b951940 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+@@ -34,12 +34,6 @@
+       <alias name='virtio-serial0'/>
+       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+     </controller>
+-    <input type='mouse' bus='ps2'>
+-      <alias name='input0'/>
+-    </input>
+-    <input type='keyboard' bus='ps2'>
+-      <alias name='input1'/>
+-    </input>
+     <memballoon model='none'/>
+     <panic model='s390'/>
+   </devices>
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-Remove-duplicated-qemuAgentCheckError.patch b/SOURCES/libvirt-qemu-Remove-duplicated-qemuAgentCheckError.patch
deleted file mode 100644
index 6c801be..0000000
--- a/SOURCES/libvirt-qemu-Remove-duplicated-qemuAgentCheckError.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c39dd7dec2fe7ab631de9ef02a1d654385810750 Mon Sep 17 00:00:00 2001
-Message-Id: <c39dd7dec2fe7ab631de9ef02a1d654385810750@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Thu, 10 Jan 2019 12:49:10 +0100
-Subject: [PATCH] qemu: Remove duplicated qemuAgentCheckError
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 5b3492fadb moved qemuAgentCheckError calls into
-qemuAgentCommand for various reasons; however, subsequent
-commit 0977b8aa0 adding a new command made call again
-So let's just remove the duplicitous call from
-qemuAgentGetInterfaces.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 9ed175fbc2deecfdaeabca7bc77c7e7ae33a3377)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1663051
-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1665000
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_agent.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index 10c6ef09fa..986e37b07d 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -1987,10 +1987,9 @@ qemuAgentGetInterfaces(qemuAgentPtr mon,
-     if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL)))
-         goto cleanup;
- 
--    if (qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 ||
--        qemuAgentCheckError(cmd, reply) < 0) {
-+    if (qemuAgentCommand(mon, cmd, &reply, false,
-+                         VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
-         goto cleanup;
--    }
- 
-     if (!(ret_array = virJSONValueObjectGet(reply, "return"))) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-Remove-unused-bypassSecurityDriver-from-qemuOpenFileAs.patch b/SOURCES/libvirt-qemu-Remove-unused-bypassSecurityDriver-from-qemuOpenFileAs.patch
deleted file mode 100644
index d2d9bbe..0000000
--- a/SOURCES/libvirt-qemu-Remove-unused-bypassSecurityDriver-from-qemuOpenFileAs.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 81f9a452639c8f910f9a73fa6687834332bc9c7e Mon Sep 17 00:00:00 2001
-Message-Id: <81f9a452639c8f910f9a73fa6687834332bc9c7e@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 25 Jul 2018 08:27:09 +0200
-Subject: [PATCH] qemu: Remove unused bypassSecurityDriver from qemuOpenFileAs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1589115
-
-This argument is not used anymore. The only function that is
-passing non-NULL (qemuDomainSaveMemory) does not actually care
-for the value (after 23087cfdb) and every other caller just
-passes NULL anyway.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 8677a476c7e5cbf7b344329d54d0b1a2d666ffc3)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_driver.c | 32 +++++++++-----------------------
- 1 file changed, 9 insertions(+), 23 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 3158f217fa..e8a595f17e 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -152,7 +152,7 @@ static int qemuDomainManagedSaveLoad(virDomainObjPtr vm,
- static int qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid,
-                           bool dynamicOwnership,
-                           const char *path, int oflags,
--                          bool *needUnlink, bool *bypassSecurityDriver);
-+                          bool *needUnlink);
- 
- static int qemuGetDHCPInterfaces(virDomainPtr dom,
-                                  virDomainObjPtr vm,
-@@ -2984,9 +2984,6 @@ qemuCompressGetCommand(virQEMUSaveFormat compression)
-  * @path: path to file to open
-  * @oflags: flags for opening/creation of the file
-  * @needUnlink: set to true if file was created by this function
-- * @bypassSecurityDriver: optional pointer to a boolean that will be set to true
-- *                        if security driver operations are pointless (due to
-- *                        NFS mount)
-  *
-  * Internal function to properly create or open existing files, with
-  * ownership affected by qemu driver setup and domain DAC label.
-@@ -3001,8 +2998,7 @@ qemuOpenFile(virQEMUDriverPtr driver,
-              virDomainObjPtr vm,
-              const char *path,
-              int oflags,
--             bool *needUnlink,
--             bool *bypassSecurityDriver)
-+             bool *needUnlink)
- {
-     int ret = -1;
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-@@ -3021,7 +3017,7 @@ qemuOpenFile(virQEMUDriverPtr driver,
-         goto cleanup;
- 
-     ret = qemuOpenFileAs(user, group, dynamicOwnership,
--                         path, oflags, needUnlink, bypassSecurityDriver);
-+                         path, oflags, needUnlink);
- 
-  cleanup:
-     return ret;
-@@ -3031,12 +3027,11 @@ static int
- qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid,
-                bool dynamicOwnership,
-                const char *path, int oflags,
--               bool *needUnlink, bool *bypassSecurityDriver)
-+               bool *needUnlink)
- {
-     struct stat sb;
-     bool is_reg = true;
-     bool need_unlink = false;
--    bool bypass_security = false;
-     unsigned int vfoflags = 0;
-     int fd = -1;
-     int path_shared = virFileIsSharedFS(path);
-@@ -3134,19 +3129,11 @@ qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid,
-                                      path);
-                 goto cleanup;
-             }
--
--            /* Since we had to setuid to create the file, and the fstype
--               is NFS, we assume it's a root-squashing NFS share, and that
--               the security driver stuff would have failed anyway */
--
--            bypass_security = true;
-         }
-     }
-  cleanup:
-     if (needUnlink)
-         *needUnlink = need_unlink;
--    if (bypassSecurityDriver)
--        *bypassSecurityDriver = bypass_security;
-     return fd;
- 
-  error:
-@@ -3198,7 +3185,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-                      unsigned int flags,
-                      qemuDomainAsyncJob asyncJob)
- {
--    bool bypassSecurityDriver = false;
-     bool needUnlink = false;
-     int ret = -1;
-     int fd = -1;
-@@ -3218,7 +3204,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-     }
-     fd = qemuOpenFile(driver, vm, path,
-                       O_WRONLY | O_TRUNC | O_CREAT | directFlag,
--                      &needUnlink, &bypassSecurityDriver);
-+                      &needUnlink);
-     if (fd < 0)
-         goto cleanup;
- 
-@@ -3249,7 +3235,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-     if (qemuFileWrapperFDClose(vm, wrapperFd) < 0)
-         goto cleanup;
- 
--    if ((fd = qemuOpenFile(driver, vm, path, O_WRONLY, NULL, NULL)) < 0 ||
-+    if ((fd = qemuOpenFile(driver, vm, path, O_WRONLY, NULL)) < 0 ||
-         virQEMUSaveDataFinish(data, &fd, path) < 0)
-         goto cleanup;
- 
-@@ -3809,7 +3795,7 @@ doCoreDump(virQEMUDriverPtr driver,
-      * created.  */
-     if ((fd = qemuOpenFile(driver, vm, path,
-                            O_CREAT | O_TRUNC | O_WRONLY | directFlag,
--                           NULL, NULL)) < 0)
-+                           NULL)) < 0)
-         goto cleanup;
- 
-     if (!(wrapperFd = virFileWrapperFdNew(&fd, path, flags)))
-@@ -6436,7 +6422,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
-     if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-         goto error;
- 
--    if ((fd = qemuOpenFile(driver, NULL, path, oflags, NULL, NULL)) < 0)
-+    if ((fd = qemuOpenFile(driver, NULL, path, oflags, NULL)) < 0)
-         goto error;
-     if (bypass_cache &&
-         !(*wrapperFd = virFileWrapperFdNew(&fd, path,
-@@ -11880,7 +11866,7 @@ qemuDomainStorageOpenStat(virQEMUDriverPtr driver,
- {
-     if (virStorageSourceIsLocalStorage(src)) {
-         if ((*ret_fd = qemuOpenFile(driver, vm, src->path, O_RDONLY,
--                                    NULL, NULL)) < 0)
-+                                    NULL)) < 0)
-             return -1;
- 
-         if (fstat(*ret_fd, ret_sb) < 0) {
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-Report-more-appropriate-running-reasons.patch b/SOURCES/libvirt-qemu-Report-more-appropriate-running-reasons.patch
deleted file mode 100644
index 7764acf..0000000
--- a/SOURCES/libvirt-qemu-Report-more-appropriate-running-reasons.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d9922630f62b27e5fea978e2b0903ab0f72d88d4 Mon Sep 17 00:00:00 2001
-Message-Id: <d9922630f62b27e5fea978e2b0903ab0f72d88d4@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 11 Sep 2018 19:26:07 +0200
-Subject: [PATCH] qemu: Report more appropriate running reasons
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch replaces some rather generic VIR_DOMAIN_RUNNING_UNPAUSED
-reasons when changing domain state to running with more specific ones.
-All of them are done when libvirtd reconnects to an existing domain
-after being restarted and sees an unfinished migration or save.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 54b5b0ac3945ad5417b67bec8443cf6e7b3d482b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634758
-https://bugzilla.redhat.com/show_bug.cgi?id=1634759
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index a4b1f97df5..26979faa72 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3247,7 +3247,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver,
-         VIR_DEBUG("Incoming migration finished, resuming domain %s",
-                   vm->def->name);
-         if (qemuProcessStartCPUs(driver, vm,
--                                 VIR_DOMAIN_RUNNING_UNPAUSED,
-+                                 VIR_DOMAIN_RUNNING_MIGRATED,
-                                  QEMU_ASYNC_JOB_NONE) < 0) {
-             VIR_WARN("Could not resume domain %s", vm->def->name);
-         }
-@@ -3354,7 +3354,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver,
-             (reason == VIR_DOMAIN_PAUSED_MIGRATION ||
-              reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
-             if (qemuProcessStartCPUs(driver, vm,
--                                     VIR_DOMAIN_RUNNING_UNPAUSED,
-+                                     VIR_DOMAIN_RUNNING_MIGRATION_CANCELED,
-                                      QEMU_ASYNC_JOB_NONE) < 0) {
-                 VIR_WARN("Could not resume domain %s", vm->def->name);
-             }
-@@ -3412,7 +3412,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver,
-                 reason == VIR_DOMAIN_PAUSED_MIGRATION)) ||
-               reason == VIR_DOMAIN_PAUSED_UNKNOWN)) {
-              if (qemuProcessStartCPUs(driver, vm,
--                                      VIR_DOMAIN_RUNNING_UNPAUSED,
-+                                      VIR_DOMAIN_RUNNING_SAVE_CANCELED,
-                                       QEMU_ASYNC_JOB_NONE) < 0) {
-                  VIR_WARN("Could not resume domain '%s' after migration to file",
-                           vm->def->name);
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-Rework-setting-process-affinity.patch b/SOURCES/libvirt-qemu-Rework-setting-process-affinity.patch
deleted file mode 100644
index d86ed56..0000000
--- a/SOURCES/libvirt-qemu-Rework-setting-process-affinity.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From dc27c829fd5909394e69ed253979f19b47644569 Mon Sep 17 00:00:00 2001
-Message-Id: <dc27c829fd5909394e69ed253979f19b47644569@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 5 Jun 2019 11:33:28 +0200
-Subject: [PATCH] qemu: Rework setting process affinity
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1503284
-
-The way we currently start qemu from CPU affinity POV is as
-follows:
-
-  1) the child process is set affinity to all online CPUs (unless
-  some vcpu pinning was given in the domain XML)
-
-  2) Once qemu is running, cpuset cgroup is configured taking
-  memory pinning into account
-
-Problem is that we let qemu allocate its memory just anywhere in
-1) and then rely in 2) to be able to move the memory to
-configured NUMA nodes. This might not be always possible (e.g.
-qemu might lock some parts of its memory) and is very suboptimal
-(copying large memory between NUMA nodes takes significant amount
-of time).
-
-The solution is to set affinity to one of (in priority order):
-  - The CPUs associated with NUMA memory affinity mask
-  - The CPUs associated with emulator pinning
-  - All online host CPUs
-
-Later (once QEMU has allocated its memory) we then change this
-again to (again in priority order):
-  - The CPUs associated with emulator pinning
-  - The CPUs returned by numad
-  - The CPUs associated with vCPU pinning
-  - All online host CPUs
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f136b83139c63f20de0df3285d9e82df2fb97bfc)
-
-RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1716943
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <c5f31a30daef2be65dc404ab0f1fbfb15be0d062.1559727075.git.mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_process.c | 132 +++++++++++++++++++---------------------
- 1 file changed, 63 insertions(+), 69 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 2d2954ba18..6071b3ba3d 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2335,6 +2335,21 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver,
- }
- 
- 
-+static int
-+qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet)
-+{
-+    *cpumapRet = NULL;
-+
-+    if (!virHostCPUHasBitmap())
-+        return 0;
-+
-+    if (!(*cpumapRet = virHostCPUGetOnlineBitmap()))
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- /*
-  * To be run between fork/exec of QEMU only
-  */
-@@ -2342,9 +2357,9 @@ static int
- qemuProcessInitCpuAffinity(virDomainObjPtr vm)
- {
-     int ret = -1;
--    virBitmapPtr cpumap = NULL;
-     virBitmapPtr cpumapToSet = NULL;
--    virBitmapPtr hostcpumap = NULL;
-+    VIR_AUTOPTR(virBitmap) hostcpumap = NULL;
-+    virDomainNumatuneMemMode mem_mode;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
- 
-     if (!vm->pid) {
-@@ -2353,59 +2368,39 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
-         return -1;
-     }
- 
--    if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {
--        VIR_DEBUG("Set CPU affinity with advisory nodeset from numad");
--        cpumapToSet = priv->autoCpuset;
-+    /* Here is the deal, we can't set cpuset.mems before qemu is
-+     * started as it clashes with KVM allocation. Therefore, we
-+     * used to let qemu allocate its memory anywhere as we would
-+     * then move the memory to desired NUMA node via CGroups.
-+     * However, that might not be always possible because qemu
-+     * might lock some parts of its memory (e.g. due to VFIO).
-+     * Even if it possible, memory has to be copied between NUMA
-+     * nodes which is suboptimal.
-+     * Solution is to set affinity that matches the best what we
-+     * would have set in CGroups and then fix it later, once qemu
-+     * is already running. */
-+    if (virDomainNumaGetNodeCount(vm->def->numa) <= 1 &&
-+        virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 &&
-+        mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
-+        if (virDomainNumatuneMaybeGetNodeset(vm->def->numa,
-+                                             priv->autoNodeset,
-+                                             &cpumapToSet,
-+                                             -1) < 0)
-+            goto cleanup;
-+    } else if (vm->def->cputune.emulatorpin) {
-+        cpumapToSet = vm->def->cputune.emulatorpin;
-     } else {
--        VIR_DEBUG("Set CPU affinity with specified cpuset");
--        if (vm->def->cpumask) {
--            cpumapToSet = vm->def->cpumask;
--        } else {
--            /* You may think this is redundant, but we can't assume libvirtd
--             * itself is running on all pCPUs, so we need to explicitly set
--             * the spawned QEMU instance to all pCPUs if no map is given in
--             * its config file */
--            int hostcpus;
--
--            if (virHostCPUHasBitmap()) {
--                hostcpumap = virHostCPUGetOnlineBitmap();
--                cpumap = virProcessGetAffinity(vm->pid);
--            }
--
--            if (hostcpumap && cpumap && virBitmapEqual(hostcpumap, cpumap)) {
--                /* we're using all available CPUs, no reason to set
--                 * mask. If libvirtd is running without explicit
--                 * affinity, we can use hotplugged CPUs for this VM */
--                ret = 0;
--                goto cleanup;
--            } else {
--                /* setaffinity fails if you set bits for CPUs which
--                 * aren't present, so we have to limit ourselves */
--                if ((hostcpus = virHostCPUGetCount()) < 0)
--                    goto cleanup;
--
--                if (hostcpus > QEMUD_CPUMASK_LEN)
--                    hostcpus = QEMUD_CPUMASK_LEN;
--
--                virBitmapFree(cpumap);
--                if (!(cpumap = virBitmapNew(hostcpus)))
--                    goto cleanup;
--
--                virBitmapSetAll(cpumap);
--
--                cpumapToSet = cpumap;
--            }
--        }
-+        if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0)
-+            goto cleanup;
-+        cpumapToSet = hostcpumap;
-     }
- 
--    if (virProcessSetAffinity(vm->pid, cpumapToSet) < 0)
-+    if (cpumapToSet &&
-+        virProcessSetAffinity(vm->pid, cpumapToSet) < 0)
-         goto cleanup;
- 
-     ret = 0;
--
-  cleanup:
--    virBitmapFree(cpumap);
--    virBitmapFree(hostcpumap);
-     return ret;
- }
- 
-@@ -2478,7 +2473,8 @@ qemuProcessSetupPid(virDomainObjPtr vm,
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     virDomainNumatuneMemMode mem_mode;
-     virCgroupPtr cgroup = NULL;
--    virBitmapPtr use_cpumask;
-+    virBitmapPtr use_cpumask = NULL;
-+    VIR_AUTOPTR(virBitmap) hostcpumap = NULL;
-     char *mem_mask = NULL;
-     int ret = -1;
- 
-@@ -2490,12 +2486,21 @@ qemuProcessSetupPid(virDomainObjPtr vm,
-     }
- 
-     /* Infer which cpumask shall be used. */
--    if (cpumask)
-+    if (cpumask) {
-         use_cpumask = cpumask;
--    else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO)
-+    } else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {
-         use_cpumask = priv->autoCpuset;
--    else
-+    } else if (vm->def->cpumask) {
-         use_cpumask = vm->def->cpumask;
-+    } else {
-+        /* You may think this is redundant, but we can't assume libvirtd
-+         * itself is running on all pCPUs, so we need to explicitly set
-+         * the spawned QEMU instance to all pCPUs if no map is given in
-+         * its config file */
-+        if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0)
-+            goto cleanup;
-+        use_cpumask = hostcpumap;
-+    }
- 
-     /*
-      * If CPU cgroup controller is not initialized here, then we need
-@@ -2520,13 +2525,7 @@ qemuProcessSetupPid(virDomainObjPtr vm,
-                 qemuSetupCgroupCpusetCpus(cgroup, use_cpumask) < 0)
-                 goto cleanup;
- 
--            /*
--             * Don't setup cpuset.mems for the emulator, they need to
--             * be set up after initialization in order for kvm
--             * allocations to succeed.
--             */
--            if (nameval != VIR_CGROUP_THREAD_EMULATOR &&
--                mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0)
-+            if (mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0)
-                 goto cleanup;
- 
-         }
-@@ -6440,12 +6439,7 @@ qemuProcessLaunch(virConnectPtr conn,
- 
-     /* This must be done after cgroup placement to avoid resetting CPU
-      * affinity */
--    if (!vm->def->cputune.emulatorpin &&
--        qemuProcessInitCpuAffinity(vm) < 0)
--        goto cleanup;
--
--    VIR_DEBUG("Setting emulator tuning/settings");
--    if (qemuProcessSetupEmulator(vm) < 0)
-+    if (qemuProcessInitCpuAffinity(vm) < 0)
-         goto cleanup;
- 
-     VIR_DEBUG("Setting cgroup for external devices (if required)");
-@@ -6514,10 +6508,6 @@ qemuProcessLaunch(virConnectPtr conn,
-     if (qemuProcessUpdateAndVerifyCPU(driver, vm, asyncJob) < 0)
-         goto cleanup;
- 
--    VIR_DEBUG("Setting up post-init cgroup restrictions");
--    if (qemuSetupCpusetMems(vm) < 0)
--        goto cleanup;
--
-     VIR_DEBUG("setting up hotpluggable cpus");
-     if (qemuDomainHasHotpluggableStartupVcpus(vm->def)) {
-         if (qemuDomainRefreshVcpuInfo(driver, vm, asyncJob, false) < 0)
-@@ -6543,6 +6533,10 @@ qemuProcessLaunch(virConnectPtr conn,
-     if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0)
-         goto cleanup;
- 
-+    VIR_DEBUG("Setting emulator tuning/settings");
-+    if (qemuProcessSetupEmulator(vm) < 0)
-+        goto cleanup;
-+
-     VIR_DEBUG("Setting global CPU cgroup (if required)");
-     if (qemuSetupGlobalCpuCgroup(vm) < 0)
-         goto cleanup;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-commit.patch b/SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-commit.patch
new file mode 100644
index 0000000..c8e7974
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-commit.patch
@@ -0,0 +1,518 @@
+From ae0be0a7cbfb291c640b25d31013f938745e8c08 Mon Sep 17 00:00:00 2001
+Message-Id: <ae0be0a7cbfb291c640b25d31013f938745e8c08@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:00 +0200
+Subject: [PATCH] qemu: Rewrite bitmap handling for block commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reuse qemuBlockGetBitmapMergeActions which allows removing the ad-hoc
+implementation of bitmap merging for block commit. The new approach is
+way simpler and more robust and also allows us to get rid of the
+disabling of bitmaps done prior to the start as we actually do want to
+update the bitmaps in the base.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 20a7abc2d2d8a378103abf105fa0c617218ec023)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <2b1054dbe576d3984c960a42d175edbafa92565a.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                         | 203 +-----------------
+ src/qemu/qemu_block.h                         |  11 +-
+ src/qemu/qemu_blockjob.c                      |  25 ++-
+ src/qemu/qemu_driver.c                        |  56 +----
+ tests/qemublocktest.c                         |  18 +-
+ .../qemublocktestdata/bitmapblockcommit/empty |   1 -
+ 6 files changed, 42 insertions(+), 272 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index b2296c2b4c..ff9e000461 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3194,117 +3194,7 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+ /**
+  * @topsrc: virStorageSource representing 'top' of the job
+  * @basesrc: virStorageSource representing 'base' of the job
+- * @blockNamedNodeData: hash table containing data about bitmaps
+- * @actions: filled with arguments for a 'transaction' command
+- * @disabledBitmapsBase: filled with a list of bitmap names which must be disabled
+- *
+- * Prepares data for correctly handling bitmaps during the start of a commit
+- * job. The bitmaps in the 'base' image must be disabled, so that the writes
+- * done by the blockjob don't dirty the enabled bitmaps.
+- *
+- * @actions and @disabledBitmapsBase are untouched if no bitmaps need
+- * to be disabled.
+- */
+-int
+-qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
+-                                  virStorageSourcePtr basesrc,
+-                                  virHashTablePtr blockNamedNodeData,
+-                                  virJSONValuePtr *actions,
+-                                  char ***disabledBitmapsBase)
+-{
+-    g_autoptr(virJSONValue) act = virJSONValueNewArray();
+-    VIR_AUTOSTRINGLIST bitmaplist = NULL;
+-    size_t curbitmapstr = 0;
+-    qemuBlockNamedNodeDataPtr entry;
+-    bool disable_bitmaps = false;
+-    size_t i;
+-
+-    if (!(entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat)))
+-        return 0;
+-
+-    bitmaplist = g_new0(char *, entry->nbitmaps + 1);
+-
+-    for (i = 0; i < entry->nbitmaps; i++) {
+-        qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+-
+-        if (!bitmap->recording || bitmap->inconsistent ||
+-            !qemuBlockBitmapChainIsValid(topsrc, bitmap->name, blockNamedNodeData))
+-            continue;
+-
+-        disable_bitmaps = true;
+-
+-        if (qemuMonitorTransactionBitmapDisable(act, basesrc->nodeformat,
+-                                                bitmap->name) < 0)
+-            return -1;
+-
+-        bitmaplist[curbitmapstr++] = g_strdup(bitmap->name);
+-    }
+-
+-    if (disable_bitmaps) {
+-        *actions = g_steal_pointer(&act);
+-        *disabledBitmapsBase = g_steal_pointer(&bitmaplist);
+-    }
+-
+-    return 0;
+-}
+-
+-
+-struct qemuBlockBitmapsHandleCommitData {
+-    bool skip;
+-    bool create;
+-    bool enable;
+-    const char *basenode;
+-    virJSONValuePtr merge;
+-    unsigned long long granularity;
+-    bool persistent;
+-};
+-
+-
+-static void
+-qemuBlockBitmapsHandleCommitDataFree(void *opaque)
+-{
+-    struct qemuBlockBitmapsHandleCommitData *data = opaque;
+-
+-    virJSONValueFree(data->merge);
+-    g_free(data);
+-}
+-
+-
+-static int
+-qemuBlockBitmapsHandleCommitFinishIterate(void *payload,
+-                                          const void *entryname,
+-                                          void *opaque)
+-{
+-    struct qemuBlockBitmapsHandleCommitData *data = payload;
+-    const char *bitmapname = entryname;
+-    virJSONValuePtr actions = opaque;
+-
+-    if (data->skip)
+-        return 0;
+-
+-    if (data->create) {
+-        if (qemuMonitorTransactionBitmapAdd(actions, data->basenode, bitmapname,
+-                                            data->persistent, !data->enable,
+-                                            data->granularity) < 0)
+-            return -1;
+-    } else {
+-        if (data->enable &&
+-            qemuMonitorTransactionBitmapEnable(actions, data->basenode, bitmapname) < 0)
+-            return -1;
+-    }
+-
+-    if (data->merge &&
+-        qemuMonitorTransactionBitmapMerge(actions, data->basenode, bitmapname,
+-                                          &data->merge) < 0)
+-        return -1;
+-
+-    return 0;
+-}
+-
+-
+-/**
+- * @topsrc: virStorageSource representing 'top' of the job
+- * @basesrc: virStorageSource representing 'base' of the job
++ * @active: commit job is an active layer block-commit
+  * @blockNamedNodeData: hash table containing data about bitmaps
+  * @actions: filled with arguments for a 'transaction' command
+  * @disabledBitmapsBase: bitmap names which were disabled
+@@ -3317,95 +3207,20 @@ qemuBlockBitmapsHandleCommitFinishIterate(void *payload,
+ int
+ qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+                                    virStorageSourcePtr basesrc,
++                                   bool active,
+                                    virHashTablePtr blockNamedNodeData,
+-                                   virJSONValuePtr *actions,
+-                                   char **disabledBitmapsBase)
++                                   virJSONValuePtr *actions)
+ {
+-    g_autoptr(virJSONValue) act = virJSONValueNewArray();
+-    virStorageSourcePtr n;
+-    qemuBlockNamedNodeDataPtr entry;
+-    g_autoptr(virHashTable) commitdata = NULL;
+-    struct qemuBlockBitmapsHandleCommitData *bitmapdata;
+-    size_t i;
+-
+-    commitdata = virHashNew(qemuBlockBitmapsHandleCommitDataFree);
+-
+-    for (n = topsrc; n != basesrc; n = n->backingStore) {
+-        if (!(entry = virHashLookup(blockNamedNodeData, n->nodeformat)))
+-            continue;
+-
+-        for (i = 0; i < entry->nbitmaps; i++) {
+-            qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+-
+-            if (!(bitmapdata = virHashLookup(commitdata, bitmap->name))) {
+-                bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
++    virStorageSourcePtr writebitmapsrc = NULL;
+ 
+-                /* we must mirror the state of the topmost bitmap and merge
+-                 * everything else */
+-                bitmapdata->create = true;
+-                bitmapdata->enable = bitmap->recording;
+-                bitmapdata->basenode = basesrc->nodeformat;
+-                bitmapdata->merge = virJSONValueNewArray();
+-                bitmapdata->granularity = bitmap->granularity;
+-                bitmapdata->persistent = bitmap->persistent;
++    if (active)
++        writebitmapsrc = basesrc;
+ 
+-                if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) < 0) {
+-                    qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
+-                    return -1;
+-                }
+-            }
+-
+-            if (bitmap->inconsistent ||
+-                !qemuBlockBitmapChainIsValid(topsrc, bitmap->name, blockNamedNodeData))
+-                bitmapdata->skip = true;
+-
+-            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(bitmapdata->merge,
+-                                                                 n->nodeformat,
+-                                                                 bitmap->name) < 0)
+-                return -1;
+-        }
+-    }
+-
+-    if ((entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat))) {
+-        /* note that all bitmaps in 'base' were disabled when commit was started */
+-        for (i = 0; i < entry->nbitmaps; i++) {
+-            qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+-
+-            if ((bitmapdata = virHashLookup(commitdata, bitmap->name))) {
+-                bitmapdata->create = false;
+-            } else {
+-                if (disabledBitmapsBase) {
+-                    char **disabledbitmaps;
+-
+-                    for (disabledbitmaps = disabledBitmapsBase; *disabledbitmaps; disabledbitmaps++) {
+-                        if (STREQ(*disabledbitmaps, bitmap->name)) {
+-                            bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
+-
+-                            bitmapdata->create = false;
+-                            bitmapdata->enable = true;
+-                            bitmapdata->basenode = basesrc->nodeformat;
+-                            bitmapdata->granularity = bitmap->granularity;
+-                            bitmapdata->persistent = bitmap->persistent;
+-
+-                            if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) < 0) {
+-                                qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
+-                                return -1;
+-                            }
+-
+-                            break;
+-                        }
+-                    }
+-                }
+-            }
+-        }
+-    }
+-
+-    if (virHashForEach(commitdata, qemuBlockBitmapsHandleCommitFinishIterate, act) < 0)
++    if (qemuBlockGetBitmapMergeActions(topsrc, basesrc, basesrc, NULL, NULL,
++                                       writebitmapsrc, actions,
++                                       blockNamedNodeData) < 0)
+         return -1;
+ 
+-    if (virJSONValueArraySize(act) > 0)
+-        *actions = g_steal_pointer(&act);
+-
+     return 0;
+ }
+ 
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 2500390734..19d2fc32e0 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -243,19 +243,12 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+                                 bool shallow,
+                                 virJSONValuePtr *actions);
+ 
+-int
+-qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
+-                                  virStorageSourcePtr basesrc,
+-                                  virHashTablePtr blockNamedNodeData,
+-                                  virJSONValuePtr *actions,
+-                                  char ***disabledBitmapsBase);
+-
+ int
+ qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+                                    virStorageSourcePtr basesrc,
++                                   bool active,
+                                    virHashTablePtr blockNamedNodeData,
+-                                   virJSONValuePtr *actions,
+-                                   char **disabledBitmapsBase);
++                                   virJSONValuePtr *actions);
+ 
+ int
+ qemuBlockReopenReadWrite(virDomainObjPtr vm,
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index c80c71295b..c63a691a0e 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1063,6 +1063,7 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObjPtr vm,
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(virHashTable) blockNamedNodeData = NULL;
+     g_autoptr(virJSONValue) actions = NULL;
++    bool active = job->type == QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT;
+ 
+     if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
+         return 0;
+@@ -1072,16 +1073,18 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObjPtr vm,
+ 
+     if (qemuBlockBitmapsHandleCommitFinish(job->data.commit.top,
+                                            job->data.commit.base,
++                                           active,
+                                            blockNamedNodeData,
+-                                           &actions,
+-                                           job->data.commit.disabledBitmapsBase) < 0)
++                                           &actions) < 0)
+         return 0;
+ 
+     if (!actions)
+         return 0;
+ 
+-    if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
+-        return -1;
++    if (!active) {
++        if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
++            return -1;
++    }
+ 
+     if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+         return -1;
+@@ -1091,8 +1094,10 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObjPtr vm,
+     if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
+         return -1;
+ 
+-    if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
+-        return -1;
++    if (!active) {
++        if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
++            return -1;
++    }
+ 
+     return 0;
+ }
+@@ -1262,6 +1267,9 @@ qemuBlockJobProcessEventCompletedActiveCommit(virQEMUDriverPtr driver,
+     job->disk->src = job->data.commit.base;
+     job->disk->src->readonly = job->data.commit.top->readonly;
+ 
++    if (qemuBlockJobProcessEventCompletedCommitBitmaps(vm, job, asyncJob) < 0)
++        return;
++
+     qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job->data.commit.top);
+ 
+     if (job->data.commit.deleteCommittedImages)
+@@ -1333,6 +1341,7 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
+                                            virDomainObjPtr vm,
+                                            qemuBlockJobDataPtr job)
+ {
++    g_autoptr(virJSONValue) actions = virJSONValueNewArray();
+     virDomainDiskDefPtr disk = job->disk;
+ 
+     VIR_DEBUG("active commit job '%s' on VM '%s' failed", job->name, vm->def->name);
+@@ -1340,6 +1349,10 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
+     if (!disk)
+         return;
+ 
++    ignore_value(qemuMonitorTransactionBitmapRemove(actions, disk->mirror->nodeformat,
++                                                    "libvirt-tmp-activewrite"));
++
++
+     /* Ideally, we would make the backing chain read only again (yes, SELinux
+      * can do that using different labels). But that is not implemented yet and
+      * not leaking security driver metadata is more important. */
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 9f7d96c0b6..983d4a04a8 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17594,9 +17594,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+ 
+     case QEMU_BLOCKJOB_TYPE_COPY:
+         if (blockdev && !job->jobflagsmissing) {
+-            g_autoptr(virHashTable) blockNamedNodeData = NULL;
+             bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
+             bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;
++            g_autoptr(virHashTable) blockNamedNodeData = NULL;
+ 
+             if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+                 return -1;
+@@ -17634,16 +17634,15 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+          * the bitmaps if it wasn't present thus must skip this */
+         if (blockdev &&
+             virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) {
+-            g_autoptr(virHashTable) blockNamedNodeData = NULL;
+ 
+-            if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+-                return -1;
++            actions = virJSONValueNewArray();
+ 
+-            if (qemuBlockBitmapsHandleCommitFinish(job->data.commit.top,
+-                                                   job->data.commit.base,
+-                                                   blockNamedNodeData,
+-                                                   &actions,
+-                                                   job->data.commit.disabledBitmapsBase) < 0)
++            if (qemuMonitorTransactionBitmapAdd(actions,
++                                                job->data.commit.base->nodeformat,
++                                                "libvirt-tmp-activewrite",
++                                                false,
++                                                false,
++                                                0) < 0)
+                 return -1;
+         }
+ 
+@@ -18758,7 +18757,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     const char *nodebase = NULL;
+     bool persistjob = false;
+     bool blockdev = false;
+-    g_autoptr(virJSONValue) bitmapDisableActions = NULL;
+     VIR_AUTOSTRINGLIST bitmapDisableList = NULL;
+ 
+     virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW |
+@@ -18920,27 +18918,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
+             goto endjob;
+     }
+ 
+-    if (blockdev &&
+-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) {
+-        g_autoptr(virHashTable) blockNamedNodeData = NULL;
+-        if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+-            goto endjob;
+-
+-        if (qemuBlockBitmapsHandleCommitStart(topSource, baseSource,
+-                                              blockNamedNodeData,
+-                                              &bitmapDisableActions,
+-                                              &bitmapDisableList) < 0)
+-            goto endjob;
+-
+-        /* if we don't have terminator on 'base' we can't reopen it */
+-        if (bitmapDisableActions && !baseSource->backingStore) {
+-            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+-                           _("can't handle bitmaps on unterminated backing image '%s'"),
+-                           base);
+-            goto endjob;
+-        }
+-    }
+-
+     if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
+                                           baseSource, &bitmapDisableList,
+                                           flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
+@@ -18965,23 +18942,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
+             !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
+             goto endjob;
+ 
+-        if (bitmapDisableActions) {
+-            int rc;
+-
+-            if (qemuBlockReopenReadWrite(vm, baseSource, QEMU_ASYNC_JOB_NONE) < 0)
+-                goto endjob;
+-
+-            qemuDomainObjEnterMonitor(driver, vm);
+-            rc = qemuMonitorTransaction(priv->mon, &bitmapDisableActions);
+-            if (qemuDomainObjExitMonitor(driver, vm) < 0)
+-                goto endjob;
+-
+-            if (qemuBlockReopenReadOnly(vm, baseSource, QEMU_ASYNC_JOB_NONE) < 0)
+-                goto endjob;
+-
+-            if (rc < 0)
+-                goto endjob;
+-        }
+     } else {
+         device = job->name;
+     }
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 8ce878f15b..f0e80a0738 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -928,12 +928,11 @@ testQemuBlockBitmapBlockcommit(const void *opaque)
+ 
+     g_autofree char *actual = NULL;
+     g_autofree char *expectpath = NULL;
+-    g_autoptr(virJSONValue) actionsDisable = NULL;
+     g_autoptr(virJSONValue) actionsMerge = NULL;
+     g_autoptr(virJSONValue) nodedatajson = NULL;
+     g_autoptr(virHashTable) nodedata = NULL;
+     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+-    VIR_AUTOSTRINGLIST bitmapsDisable = NULL;
++    bool active = data->top == data->chain;
+ 
+     expectpath = g_strdup_printf("%s/%s%s", abs_srcdir,
+                                  blockcommitPrefix, data->name);
+@@ -947,20 +946,10 @@ testQemuBlockBitmapBlockcommit(const void *opaque)
+         return -1;
+     }
+ 
+-    if (qemuBlockBitmapsHandleCommitStart(data->top, data->base, nodedata,
+-                                          &actionsDisable, &bitmapsDisable) < 0)
+-        return -1;
+-
+-    virBufferAddLit(&buf, "pre job bitmap disable:\n");
+-
+-    if (actionsDisable &&
+-        virJSONValueToBuffer(actionsDisable, &buf, true) < 0)
+-        return -1;
+-
+     virBufferAddLit(&buf, "merge bitmpas:\n");
+ 
+-    if (qemuBlockBitmapsHandleCommitFinish(data->top, data->base, nodedata,
+-                                           &actionsMerge, bitmapsDisable) < 0)
++    if (qemuBlockBitmapsHandleCommitFinish(data->top, data->base, active, nodedata,
++                                           &actionsMerge) < 0)
+         return -1;
+ 
+     if (actionsMerge &&
+@@ -1356,6 +1345,7 @@ mymain(void)
+ #define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
+     do {\
+         blockbitmapblockcommitdata.name = testname; \
++        blockbitmapblockcommitdata.chain = bitmapSourceChain; \
+         blockbitmapblockcommitdata.top = testQemuBitmapGetFakeChainEntry(bitmapSourceChain, topimg); \
+         blockbitmapblockcommitdata.base = testQemuBitmapGetFakeChainEntry(bitmapSourceChain, baseimg); \
+         blockbitmapblockcommitdata.nodedatafile = ndf; \
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/empty b/tests/qemublocktestdata/bitmapblockcommit/empty
+index bfc58f994e..9260011852 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/empty
++++ b/tests/qemublocktestdata/bitmapblockcommit/empty
+@@ -1,2 +1 @@
+-pre job bitmap disable:
+ merge bitmpas:
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-copy.patch b/SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-copy.patch
new file mode 100644
index 0000000..8ad75d7
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Rewrite-bitmap-handling-for-block-copy.patch
@@ -0,0 +1,281 @@
+From 8d813e074a1bbe7636c487487e661a5e1a713fd1 Mon Sep 17 00:00:00 2001
+Message-Id: <8d813e074a1bbe7636c487487e661a5e1a713fd1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:04 +0200
+Subject: [PATCH] qemu: Rewrite bitmap handling for block copy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reuse qemuBlockGetBitmapMergeActions which allows the removal of the
+ad-hoc implementation of bitmap merging for block copy.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 7bfff40fdfe5410c446c1cd8ec413e00530faf7d)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <6a254120769a0071ef6867e4c15aca7d3760cf3c.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c    | 113 ++-------------------------------------
+ src/qemu/qemu_blockjob.c |  40 ++++++++++++++
+ src/qemu/qemu_driver.c   |  13 ++---
+ tests/qemublocktest.c    |   6 ++-
+ 4 files changed, 57 insertions(+), 115 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index ff9e000461..18c3861a2e 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3053,38 +3053,6 @@ qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
+ }
+ 
+ 
+-struct qemuBlockBitmapsHandleBlockcopyConcatData {
+-    virHashTablePtr bitmaps_merge;
+-    virJSONValuePtr actions;
+-    const char *mirrornodeformat;
+-    bool has_bitmaps;
+-};
+-
+-
+-static int
+-qemuBlockBitmapsHandleBlockcopyConcatActions(void *payload,
+-                                             const void *name,
+-                                             void *opaque)
+-{
+-    struct qemuBlockBitmapsHandleBlockcopyConcatData *data = opaque;
+-    virJSONValuePtr createactions = payload;
+-    const char *bitmapname = name;
+-    g_autoptr(virJSONValue) mergebitmaps = virHashSteal(data->bitmaps_merge, bitmapname);
+-
+-    data->has_bitmaps = true;
+-
+-    virJSONValueArrayConcat(data->actions, createactions);
+-
+-    if (qemuMonitorTransactionBitmapMerge(data->actions,
+-                                          data->mirrornodeformat,
+-                                          bitmapname,
+-                                          &mergebitmaps) < 0)
+-        return -1;
+-
+-    return 0;
+-}
+-
+-
+ /**
+  * qemuBlockBitmapsHandleBlockcopy:
+  * @src: disk source
+@@ -3107,86 +3075,15 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+                                 bool shallow,
+                                 virJSONValuePtr *actions)
+ {
+-    g_autoptr(virHashTable) bitmaps = virHashNew(virJSONValueHashFree);
+-    g_autoptr(virHashTable) bitmaps_merge = virHashNew(virJSONValueHashFree);
+-    g_autoptr(virHashTable) bitmaps_skip = virHashNew(NULL);
+-    g_autoptr(virJSONValue) tmpactions = virJSONValueNewArray();
+-    qemuBlockNamedNodeDataPtr entry;
+-    virStorageSourcePtr n;
+-    size_t i;
+-    struct qemuBlockBitmapsHandleBlockcopyConcatData data = { .bitmaps_merge = bitmaps_merge,
+-                                                              .actions = tmpactions,
+-                                                              .mirrornodeformat = mirror->nodeformat,
+-                                                              .has_bitmaps = false, };
+-
+-    for (n = src; n; n = n->backingStore) {
+-        if (!(entry = virHashLookup(blockNamedNodeData, n->nodeformat)))
+-            continue;
+-
+-        for (i = 0; i < entry->nbitmaps; i++) {
+-            qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+-            virJSONValuePtr bitmap_merge;
+-
+-            if (virHashHasEntry(bitmaps_skip, bitmap->name))
+-                continue;
+-
+-            if (!(bitmap_merge = virHashLookup(bitmaps_merge, bitmap->name))) {
+-                g_autoptr(virJSONValue) tmp = NULL;
+-                bool disabled = !bitmap->recording;
+-
+-                /* disable any non top-layer bitmaps */
+-                if (n != src)
+-                    disabled = true;
+-
+-                if (!bitmap->persistent ||
+-                    !(qemuBlockBitmapChainIsValid(n, bitmap->name,
+-                                                  blockNamedNodeData))) {
+-                    ignore_value(virHashAddEntry(bitmaps_skip, bitmap->name, NULL));
+-                    continue;
+-                }
+-
+-                /* prepare the data for adding the bitmap to the mirror */
+-                tmp = virJSONValueNewArray();
+-
+-                if (qemuMonitorTransactionBitmapAdd(tmp,
+-                                                    mirror->nodeformat,
+-                                                    bitmap->name,
+-                                                    true,
+-                                                    disabled,
+-                                                    bitmap->granularity) < 0)
+-                    return -1;
++    virStorageSourcePtr base = NULL;
+ 
+-                if (virHashAddEntry(bitmaps, bitmap->name, tmp) < 0)
+-                    return -1;
+-
+-                tmp = NULL;
+-
+-                /* prepare array for merging all the bitmaps from the original chain */
+-                tmp = virJSONValueNewArray();
+-
+-                if (virHashAddEntry(bitmaps_merge, bitmap->name, tmp) < 0)
+-                    return -1;
+-
+-                bitmap_merge = g_steal_pointer(&tmp);
+-            }
++    if (shallow)
++        base = src->backingStore;
+ 
+-            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(bitmap_merge,
+-                                                                 n->nodeformat,
+-                                                                 bitmap->name) < 0)
+-                return -1;
+-        }
+-
+-        if (shallow)
+-            break;
+-    }
+-
+-    if (virHashForEach(bitmaps, qemuBlockBitmapsHandleBlockcopyConcatActions,
+-                       &data) < 0)
++    if (qemuBlockGetBitmapMergeActions(src, base, mirror, NULL, NULL, mirror, actions,
++                                       blockNamedNodeData) < 0)
+         return -1;
+ 
+-    if (data.has_bitmaps)
+-        *actions = g_steal_pointer(&tmpactions);
+-
+     return 0;
+ }
+ 
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index d106165175..6e33f8666c 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1281,6 +1281,43 @@ qemuBlockJobProcessEventCompletedActiveCommit(virQEMUDriverPtr driver,
+ }
+ 
+ 
++static int
++qemuBlockJobProcessEventCompletedCopyBitmaps(virDomainObjPtr vm,
++                                             qemuBlockJobDataPtr job,
++                                             qemuDomainAsyncJob asyncJob)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    g_autoptr(virHashTable) blockNamedNodeData = NULL;
++    g_autoptr(virJSONValue) actions = NULL;
++    bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
++
++    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
++        return 0;
++
++    if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
++        return -1;
++
++    if (qemuBlockBitmapsHandleBlockcopy(job->disk->src,
++                                        job->disk->mirror,
++                                        blockNamedNodeData,
++                                        shallow,
++                                        &actions) < 0)
++        return 0;
++
++    if (!actions)
++        return 0;
++
++    if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
++        return -1;
++
++    qemuMonitorTransaction(priv->mon, &actions);
++
++    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
++        return -1;
++
++    return 0;
++}
++
+ static void
+ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriverPtr driver,
+                                            virDomainObjPtr vm,
+@@ -1295,6 +1332,8 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriverPtr driver,
+         !job->disk->mirror)
+         return;
+ 
++    qemuBlockJobProcessEventCompletedCopyBitmaps(vm, job, asyncJob);
++
+     /* for shallow copy without reusing external image the user can either not
+      * specify the backing chain in which case libvirt will open and use the
+      * chain the user provided or not specify a chain in which case we'll
+@@ -1328,6 +1367,7 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDriverPtr driver,
+         !job->disk->mirror)
+         return;
+ 
++    /* activeWrite bitmap is removed automatically here */
+     qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job->disk->mirror);
+     virObjectUnref(job->disk->mirror);
+     job->disk->mirror = NULL;
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ed5498d2bc..9e3a455814 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17596,14 +17596,15 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         if (blockdev && !job->jobflagsmissing) {
+             bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
+             bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;
+-            g_autoptr(virHashTable) blockNamedNodeData = NULL;
+ 
+-            if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+-                return -1;
++            actions = virJSONValueNewArray();
+ 
+-            if (qemuBlockBitmapsHandleBlockcopy(disk->src, disk->mirror,
+-                                                blockNamedNodeData,
+-                                                shallow, &actions) < 0)
++            if (qemuMonitorTransactionBitmapAdd(actions,
++                                                disk->mirror->nodeformat,
++                                                "libvirt-tmp-activewrite",
++                                                false,
++                                                false,
++                                                0) < 0)
+                 return -1;
+ 
+             /* Open and install the backing chain of 'mirror' late if we can use
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index e1468f13fa..193b4aaed0 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -881,6 +881,7 @@ testQemuBlockBitmapBlockcopy(const void *opaque)
+     g_autoptr(virJSONValue) nodedatajson = NULL;
+     g_autoptr(virHashTable) nodedata = NULL;
+     g_autoptr(virStorageSource) fakemirror = virStorageSourceNew();
++    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+ 
+     if (!fakemirror)
+         return -1;
+@@ -903,10 +904,13 @@ testQemuBlockBitmapBlockcopy(const void *opaque)
+                                         data->shallow, &actions) < 0)
+         return -1;
+ 
++
+     if (actions &&
+-        !(actual = virJSONValueToString(actions, true)))
++        virJSONValueToBuffer(actions, &buf, true) < 0)
+         return -1;
+ 
++    actual = virBufferContentAndReset(&buf);
++
+     return virTestCompareToFile(actual, expectpath);
+ }
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-Set-identity-for-the-reconnect-all-thread.patch b/SOURCES/libvirt-qemu-Set-identity-for-the-reconnect-all-thread.patch
deleted file mode 100644
index b2c1428..0000000
--- a/SOURCES/libvirt-qemu-Set-identity-for-the-reconnect-all-thread.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 4df55f75bf523e3c1964198299713bdfa85fbad2 Mon Sep 17 00:00:00 2001
-Message-Id: <4df55f75bf523e3c1964198299713bdfa85fbad2@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Wed, 14 Nov 2018 14:41:31 -0500
-Subject: [PATCH] qemu: Set identity for the reconnect all thread
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1648546 (RHEL8)
-https://bugzilla.redhat.com/show_bug.cgi?id=1631622 (RHEL7)
-
-If polkit authentication is enabled, an attempt to open
-the connection failed during virAccessDriverPolkitGetCaller
-when the call to virIdentityGetCurrent returned NULL resulting
-in the errors:
-
-  virAccessDriverPolkitGetCaller:87 : access denied:
-  Policy kit denied action org.libvirt.api.connect.getattr from <anonymous>
-
-Because qemuProcessReconnect runs in a thread during
-daemonRunStateInit processing it doesn't have the thread
-local identity. Thus when the virGetConnectNWFilter is
-called as part of the qemuProcessFiltersInstantiate when
-virDomainConfNWFilterInstantiate is run the attempt to get
-the idenity fails and results in the anonymous error above.
-
-To fix this, let's grab/use the virIdenityPtr of the process
-that will be creating the thread, e.g. what daemonRunStateInit
-has set and use that for our thread. That way any other similar
-processing that uses/requires an identity for any other call
-that would have previously been successfully run won't fail in
-a similar manner.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit b04b82f8cb671f067bad2d5e922acf88f13f0934)
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_process.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 8ba14abfa4..4b99fbd835 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -81,6 +81,7 @@
- #include "netdev_bandwidth_conf.h"
- #include "virresctrl.h"
- #include "virvsock.h"
-+#include "viridentity.h"
- 
- #define VIR_FROM_THIS VIR_FROM_QEMU
- 
-@@ -7609,6 +7610,7 @@ qemuProcessRefreshCPU(virQEMUDriverPtr driver,
- struct qemuProcessReconnectData {
-     virQEMUDriverPtr driver;
-     virDomainObjPtr obj;
-+    virIdentityPtr identity;
- };
- /*
-  * Open an existing VM's monitor, re-detect VCPU threads
-@@ -7645,6 +7647,8 @@ qemuProcessReconnect(void *opaque)
-     virCapsPtr caps = NULL;
-     bool retry = true;
- 
-+    virIdentitySetCurrent(data->identity);
-+    virObjectUnref(data->identity);
-     VIR_FREE(data);
- 
-     qemuDomainObjRestoreJob(obj, &oldjob);
-@@ -7865,6 +7869,7 @@ qemuProcessReconnect(void *opaque)
-     virObjectUnref(cfg);
-     virObjectUnref(caps);
-     virNWFilterUnlockFilterUpdates();
-+    virIdentitySetCurrent(NULL);
-     return;
- 
-  error:
-@@ -7902,6 +7907,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj,
- 
-     memcpy(data, src, sizeof(*data));
-     data->obj = obj;
-+    data->identity = virIdentityGetCurrent();
- 
-     virNWFilterReadLockFilterUpdates();
- 
-@@ -7925,6 +7931,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj,
- 
-         virDomainObjEndAPI(&obj);
-         virNWFilterUnlockFilterUpdates();
-+        virObjectUnref(data->identity);
-         VIR_FREE(data);
-         return -1;
-     }
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-qemu-Set-up-EMULATOR-thread-and-cpuset.mems-before-exec-ing-qemu.patch b/SOURCES/libvirt-qemu-Set-up-EMULATOR-thread-and-cpuset.mems-before-exec-ing-qemu.patch
deleted file mode 100644
index 3605c9b..0000000
--- a/SOURCES/libvirt-qemu-Set-up-EMULATOR-thread-and-cpuset.mems-before-exec-ing-qemu.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ac89574e251dfecf34606083e402194ded63dba2 Mon Sep 17 00:00:00 2001
-Message-Id: <ac89574e251dfecf34606083e402194ded63dba2@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 5 Jun 2019 11:33:29 +0200
-Subject: [PATCH] qemu: Set up EMULATOR thread and cpuset.mems before
- exec()-ing qemu
-
-It's funny how this went unnoticed for such a long time. Long
-story short, if a domain is configured with
-VIR_DOMAIN_NUMATUNE_MEM_STRICT libvirt doesn't really honour
-that. This is because of 7e72ac787848 after which libvirt allowed
-qemu to allocate memory just anywhere and only after that it used
-some magic involving cpuset.memory_migrate and cpuset.mems to
-move the memory to desired NUMA nodes. This was done in order to
-work around some KVM bug where KVM would fail if there wasn't a
-DMA zone available on the NUMA node. Well, while the work around
-might stopped libvirt tickling the KVM bug it also caused a bug
-on libvirt side: if there is not enough memory on configured NUMA
-node(s) then any attempt to start a domain must fail. Because of
-the way we play with guest memory domains can start just happily.
-
-The solution is to move the child we've just forked into emulator
-cgroup, set up cpuset.mems and exec() qemu only after that.
-
-This basically reverts 7e72ac787848b7434c9 which was a workaround
-for kernel bug. This bug was apparently fixed because I've tested
-this successfully with recent kernel.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 0eaa4716e1b8f6eb59d77049aed3735c3b5fbdd6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716943
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <fe479c5bad92778ec29f1c1bf4fb0c7b9049f3ab.1559727075.git.mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_process.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 6071b3ba3d..8b05cef80c 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6442,6 +6442,10 @@ qemuProcessLaunch(virConnectPtr conn,
-     if (qemuProcessInitCpuAffinity(vm) < 0)
-         goto cleanup;
- 
-+    VIR_DEBUG("Setting emulator tuning/settings");
-+    if (qemuProcessSetupEmulator(vm) < 0)
-+        goto cleanup;
-+
-     VIR_DEBUG("Setting cgroup for external devices (if required)");
-     if (qemuSetupCgroupForExtDevices(vm, driver) < 0)
-         goto cleanup;
-@@ -6533,10 +6537,6 @@ qemuProcessLaunch(virConnectPtr conn,
-     if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0)
-         goto cleanup;
- 
--    VIR_DEBUG("Setting emulator tuning/settings");
--    if (qemuProcessSetupEmulator(vm) < 0)
--        goto cleanup;
--
-     VIR_DEBUG("Setting global CPU cgroup (if required)");
-     if (qemuSetupGlobalCpuCgroup(vm) < 0)
-         goto cleanup;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Split-out-initialization-of-secrets-for-iscsi-hostdevs.patch b/SOURCES/libvirt-qemu-Split-out-initialization-of-secrets-for-iscsi-hostdevs.patch
new file mode 100644
index 0000000..dd245ad
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Split-out-initialization-of-secrets-for-iscsi-hostdevs.patch
@@ -0,0 +1,80 @@
+From 1c5d21527ce3cb5182434d206d589a85b1901b42 Mon Sep 17 00:00:00 2001
+Message-Id: <1c5d21527ce3cb5182434d206d589a85b1901b42@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:52 +0100
+Subject: [PATCH] qemu: Split out initialization of secrets for 'iscsi'
+ hostdevs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Currently we don't have infrastructure to remember the secret aliases
+for hostdevs. Since an upcoming patch is going to change aliases for
+the disks, initialize the iscsi hostdevs separately so that we can keep
+the alias. At the same time let's use qemuAliasForSecret instead of
+qemuDomainGetSecretAESAlias when unplugging the iscsi hostdev.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 740dd1a4e5ce81e5b0be855dd413dd7eec81ccd3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <f4157def83aa59b7432c6e0714d621ff5b2bed4a.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c  | 25 +++++++++++++++++++++++--
+ src/qemu/qemu_hotplug.c |  2 +-
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 897e21726a..0047a1d316 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1848,8 +1848,29 @@ qemuDomainSecretHostdevPrepare(qemuDomainObjPrivatePtr priv,
+ 
+         if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI &&
+             src->auth) {
+-            if (qemuDomainSecretStorageSourcePrepare(priv, src,
+-                                                     hostdev->info->alias, NULL) < 0)
++            bool iscsiHasPS = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET);
++            virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI;
++            qemuDomainStorageSourcePrivatePtr srcPriv;
++
++            if (!(src->privateData = qemuDomainStorageSourcePrivateNew()))
++                return -1;
++
++            srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
++
++            if (!qemuDomainSupportsEncryptedSecret(priv) || !iscsiHasPS) {
++                srcPriv->secinfo = qemuDomainSecretInfoNewPlain(usageType,
++                                                                src->auth->username,
++                                                                &src->auth->seclookupdef);
++            } else {
++                srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
++                                                                      hostdev->info->alias,
++                                                                      usageType,
++                                                                      src->auth->username,
++                                                                      &src->auth->seclookupdef,
++                                                                      false);
++            }
++
++            if (!srcPriv->secinfo)
+                 return -1;
+         }
+     }
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index 12bc1f9dd5..a473bab3e1 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -4438,7 +4438,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
+         if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI &&
+             virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET) &&
+             qemuDomainStorageSourceHasAuth(iscsisrc->src)) {
+-            if (!(objAlias = qemuDomainGetSecretAESAlias(hostdev->info->alias, false)))
++            if (!(objAlias = qemuAliasForSecret(hostdev->info->alias, NULL)))
+                 return -1;
+         }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Stop-domain-on-failed-restore.patch b/SOURCES/libvirt-qemu-Stop-domain-on-failed-restore.patch
new file mode 100644
index 0000000..fd54a23
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Stop-domain-on-failed-restore.patch
@@ -0,0 +1,107 @@
+From 84c5cad5921e96c6106cfd217de2064b64e1464f Mon Sep 17 00:00:00 2001
+Message-Id: <84c5cad5921e96c6106cfd217de2064b64e1464f@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 16 Jan 2020 10:03:54 +0100
+Subject: [PATCH] qemu: Stop domain on failed restore
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When resuming a domain from a save file, we read the domain XML
+from the file, add it onto our internal list of domains, start
+the qemu process, let it load the incoming migration stream and
+resume its vCPUs afterwards. If anything goes wrong, the domain
+object is removed from the list of domains and error is returned
+to the caller. However, the qemu process might be left behind -
+if resuming vCPUs fails (e.g. because qemu is unable to acquire
+write lock on a disk) then due to a bug the qemu process is not
+killed but the domain object is removed from the list.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1718707
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit 4c581527d431939a63be70c201b4ddab703cddbe)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <4048f92488a8b8c31c7a17a14b579840a9492328.1579165329.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ce9b1772c1..217d873671 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -6800,7 +6800,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     int ret = -1;
+-    bool restored = false;
++    bool started = false;
+     virObjectEventPtr event;
+     VIR_AUTOCLOSE intermediatefd = -1;
+     g_autoptr(virCommand) cmd = NULL;
+@@ -6808,6 +6808,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     virQEMUSaveHeaderPtr header = &data->header;
+     g_autoptr(qemuDomainSaveCookie) cookie = NULL;
++    int rc = 0;
+ 
+     if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie,
+                                  virDomainXMLOptionGetSaveCookie(driver->xmlopt)) < 0)
+@@ -6848,12 +6849,12 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+                          VIR_NETDEV_VPORT_PROFILE_OP_RESTORE,
+                          VIR_QEMU_PROCESS_START_PAUSED |
+                          VIR_QEMU_PROCESS_START_GEN_VMID) == 0)
+-        restored = true;
++        started = true;
+ 
+     if (intermediatefd != -1) {
+         virErrorPtr orig_err = NULL;
+ 
+-        if (!restored) {
++        if (!started) {
+             /* if there was an error setting up qemu, the intermediate
+              * process will wait forever to write to stdout, so we
+              * must manually kill it and ignore any error related to
+@@ -6864,21 +6865,17 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+             VIR_FORCE_CLOSE(*fd);
+         }
+ 
+-        if (virCommandWait(cmd, NULL) < 0) {
+-            qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, 0);
+-            restored = false;
+-        }
++        rc = virCommandWait(cmd, NULL);
+         VIR_DEBUG("Decompression binary stderr: %s", NULLSTR(errbuf));
+-
+         virErrorRestore(&orig_err);
+     }
+     if (VIR_CLOSE(*fd) < 0) {
+         virReportSystemError(errno, _("cannot close file: %s"), path);
+-        restored = false;
++        rc = -1;
+     }
+ 
+-    virDomainAuditStart(vm, "restored", restored);
+-    if (!restored)
++    virDomainAuditStart(vm, "restored", started);
++    if (!started || rc < 0)
+         goto cleanup;
+ 
+     /* qemuProcessStart doesn't unset the qemu error reporting infrastructure
+@@ -6918,6 +6915,10 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+     ret = 0;
+ 
+  cleanup:
++    if (ret < 0 && started) {
++        qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
++                        asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED);
++    }
+     if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0)
+         VIR_WARN("failed to restore save state label on %s", path);
+     return ret;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Tell-secdrivers-which-images-are-top-parent.patch b/SOURCES/libvirt-qemu-Tell-secdrivers-which-images-are-top-parent.patch
new file mode 100644
index 0000000..4e7ec99
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Tell-secdrivers-which-images-are-top-parent.patch
@@ -0,0 +1,312 @@
+From d9369eae049c780ebd130a13eedfaaf3586242eb Mon Sep 17 00:00:00 2001
+Message-Id: <d9369eae049c780ebd130a13eedfaaf3586242eb@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 9 Mar 2020 14:58:57 +0100
+Subject: [PATCH] qemu: Tell secdrivers which images are top parent
+
+When preparing images for block jobs we modify their seclabels so
+that QEMU can open them. However, as mentioned in the previous
+commit, secdrivers base some it their decisions whether the image
+they are working on is top of of the backing chain. Fortunately,
+in places where we call secdrivers we know this and the
+information can be passed to secdrivers.
+
+The problem is the following: after the first blockcommit from
+the base to one of the parents the XATTRs on the base image are
+not cleared and therefore the second attempt to do another
+blockcommit fails. This is caused by blockcommit code calling
+qemuSecuritySetImageLabel() over the base image, possibly
+multiple times (to ensure RW/RO access). A naive fix would be to
+call the restore function. But this is not possible, because that
+would deny QEMU the access to the base image.  Fortunately, we
+can use the fact that seclabels are remembered only for the top
+of the backing chain and not for the rest of the backing chain.
+And thanks to the previous commit we can tell secdrivers which
+images are top of the backing chain.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803551
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 13eb6c14682004d0dc692554475125db0f161da7)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <a8d9171d9f88b325480c17969e074d62d3eeba3b.1583760062.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_backup.c     |  4 ++--
+ src/qemu/qemu_blockjob.c   |  6 ++++--
+ src/qemu/qemu_checkpoint.c |  6 ++++--
+ src/qemu/qemu_domain.c     | 24 ++++++++++++++++++++----
+ src/qemu/qemu_domain.h     |  3 ++-
+ src/qemu/qemu_driver.c     | 23 +++++++++++++++++------
+ src/qemu/qemu_process.c    |  2 +-
+ src/qemu/qemu_security.c   |  6 +++++-
+ src/qemu/qemu_security.h   |  3 ++-
+ 9 files changed, 57 insertions(+), 20 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 2cc6ff7a42..8b66ee8d1f 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -469,8 +469,8 @@ qemuBackupDiskPrepareOneStorage(virDomainObjPtr vm,
+         dd->created = true;
+     }
+ 
+-    if (qemuDomainStorageSourceAccessAllow(priv->driver, vm, dd->store, false,
+-                                           true) < 0)
++    if (qemuDomainStorageSourceAccessAllow(priv->driver, vm, dd->store,
++                                           false, true, true) < 0)
+         return -1;
+ 
+     dd->labelled = true;
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 71df0d1ab2..e894e1634d 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1105,9 +1105,11 @@ qemuBlockJobProcessEventCompletedCommit(virQEMUDriverPtr driver,
+         return;
+ 
+     /* revert access to images */
+-    qemuDomainStorageSourceAccessAllow(driver, vm, job->data.commit.base, true, false);
++    qemuDomainStorageSourceAccessAllow(driver, vm, job->data.commit.base,
++                                       true, false, false);
+     if (job->data.commit.topparent != job->disk->src)
+-        qemuDomainStorageSourceAccessAllow(driver, vm, job->data.commit.topparent, true, false);
++        qemuDomainStorageSourceAccessAllow(driver, vm, job->data.commit.topparent,
++                                           true, false, true);
+ 
+     baseparent->backingStore = NULL;
+     job->data.commit.topparent->backingStore = job->data.commit.base;
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index c06bfe6a21..fe54af74ec 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -298,7 +298,8 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     for (next = reopenimages; next; next = next->next) {
+         virStorageSourcePtr src = next->data;
+ 
+-        if (qemuDomainStorageSourceAccessAllow(driver, vm, src, false, false) < 0)
++        if (qemuDomainStorageSourceAccessAllow(driver, vm, src,
++                                               false, false, false) < 0)
+             goto relabel;
+ 
+         relabelimages = g_slist_prepend(relabelimages, src);
+@@ -313,7 +314,8 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     for (next = relabelimages; next; next = next->next) {
+         virStorageSourcePtr src = next->data;
+ 
+-        ignore_value(qemuDomainStorageSourceAccessAllow(driver, vm, src, true, false));
++        ignore_value(qemuDomainStorageSourceAccessAllow(driver, vm, src,
++                                                        true, false, false));
+     }
+ 
+     return rc;
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 3cbe7ef6e1..14bab896bc 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -11770,6 +11770,8 @@ typedef enum {
+     QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE = 1 << 4,
+     /* VM already has access to the source and we are just modifying it */
+     QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS = 1 << 5,
++    /* whether the image is the top image of the backing chain (e.g. disk source) */
++    QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN_TOP = 1 << 6,
+ } qemuDomainStorageSourceAccessFlags;
+ 
+ 
+@@ -11847,6 +11849,7 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver,
+     bool force_ro = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_ONLY;
+     bool force_rw = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_WRITE;
+     bool revoke = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE;
++    bool chain_top = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN_TOP;
+     int rc;
+     bool was_readonly = src->readonly;
+     bool revoke_cgroup = false;
+@@ -11893,7 +11896,7 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver,
+         revoke_namespace = true;
+     }
+ 
+-    if (qemuSecuritySetImageLabel(driver, vm, src, chain) < 0)
++    if (qemuSecuritySetImageLabel(driver, vm, src, chain, chain_top) < 0)
+         goto revoke;
+ 
+     revoke_label = true;
+@@ -11956,7 +11959,8 @@ qemuDomainStorageSourceChainAccessAllow(virQEMUDriverPtr driver,
+                                         virDomainObjPtr vm,
+                                         virStorageSourcePtr src)
+ {
+-    qemuDomainStorageSourceAccessFlags flags = QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN;
++    qemuDomainStorageSourceAccessFlags flags = QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN |
++                                               QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN_TOP;
+ 
+     return qemuDomainStorageSourceAccessModify(driver, vm, src, flags);
+ }
+@@ -11968,7 +11972,8 @@ qemuDomainStorageSourceChainAccessRevoke(virQEMUDriverPtr driver,
+                                          virStorageSourcePtr src)
+ {
+     qemuDomainStorageSourceAccessFlags flags = QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE |
+-                                               QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN;
++                                               QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN |
++                                               QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN_TOP;
+ 
+     return qemuDomainStorageSourceAccessModify(driver, vm, src, flags);
+ }
+@@ -11998,6 +12003,7 @@ qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr driver,
+  * @elem: source structure to set access for
+  * @readonly: setup read-only access if true
+  * @newSource: @elem describes a storage source which @vm can't access yet
++ * @chainTop: @elem is top parent of backing chain
+  *
+  * Allow a VM access to a single element of a disk backing chain; this helper
+  * ensures that the lock manager, cgroup device controller, and security manager
+@@ -12005,13 +12011,20 @@ qemuDomainStorageSourceAccessRevoke(virQEMUDriverPtr driver,
+  *
+  * When modifying permissions of @elem which @vm can already access (is in the
+  * backing chain) @newSource needs to be set to false.
++ *
++ * The @chainTop flag must be set if the @elem image is the topmost image of a
++ * given backing chain or meant to become the topmost image (for e.g.
++ * snapshots, or blockcopy or even in the end for active layer block commit,
++ * where we discard the top of the backing chain so one of the intermediates
++ * (the base) becomes the top of the chain).
+  */
+ int
+ qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr driver,
+                                    virDomainObjPtr vm,
+                                    virStorageSourcePtr elem,
+                                    bool readonly,
+-                                   bool newSource)
++                                   bool newSource,
++                                   bool chainTop)
+ {
+     qemuDomainStorageSourceAccessFlags flags = QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_SKIP_REVOKE;
+ 
+@@ -12023,6 +12036,9 @@ qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr driver,
+     if (!newSource)
+         flags |= QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS;
+ 
++    if (chainTop)
++        flags |= QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN_TOP;
++
+     return qemuDomainStorageSourceAccessModify(driver, vm, elem, flags);
+ }
+ 
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 83150e4e6d..9d143b575d 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -895,7 +895,8 @@ int qemuDomainStorageSourceAccessAllow(virQEMUDriverPtr driver,
+                                        virDomainObjPtr vm,
+                                        virStorageSourcePtr elem,
+                                        bool readonly,
+-                                       bool newSource);
++                                       bool newSource,
++                                       bool chainTop);
+ 
+ int qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDefPtr disk,
+                                            virStorageSourcePtr src,
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index d346446444..26f100177b 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15467,7 +15467,8 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
+     }
+ 
+     /* set correct security, cgroup and locking options on the new image */
+-    if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, true) < 0)
++    if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src,
++                                           false, true, true) < 0)
+         return -1;
+ 
+     dd->prepared = true;
+@@ -18815,11 +18816,19 @@ qemuDomainBlockCommit(virDomainPtr dom,
+      * operation succeeds, but doing that requires tracking the
+      * operation in XML across libvirtd restarts.  */
+     clean_access = true;
+-    if (qemuDomainStorageSourceAccessAllow(driver, vm, baseSource, false, false) < 0 ||
+-        (top_parent && top_parent != disk->src &&
+-         qemuDomainStorageSourceAccessAllow(driver, vm, top_parent, false, false) < 0))
++    if (qemuDomainStorageSourceAccessAllow(driver, vm, baseSource,
++                                           false, false, false) < 0)
+         goto endjob;
+ 
++    if (top_parent && top_parent != disk->src) {
++        /* While top_parent is topmost image, we don't need to remember its
++         * owner as it will be overwritten upon finishing the commit. Hence,
++         * pass chainTop = false. */
++        if (qemuDomainStorageSourceAccessAllow(driver, vm, top_parent,
++                                               false, false, false) < 0)
++            goto endjob;
++    }
++
+     if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
+                                           baseSource,
+                                           flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
+@@ -18877,9 +18886,11 @@ qemuDomainBlockCommit(virDomainPtr dom,
+         virErrorPtr orig_err;
+         virErrorPreserveLast(&orig_err);
+         /* Revert access to read-only, if possible.  */
+-        qemuDomainStorageSourceAccessAllow(driver, vm, baseSource, true, false);
++        qemuDomainStorageSourceAccessAllow(driver, vm, baseSource,
++                                           true, false, false);
+         if (top_parent && top_parent != disk->src)
+-            qemuDomainStorageSourceAccessAllow(driver, vm, top_parent, true, false);
++            qemuDomainStorageSourceAccessAllow(driver, vm, top_parent,
++                                               true, false, false);
+ 
+         virErrorRestore(&orig_err);
+     }
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 0476f18517..dffff04554 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7823,7 +7823,7 @@ qemuProcessRefreshLegacyBlockjob(void *payload,
+                 (qemuDomainNamespaceSetupDisk(vm, disk->mirror) < 0 ||
+                  qemuSetupImageChainCgroup(vm, disk->mirror) < 0 ||
+                  qemuSecuritySetImageLabel(priv->driver, vm, disk->mirror,
+-                                           true) < 0))
++                                           true, true) < 0))
+                 goto cleanup;
+         }
+     }
+diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
+index 2aa2b5b9c6..484fc34552 100644
+--- a/src/qemu/qemu_security.c
++++ b/src/qemu/qemu_security.c
+@@ -98,7 +98,8 @@ int
+ qemuSecuritySetImageLabel(virQEMUDriverPtr driver,
+                           virDomainObjPtr vm,
+                           virStorageSourcePtr src,
+-                          bool backingChain)
++                          bool backingChain,
++                          bool chainTop)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     pid_t pid = -1;
+@@ -108,6 +109,9 @@ qemuSecuritySetImageLabel(virQEMUDriverPtr driver,
+     if (backingChain)
+         labelFlags |= VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN;
+ 
++    if (chainTop)
++        labelFlags |= VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP;
++
+     if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
+         pid = vm->pid;
+ 
+diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
+index a8c648ece1..c8516005ac 100644
+--- a/src/qemu/qemu_security.h
++++ b/src/qemu/qemu_security.h
+@@ -36,7 +36,8 @@ void qemuSecurityRestoreAllLabel(virQEMUDriverPtr driver,
+ int qemuSecuritySetImageLabel(virQEMUDriverPtr driver,
+                               virDomainObjPtr vm,
+                               virStorageSourcePtr src,
+-                              bool backingChain);
++                              bool backingChain,
++                              bool chainTop);
+ 
+ int qemuSecurityRestoreImageLabel(virQEMUDriverPtr driver,
+                                   virDomainObjPtr vm,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-Translate-feature-names-from-query-cpu-model-expansion.patch b/SOURCES/libvirt-qemu-Translate-feature-names-from-query-cpu-model-expansion.patch
deleted file mode 100644
index 757e07d..0000000
--- a/SOURCES/libvirt-qemu-Translate-feature-names-from-query-cpu-model-expansion.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From f047006a60d92f9c5e66ac9c2c532f8ac4c2ba28 Mon Sep 17 00:00:00 2001
-Message-Id: <f047006a60d92f9c5e66ac9c2c532f8ac4c2ba28@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:56 +0200
-Subject: [PATCH] qemu: Translate feature names from query-cpu-model-expansion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By default query-cpu-model-expansion only reports canonical names of all
-CPU features. We do some magic and call the command twice to get all
-possible spellings of the features, but being able to consume canonical
-names will allow us to drop this magic.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit ec232c5ddc3cc47651a815dcf4cff7cd31910b3e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5a50943665bc9df69bb99c25763f0b99a7364d8c.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 19 +++++++++++--------
- src/qemu/qemu_capspriv.h     |  3 ++-
- tests/cputest.c              |  2 +-
- 3 files changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index c48d66b39b..88c651ea7b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2868,11 +2868,12 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
-     for (i = 0; i < modelInfo->nprops; i++) {
-         virCPUFeatureDefPtr feature = cpu->features + cpu->nfeatures;
-         qemuMonitorCPUPropertyPtr prop = modelInfo->props + i;
-+        const char *name = virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name);
- 
-         if (prop->type != QEMU_MONITOR_CPU_PROPERTY_BOOLEAN)
-             continue;
- 
--        if (VIR_STRDUP(feature->name, prop->name) < 0)
-+        if (VIR_STRDUP(feature->name, name) < 0)
-             return -1;
- 
-         if (!prop->value.boolean ||
-@@ -2888,7 +2889,8 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
- 
- 
- virCPUDataPtr
--virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,
-+virQEMUCapsGetCPUModelX86Data(virQEMUCapsPtr qemuCaps,
-+                              qemuMonitorCPUModelInfoPtr model,
-                               bool migratable)
- {
-     unsigned long long sigFamily = 0;
-@@ -2903,6 +2905,7 @@ virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,
- 
-     for (i = 0; i < model->nprops; i++) {
-         qemuMonitorCPUPropertyPtr prop = model->props + i;
-+        const char *name = virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name);
- 
-         switch (prop->type) {
-         case QEMU_MONITOR_CPU_PROPERTY_BOOLEAN:
-@@ -2910,23 +2913,23 @@ virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,
-                 (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO))
-                 continue;
- 
--            if (virCPUx86DataAddFeature(data, prop->name) < 0)
-+            if (virCPUx86DataAddFeature(data, name) < 0)
-                 goto cleanup;
- 
-             break;
- 
-         case QEMU_MONITOR_CPU_PROPERTY_STRING:
--            if (STREQ(prop->name, "vendor") &&
-+            if (STREQ(name, "vendor") &&
-                 virCPUx86DataSetVendor(data, prop->value.string) < 0)
-                 goto cleanup;
-             break;
- 
-         case QEMU_MONITOR_CPU_PROPERTY_NUMBER:
--            if (STREQ(prop->name, "family"))
-+            if (STREQ(name, "family"))
-                 sigFamily = prop->value.number;
--            else if (STREQ(prop->name, "model"))
-+            else if (STREQ(name, "model"))
-                 sigModel = prop->value.number;
--            else if (STREQ(prop->name, "stepping"))
-+            else if (STREQ(name, "stepping"))
-                 sigStepping = prop->value.number;
-             break;
- 
-@@ -2964,7 +2967,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
-     if (!model)
-         return 1;
- 
--    if (!(data = virQEMUCapsGetCPUModelX86Data(model, migratable)))
-+    if (!(data = virQEMUCapsGetCPUModelX86Data(qemuCaps, model, migratable)))
-         goto cleanup;
- 
-     if (cpuDecode(cpu, data, virQEMUCapsGetCPUDefinitions(qemuCaps, type)) < 0)
-diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
-index c3b7f934a9..b17deb01d7 100644
---- a/src/qemu/qemu_capspriv.h
-+++ b/src/qemu/qemu_capspriv.h
-@@ -85,7 +85,8 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                            qemuMonitorCPUModelInfoPtr modelInfo);
- 
- virCPUDataPtr
--virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,
-+virQEMUCapsGetCPUModelX86Data(virQEMUCapsPtr qemuCaps,
-+                              qemuMonitorCPUModelInfoPtr model,
-                               bool migratable);
- 
- virCPUDefPtr
-diff --git a/tests/cputest.c b/tests/cputest.c
-index e62cda34b7..1ce50caccd 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -941,7 +941,7 @@ cpuTestJSONSignature(const void *arg)
-         goto cleanup;
- 
-     modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, VIR_DOMAIN_VIRT_KVM);
--    if (!(hostData = virQEMUCapsGetCPUModelX86Data(modelInfo, false)))
-+    if (!(hostData = virQEMUCapsGetCPUModelX86Data(qemuCaps, modelInfo, false)))
-         goto cleanup;
- 
-     ret = cpuTestCompareSignature(data, hostData);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Translate-features-in-virQEMUCapsGetCPUFeatures.patch b/SOURCES/libvirt-qemu-Translate-features-in-virQEMUCapsGetCPUFeatures.patch
deleted file mode 100644
index 222ba0b..0000000
--- a/SOURCES/libvirt-qemu-Translate-features-in-virQEMUCapsGetCPUFeatures.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f2962c42448d442414246715a30ae74c8dc9fef3 Mon Sep 17 00:00:00 2001
-Message-Id: <f2962c42448d442414246715a30ae74c8dc9fef3@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 27 Feb 2020 15:23:04 +0100
-Subject: [PATCH] qemu: Translate features in virQEMUCapsGetCPUFeatures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with QEMU 4.1 qemuMonitorCPUModelInfo structure in virQEMUCaps
-stores only canonical feature names which may differ from the name used
-by libvirt. We need translate these canonical names into libvirt names
-for further consumption.
-
-This fixes a bug in qemuConnectBaselineHypervisorCPU which would remove
-all features for which libvirt's spelling differs from the QEMU's
-preferred name. For example, the following result of
-qemuConnectBaselineHypervisorCPU on my host with QEMU 4.1 is wrong:
-
-    <cpu mode='custom' match='exact'>
-      <model fallback='forbid'>Skylake-Client</model>
-      <vendor>Intel</vendor>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='vmx'/>
-      <feature policy='require' name='hypervisor'/>
-      <feature policy='require' name='clflushopt'/>
-      <feature policy='require' name='umip'/>
-      <feature policy='require' name='arch-capabilities'/>
-      <feature policy='require' name='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-      <feature policy='disable' name='pclmuldq'/>
-      <feature policy='disable' name='lahf_lm'/>
-    </cpu>
-
-The 'pclmuldq' and 'lahf_lm' should not be disabled in the baseline CPU
-as they are supported by QEMU on this host.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 1fd28a2e79692babd63d6b8e9eea90168dd0897e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1804224
-https://bugzilla.redhat.com/show_bug.cgi?id=1809510
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <d6d9ffeea42852d1baf6ff08b3174af22b113353.1582813158.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index c25d8c3e1a..a7cc324105 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2521,7 +2521,8 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps,
-         if (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO)
-             continue;
- 
--        if (VIR_STRDUP(list[n++], prop->name) < 0)
-+        if (VIR_STRDUP(list[n++],
-+                       virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name)) < 0)
-             goto cleanup;
-     }
- 
--- 
-2.25.1
-
diff --git a/SOURCES/libvirt-qemu-Use-g_autoptr-for-qemuDomainSaveCookie.patch b/SOURCES/libvirt-qemu-Use-g_autoptr-for-qemuDomainSaveCookie.patch
new file mode 100644
index 0000000..b4ca4f7
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Use-g_autoptr-for-qemuDomainSaveCookie.patch
@@ -0,0 +1,146 @@
+From c5cdebd40024c33675f93b47732869c658204056 Mon Sep 17 00:00:00 2001
+Message-Id: <c5cdebd40024c33675f93b47732869c658204056@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 16 Jan 2020 10:03:53 +0100
+Subject: [PATCH] qemu: Use g_autoptr() for qemuDomainSaveCookie
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1718707
+
+(cherry picked from commit 3203ad6cfd617fb11d4bb47e514c370b6624641b)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <5e58b5853f9bd1a2b5109145afdad190071f5c44.1579165329.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 28 ++++++++++------------------
+ src/qemu/qemu_domain.h |  1 +
+ src/qemu/qemu_driver.c |  6 ++----
+ 3 files changed, 13 insertions(+), 22 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 0edf316fff..91a9f0481b 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -16001,27 +16001,23 @@ qemuDomainSaveCookiePtr
+ qemuDomainSaveCookieNew(virDomainObjPtr vm)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+-    qemuDomainSaveCookiePtr cookie = NULL;
++    g_autoptr(qemuDomainSaveCookie) cookie = NULL;
+ 
+     if (qemuDomainInitialize() < 0)
+-        goto error;
++        return NULL;
+ 
+     if (!(cookie = virObjectNew(qemuDomainSaveCookieClass)))
+-        goto error;
++        return NULL;
+ 
+     if (priv->origCPU && !(cookie->cpu = virCPUDefCopy(vm->def->cpu)))
+-        goto error;
++        return NULL;
+ 
+     cookie->slirpHelper = qemuDomainGetSlirpHelperOk(vm);
+ 
+     VIR_DEBUG("Save cookie %p, cpu=%p, slirpHelper=%d",
+               cookie, cookie->cpu, cookie->slirpHelper);
+ 
+-    return cookie;
+-
+- error:
+-    virObjectUnref(cookie);
+-    return NULL;
++    return g_steal_pointer(&cookie);
+ }
+ 
+ 
+@@ -16029,26 +16025,22 @@ static int
+ qemuDomainSaveCookieParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED,
+                           virObjectPtr *obj)
+ {
+-    qemuDomainSaveCookiePtr cookie = NULL;
++    g_autoptr(qemuDomainSaveCookie) cookie = NULL;
+ 
+     if (qemuDomainInitialize() < 0)
+-        goto error;
++        return -1;
+ 
+     if (!(cookie = virObjectNew(qemuDomainSaveCookieClass)))
+-        goto error;
++        return -1;
+ 
+     if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST,
+                           &cookie->cpu) < 0)
+-        goto error;
++        return -1;
+ 
+     cookie->slirpHelper = virXPathBoolean("boolean(./slirpHelper)", ctxt) > 0;
+ 
+-    *obj = (virObjectPtr) cookie;
++    *obj = (virObjectPtr) g_steal_pointer(&cookie);
+     return 0;
+-
+- error:
+-    virObjectUnref(cookie);
+-    return -1;
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index c6afc484f6..60b80297fa 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -610,6 +610,7 @@ struct _qemuDomainSaveCookie {
+     bool slirpHelper;
+ };
+ 
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDomainSaveCookie, virObjectUnref);
+ 
+ typedef struct _qemuDomainXmlNsDef qemuDomainXmlNsDef;
+ typedef qemuDomainXmlNsDef *qemuDomainXmlNsDefPtr;
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index e1c0550b9a..ce9b1772c1 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -3293,7 +3293,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver,
+     virObjectEventPtr event = NULL;
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     virQEMUSaveDataPtr data = NULL;
+-    qemuDomainSaveCookiePtr cookie = NULL;
++    g_autoptr(qemuDomainSaveCookie) cookie = NULL;
+ 
+     if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0))
+         goto cleanup;
+@@ -3399,7 +3399,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver,
+         qemuDomainRemoveInactiveJob(driver, vm);
+ 
+  cleanup:
+-    virObjectUnref(cookie);
+     virQEMUSaveDataFree(data);
+     virObjectEventStateQueue(driver->domainEventState, event);
+     return ret;
+@@ -6808,7 +6807,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+     g_autofree char *errbuf = NULL;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     virQEMUSaveHeaderPtr header = &data->header;
+-    qemuDomainSaveCookiePtr cookie = NULL;
++    g_autoptr(qemuDomainSaveCookie) cookie = NULL;
+ 
+     if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie,
+                                  virDomainXMLOptionGetSaveCookie(driver->xmlopt)) < 0)
+@@ -6919,7 +6918,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+     ret = 0;
+ 
+  cleanup:
+-    virObjectUnref(cookie);
+     if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0)
+         VIR_WARN("failed to restore save state label on %s", path);
+     return ret;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Use-switch-statement-in-qemuBuildCpuCommandLine.patch b/SOURCES/libvirt-qemu-Use-switch-statement-in-qemuBuildCpuCommandLine.patch
new file mode 100644
index 0000000..450a974
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Use-switch-statement-in-qemuBuildCpuCommandLine.patch
@@ -0,0 +1,74 @@
+From 67198a38ee3bce9ff19a8c80a593724d684d966e Mon Sep 17 00:00:00 2001
+Message-Id: <67198a38ee3bce9ff19a8c80a593724d684d966e@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 13:12:33 +0100
+Subject: [PATCH] qemu: Use switch statement in qemuBuildCpuCommandLine()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Make sure we are taking all possible virDomainTimerNameType values
+into account. This will make upcoming changes easier.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit f8e923c1ba70d7be53ea18d9b4de040763347f9e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214121237.623948-3-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_command.c | 34 ++++++++++++++++++++++++----------
+ 1 file changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index d144855b0d..0ad09baa1d 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -6616,16 +6616,30 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
+     for (i = 0; i < def->clock.ntimers; i++) {
+         virDomainTimerDefPtr timer = def->clock.timers[i];
+ 
+-        if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK &&
+-            timer->present != -1) {
+-            qemuBuildCpuFeature(qemuCaps, &buf, "kvmclock",
+-                                !!timer->present);
+-        } else if (timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK &&
+-                   timer->present == 1) {
+-            virBufferAddLit(&buf, ",hv-time");
+-        } else if (timer->name == VIR_DOMAIN_TIMER_NAME_TSC &&
+-                   timer->frequency > 0) {
+-            virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
++        switch ((virDomainTimerNameType)timer->name) {
++        case VIR_DOMAIN_TIMER_NAME_KVMCLOCK:
++            if (timer->present != -1) {
++                qemuBuildCpuFeature(qemuCaps, &buf, "kvmclock",
++                                    !!timer->present);
++            }
++            break;
++        case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK:
++            if (timer->present == 1)
++                virBufferAddLit(&buf, ",hv-time");
++            break;
++        case VIR_DOMAIN_TIMER_NAME_TSC:
++            if (timer->frequency > 0)
++                virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
++            break;
++        case VIR_DOMAIN_TIMER_NAME_PLATFORM:
++        case VIR_DOMAIN_TIMER_NAME_PIT:
++        case VIR_DOMAIN_TIMER_NAME_RTC:
++        case VIR_DOMAIN_TIMER_NAME_HPET:
++            break;
++        case VIR_DOMAIN_TIMER_NAME_LAST:
++        default:
++            virReportEnumRangeError(virDomainTimerNameType, timer->name);
++            return -1;
+         }
+     }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Use-tmpChr-in-qemuDomainDetachChrDevice-to-build-device-string.patch b/SOURCES/libvirt-qemu-Use-tmpChr-in-qemuDomainDetachChrDevice-to-build-device-string.patch
deleted file mode 100644
index ca4f86b..0000000
--- a/SOURCES/libvirt-qemu-Use-tmpChr-in-qemuDomainDetachChrDevice-to-build-device-string.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cdb5af98d3801255903c4237269ca5723abc36c1 Mon Sep 17 00:00:00 2001
-Message-Id: <cdb5af98d3801255903c4237269ca5723abc36c1@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 14:44:44 +0200
-Subject: [PATCH] qemu: Use @tmpChr in qemuDomainDetachChrDevice to build
- device string
-
-So far we are passing @chr to qemuBuildChrDeviceStr. This is
-suboptimal (in fact wrong) because @chr is just parsed XML
-definition provided by user which by definition may lack some
-information. On the other hand, @tmpChr is the one that was found
-using @chr in domain definition so it contains the same amount of
-information or more.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit f538f5ed3a876c3cb67ae5b7a01f133f192aca13)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624204
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <75600f93c5e22f43762635ac97f5a0acef1cf465.1561639408.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hotplug.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 5b9a5683bb..da9d56ffb1 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -5753,7 +5753,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
- 
-     sa_assert(tmpChr->info.alias);
- 
--    if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
-+    if (qemuBuildChrDeviceStr(&devstr, vmdef, tmpChr, priv->qemuCaps) < 0)
-         goto cleanup;
- 
-     if (!async)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-Validate-configuration-for-the-armvtimer-timer.patch b/SOURCES/libvirt-qemu-Validate-configuration-for-the-armvtimer-timer.patch
new file mode 100644
index 0000000..86f5cd4
--- /dev/null
+++ b/SOURCES/libvirt-qemu-Validate-configuration-for-the-armvtimer-timer.patch
@@ -0,0 +1,78 @@
+From 8152b6ac3b740bfe1155e3c4c251684cc5b3192e Mon Sep 17 00:00:00 2001
+Message-Id: <8152b6ac3b740bfe1155e3c4c251684cc5b3192e@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 13:12:36 +0100
+Subject: [PATCH] qemu: Validate configuration for the armvtimer timer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Its use is limited to certain guest types, and it only supports
+a subset of all possible tick policies.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit aeddab230cd1e2a12d5d6352971bb70ea067a1c4)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214121237.623948-6-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 4de4f9da53..1bed117eb0 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -5506,6 +5506,44 @@ qemuDomainDefValidateClockTimers(const virDomainDef *def,
+             break;
+ 
+         case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
++            if (def->virtType != VIR_DOMAIN_VIRT_KVM ||
++                !qemuDomainIsARMVirt(def)) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("Configuring the '%s' timer is not supported "
++                                 "for virtType=%s arch=%s machine=%s guests"),
++                               virDomainTimerNameTypeToString(timer->name),
++                               virDomainVirtTypeToString(def->virtType),
++                               virArchToString(def->os.arch),
++                               def->os.machine);
++                return -1;
++            }
++            if (timer->present == 0) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("The '%s' timer can't be disabled"),
++                               virDomainTimerNameTypeToString(timer->name));
++                return -1;
++            }
++            if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_KVM_NO_ADJVTIME)) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("Configuring the '%s' timer is not supported "
++                                 "with this QEMU binary"),
++                               virDomainTimerNameTypeToString(timer->name));
++                return -1;
++            }
++
++            switch (timer->tickpolicy) {
++            case -1:
++            case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY:
++            case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD:
++                break;
++            case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP:
++            case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE:
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("The '%s' timer does not support tickpolicy '%s'"),
++                               virDomainTimerNameTypeToString(timer->name),
++                               virDomainTimerTickpolicyTypeToString(timer->tickpolicy));
++                return -1;
++            }
+             break;
+         }
+     }
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-Wire-up-PR_MANAGER_STATUS_CHANGED-event.patch b/SOURCES/libvirt-qemu-Wire-up-PR_MANAGER_STATUS_CHANGED-event.patch
deleted file mode 100644
index f1b3844..0000000
--- a/SOURCES/libvirt-qemu-Wire-up-PR_MANAGER_STATUS_CHANGED-event.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From 89bfdeacefd0160080ab98a41109c75db6d5e913 Mon Sep 17 00:00:00 2001
-Message-Id: <89bfdeacefd0160080ab98a41109c75db6d5e913@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 11 Jul 2018 17:27:26 +0200
-Subject: [PATCH] qemu: Wire up PR_MANAGER_STATUS_CHANGED event
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1470007
-
-This event is emitted on the monitor if one of pr-managers lost
-connection to its pr-helper process. What libvirt needs to do is
-restart the pr-helper process iff it corresponds to managed
-pr-manager.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6fbda83330293ed8bec1ea9e3ba7273c4ee2b9e2)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.c       |  1 +
- src/qemu/qemu_domain.h       |  1 +
- src/qemu/qemu_driver.c       | 17 +++++++++++
- src/qemu/qemu_monitor.c      | 15 ++++++++++
- src/qemu/qemu_monitor.h      | 11 ++++++++
- src/qemu/qemu_monitor_json.c | 23 +++++++++++++++
- src/qemu/qemu_process.c      | 55 ++++++++++++++++++++++++++++++++++++
- 7 files changed, 123 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index cfecbaca74..dec057e021 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -12979,6 +12979,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event)
-     case QEMU_PROCESS_EVENT_MONITOR_EOF:
-         VIR_FREE(event->data);
-         break;
-+    case QEMU_PROCESS_EVENT_PR_DISCONNECT:
-     case QEMU_PROCESS_EVENT_LAST:
-         break;
-     }
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 30d186a921..e748d78adb 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -477,6 +477,7 @@ typedef enum {
-     QEMU_PROCESS_EVENT_SERIAL_CHANGED,
-     QEMU_PROCESS_EVENT_BLOCK_JOB,
-     QEMU_PROCESS_EVENT_MONITOR_EOF,
-+    QEMU_PROCESS_EVENT_PR_DISCONNECT,
- 
-     QEMU_PROCESS_EVENT_LAST
- } qemuProcessEventType;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 825b2b27e6..868ef9d406 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -4792,6 +4792,20 @@ processMonitorEOFEvent(virQEMUDriverPtr driver,
- }
- 
- 
-+static void
-+processPRDisconnectEvent(virDomainObjPtr vm)
-+{
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-+
-+    if (!virDomainObjIsActive(vm))
-+        return;
-+
-+    if (!priv->prDaemonRunning &&
-+        virDomainDefHasManagedPR(vm->def))
-+        qemuProcessStartManagedPRDaemon(vm);
-+}
-+
-+
- static void qemuProcessEventHandler(void *data, void *opaque)
- {
-     struct qemuProcessEvent *processEvent = data;
-@@ -4829,6 +4843,9 @@ static void qemuProcessEventHandler(void *data, void *opaque)
-     case QEMU_PROCESS_EVENT_MONITOR_EOF:
-         processMonitorEOFEvent(driver, vm);
-         break;
-+    case QEMU_PROCESS_EVENT_PR_DISCONNECT:
-+        processPRDisconnectEvent(vm);
-+        break;
-     case QEMU_PROCESS_EVENT_LAST:
-         break;
-     }
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index ae5b23b9fc..86b2b6e985 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1669,6 +1669,21 @@ qemuMonitorEmitDumpCompleted(qemuMonitorPtr mon,
- }
- 
- 
-+int
-+qemuMonitorEmitPRManagerStatusChanged(qemuMonitorPtr mon,
-+                                      const char *prManager,
-+                                      bool connected)
-+{
-+    int ret = -1;
-+    VIR_DEBUG("mon=%p, prManager='%s', connected=%d", mon, prManager, connected);
-+
-+    QEMU_MONITOR_CALLBACK(mon, ret, domainPRManagerStatusChanged,
-+                          mon->vm, prManager, connected);
-+
-+    return ret;
-+}
-+
-+
- int
- qemuMonitorSetCapabilities(qemuMonitorPtr mon)
- {
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index e8adda8aa0..a906bc8410 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -273,6 +273,12 @@ typedef int (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitorPtr mon,
-                                                       const char *error,
-                                                       void *opaque);
- 
-+typedef int (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitorPtr mon,
-+                                                               virDomainObjPtr vm,
-+                                                               const char *prManager,
-+                                                               bool connected,
-+                                                               void *opaque);
-+
- typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks;
- typedef qemuMonitorCallbacks *qemuMonitorCallbacksPtr;
- struct _qemuMonitorCallbacks {
-@@ -305,6 +311,7 @@ struct _qemuMonitorCallbacks {
-     qemuMonitorDomainAcpiOstInfoCallback domainAcpiOstInfo;
-     qemuMonitorDomainBlockThresholdCallback domainBlockThreshold;
-     qemuMonitorDomainDumpCompletedCallback domainDumpCompleted;
-+    qemuMonitorDomainPRManagerStatusChangedCallback domainPRManagerStatusChanged;
- };
- 
- char *qemuMonitorEscapeArg(const char *in);
-@@ -433,6 +440,10 @@ int qemuMonitorEmitDumpCompleted(qemuMonitorPtr mon,
-                                  qemuMonitorDumpStatsPtr stats,
-                                  const char *error);
- 
-+int qemuMonitorEmitPRManagerStatusChanged(qemuMonitorPtr mon,
-+                                          const char *prManager,
-+                                          bool connected);
-+
- int qemuMonitorStartCPUs(qemuMonitorPtr mon);
- int qemuMonitorStopCPUs(qemuMonitorPtr mon);
- 
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 3e90279b71..03c94cd88b 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -91,6 +91,7 @@ static void qemuMonitorJSONHandleMigrationPass(qemuMonitorPtr mon, virJSONValueP
- static void qemuMonitorJSONHandleAcpiOstInfo(qemuMonitorPtr mon, virJSONValuePtr data);
- static void qemuMonitorJSONHandleBlockThreshold(qemuMonitorPtr mon, virJSONValuePtr data);
- static void qemuMonitorJSONHandleDumpCompleted(qemuMonitorPtr mon, virJSONValuePtr data);
-+static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data);
- 
- typedef struct {
-     const char *type;
-@@ -113,6 +114,7 @@ static qemuEventHandler eventHandlers[] = {
-     { "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, },
-     { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, },
-     { "POWERDOWN", qemuMonitorJSONHandlePowerdown, },
-+    { "PR_MANAGER_STATUS_CHANGED", qemuMonitorJSONHandlePRManagerStatusChanged, },
-     { "RESET", qemuMonitorJSONHandleReset, },
-     { "RESUME", qemuMonitorJSONHandleResume, },
-     { "RTC_CHANGE", qemuMonitorJSONHandleRTCChange, },
-@@ -1297,6 +1299,27 @@ qemuMonitorJSONHandleDumpCompleted(qemuMonitorPtr mon,
- }
- 
- 
-+static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon,
-+                                                        virJSONValuePtr data)
-+{
-+    const char *name;
-+    bool connected;
-+
-+    if (!(name = virJSONValueObjectGetString(data, "id"))) {
-+        VIR_WARN("missing pr-manager alias in PR_MANAGER_STATUS_CHANGED event");
-+        return;
-+    }
-+
-+    if (virJSONValueObjectGetBoolean(data, "connected", &connected) < 0) {
-+        VIR_WARN("missing connected state for %s "
-+                 "in PR_MANAGER_STATUS_CHANGED event", name);
-+        return;
-+    }
-+
-+    qemuMonitorEmitPRManagerStatusChanged(mon, name, connected);
-+}
-+
-+
- int
- qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon,
-                                   const char *cmd_str,
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index f200729cb1..fbc8529f3b 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -1615,6 +1615,60 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
- }
- 
- 
-+static int
-+qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-+                                        virDomainObjPtr vm,
-+                                        const char *prManager,
-+                                        bool connected,
-+                                        void *opaque)
-+{
-+    virQEMUDriverPtr driver = opaque;
-+    qemuDomainObjPrivatePtr priv;
-+    struct qemuProcessEvent *processEvent = NULL;
-+    const char *managedAlias = qemuDomainGetManagedPRAlias();
-+    int ret = -1;
-+
-+    virObjectLock(vm);
-+
-+    VIR_DEBUG("pr-manager %s status changed for domain %p %s connected=%d",
-+              prManager, vm, vm->def->name, connected);
-+
-+    if (connected) {
-+        /* Connect events are boring. */
-+        ret = 0;
-+        goto cleanup;
-+    }
-+    /* Disconnect events are more interesting. */
-+
-+    if (STRNEQ(prManager, managedAlias)) {
-+        VIR_DEBUG("pr-manager %s not managed, ignoring event",
-+                  prManager);
-+        ret = 0;
-+        goto cleanup;
-+    }
-+
-+    priv = vm->privateData;
-+    priv->prDaemonRunning = false;
-+
-+    if (VIR_ALLOC(processEvent) < 0)
-+        goto cleanup;
-+
-+    processEvent->eventType = QEMU_PROCESS_EVENT_PR_DISCONNECT;
-+    processEvent->vm = virObjectRef(vm);
-+
-+    if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) {
-+        qemuProcessEventFree(processEvent);
-+        virObjectUnref(vm);
-+        goto cleanup;
-+    }
-+
-+    ret = 0;
-+ cleanup:
-+    virObjectUnlock(vm);
-+    return ret;
-+}
-+
-+
- static qemuMonitorCallbacks monitorCallbacks = {
-     .eofNotify = qemuProcessHandleMonitorEOF,
-     .errorNotify = qemuProcessHandleMonitorError,
-@@ -1643,6 +1697,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
-     .domainAcpiOstInfo = qemuProcessHandleAcpiOstInfo,
-     .domainBlockThreshold = qemuProcessHandleBlockThreshold,
-     .domainDumpCompleted = qemuProcessHandleDumpCompleted,
-+    .domainPRManagerStatusChanged = qemuProcessHandlePRManagerStatusChanged,
- };
- 
- static void
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-add-QEMU_CAPS_DEVICE_VHOST_USER_FS.patch b/SOURCES/libvirt-qemu-add-QEMU_CAPS_DEVICE_VHOST_USER_FS.patch
new file mode 100644
index 0000000..3614dd4
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-QEMU_CAPS_DEVICE_VHOST_USER_FS.patch
@@ -0,0 +1,122 @@
+From e6a402520fef59636ede2d24249ae6b4fe45ac60 Mon Sep 17 00:00:00 2001
+Message-Id: <e6a402520fef59636ede2d24249ae6b4fe45ac60@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:39 +0100
+Subject: [PATCH] qemu: add QEMU_CAPS_DEVICE_VHOST_USER_FS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduced by QEMU commit 98fc1ada4cf70af0f1df1a2d7183cf786fc7da05
+    virtio: add vhost-user-fs base device
+
+Released in QEMU v4.2.0.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit d99128a62b9f84e3e5b372d1e6419f4f1d1dffe6)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+
+Conflicts: * different set of capabilities available downstream:
+    src/qemu/qemu_capabilities.c
+    tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+  * missing downstream:
+    tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <2450cfcd270e664a9832a82367787b6cdfc2c6fa.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                      | 2 ++
+ src/qemu/qemu_capabilities.h                      | 1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml   | 1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 1 +
+ tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
+ 6 files changed, 7 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 6912a6f72b..34df4d89b3 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -558,6 +558,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               /* 350 */
+               "virtio-net.failover",
+               "cpu.kvm-no-adjvtime",
++              "vhost-user-fs",
+     );
+ 
+ 
+@@ -1272,6 +1273,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
+     { "vhost-user-vga", QEMU_CAPS_DEVICE_VHOST_USER_VGA },
+     { "ramfb", QEMU_CAPS_DEVICE_RAMFB },
+     { "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU },
++    { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 4ccb0c55bc..e3449a9ca3 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -539,6 +539,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     /* 350 */
+     QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
+     QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */
++    QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+index 6af09e1a83..55fa169d89 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+@@ -177,6 +177,7 @@
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
+   <flag name='virtio-net.failover'/>
++  <flag name='vhost-user-fs'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+index c8746f05ef..49963b7020 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+@@ -136,6 +136,7 @@
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
++  <flag name='vhost-user-fs'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+index c71791e205..ed3dea23b3 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+@@ -220,6 +220,7 @@
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
+   <flag name='virtio-net.failover'/>
++  <flag name='vhost-user-fs'/>
+   <version>4002000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+index e871ba528e..8195da4e27 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+@@ -179,6 +179,7 @@
+   <flag name='smp-dies'/>
+   <flag name='virtio-net.failover'/>
+   <flag name='cpu.kvm-no-adjvtime'/>
++  <flag name='vhost-user-fs'/>
+   <version>4002050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700241</microcodeVersion>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-add-QEMU_CAPS_STORAGE_WERROR.patch b/SOURCES/libvirt-qemu-add-QEMU_CAPS_STORAGE_WERROR.patch
new file mode 100644
index 0000000..46b44a7
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-QEMU_CAPS_STORAGE_WERROR.patch
@@ -0,0 +1,407 @@
+From 3d20773c3ab225449f1977b064d779adf316853c Mon Sep 17 00:00:00 2001
+Message-Id: <3d20773c3ab225449f1977b064d779adf316853c@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 1 Apr 2020 17:19:26 +0200
+Subject: [PATCH] qemu: add QEMU_CAPS_STORAGE_WERROR
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Detect the werror property on SCSI and virtio disks.
+But clear it if the QEMU supports usb-storage device without it
+also supporting this option for usb-storage.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 47e84b06ec8181cbdb00c87bcc67f20edd9e949b)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1819250
+
+Conflicts: src/qemu/qemu_capabilities.c
+	tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+	tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+	tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+	tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+	tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+	tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+	tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+	tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+           different capablility sets
+Message-Id: <67c670e206dd05aac31b86cac1f42e2f37b366e5.1585754141.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                      | 10 +++++++++-
+ src/qemu/qemu_capabilities.h                      |  1 +
+ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml |  1 +
+ tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml |  1 +
+ tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml |  1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml   |  1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  |  1 +
+ tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml |  1 +
+ 26 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 0b4ed4253c..9d744501b9 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -563,7 +563,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "blockdev-reopen",
+ 
+               /* 355 */
+-              "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api"
++              "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api",
++              "storage.werror",
+     );
+ 
+ 
+@@ -1299,6 +1300,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBlk[] = {
+     { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM },
+     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
+     { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE },
++    { "werror", QEMU_CAPS_STORAGE_WERROR },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] = {
+@@ -1334,6 +1336,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIDisk[] = {
+     { "share-rw", QEMU_CAPS_DISK_SHARE_RW },
+     { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE },
+     { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID },
++    { "werror", QEMU_CAPS_STORAGE_WERROR },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsIDEDrive[] = {
+@@ -4811,6 +4814,11 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCapsPtr qemuCaps)
+ {
+     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
+         virQEMUCapsClear(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);
++
++    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE) &&
++        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_WERROR)) {
++        virQEMUCapsClear(qemuCaps, QEMU_CAPS_STORAGE_WERROR);
++    }
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 0f7c586703..78bddb3856 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -545,6 +545,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+ 
+     /* 355 */
+     QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
++    QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+index aa9027d514..04ac872985 100644
+--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+@@ -106,6 +106,7 @@
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='query-cpu-model-baseline'/>
+   <flag name='query-cpu-model-comparison'/>
++  <flag name='storage.werror'/>
+   <version>2010000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100287</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+index db51d461a8..6d36a6e484 100644
+--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+@@ -113,6 +113,7 @@
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='query-cpu-model-baseline'/>
+   <flag name='query-cpu-model-comparison'/>
++  <flag name='storage.werror'/>
+   <version>2011000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100288</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+index cbbe24823a..21a168dd3b 100644
+--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+@@ -125,6 +125,7 @@
+   <flag name='query-cpu-model-baseline'/>
+   <flag name='query-cpu-model-comparison'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>2012000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100289</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+index 762ce4946e..17351ca6bf 100644
+--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+@@ -90,6 +90,7 @@
+   <flag name='virtual-css-bridge'/>
+   <flag name='sdl-gl'/>
+   <flag name='zpci'/>
++  <flag name='storage.werror'/>
+   <version>2007000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100245</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+index 6000bed682..d204b82030 100644
+--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+@@ -95,6 +95,7 @@
+   <flag name='zpci'/>
+   <flag name='query-cpu-model-baseline'/>
+   <flag name='query-cpu-model-comparison'/>
++  <flag name='storage.werror'/>
+   <version>2007093</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100246</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+index 95251de022..9a6d94d37b 100644
+--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+@@ -100,6 +100,7 @@
+   <flag name='iothread.poll-max-ns'/>
+   <flag name='query-cpu-model-baseline'/>
+   <flag name='query-cpu-model-comparison'/>
++  <flag name='storage.werror'/>
+   <version>2009000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100247</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+index 0b507ec80e..6814a2f9c6 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+@@ -95,6 +95,7 @@
+   <flag name='memory-backend-file.align'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>3000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>0</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+index 0d7c589f71..b81f5825cc 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+@@ -95,6 +95,7 @@
+   <flag name='memory-backend-file.align'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>3000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>0</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+index da57f8738b..85cda12076 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+@@ -128,6 +128,7 @@
+   <flag name='query-cpu-model-comparison'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>3000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100239</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+index c955994ac0..575b1c2a43 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+@@ -202,6 +202,7 @@
+   <flag name='bochs-display'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>3000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100239</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+index cab38d442b..591f054193 100644
+--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+@@ -159,6 +159,7 @@
+   <flag name='overcommit'/>
+   <flag name='bochs-display'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>3000091</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+index 3e89d7f933..6e434579ff 100644
+--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+@@ -205,6 +205,7 @@
+   <flag name='bochs-display'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>3000092</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+index 757bf193fc..6fd1880ae2 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+@@ -169,6 +169,7 @@
+   <flag name='ramfb'/>
+   <flag name='arm-max-cpu'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+index 4e13888042..aa22eccc6f 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+@@ -173,6 +173,7 @@
+   <flag name='migration-file-drop-cache'/>
+   <flag name='machine.pseries.cap-ccf-assist'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+index 7d3a1bec6f..6a567239b9 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+@@ -170,6 +170,7 @@
+   <flag name='bochs-display'/>
+   <flag name='migration-file-drop-cache'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>0</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+index 1732139db8..d6686b7c68 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+@@ -170,6 +170,7 @@
+   <flag name='bochs-display'/>
+   <flag name='migration-file-drop-cache'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>0</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+index fd124ce0c5..9dc29832f9 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+@@ -136,6 +136,7 @@
+   <flag name='query-cpu-model-baseline'/>
+   <flag name='query-cpu-model-comparison'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+index ba32d4c592..3c1baf9560 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+@@ -210,6 +210,7 @@
+   <flag name='migration-file-drop-cache'/>
+   <flag name='ramfb'/>
+   <flag name='drive-nvme'/>
++  <flag name='storage.werror'/>
+   <version>4000000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100240</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+index 54b797a86a..d5f2673fb6 100644
+--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+@@ -216,6 +216,7 @@
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
++  <flag name='storage.werror'/>
+   <version>4001000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100241</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+index 55fa169d89..75f9bc3158 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+@@ -178,6 +178,7 @@
+   <flag name='smp-dies'/>
+   <flag name='virtio-net.failover'/>
+   <flag name='vhost-user-fs'/>
++  <flag name='storage.werror'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+index 7c62546d74..f5121fca94 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+@@ -177,6 +177,7 @@
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
++  <flag name='storage.werror'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+index 49963b7020..59cb9200cb 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+@@ -137,6 +137,7 @@
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
+   <flag name='vhost-user-fs'/>
++  <flag name='storage.werror'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+index ed3dea23b3..f6df71ff3e 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+@@ -221,6 +221,7 @@
+   <flag name='smp-dies'/>
+   <flag name='virtio-net.failover'/>
+   <flag name='vhost-user-fs'/>
++  <flag name='storage.werror'/>
+   <version>4002000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+index 8195da4e27..140a466910 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+@@ -180,6 +180,7 @@
+   <flag name='virtio-net.failover'/>
+   <flag name='cpu.kvm-no-adjvtime'/>
+   <flag name='vhost-user-fs'/>
++  <flag name='storage.werror'/>
+   <version>4002050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700241</microcodeVersion>
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-add-capabilities-flag-for-failover-feature.patch b/SOURCES/libvirt-qemu-add-capabilities-flag-for-failover-feature.patch
new file mode 100644
index 0000000..454a9ea
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-capabilities-flag-for-failover-feature.patch
@@ -0,0 +1,123 @@
+From a2712d6a8ef06050b4e31d9e6e9800a4babc2cd8 Mon Sep 17 00:00:00 2001
+Message-Id: <a2712d6a8ef06050b4e31d9e6e9800a4babc2cd8@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 30 Jan 2020 14:12:39 -0500
+Subject: [PATCH] qemu: add capabilities flag for failover feature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Presence of the virtio-net-pci option called "failover" indicates
+support in a qemu binary of a simplistic bonding of a virtio-net
+device with another PCI device. This feature allows migration of
+guests that have a network device assigned to a guest with VFIO, by
+creating a network bond device in the guest consisting of the
+VFIO-assigned device and a virtio-net-pci device, then temporarily
+(and automatically) unplugging the VFIO net device prior to migration
+(and hotplugging an equivalent device on the migration
+destination). (The feature is called "failover" because the bond
+device uses the vfio-pci netdev for normal guest networking, but
+"fails over" to the virtio-net-pci netdev once the vfio-pci device is
+unplugged for migration.)
+
+Full functioning of the feature also requires support in the
+virtio-net driver in the guest OS (since that is where the bond device
+resides), but if the "failover" commandline option is present for the
+virtio-net-pci device in qemu, at least the qemu part of the feature
+is available, and libvirt can add the proper options to both the
+virtio-net-pci and vfio-pci device commandlines to indicate qemu
+should attempt doing the failover during migration.
+
+This patch just adds the qemu capabilities flag "virtio-net.failover".
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit cad65f222f29dffd4e91d43b230665aca813c7a6)
+
+Conflicts:
+   src/qemu/qemu_capabilities.c
+   src/qemu/qemu_capabilities.h
+   tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+   tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+
+     context changed due to other capabilities flags
+     added upstream
+
+   tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+
+     only exists upstream
+
+https://bugzilla.redhat.com/1693587
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200130191244.24174-2-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                      | 4 ++++
+ src/qemu/qemu_capabilities.h                      | 3 +++
+ tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 +
+ tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 1 +
+ 4 files changed, 9 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 893fc5a1bb..10c17323be 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -554,6 +554,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "savevm-monitor-nodes",
+               "drive-nvme",
+               "smp-dies",
++
++              /* 350 */
++              "virtio-net.failover",
+     );
+ 
+ 
+@@ -1299,6 +1302,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] = {
+     { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY },
+     { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM },
+     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
++    { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSpaprPCIHostBridge[] = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 5ec8901bb3..6ab0eabd3f 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -536,6 +536,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */
+     QEMU_CAPS_SMP_DIES, /*  -smp dies= */
+ 
++    /* 350 */
++    QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
++
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+ 
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+index 184bb7ff77..6af09e1a83 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+@@ -176,6 +176,7 @@
+   <flag name='savevm-monitor-nodes'/>
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
++  <flag name='virtio-net.failover'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+index afd59a269d..c71791e205 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+@@ -219,6 +219,7 @@
+   <flag name='savevm-monitor-nodes'/>
+   <flag name='drive-nvme'/>
+   <flag name='smp-dies'/>
++  <flag name='virtio-net.failover'/>
+   <version>4002000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100242</microcodeVersion>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-add-code-for-handling-virtiofsd.patch b/SOURCES/libvirt-qemu-add-code-for-handling-virtiofsd.patch
new file mode 100644
index 0000000..d80f3de
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-code-for-handling-virtiofsd.patch
@@ -0,0 +1,528 @@
+From d4f90466fc4685b72ae9ca4bae1d022c04f0e2be Mon Sep 17 00:00:00 2001
+Message-Id: <d4f90466fc4685b72ae9ca4bae1d022c04f0e2be@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:46 +0100
+Subject: [PATCH] qemu: add code for handling virtiofsd
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Start virtiofsd for each <filesystem> device using it.
+
+Pre-create the socket for communication with QEMU and pass it
+to virtiofsd.
+
+Note that virtiofsd needs to run as root.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+
+Introduced by QEMU commit a43efa34c7d7b628cbf1ec0fe60043e5c91043ea
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit f0f986efa8a8e352fbdce7079ec440a4f3c8f522)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <78ba169fbe59c5307db462ad78b65b06776d64a6.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ po/POTFILES.in            |   1 +
+ src/qemu/Makefile.inc.am  |   2 +
+ src/qemu/qemu_domain.c    |   5 +-
+ src/qemu/qemu_domain.h    |   2 +-
+ src/qemu/qemu_extdevice.c |  20 ++-
+ src/qemu/qemu_virtiofs.c  | 301 ++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_virtiofs.h  |  37 +++++
+ tests/qemuxml2argvtest.c  |  11 ++
+ 8 files changed, 376 insertions(+), 3 deletions(-)
+ create mode 100644 src/qemu/qemu_virtiofs.c
+ create mode 100644 src/qemu/qemu_virtiofs.h
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index faf173584e..29984042f4 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -169,6 +169,7 @@
+ @SRCDIR@/src/qemu/qemu_tpm.c
+ @SRCDIR@/src/qemu/qemu_vhost_user.c
+ @SRCDIR@/src/qemu/qemu_vhost_user_gpu.c
++@SRCDIR@/src/qemu/qemu_virtiofs.c
+ @SRCDIR@/src/remote/remote_daemon.c
+ @SRCDIR@/src/remote/remote_daemon_config.c
+ @SRCDIR@/src/remote/remote_daemon_dispatch.c
+diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
+index 967f6e75a2..77786526ea 100644
+--- a/src/qemu/Makefile.inc.am
++++ b/src/qemu/Makefile.inc.am
+@@ -67,6 +67,8 @@ QEMU_DRIVER_SOURCES = \
+ 	qemu/qemu_vhost_user.h \
+ 	qemu/qemu_vhost_user_gpu.c \
+ 	qemu/qemu_vhost_user_gpu.h \
++	qemu/qemu_virtiofs.c \
++	qemu/qemu_virtiofs.h \
+ 	qemu/qemu_checkpoint.c \
+ 	qemu/qemu_checkpoint.h \
+ 	qemu/qemu_backup.c \
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 79d8de2e42..3cbe7ef6e1 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1440,8 +1440,11 @@ qemuDomainFSPrivateNew(void)
+ 
+ 
+ static void
+-qemuDomainFSPrivateDispose(void *obj G_GNUC_UNUSED)
++qemuDomainFSPrivateDispose(void *obj)
+ {
++    qemuDomainFSPrivatePtr priv = obj;
++
++    g_free(priv->vhostuser_fs_sock);
+ }
+ 
+ static virClassPtr qemuDomainVideoPrivateClass;
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index c581b3a162..83150e4e6d 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -568,7 +568,7 @@ typedef qemuDomainFSPrivate *qemuDomainFSPrivatePtr;
+ struct _qemuDomainFSPrivate {
+     virObject parent;
+ 
+-    int dummy;
++    char *vhostuser_fs_sock;
+ };
+ 
+ 
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index bb73787b8d..bfa770f45a 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -20,11 +20,13 @@
+ 
+ #include <config.h>
+ 
++#include "qemu_command.h"
+ #include "qemu_extdevice.h"
+ #include "qemu_vhost_user_gpu.h"
+ #include "qemu_domain.h"
+ #include "qemu_tpm.h"
+ #include "qemu_slirp.h"
++#include "qemu_virtiofs.h"
+ 
+ #include "viralloc.h"
+ #include "virlog.h"
+@@ -153,7 +155,7 @@ qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
+ int
+ qemuExtDevicesStart(virQEMUDriverPtr driver,
+                     virDomainObjPtr vm,
+-                    virLogManagerPtr logManager G_GNUC_UNUSED,
++                    virLogManagerPtr logManager,
+                     bool incomingMigration)
+ {
+     virDomainDefPtr def = vm->def;
+@@ -183,6 +185,15 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
+             return -1;
+     }
+ 
++    for (i = 0; i < def->nfss; i++) {
++        virDomainFSDefPtr fs = def->fss[i];
++
++        if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
++            if (qemuVirtioFSStart(logManager, driver, vm, fs) < 0)
++                return -1;
++        }
++    }
++
+     return 0;
+ }
+ 
+@@ -214,6 +225,13 @@ qemuExtDevicesStop(virQEMUDriverPtr driver,
+         if (slirp)
+             qemuSlirpStop(slirp, vm, driver, net, false);
+     }
++
++    for (i = 0; i < def->nfss; i++) {
++        virDomainFSDefPtr fs = def->fss[i];
++
++        if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS)
++            qemuVirtioFSStop(driver, vm, fs);
++    }
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
+new file mode 100644
+index 0000000000..09ab2cef27
+--- /dev/null
++++ b/src/qemu/qemu_virtiofs.c
+@@ -0,0 +1,301 @@
++/*
++ * qemu_virtiofs.c: virtiofs support
++ *
++ * 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 <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++
++#include "logging/log_manager.h"
++#include "virlog.h"
++#include "qemu_command.h"
++#include "qemu_conf.h"
++#include "qemu_extdevice.h"
++#include "qemu_security.h"
++#include "qemu_virtiofs.h"
++#include "virpidfile.h"
++#include "virqemu.h"
++#include "virutil.h"
++
++#define VIR_FROM_THIS VIR_FROM_QEMU
++
++
++char *
++qemuVirtioFSCreatePidFilename(virDomainObjPtr vm,
++                              const char *alias)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    g_autofree char *shortName = NULL;
++    g_autofree char *name = NULL;
++
++    if (!(shortName = virDomainDefGetShortName(vm->def)))
++        return NULL;
++
++    name = g_strdup_printf("%s-%s-virtiofsd", shortName, alias);
++
++    return virPidFileBuildPath(priv->libDir, name);
++}
++
++
++char *
++qemuVirtioFSCreateSocketFilename(virDomainObjPtr vm,
++                                 const char *alias)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++
++    return virFileBuildPath(priv->libDir, alias, "-virtiofsd.sock");
++}
++
++
++static char *
++qemuVirtioFSCreateLogFilename(virQEMUDriverConfigPtr cfg,
++                              const virDomainDef *def,
++                              const char *alias)
++{
++    g_autofree char *name = NULL;
++
++    name = g_strdup_printf("%s-%s", def->name, alias);
++
++    return virFileBuildPath(cfg->logDir, name, "-virtiofsd.log");
++}
++
++
++static int
++qemuVirtioFSOpenChardev(virQEMUDriverPtr driver,
++                        virDomainObjPtr vm,
++                        const char *socket_path)
++{
++    virDomainChrSourceDefPtr chrdev = virDomainChrSourceDefNew(NULL);
++    virDomainChrDef chr = { .source = chrdev };
++    VIR_AUTOCLOSE fd = -1;
++    int ret = -1;
++
++    chrdev->type = VIR_DOMAIN_CHR_TYPE_UNIX;
++    chrdev->data.nix.listen = true;
++    chrdev->data.nix.path = g_strdup(socket_path);
++
++    if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0)
++        goto cleanup;
++    fd = qemuOpenChrChardevUNIXSocket(chrdev);
++    if (fd < 0) {
++        ignore_value(qemuSecurityClearSocketLabel(driver->securityManager, vm->def));
++        goto cleanup;
++    }
++    if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0)
++        goto cleanup;
++
++    if (qemuSecuritySetChardevLabel(driver, vm, &chr) < 0)
++        goto cleanup;
++
++    ret = fd;
++    fd = -1;
++
++ cleanup:
++    virObjectUnref(chrdev);
++    return ret;
++}
++
++
++static virCommandPtr
++qemuVirtioFSBuildCommandLine(virQEMUDriverConfigPtr cfg,
++                             virDomainFSDefPtr fs,
++                             int *fd)
++{
++    g_autoptr(virCommand) cmd = NULL;
++    g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER;
++
++    if (!(cmd = virCommandNew(fs->binary)))
++        return NULL;
++
++    virCommandAddArgFormat(cmd, "--fd=%d", *fd);
++    virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
++    *fd = -1;
++
++    virCommandAddArg(cmd, "-o");
++    virBufferAddLit(&opts, "source=");
++    virQEMUBuildBufferEscapeComma(&opts, fs->src->path);
++    if (fs->cache)
++        virBufferAsprintf(&opts, ",cache=%s", virDomainFSCacheModeTypeToString(fs->cache));
++
++    if (fs->xattr == VIR_TRISTATE_SWITCH_ON)
++        virBufferAddLit(&opts, ",xattr");
++    else if (fs->xattr == VIR_TRISTATE_SWITCH_OFF)
++        virBufferAddLit(&opts, ",no_xattr");
++
++    if (fs->flock == VIR_TRISTATE_SWITCH_ON)
++        virBufferAddLit(&opts, ",flock");
++    else if (fs->flock == VIR_TRISTATE_SWITCH_OFF)
++        virBufferAddLit(&opts, ",no_flock");
++
++    if (fs->posix_lock == VIR_TRISTATE_SWITCH_ON)
++        virBufferAddLit(&opts, ",posix_lock");
++    else if (fs->posix_lock == VIR_TRISTATE_SWITCH_OFF)
++        virBufferAddLit(&opts, ",no_posix_lock");
++
++    virCommandAddArgBuffer(cmd, &opts);
++    if (cfg->virtiofsdDebug)
++        virCommandAddArg(cmd, "-d");
++
++    return g_steal_pointer(&cmd);
++}
++
++int
++qemuVirtioFSStart(virLogManagerPtr logManager,
++                  virQEMUDriverPtr driver,
++                  virDomainObjPtr vm,
++                  virDomainFSDefPtr fs)
++{
++    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
++    g_autoptr(virCommand) cmd = NULL;
++    g_autofree char *socket_path = NULL;
++    g_autofree char *pidfile = NULL;
++    g_autofree char *logpath = NULL;
++    pid_t pid = (pid_t) -1;
++    VIR_AUTOCLOSE fd = -1;
++    VIR_AUTOCLOSE logfd = -1;
++    int ret = -1;
++    int rc;
++
++    if (!virFileExists(fs->src->path)) {
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("the virtiofs export directory '%s' does not exist"),
++                       fs->src->path);
++        return -1;
++    }
++
++    if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias)))
++        goto cleanup;
++
++    if (!(socket_path = qemuVirtioFSCreateSocketFilename(vm, fs->info.alias)))
++        goto cleanup;
++
++    if ((fd = qemuVirtioFSOpenChardev(driver, vm, socket_path)) < 0)
++        goto cleanup;
++
++    logpath = qemuVirtioFSCreateLogFilename(cfg, vm->def, fs->info.alias);
++
++    if (cfg->stdioLogD) {
++        if ((logfd = virLogManagerDomainOpenLogFile(logManager,
++                                                    "qemu",
++                                                    vm->def->uuid,
++                                                    vm->def->name,
++                                                    logpath,
++                                                    0,
++                                                    NULL, NULL)) < 0)
++            goto cleanup;
++    } else {
++        if ((logfd = open(logpath, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) < 0) {
++            virReportSystemError(errno, _("failed to create logfile %s"),
++                                 logpath);
++            goto cleanup;
++        }
++        if (virSetCloseExec(logfd) < 0) {
++            virReportSystemError(errno, _("failed to set close-on-exec flag on %s"),
++                                 logpath);
++            goto error;
++        }
++    }
++
++    if (!(cmd = qemuVirtioFSBuildCommandLine(cfg, fs, &fd)))
++        goto cleanup;
++
++    /* so far only running as root is supported */
++    virCommandSetUID(cmd, 0);
++    virCommandSetGID(cmd, 0);
++
++    virCommandSetPidFile(cmd, pidfile);
++    virCommandSetOutputFD(cmd, &logfd);
++    virCommandSetErrorFD(cmd, &logfd);
++    virCommandNonblockingFDs(cmd);
++    virCommandDaemonize(cmd);
++
++    if (qemuExtDeviceLogCommand(driver, vm, cmd, "virtiofsd") < 0)
++        goto cleanup;
++
++    rc = virCommandRun(cmd, NULL);
++
++    if (rc < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                       _("Could not start 'virtiofsd'"));
++        goto error;
++    }
++
++    rc = virPidFileReadPath(pidfile, &pid);
++    if (rc < 0) {
++        virReportSystemError(-rc,
++                             _("Unable to read virtiofsd pidfile '%s'"),
++                             pidfile);
++        goto error;
++    }
++
++    if (virProcessKill(pid, 0) != 0) {
++        virReportSystemError(errno, "%s",
++                             _("virtiofsd died unexpectedly"));
++        goto error;
++    }
++
++    QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock = g_steal_pointer(&socket_path);
++    ret = 0;
++
++ cleanup:
++    if (socket_path)
++        unlink(socket_path);
++    return ret;
++
++ error:
++    if (pid != -1)
++        virProcessKillPainfully(pid, true);
++    if (pidfile)
++        unlink(pidfile);
++    goto cleanup;
++}
++
++
++void
++qemuVirtioFSStop(virQEMUDriverPtr driver G_GNUC_UNUSED,
++                    virDomainObjPtr vm,
++                    virDomainFSDefPtr fs)
++{
++    g_autofree char *pidfile = NULL;
++    virErrorPtr orig_err;
++    pid_t pid = -1;
++    int rc;
++
++    virErrorPreserveLast(&orig_err);
++
++    if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias)))
++        goto cleanup;
++
++    rc = virPidFileReadPathIfAlive(pidfile, &pid, NULL);
++    if (rc >= 0 && pid != (pid_t) -1)
++        virProcessKillPainfully(pid, true);
++
++    if (unlink(pidfile) < 0 &&
++        errno != ENOENT) {
++        virReportSystemError(errno,
++                             _("Unable to remove stale pidfile %s"),
++                             pidfile);
++    }
++
++    if (QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock)
++        unlink(QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock);
++
++ cleanup:
++    virErrorRestore(&orig_err);
++}
+diff --git a/src/qemu/qemu_virtiofs.h b/src/qemu/qemu_virtiofs.h
+new file mode 100644
+index 0000000000..b2f0c57d0c
+--- /dev/null
++++ b/src/qemu/qemu_virtiofs.h
+@@ -0,0 +1,37 @@
++/*
++ * qemu_virtiofs.h: virtiofs support
++ *
++ * 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
++
++
++char *
++qemuVirtioFSCreatePidFilename(virDomainObjPtr vm,
++                              const char *alias);
++char *
++qemuVirtioFSCreateSocketFilename(virDomainObjPtr vm,
++                                 const char *alias);
++
++int
++qemuVirtioFSStart(virLogManagerPtr logManager,
++                  virQEMUDriverPtr driver,
++                  virDomainObjPtr vm,
++                  virDomainFSDefPtr fs);
++void
++qemuVirtioFSStop(virQEMUDriverPtr driver,
++                 virDomainObjPtr vm,
++                 virDomainFSDefPtr fs);
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 8215935bab..a391823090 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -496,6 +496,17 @@ testCompareXMLToArgv(const void *data)
+         }
+     }
+ 
++    for (i = 0; i < vm->def->nfss; i++) {
++        virDomainFSDefPtr fs = vm->def->fss[i];
++        char *s;
++
++        if (fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS)
++            continue;
++
++        s = g_strdup_printf("/tmp/lib/domain--1-guest/fs%zu.vhost-fs.sock", i);
++        QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock = s;
++    }
++
+     if (vm->def->vsock) {
+         virDomainVsockDefPtr vsock = vm->def->vsock;
+         qemuDomainVsockPrivatePtr vsockPriv =
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-add-support-for-specifying-CPU-dies-topology-parameter.patch b/SOURCES/libvirt-qemu-add-support-for-specifying-CPU-dies-topology-parameter.patch
new file mode 100644
index 0000000..9656320
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-support-for-specifying-CPU-dies-topology-parameter.patch
@@ -0,0 +1,382 @@
+From 2527410246c5d9f0642087fbd894fdba8d8fa906 Mon Sep 17 00:00:00 2001
+Message-Id: <2527410246c5d9f0642087fbd894fdba8d8fa906@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 3 Feb 2020 18:07:24 +0000
+Subject: [PATCH] qemu: add support for specifying CPU "dies" topology
+ parameter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QEMU since 4.1.0 supports the "dies" parameter for -smp
+
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 4cf8dd0c57330e9141333a1b9f4e318e3c83a289)
+
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785207
+Message-Id: <20200203180726.2203691-4-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                  |  2 ++
+ src/qemu/qemu_capabilities.h                  |  1 +
+ src/qemu/qemu_command.c                       |  9 +++--
+ .../caps_4.1.0.x86_64.xml                     |  1 +
+ .../caps_4.2.0.aarch64.xml                    |  1 +
+ .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  1 +
+ .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |  1 +
+ .../caps_4.2.0.x86_64.xml                     |  1 +
+ .../hugepages-nvdimm.x86_64-latest.args       |  2 +-
+ ...memory-default-hugepage.x86_64-latest.args |  2 +-
+ .../memfd-memory-numa.x86_64-latest.args      |  2 +-
+ ...y-hotplug-nvdimm-access.x86_64-latest.args |  2 +-
+ ...ry-hotplug-nvdimm-align.x86_64-latest.args |  2 +-
+ ...ry-hotplug-nvdimm-label.x86_64-latest.args |  2 +-
+ ...ory-hotplug-nvdimm-pmem.x86_64-latest.args |  2 +-
+ ...hotplug-nvdimm-readonly.x86_64-latest.args |  2 +-
+ .../memory-hotplug-nvdimm.x86_64-latest.args  |  2 +-
+ tests/qemuxml2argvdata/smp-dies.args          | 29 ++++++++++++++++
+ tests/qemuxml2argvdata/smp-dies.xml           | 33 +++++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  1 +
+ 20 files changed, 86 insertions(+), 12 deletions(-)
+ create mode 100644 tests/qemuxml2argvdata/smp-dies.args
+ create mode 100644 tests/qemuxml2argvdata/smp-dies.xml
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index edefb70309..893fc5a1bb 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -553,6 +553,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "blockdev-file-dynamic-auto-read-only",
+               "savevm-monitor-nodes",
+               "drive-nvme",
++              "smp-dies",
+     );
+ 
+ 
+@@ -3097,6 +3098,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
+     { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST },
+     { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS },
+     { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
++    { "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
+ };
+ 
+ static int
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index d76c1dbfa9..5ec8901bb3 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -534,6 +534,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */
+     QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */
+     QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */
++    QEMU_CAPS_SMP_DIES, /*  -smp dies= */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index d7e8216092..7a184c229e 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -7105,7 +7105,8 @@ qemuBuildTSEGCommandLine(virCommandPtr cmd,
+ 
+ static int
+ qemuBuildSmpCommandLine(virCommandPtr cmd,
+-                        virDomainDefPtr def)
++                        virDomainDefPtr def,
++                        virQEMUCapsPtr qemuCaps)
+ {
+     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+     unsigned int maxvcpus = virDomainDefGetVcpusMax(def);
+@@ -7130,12 +7131,14 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
+     /* sockets, cores, and threads are either all zero
+      * or all non-zero, thus checking one of them is enough */
+     if (def->cpu && def->cpu->sockets) {
+-        if (def->cpu->dies != 1) {
++        if (def->cpu->dies != 1 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                            _("Only 1 die per socket is supported"));
+             return -1;
+         }
+         virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
++        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES))
++            virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies);
+         virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
+         virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
+     } else {
+@@ -9823,7 +9826,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
+     if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps, priv) < 0)
+         return NULL;
+ 
+-    if (qemuBuildSmpCommandLine(cmd, def) < 0)
++    if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
+         return NULL;
+ 
+     if (qemuBuildIOThreadCommandLine(cmd, def) < 0)
+diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+index a98945de0e..54b797a86a 100644
+--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+@@ -215,6 +215,7 @@
+   <flag name='ramfb'/>
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
+   <version>4001000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100241</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+index a6469073fd..184bb7ff77 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+@@ -175,6 +175,7 @@
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='savevm-monitor-nodes'/>
+   <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>61700242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+index ee9fb23640..7c62546d74 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+@@ -176,6 +176,7 @@
+   <flag name='machine.pseries.cap-ccf-assist'/>
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>42900242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+index fdf5cb4ce9..c8746f05ef 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+@@ -135,6 +135,7 @@
+   <flag name='query-cpu-model-comparison'/>
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
+   <version>4001050</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>39100242</microcodeVersion>
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+index 4857e2f5a5..afd59a269d 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+@@ -218,6 +218,7 @@
+   <flag name='blockdev-file-dynamic-auto-read-only'/>
+   <flag name='savevm-monitor-nodes'/>
+   <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
+   <version>4002000</version>
+   <kvmVersion>0</kvmVersion>
+   <microcodeVersion>43100242</microcodeVersion>
+diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+index 9056e56cb7..0d795dca91 100644
+--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=1048576k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -object memory-backend-file,id=ram-node0,prealloc=yes,\
+ mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824 \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+index 998c9f98bd..a655fb1f7c 100644
+--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+@@ -16,7 +16,7 @@ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
+ -m 14336 \
+ -mem-prealloc \
+ -overcommit mem-lock=off \
+--smp 8,sockets=1,cores=8,threads=1 \
++-smp 8,sockets=1,dies=1,cores=8,threads=1 \
+ -object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=2097152,\
+ share=yes,size=15032385536,host-nodes=3,policy=preferred \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+index 998c9f98bd..a655fb1f7c 100644
+--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+@@ -16,7 +16,7 @@ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
+ -m 14336 \
+ -mem-prealloc \
+ -overcommit mem-lock=off \
+--smp 8,sockets=1,cores=8,threads=1 \
++-smp 8,sockets=1,dies=1,cores=8,threads=1 \
+ -object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=2097152,\
+ share=yes,size=15032385536,host-nodes=3,policy=preferred \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+index beac9ab22a..c8a6ec5755 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -numa node,nodeid=0,cpus=0-1,mem=214 \
+ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
+ share=no,size=536870912 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+index 3e599098f0..60e9e80039 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -numa node,nodeid=0,cpus=0-1,mem=214 \
+ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
+ share=no,size=536870912,align=2097152 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+index 05a473dbcc..8c5e483cbb 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -numa node,nodeid=0,cpus=0-1,mem=214 \
+ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
+ share=no,size=536870912 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+index c3554ac101..7f77ab9fce 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -numa node,nodeid=0,cpus=0-1,mem=214 \
+ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
+ share=no,size=536870912,pmem=on \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+index e1d3fc57a4..631835a380 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -numa node,nodeid=0,cpus=0-1,mem=214 \
+ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
+ share=no,size=536870912 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+index dc6ddd3a0e..48221a5526 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+@@ -15,7 +15,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
+ -m size=1048576k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+ -numa node,nodeid=0,cpus=0-1,mem=1024 \
+ -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
+ size=536870912 \
+diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
+new file mode 100644
+index 0000000000..632e9d8e34
+--- /dev/null
++++ b/tests/qemuxml2argvdata/smp-dies.args
+@@ -0,0 +1,29 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-i386 \
++-name QEMUGuest1 \
++-S \
++-machine pc,accel=tcg,usb=off,dump-guest-core=off \
++-m 214 \
++-realtime mlock=off \
++-smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \
++-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
++server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-usb \
++-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
++-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1
+diff --git a/tests/qemuxml2argvdata/smp-dies.xml b/tests/qemuxml2argvdata/smp-dies.xml
+new file mode 100644
+index 0000000000..caadaef8b5
+--- /dev/null
++++ b/tests/qemuxml2argvdata/smp-dies.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' current='1'>4</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <cpu>
++    <topology sockets='2' dies='2' cores='1' threads='1'/>
++  </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-i386</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'/>
++    <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 58b4deefc6..b923590930 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1689,6 +1689,7 @@ mymain(void)
+     DO_TEST("qemu-ns-alt", NONE);
+ 
+     DO_TEST("smp", NONE);
++    DO_TEST("smp-dies", QEMU_CAPS_SMP_DIES);
+ 
+     DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD);
+     DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-add-vfio-ap-capability.patch b/SOURCES/libvirt-qemu-add-vfio-ap-capability.patch
deleted file mode 100644
index 822f4d5..0000000
--- a/SOURCES/libvirt-qemu-add-vfio-ap-capability.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 393120dca767f8a8dc5b60a46dd2c6124208e4df Mon Sep 17 00:00:00 2001
-Message-Id: <393120dca767f8a8dc5b60a46dd2c6124208e4df@dist-git>
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Fri, 30 Nov 2018 15:49:23 +0100
-Subject: [PATCH] qemu: add vfio-ap capability
-
-Introduce vfio-ap capability.
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: Chris Venteicher <cventeic@redhat.com>
-(cherry picked from commit dc788d254017d51c6a3ccb5e5c9663ce82a4683b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508146
-
-Signed-off-by: Pino Toscano <ptoscano@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- 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 5fd10c2d40..feef102874 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -507,6 +507,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
- 
-               /* 315 */
-               "vfio-pci.display",
-+              "vfio-ap",
-     );
- 
- 
-@@ -1145,6 +1146,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "vhost-vsock-device", QEMU_CAPS_DEVICE_VHOST_VSOCK },
-     { "mch", QEMU_CAPS_DEVICE_MCH },
-     { "sev-guest", QEMU_CAPS_SEV_GUEST },
-+    { "vfio-ap", QEMU_CAPS_DEVICE_VFIO_AP },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 6acd9fe825..1a9e5386a8 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -491,6 +491,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
- 
-     /* 315 */
-     QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
-+    QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-qemu-add-virtiofsd_debug-to-qemu.conf.patch b/SOURCES/libvirt-qemu-add-virtiofsd_debug-to-qemu.conf.patch
new file mode 100644
index 0000000..157f3e5
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-virtiofsd_debug-to-qemu.conf.patch
@@ -0,0 +1,99 @@
+From 26d83d4f99fbdebf9546ebb883535a85dda2fbad Mon Sep 17 00:00:00 2001
+Message-Id: <26d83d4f99fbdebf9546ebb883535a85dda2fbad@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:43 +0100
+Subject: [PATCH] qemu: add virtiofsd_debug to qemu.conf
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a 'virtiofsd_debug' option for tuning whether to run virtiofsd
+in debug mode.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit f04319a5449974f1553458e96c2a6ee25e65ab93)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <6e46af8184e9e982a6aca92a62534623795bb1fc.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/libvirtd_qemu.aug         | 1 +
+ src/qemu/qemu.conf                 | 7 +++++++
+ src/qemu/qemu_conf.c               | 2 ++
+ src/qemu/qemu_conf.h               | 1 +
+ src/qemu/test_libvirtd_qemu.aug.in | 1 +
+ 5 files changed, 12 insertions(+)
+
+diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
+index 557b6f38f8..3014fa6b86 100644
+--- a/src/qemu/libvirtd_qemu.aug
++++ b/src/qemu/libvirtd_qemu.aug
+@@ -116,6 +116,7 @@ module Libvirtd_qemu =
+    let nvram_entry = str_array_entry "nvram"
+ 
+    let debug_level_entry = int_entry "gluster_debug_level"
++                 | bool_entry "virtiofsd_debug"
+ 
+    let memory_entry = str_entry "memory_backing_dir"
+ 
+diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
+index b6805ffc41..815d2d78ae 100644
+--- a/src/qemu/qemu.conf
++++ b/src/qemu/qemu.conf
+@@ -809,6 +809,13 @@
+ #
+ #gluster_debug_level = 9
+ 
++# virtiofsd debug
++#
++# Whether to enable the debugging output of the virtiofsd daemon.
++# Possible values are 0 or 1. Disabled by default.
++#
++#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,
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 029996427e..7aaf2862a4 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -801,6 +801,8 @@ virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfigPtr cfg,
+ {
+     if (virConfGetValueUInt(conf, "gluster_debug_level", &cfg->glusterDebugLevel) < 0)
+         return -1;
++    if (virConfGetValueBool(conf, "virtiofsd_debug", &cfg->virtiofsdDebug) < 0)
++        return -1;
+ 
+     return 0;
+ }
+diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
+index b9401635d7..4361f5b2bb 100644
+--- a/src/qemu/qemu_conf.h
++++ b/src/qemu/qemu_conf.h
+@@ -202,6 +202,7 @@ struct _virQEMUDriverConfig {
+     virFirmwarePtr *firmwares;
+     size_t nfirmwares;
+     unsigned int glusterDebugLevel;
++    bool virtiofsdDebug;
+ 
+     char *memoryBackingDir;
+ 
+diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
+index dd90edf687..fca9a942c9 100644
+--- a/src/qemu/test_libvirtd_qemu.aug.in
++++ b/src/qemu/test_libvirtd_qemu.aug.in
+@@ -98,6 +98,7 @@ module Test_libvirtd_qemu =
+ }
+ { "stdio_handler" = "logd" }
+ { "gluster_debug_level" = "9" }
++{ "virtiofsd_debug" = "1" }
+ { "namespaces"
+     { "1" = "mount" }
+ }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-add-wait-unplug-to-qemu-migration-status-enum.patch b/SOURCES/libvirt-qemu-add-wait-unplug-to-qemu-migration-status-enum.patch
new file mode 100644
index 0000000..b5163bd
--- /dev/null
+++ b/SOURCES/libvirt-qemu-add-wait-unplug-to-qemu-migration-status-enum.patch
@@ -0,0 +1,82 @@
+From 614ff7c7faf6ad46bb3b44ff5b57e839b00af4a4 Mon Sep 17 00:00:00 2001
+Message-Id: <614ff7c7faf6ad46bb3b44ff5b57e839b00af4a4@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 30 Jan 2020 14:12:43 -0500
+Subject: [PATCH] qemu: add wait-unplug to qemu migration status enum
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Aside from itinerant error (actually warning) messages due to an
+unrecognized response from qemu, this isn't even necessary - the
+migration proceeds successfully to completion anyway.
+
+(I'm not sure where to see this status reported in the API though - do
+we need to add an extra state, or recognition of a new event somewhere?)
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 8a226ddb3602586a2ba2359afc4448c02f566a0e)
+
+https://bugzilla.redhat.com/1693587
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200130191244.24174-6-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_migration.c    | 1 +
+ src/qemu/qemu_monitor.c      | 1 +
+ src/qemu/qemu_monitor.h      | 1 +
+ src/qemu/qemu_monitor_json.c | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 46612a3c84..b56ccbdc3c 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -1457,6 +1457,7 @@ qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo)
+     case QEMU_MONITOR_MIGRATION_STATUS_SETUP:
+     case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE:
+     case QEMU_MONITOR_MIGRATION_STATUS_CANCELLING:
++    case QEMU_MONITOR_MIGRATION_STATUS_WAIT_UNPLUG:
+     case QEMU_MONITOR_MIGRATION_STATUS_LAST:
+         break;
+     }
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index ccd20b3740..4f547bf5ec 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -168,6 +168,7 @@ VIR_ENUM_IMPL(qemuMonitorMigrationStatus,
+               "device", "postcopy-active",
+               "completed", "failed",
+               "cancelling", "cancelled",
++              "wait-unplug",
+ );
+ 
+ VIR_ENUM_IMPL(qemuMonitorVMStatus,
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index 3f3b81cddd..cca2cdcb27 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -767,6 +767,7 @@ typedef enum {
+     QEMU_MONITOR_MIGRATION_STATUS_ERROR,
+     QEMU_MONITOR_MIGRATION_STATUS_CANCELLING,
+     QEMU_MONITOR_MIGRATION_STATUS_CANCELLED,
++    QEMU_MONITOR_MIGRATION_STATUS_WAIT_UNPLUG,
+ 
+     QEMU_MONITOR_MIGRATION_STATUS_LAST
+ } qemuMonitorMigrationStatus;
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index e5164d218a..5d8c7e9b5e 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -3515,6 +3515,7 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply,
+     case QEMU_MONITOR_MIGRATION_STATUS_INACTIVE:
+     case QEMU_MONITOR_MIGRATION_STATUS_SETUP:
+     case QEMU_MONITOR_MIGRATION_STATUS_CANCELLED:
++    case QEMU_MONITOR_MIGRATION_STATUS_WAIT_UNPLUG:
+     case QEMU_MONITOR_MIGRATION_STATUS_LAST:
+         break;
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-address-Handle-all-the-video-devices-within-a-single-loop.patch b/SOURCES/libvirt-qemu-address-Handle-all-the-video-devices-within-a-single-loop.patch
deleted file mode 100644
index 3ac0110..0000000
--- a/SOURCES/libvirt-qemu-address-Handle-all-the-video-devices-within-a-single-loop.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9743e1100067451a20fe1373c1d3b828f416320b Mon Sep 17 00:00:00 2001
-Message-Id: <9743e1100067451a20fe1373c1d3b828f416320b@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:50 +0200
-Subject: [PATCH] qemu: address: Handle all the video devices within a single
- loop
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since 133fb140 moved the validation of a video device into a separate
-function, the code handling PCI slot assignment for video devices has
-been the same for both the primary device and the secondary devices.
-Let's merge these and thus handle all the devices within the existing
-'for' loop.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 3e90bd67a215adcb997b8c2be5d1d6b83251409f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain_address.c | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index e9f460d77a..ab2ac022f1 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -2103,15 +2103,9 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
-             goto error;
-     }
- 
--    /* Assign a PCI slot to the primary video card if there is not an
--     * assigned address. */
--    if (def->nvideos > 0 &&
--        virDeviceInfoPCIAddressWanted(&def->videos[0]->info)) {
--        if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[0]->info) < 0)
--            goto error;
--    }
-+    /* Video devices */
-+    for (i = 0; i < def->nvideos; i++) {
- 
--    for (i = 1; i < def->nvideos; i++) {
-         if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info))
-             continue;
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-allow-migration-with-assigned-PCI-hostdev-if-teaming-is-set.patch b/SOURCES/libvirt-qemu-allow-migration-with-assigned-PCI-hostdev-if-teaming-is-set.patch
new file mode 100644
index 0000000..b36e29f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-allow-migration-with-assigned-PCI-hostdev-if-teaming-is-set.patch
@@ -0,0 +1,96 @@
+From a86311164657b4bc304705b1dd5cea3db83c7c12 Mon Sep 17 00:00:00 2001
+Message-Id: <a86311164657b4bc304705b1dd5cea3db83c7c12@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 30 Jan 2020 14:12:42 -0500
+Subject: [PATCH] qemu: allow migration with assigned PCI hostdev if <teaming>
+ is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Normally a PCI hostdev can't be migrated, so
+qemuMigrationSrcIsAllowedHostdev() won't permit it. In the case of a a
+hostdev network interface that has <teaming type='transient'/> set,
+QEMU will automatically unplug the device prior to migration, and
+re-plug a corresponding device on the destination. This patch modifies
+qemuMigrationSrcIsAllowedHostdev() to allow domains with those devices
+to be migrated.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 2758f680b7d586baf084f340b153d7706b8ce12b)
+
+https://bugzilla.redhat.com/1693587
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200130191244.24174-5-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_migration.c | 52 ++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 29d228a8d9..46612a3c84 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -1093,10 +1093,54 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
+      * forbidden. */
+     for (i = 0; i < def->nhostdevs; i++) {
+         virDomainHostdevDefPtr hostdev = def->hostdevs[i];
+-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
+-            hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
+-            virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+-                           _("domain has assigned non-USB host devices"));
++        switch ((virDomainHostdevMode)hostdev->mode) {
++        case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES:
++            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                           _("cannot migrate a domain with <hostdev mode='capabilities'>"));
++            return false;
++
++        case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
++            switch ((virDomainHostdevSubsysType)hostdev->source.subsys.type) {
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
++                /* USB devices can be "migrated" */
++                continue;
++
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
++                virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
++                               _("cannot migrate a domain with <hostdev mode='subsystem' type='%s'>"),
++                               virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
++                return false;
++
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
++                /*
++                 * if this is a network interface with <teaming
++                 * type='transient'>, migration *is* allowed because
++                 * the device will be auto-unplugged by QEMU during
++                 * migration.
++                 */
++                if (hostdev->parentnet &&
++                    hostdev->parentnet->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT) {
++                    continue;
++                }
++
++                /* all other PCI hostdevs can't be migrated */
++                virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
++                               _("cannot migrate a domain with <hostdev mode='subsystem' type='%s'>"),
++                               virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
++                return false;
++
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
++                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                               _("invalid hostdev subsystem type"));
++                return false;
++            }
++            break;
++
++        case VIR_DOMAIN_HOSTDEV_MODE_LAST:
++            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                           _("invalid hostdev mode"));
+             return false;
+         }
+     }
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-avoid-launching-non-x86-guests-with-APIC-EOI-setting.patch b/SOURCES/libvirt-qemu-avoid-launching-non-x86-guests-with-APIC-EOI-setting.patch
new file mode 100644
index 0000000..4236c7f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-avoid-launching-non-x86-guests-with-APIC-EOI-setting.patch
@@ -0,0 +1,80 @@
+From a809e7c5200c4089153768a047f85add0205c4bc Mon Sep 17 00:00:00 2001
+Message-Id: <a809e7c5200c4089153768a047f85add0205c4bc@dist-git>
+From: Daniel Henrique Barboza <danielhb413@gmail.com>
+Date: Mon, 30 Mar 2020 17:18:27 -0400
+Subject: [PATCH] qemu: avoid launching non-x86 guests with APIC-EOI setting
+
+The "<apic/>" feature, although it's available only for x86 guests,
+can be declared in the domain XML of other archs without errors.
+But setting its 'eoi' attribute will break QEMU. For "<apic eoi='on'/>",
+in a ppc64 guest:
+
+qemu-kvm: Expected key=value format, found +kvm_pv_eoi
+
+A similar error happens with eoi='off'.
+
+One can argue that it's better to simply forbid launching non-x86
+guests with "<apic/>" declared in the XML - it is a feature that
+the architecture doesn't support and this would make it clearer
+about it. This is sensible, but there are non-x86 guests that are
+running with "<apic/>" declared in the domain (and A LOT of guests
+running with "<acpi/>" for that matter, probably reminiscent of x86
+templates that were reused for other archs) that will stop working if we
+go this route.
+
+A more subtle approach is to detect if the 'eoi' element is being set
+for non-x86 guests and warn the user about it with a better error
+message than the one QEMU provides. This is the new error message
+when any value is set for the 'eoi' element in a ppc64 XML:
+
+error: unsupported configuration: The 'eoi' attribute of the 'apic'
+feature is not supported for architecture 'ppc64' or machine type
+'pseries'.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1236440
+
+Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit dbda73ff27cf185fb5db498cc4db281b2d76778d)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1829729
+
+Signed-off-by: Daniel Henrique Barboza <dbarboza@redhat.com>
+Message-Id: <20200330211827.951474-2-dbarboza@redhat.com>
+Reviewed-by: Andrea Bolognani <abologna@redhat.com>
+---
+ src/qemu/qemu_domain.c | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index bb28716ff0..8f746cdf13 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -5279,8 +5279,23 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
+             }
+             break;
+ 
+-        case VIR_DOMAIN_FEATURE_ACPI:
+         case VIR_DOMAIN_FEATURE_APIC:
++            /* The kvm_pv_eoi feature is x86-only. */
++            if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
++                def->apic_eoi != VIR_TRISTATE_SWITCH_ABSENT &&
++                !ARCH_IS_X86(def->os.arch)) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("The 'eoi' attribute of the '%s' feature "
++                                 "is not supported for architecture '%s' or "
++                                 "machine type '%s'"),
++                                 featureName,
++                                 virArchToString(def->os.arch),
++                                 def->os.machine);
++                 return -1;
++            }
++            break;
++
++        case VIR_DOMAIN_FEATURE_ACPI:
+         case VIR_DOMAIN_FEATURE_PAE:
+         case VIR_DOMAIN_FEATURE_HAP:
+         case VIR_DOMAIN_FEATURE_VIRIDIAN:
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-backup-Fix-backup-of-disk-skipped-in-an-intermediate-checkpoint.patch b/SOURCES/libvirt-qemu-backup-Fix-backup-of-disk-skipped-in-an-intermediate-checkpoint.patch
new file mode 100644
index 0000000..2b5aa3d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Fix-backup-of-disk-skipped-in-an-intermediate-checkpoint.patch
@@ -0,0 +1,81 @@
+From 97a6adcb3ac735ff135469aa602c798fbc0b1491 Mon Sep 17 00:00:00 2001
+Message-Id: <97a6adcb3ac735ff135469aa602c798fbc0b1491@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:36 +0200
+Subject: [PATCH] qemu: backup: Fix backup of disk skipped in an intermediate
+ checkpoint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a disk is not captured by one of the intermediate checkpoints the
+code would fail, but we can easily calculate the bitmaps to merge
+correctly by skipping over checkpoints which don't describe the disk.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit c89a44777fdf89b400878adcb03a3557bcec3f4e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <d0efe760e9f8049758691b7f66a7de41fce5c264.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 24 ++++++++++++++++++++++++
+ tests/qemublocktest.c  |  6 ++++++
+ 2 files changed, 30 insertions(+)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 400b711f79..adbf696de6 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -240,6 +240,30 @@ qemuBackupDiskPrepareOneBitmapsChain(virDomainMomentDefPtr *incremental,
+     for (incridx = 0; incremental[incridx]; incridx++) {
+         g_autoptr(virJSONValue) tmp = virJSONValueNewArray();
+         virStorageSourcePtr tmpsrc = NULL;
++        virDomainCheckpointDefPtr chkdef = (virDomainCheckpointDefPtr) incremental[incridx];
++        bool checkpoint_has_disk = false;
++        size_t i;
++
++        for (i = 0; i < chkdef->ndisks; i++) {
++            if (STRNEQ_NULLABLE(diskdst, chkdef->disks[i].name))
++                continue;
++
++            if (chkdef->disks[i].type == VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++                checkpoint_has_disk = true;
++
++            break;
++        }
++
++        if (!checkpoint_has_disk) {
++            if (!incremental[incridx + 1]) {
++                virReportError(VIR_ERR_INVALID_ARG,
++                               _("disk '%s' not found in checkpoint '%s'"),
++                               diskdst, incremental[incridx]->name);
++                return NULL;
++            }
++
++            continue;
++        }
+ 
+         if (qemuBackupGetBitmapMergeRange(n, incremental[incridx]->name,
+                                           &tmp, &tmpsrc, diskdst,
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index e461b3a23d..d15965d9eb 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -727,6 +727,12 @@ testQemuBackupGetIncrementalMoment(const char *name)
+     if (!(checkpoint = virDomainCheckpointDefNew()))
+         abort();
+ 
++    checkpoint->disks = g_new0(virDomainCheckpointDiskDef, 1);
++    checkpoint->ndisks = 1;
++
++    checkpoint->disks[0].name = g_strdup("testdisk");
++    checkpoint->disks[0].type = VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP;
++
+     checkpoint->parent.name = g_strdup(name);
+ 
+     return (virDomainMomentDefPtr) checkpoint;
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Fix-handling-of-backing-store-for-backup-target-images.patch b/SOURCES/libvirt-qemu-backup-Fix-handling-of-backing-store-for-backup-target-images.patch
new file mode 100644
index 0000000..58078d1
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Fix-handling-of-backing-store-for-backup-target-images.patch
@@ -0,0 +1,125 @@
+From 14b1e4fc93ba1a87854aa1afaf519cc3accff4c6 Mon Sep 17 00:00:00 2001
+Message-Id: <14b1e4fc93ba1a87854aa1afaf519cc3accff4c6@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:34 +0200
+Subject: [PATCH] qemu: backup: Fix handling of backing store for backup target
+ images
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We always tried to install backing store for the image even if it didn't
+make sense, e.g. for a full backup into a raw image. Additionally we
+didn't record the backing file into the qcow2 metadata so the image
+itself contained the diff of data but reading from it would be
+incomplete as it depends on the backing image.
+
+This patch fixes both issues by carefully installing the correct backing
+file when appropriate and also recording it into the metadata when
+creating the image.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1813310
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4aea6f42fe32175ce0cb9015913db536097130e4)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <8c4ebc06863aac1f75532b6633772944a6b0bd2a.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 26 ++++++++++++++++++++++----
+ 1 file changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 9a056fa407..5d18720f53 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -105,6 +105,8 @@ struct qemuBackupDiskData {
+     virDomainDiskDefPtr domdisk;
+     qemuBlockJobDataPtr blockjob;
+     virStorageSourcePtr store;
++    virStorageSourcePtr terminator;
++    virStorageSourcePtr backingStore;
+     char *incrementalBitmap;
+     qemuBlockStorageSourceChainDataPtr crdata;
+     bool labelled;
+@@ -146,6 +148,7 @@ qemuBackupDiskDataCleanupOne(virDomainObjPtr vm,
+         qemuBlockJobStartupFinalize(vm, dd->blockjob);
+ 
+     qemuBlockStorageSourceChainDataFree(dd->crdata);
++    virObjectUnref(dd->terminator);
+ }
+ 
+ 
+@@ -295,6 +298,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+                              virDomainBackupDiskDefPtr backupdisk,
+                              struct qemuBackupDiskData *dd,
+                              virJSONValuePtr actions,
++                             bool pull,
+                              virDomainMomentDefPtr *incremental,
+                              virHashTablePtr blockNamedNodeData,
+                              virQEMUDriverConfigPtr cfg)
+@@ -314,6 +318,19 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+     if (!dd->store->format)
+         dd->store->format = VIR_STORAGE_FILE_QCOW2;
+ 
++    /* calculate backing store to use:
++     * push mode:
++     *   full backups: no backing store
++     *   incremental: original disk if format supports backing store
++     * pull mode:
++     *   both: original disk
++     */
++    if (pull || (incremental && dd->store->format >= VIR_STORAGE_FILE_BACKING)) {
++        dd->backingStore = dd->domdisk->src;
++    } else {
++        dd->backingStore = dd->terminator = virStorageSourceNew();
++    }
++
+     if (qemuDomainStorageFileInit(priv->driver, vm, dd->store, dd->domdisk->src) < 0)
+         return -1;
+ 
+@@ -337,7 +354,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+ 
+     /* use original disk as backing to prevent opening the backing chain */
+     if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->store,
+-                                                                           dd->domdisk->src,
++                                                                           dd->backingStore,
+                                                                            priv->qemuCaps)))
+         return -1;
+ 
+@@ -398,6 +415,7 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm,
+     struct qemuBackupDiskData *disks = NULL;
+     ssize_t ndisks = 0;
+     size_t i;
++    bool pull = def->type == VIR_DOMAIN_BACKUP_TYPE_PULL;
+ 
+     disks = g_new0(struct qemuBackupDiskData, def->ndisks);
+ 
+@@ -410,12 +428,12 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm,
+ 
+         ndisks++;
+ 
+-        if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions,
++        if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, pull,
+                                          incremental, blockNamedNodeData,
+                                          cfg) < 0)
+             goto error;
+ 
+-        if (def->type == VIR_DOMAIN_BACKUP_TYPE_PULL) {
++        if (pull) {
+             if (qemuBackupDiskPrepareDataOnePull(actions, dd) < 0)
+                 goto error;
+         } else {
+@@ -480,7 +498,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObjPtr vm,
+                                                    dd->store, dd->domdisk->src) < 0)
+             return -1;
+ 
+-        if (qemuBlockStorageSourceCreate(vm, dd->store, NULL, NULL,
++        if (qemuBlockStorageSourceCreate(vm, dd->store, dd->backingStore, NULL,
+                                          dd->crdata->srcdata[0],
+                                          QEMU_ASYNC_JOB_BACKUP) < 0)
+             return -1;
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-bitmap-name-configuration.patch b/SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-bitmap-name-configuration.patch
new file mode 100644
index 0000000..8871ea3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-bitmap-name-configuration.patch
@@ -0,0 +1,56 @@
+From fc87d33beca46597b7d413752a07f50af8579a6a Mon Sep 17 00:00:00 2001
+Message-Id: <fc87d33beca46597b7d413752a07f50af8579a6a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:42 +0100
+Subject: [PATCH] qemu: backup: Implement support for backup disk bitmap name
+ configuration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the user-configured name of the bitmap when merging the appropriate
+bitmaps for an incremental backup so that the user can see it as
+configured. Additionally expose the default bitmap name if nothing is
+configured.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit 0c3792a155d79ecf39221b9856fa14fde183af91)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <0071b6d1293859c700344434e71e3b2f75ce6ffd.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 2cc0e6ab07..23518a5d40 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -322,7 +322,10 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+         return -1;
+ 
+     if (incremental) {
+-        dd->incrementalBitmap = g_strdup_printf("backup-%s", dd->domdisk->dst);
++        if (dd->backupdisk->exportbitmap)
++            dd->incrementalBitmap = g_strdup(dd->backupdisk->exportbitmap);
++        else
++            dd->incrementalBitmap = g_strdup_printf("backup-%s", dd->domdisk->dst);
+ 
+         if (qemuBackupDiskPrepareOneBitmaps(dd, actions, incremental,
+                                             blockNamedNodeData) < 0)
+@@ -368,6 +371,10 @@ static int
+ qemuBackupDiskPrepareDataOnePull(virJSONValuePtr actions,
+                                  struct qemuBackupDiskData *dd)
+ {
++    if (!dd->backupdisk->exportbitmap &&
++        dd->incrementalBitmap)
++        dd->backupdisk->exportbitmap = g_strdup(dd->incrementalBitmap);
++
+     if (qemuMonitorTransactionBackup(actions,
+                                      dd->domdisk->src->nodeformat,
+                                      dd->blockjob->name,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-export-name-configuration.patch b/SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-export-name-configuration.patch
new file mode 100644
index 0000000..a617dca
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Implement-support-for-backup-disk-export-name-configuration.patch
@@ -0,0 +1,46 @@
+From ca5b0a17880bd76c2965e86fa6b6ee93dec204b9 Mon Sep 17 00:00:00 2001
+Message-Id: <ca5b0a17880bd76c2965e86fa6b6ee93dec204b9@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:41 +0100
+Subject: [PATCH] qemu: backup: Implement support for backup disk export name
+ configuration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Pass the exportname as configured when exporting the image via NBD and
+fill it with the default if it's not configured.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit bce4ac55f8d3df9d649c74d2f35feeaad4422028)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <de4d8ed67fa09ec4016bcafb818f9ab704afb305.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index c47de2f4a8..2cc0e6ab07 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -548,9 +548,12 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm,
+     for (i = 0; i < ndisks; i++) {
+         struct qemuBackupDiskData *dd = disks + i;
+ 
++        if (!dd->backupdisk->exportname)
++            dd->backupdisk->exportname = g_strdup(dd->domdisk->dst);
++
+         if (qemuMonitorNBDServerAdd(priv->mon,
+                                     dd->store->nodeformat,
+-                                    dd->domdisk->dst,
++                                    dd->backupdisk->exportname,
+                                     false,
+                                     dd->incrementalBitmap) < 0)
+             return -1;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Initialize-store-source-properly-and-just-once.patch b/SOURCES/libvirt-qemu-backup-Initialize-store-source-properly-and-just-once.patch
new file mode 100644
index 0000000..c758c9d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Initialize-store-source-properly-and-just-once.patch
@@ -0,0 +1,49 @@
+From 7ffdca30e2d5c80e68846df2656efed0e13a81d4 Mon Sep 17 00:00:00 2001
+Message-Id: <7ffdca30e2d5c80e68846df2656efed0e13a81d4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:08 +0200
+Subject: [PATCH] qemu: backup: Initialize 'store' source properly and just
+ once
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Two functions called in sequence both initialized the virStorageSource
+backing 'store' leading to a memleak.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2d26f8b710d259a3e164a2bea3c9f9dc0de9b419)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <0e2df46f3a2ffd182e21d54497bafcfc09b26b0d.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index c207d3b7d0..013a82e06d 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -269,9 +269,6 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+         dd->backingStore = dd->terminator = virStorageSourceNew();
+     }
+ 
+-    if (qemuDomainStorageFileInit(priv->driver, vm, dd->store, dd->domdisk->src) < 0)
+-        return -1;
+-
+     if (qemuDomainPrepareStorageSourceBlockdev(NULL, dd->store, priv, cfg) < 0)
+         return -1;
+ 
+@@ -407,7 +404,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObjPtr vm,
+             return -1;
+         }
+ 
+-        if (qemuDomainStorageFileInit(priv->driver, vm, dd->store, NULL) < 0)
++        if (qemuDomainStorageFileInit(priv->driver, vm, dd->store, dd->domdisk->src) < 0)
+             return -1;
+ 
+         dd->initialized = true;
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Move-fetching-of-checkpoint-list-for-incremental-backup.patch b/SOURCES/libvirt-qemu-backup-Move-fetching-of-checkpoint-list-for-incremental-backup.patch
new file mode 100644
index 0000000..1000fe4
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Move-fetching-of-checkpoint-list-for-incremental-backup.patch
@@ -0,0 +1,213 @@
+From 7dae651c45df86ce74b304535baf62013d7f527d Mon Sep 17 00:00:00 2001
+Message-Id: <7dae651c45df86ce74b304535baf62013d7f527d@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:38 +0200
+Subject: [PATCH] qemu: backup: Move fetching of checkpoint list for
+ incremental backup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fetch the checkpoint list for every disk specifically based on the new
+per-disk 'incremental' field.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 15c5ed8ba64e26090174d296486eacfa240af53e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <485f9933893a9890f018889a76fc48654de2c58a.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 109 ++++++++++++++++++++---------------------
+ 1 file changed, 53 insertions(+), 56 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index adbf696de6..13e2a7412b 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -173,6 +173,50 @@ qemuBackupDiskDataCleanup(virDomainObjPtr vm,
+ }
+ 
+ 
++/**
++ * qemuBackupBeginCollectIncrementalCheckpoints:
++ * @vm: domain object
++ * @incrFrom: name of checkpoint representing starting point of incremental backup
++ *
++ * Returns a NULL terminated list of pointers to checkpoint definitions in
++ * chronological order starting from the 'current' checkpoint until reaching
++ * @incrFrom.
++ */
++static virDomainMomentDefPtr *
++qemuBackupBeginCollectIncrementalCheckpoints(virDomainObjPtr vm,
++                                             const char *incrFrom)
++{
++    virDomainMomentObjPtr n = virDomainCheckpointGetCurrent(vm->checkpoints);
++    g_autofree virDomainMomentDefPtr *incr = NULL;
++    size_t nincr = 0;
++
++    while (n) {
++        virDomainMomentDefPtr def = n->def;
++
++        if (VIR_APPEND_ELEMENT_COPY(incr, nincr, def) < 0)
++            return NULL;
++
++        if (STREQ(def->name, incrFrom)) {
++            def = NULL;
++            if (VIR_APPEND_ELEMENT_COPY(incr, nincr, def) < 0)
++                return NULL;
++
++            return g_steal_pointer(&incr);
++        }
++
++        if (!n->def->parent_name)
++            break;
++
++        n = virDomainCheckpointFindByName(vm->checkpoints, n->def->parent_name);
++    }
++
++    virReportError(VIR_ERR_OPERATION_INVALID,
++                   _("could not locate checkpoint '%s' for incremental backup"),
++                   incrFrom);
++    return NULL;
++}
++
++
+ static int
+ qemuBackupGetBitmapMergeRange(virStorageSourcePtr from,
+                               const char *bitmapname,
+@@ -334,11 +378,11 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+                              struct qemuBackupDiskData *dd,
+                              virJSONValuePtr actions,
+                              bool pull,
+-                             virDomainMomentDefPtr *incremental,
+                              virHashTablePtr blockNamedNodeData,
+                              virQEMUDriverConfigPtr cfg)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
++    g_autofree virDomainMomentDefPtr *incremental = NULL;
+ 
+     /* set data structure */
+     dd->backupdisk = backupdisk;
+@@ -360,7 +404,8 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+      * pull mode:
+      *   both: original disk
+      */
+-    if (pull || (incremental && dd->store->format >= VIR_STORAGE_FILE_BACKING)) {
++    if (pull || (dd->backupdisk->incremental &&
++                 dd->store->format >= VIR_STORAGE_FILE_BACKING)) {
+         dd->backingStore = dd->domdisk->src;
+     } else {
+         dd->backingStore = dd->terminator = virStorageSourceNew();
+@@ -372,7 +417,10 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+     if (qemuDomainPrepareStorageSourceBlockdev(NULL, dd->store, priv, cfg) < 0)
+         return -1;
+ 
+-    if (incremental) {
++    if (dd->backupdisk->incremental) {
++        if (!(incremental = qemuBackupBeginCollectIncrementalCheckpoints(vm, dd->backupdisk->incremental)))
++            return -1;
++
+         if (dd->backupdisk->exportbitmap)
+             dd->incrementalBitmap = g_strdup(dd->backupdisk->exportbitmap);
+         else
+@@ -441,7 +489,6 @@ qemuBackupDiskPrepareDataOnePull(virJSONValuePtr actions,
+ static ssize_t
+ qemuBackupDiskPrepareData(virDomainObjPtr vm,
+                           virDomainBackupDefPtr def,
+-                          virDomainMomentDefPtr *incremental,
+                           virHashTablePtr blockNamedNodeData,
+                           virJSONValuePtr actions,
+                           virQEMUDriverConfigPtr cfg,
+@@ -464,8 +511,7 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm,
+         ndisks++;
+ 
+         if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, pull,
+-                                         incremental, blockNamedNodeData,
+-                                         cfg) < 0)
++                                         blockNamedNodeData, cfg) < 0)
+             goto error;
+ 
+         if (pull) {
+@@ -622,50 +668,6 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm,
+ }
+ 
+ 
+-/**
+- * qemuBackupBeginCollectIncrementalCheckpoints:
+- * @vm: domain object
+- * @incrFrom: name of checkpoint representing starting point of incremental backup
+- *
+- * Returns a NULL terminated list of pointers to checkpoint definitions in
+- * chronological order starting from the 'current' checkpoint until reaching
+- * @incrFrom.
+- */
+-static virDomainMomentDefPtr *
+-qemuBackupBeginCollectIncrementalCheckpoints(virDomainObjPtr vm,
+-                                             const char *incrFrom)
+-{
+-    virDomainMomentObjPtr n = virDomainCheckpointGetCurrent(vm->checkpoints);
+-    g_autofree virDomainMomentDefPtr *incr = NULL;
+-    size_t nincr = 0;
+-
+-    while (n) {
+-        virDomainMomentDefPtr def = n->def;
+-
+-        if (VIR_APPEND_ELEMENT_COPY(incr, nincr, def) < 0)
+-            return NULL;
+-
+-        if (STREQ(def->name, incrFrom)) {
+-            def = NULL;
+-            if (VIR_APPEND_ELEMENT_COPY(incr, nincr, def) < 0)
+-                return NULL;
+-
+-            return g_steal_pointer(&incr);
+-        }
+-
+-        if (!n->def->parent_name)
+-            break;
+-
+-        n = virDomainCheckpointFindByName(vm->checkpoints, n->def->parent_name);
+-    }
+-
+-    virReportError(VIR_ERR_OPERATION_INVALID,
+-                   _("could not locate checkpoint '%s' for incremental backup"),
+-                   incrFrom);
+-    return NULL;
+-}
+-
+-
+ void
+ qemuBackupJobTerminate(virDomainObjPtr vm,
+                        qemuDomainJobStatus jobstatus)
+@@ -799,7 +801,6 @@ qemuBackupBegin(virDomainObjPtr vm,
+     bool pull = false;
+     virDomainMomentObjPtr chk = NULL;
+     g_autoptr(virDomainCheckpointDef) chkdef = NULL;
+-    g_autofree virDomainMomentDefPtr *incremental = NULL;
+     g_autoptr(virJSONValue) actions = NULL;
+     struct qemuBackupDiskData *dd = NULL;
+     ssize_t ndd = 0;
+@@ -867,10 +868,6 @@ qemuBackupBegin(virDomainObjPtr vm,
+     if (virDomainBackupAlignDisks(def, vm->def, suffix) < 0)
+         goto endjob;
+ 
+-    if (def->incremental &&
+-        !(incremental = qemuBackupBeginCollectIncrementalCheckpoints(vm, def->incremental)))
+-        goto endjob;
+-
+     actions = virJSONValueNewArray();
+ 
+     /* The 'chk' checkpoint must be rolled back if the transaction command
+@@ -884,7 +881,7 @@ qemuBackupBegin(virDomainObjPtr vm,
+     if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_BACKUP)))
+         goto endjob;
+ 
+-    if ((ndd = qemuBackupDiskPrepareData(vm, def, incremental, blockNamedNodeData,
++    if ((ndd = qemuBackupDiskPrepareData(vm, def, blockNamedNodeData,
+                                          actions, cfg, &dd)) <= 0) {
+         if (ndd == 0) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Rewrite-backup-bitmap-handling-to-the-new-bitmap-semantics.patch b/SOURCES/libvirt-qemu-backup-Rewrite-backup-bitmap-handling-to-the-new-bitmap-semantics.patch
new file mode 100644
index 0000000..c8e5883
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Rewrite-backup-bitmap-handling-to-the-new-bitmap-semantics.patch
@@ -0,0 +1,457 @@
+From 1fd01969c2a7c4deefc28363c9748786ca5d7169 Mon Sep 17 00:00:00 2001
+Message-Id: <1fd01969c2a7c4deefc28363c9748786ca5d7169@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:57 +0200
+Subject: [PATCH] qemu: backup: Rewrite backup bitmap handling to the new
+ bitmap semantics
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reuse qemuBlockGetBitmapMergeActions which allows removal of the ad-hoc
+implementation of bitmap merging for backup. The new approach is simpler
+and also more robust in case some of the bitmaps break as they remove
+the dependency on the whole chain of bitmaps working.
+
+The new approach also allows backups if a snapshot is created outside of
+libvirt.
+
+Additionally the code is greatly simplified.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit e0d8d989e2bc9024f85b676166da0305c4b4014d)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <468adeee4056441afbf7b452def02179da043030.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c                        | 220 +++---------------
+ src/qemu/qemu_backup.h                        |  12 +-
+ tests/qemublocktest.c                         |  86 ++-----
+ .../backupmerge/empty-out.json                |   4 +-
+ 4 files changed, 63 insertions(+), 259 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 13e2a7412b..67d646f477 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -173,199 +173,58 @@ qemuBackupDiskDataCleanup(virDomainObjPtr vm,
+ }
+ 
+ 
+-/**
+- * qemuBackupBeginCollectIncrementalCheckpoints:
+- * @vm: domain object
+- * @incrFrom: name of checkpoint representing starting point of incremental backup
+- *
+- * Returns a NULL terminated list of pointers to checkpoint definitions in
+- * chronological order starting from the 'current' checkpoint until reaching
+- * @incrFrom.
+- */
+-static virDomainMomentDefPtr *
+-qemuBackupBeginCollectIncrementalCheckpoints(virDomainObjPtr vm,
+-                                             const char *incrFrom)
+-{
+-    virDomainMomentObjPtr n = virDomainCheckpointGetCurrent(vm->checkpoints);
+-    g_autofree virDomainMomentDefPtr *incr = NULL;
+-    size_t nincr = 0;
+-
+-    while (n) {
+-        virDomainMomentDefPtr def = n->def;
+-
+-        if (VIR_APPEND_ELEMENT_COPY(incr, nincr, def) < 0)
+-            return NULL;
+-
+-        if (STREQ(def->name, incrFrom)) {
+-            def = NULL;
+-            if (VIR_APPEND_ELEMENT_COPY(incr, nincr, def) < 0)
+-                return NULL;
+-
+-            return g_steal_pointer(&incr);
+-        }
+-
+-        if (!n->def->parent_name)
+-            break;
+-
+-        n = virDomainCheckpointFindByName(vm->checkpoints, n->def->parent_name);
+-    }
+-
+-    virReportError(VIR_ERR_OPERATION_INVALID,
+-                   _("could not locate checkpoint '%s' for incremental backup"),
+-                   incrFrom);
+-    return NULL;
+-}
+-
+-
+-static int
+-qemuBackupGetBitmapMergeRange(virStorageSourcePtr from,
+-                              const char *bitmapname,
+-                              virJSONValuePtr *actions,
+-                              virStorageSourcePtr *to,
+-                              const char *diskdst,
+-                              virHashTablePtr blockNamedNodeData)
++int
++qemuBackupDiskPrepareOneBitmapsChain(virStorageSourcePtr backingChain,
++                                     virStorageSourcePtr targetsrc,
++                                     const char *targetbitmap,
++                                     const char *incremental,
++                                     virJSONValuePtr actions,
++                                     virHashTablePtr blockNamedNodeData)
+ {
+-    g_autoptr(virJSONValue) act = virJSONValueNewArray();
+-    virStorageSourcePtr tmpsrc = NULL;
+-    virStorageSourcePtr n;
+-    bool foundbitmap = false;
++    g_autoptr(virJSONValue) tmpactions = NULL;
+ 
+-    for (n = from; virStorageSourceIsBacking(n); n = n->backingStore) {
+-        qemuBlockNamedNodeDataBitmapPtr bitmap = NULL;
+-
+-        if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                             n,
+-                                                             bitmapname)))
+-            break;
+-
+-        foundbitmap = true;
+-
+-        if (bitmap->inconsistent) {
+-            virReportError(VIR_ERR_INVALID_ARG,
+-                           _("bitmap '%s' for image '%s%u' is inconsistent"),
+-                           bitmap->name, diskdst, n->id);
+-            return -1;
+-        }
+-
+-        if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(act,
+-                                                             n->nodeformat,
+-                                                             bitmapname) < 0)
+-            return -1;
+-
+-        tmpsrc = n;
+-    }
+-
+-    if (!foundbitmap) {
+-        virReportError(VIR_ERR_INVALID_ARG,
+-                       _("failed to find bitmap '%s' in image '%s%u'"),
+-                       bitmapname, diskdst, from->id);
++    if (qemuBlockGetBitmapMergeActions(backingChain, NULL, targetsrc,
++                                       incremental, targetbitmap, NULL,
++                                       &tmpactions,
++                                       blockNamedNodeData) < 0)
+         return -1;
+-    }
+ 
+-    *actions = g_steal_pointer(&act);
+-    *to = tmpsrc;
++    if (tmpactions &&
++        virJSONValueArrayConcat(actions, tmpactions) < 0)
++        return -1;
+ 
+     return 0;
+ }
+ 
+ 
+-virJSONValuePtr
+-qemuBackupDiskPrepareOneBitmapsChain(virDomainMomentDefPtr *incremental,
+-                                     virStorageSourcePtr backingChain,
+-                                     virHashTablePtr blockNamedNodeData,
+-                                     const char *diskdst)
+-{
+-    g_autoptr(virJSONValue) ret = NULL;
+-    size_t incridx = 0;
+-    virStorageSourcePtr n = backingChain;
+-
+-    ret = virJSONValueNewArray();
+-
+-    for (incridx = 0; incremental[incridx]; incridx++) {
+-        g_autoptr(virJSONValue) tmp = virJSONValueNewArray();
+-        virStorageSourcePtr tmpsrc = NULL;
+-        virDomainCheckpointDefPtr chkdef = (virDomainCheckpointDefPtr) incremental[incridx];
+-        bool checkpoint_has_disk = false;
+-        size_t i;
+-
+-        for (i = 0; i < chkdef->ndisks; i++) {
+-            if (STRNEQ_NULLABLE(diskdst, chkdef->disks[i].name))
+-                continue;
+-
+-            if (chkdef->disks[i].type == VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+-                checkpoint_has_disk = true;
+-
+-            break;
+-        }
+-
+-        if (!checkpoint_has_disk) {
+-            if (!incremental[incridx + 1]) {
+-                virReportError(VIR_ERR_INVALID_ARG,
+-                               _("disk '%s' not found in checkpoint '%s'"),
+-                               diskdst, incremental[incridx]->name);
+-                return NULL;
+-            }
+-
+-            continue;
+-        }
+-
+-        if (qemuBackupGetBitmapMergeRange(n, incremental[incridx]->name,
+-                                          &tmp, &tmpsrc, diskdst,
+-                                          blockNamedNodeData) < 0)
+-            return NULL;
+-
+-        if (virJSONValueArrayConcat(ret, tmp) < 0)
+-            return NULL;
+-
+-        n = tmpsrc;
+-    }
+-
+-    return g_steal_pointer(&ret);
+-}
+-
+-
+ static int
+ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd,
+                                 virJSONValuePtr actions,
+-                                virDomainMomentDefPtr *incremental,
+                                 virHashTablePtr blockNamedNodeData)
+ {
+-    g_autoptr(virJSONValue) mergebitmaps = NULL;
+-    g_autoptr(virJSONValue) mergebitmapsstore = NULL;
+-
+-    if (!(mergebitmaps = qemuBackupDiskPrepareOneBitmapsChain(incremental,
+-                                                              dd->domdisk->src,
+-                                                              blockNamedNodeData,
+-                                                              dd->domdisk->dst)))
+-        return -1;
+-
+-    if (!(mergebitmapsstore = virJSONValueCopy(mergebitmaps)))
+-        return -1;
+-
+-    if (qemuMonitorTransactionBitmapAdd(actions,
+-                                        dd->domdisk->src->nodeformat,
+-                                        dd->incrementalBitmap,
+-                                        false,
+-                                        true, 0) < 0)
+-        return -1;
+-
+-    if (qemuMonitorTransactionBitmapMerge(actions,
+-                                          dd->domdisk->src->nodeformat,
+-                                          dd->incrementalBitmap,
+-                                          &mergebitmaps) < 0)
++    if (!qemuBlockBitmapChainIsValid(dd->domdisk->src,
++                                     dd->backupdisk->incremental,
++                                     blockNamedNodeData)) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("missing or broken bitmap '%s' for disk '%s'"),
++                       dd->backupdisk->incremental, dd->domdisk->dst);
+         return -1;
++    }
+ 
+-    if (qemuMonitorTransactionBitmapAdd(actions,
+-                                        dd->store->nodeformat,
+-                                        dd->incrementalBitmap,
+-                                        false,
+-                                        true, 0) < 0)
++    if (qemuBackupDiskPrepareOneBitmapsChain(dd->domdisk->src,
++                                             dd->domdisk->src,
++                                             dd->incrementalBitmap,
++                                             dd->backupdisk->incremental,
++                                             actions,
++                                             blockNamedNodeData) < 0)
+         return -1;
+ 
+-    if (qemuMonitorTransactionBitmapMerge(actions,
+-                                          dd->store->nodeformat,
+-                                          dd->incrementalBitmap,
+-                                          &mergebitmapsstore) < 0)
++    if (qemuBackupDiskPrepareOneBitmapsChain(dd->domdisk->src,
++                                             dd->store,
++                                             dd->incrementalBitmap,
++                                             dd->backupdisk->incremental,
++                                             actions,
++                                             blockNamedNodeData) < 0)
+         return -1;
+ 
+     return 0;
+@@ -382,7 +241,6 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+                              virQEMUDriverConfigPtr cfg)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+-    g_autofree virDomainMomentDefPtr *incremental = NULL;
+ 
+     /* set data structure */
+     dd->backupdisk = backupdisk;
+@@ -418,16 +276,12 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
+         return -1;
+ 
+     if (dd->backupdisk->incremental) {
+-        if (!(incremental = qemuBackupBeginCollectIncrementalCheckpoints(vm, dd->backupdisk->incremental)))
+-            return -1;
+-
+         if (dd->backupdisk->exportbitmap)
+             dd->incrementalBitmap = g_strdup(dd->backupdisk->exportbitmap);
+         else
+             dd->incrementalBitmap = g_strdup_printf("backup-%s", dd->domdisk->dst);
+ 
+-        if (qemuBackupDiskPrepareOneBitmaps(dd, actions, incremental,
+-                                            blockNamedNodeData) < 0)
++        if (qemuBackupDiskPrepareOneBitmaps(dd, actions, blockNamedNodeData) < 0)
+             return -1;
+     }
+ 
+@@ -881,8 +735,8 @@ qemuBackupBegin(virDomainObjPtr vm,
+     if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_BACKUP)))
+         goto endjob;
+ 
+-    if ((ndd = qemuBackupDiskPrepareData(vm, def, blockNamedNodeData,
+-                                         actions, cfg, &dd)) <= 0) {
++    if ((ndd = qemuBackupDiskPrepareData(vm, def, blockNamedNodeData, actions,
++                                         cfg, &dd)) <= 0) {
+         if (ndd == 0) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                            _("no disks selected for backup"));
+diff --git a/src/qemu/qemu_backup.h b/src/qemu/qemu_backup.h
+index 3321ba0b6f..c821baf0ee 100644
+--- a/src/qemu/qemu_backup.h
++++ b/src/qemu/qemu_backup.h
+@@ -52,8 +52,10 @@ qemuBackupGetJobInfoStats(virQEMUDriverPtr driver,
+                           qemuDomainJobInfoPtr jobInfo);
+ 
+ /* exported for testing */
+-virJSONValuePtr
+-qemuBackupDiskPrepareOneBitmapsChain(virDomainMomentDefPtr *incremental,
+-                                     virStorageSourcePtr backingChain,
+-                                     virHashTablePtr blockNamedNodeData,
+-                                     const char *diskdst);
++int
++qemuBackupDiskPrepareOneBitmapsChain(virStorageSourcePtr backingChain,
++                                     virStorageSourcePtr targetsrc,
++                                     const char *targetbitmap,
++                                     const char *incremental,
++                                     virJSONValuePtr actions,
++                                     virHashTablePtr blockNamedNodeData);
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 7c8f67dd6b..dcdc9eade0 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -716,65 +716,6 @@ testQemuBitmapGetFakeChainEntry(virStorageSourcePtr src,
+ }
+ 
+ 
+-typedef virDomainMomentDefPtr testMomentList;
+-
+-static void
+-testMomentListFree(testMomentList *list)
+-{
+-    testMomentList *tmp = list;
+-
+-    if (!list)
+-        return;
+-
+-    while (*tmp) {
+-        virObjectUnref(*tmp);
+-        tmp++;
+-    }
+-
+-    g_free(list);
+-}
+-
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(testMomentList, testMomentListFree);
+-
+-static virDomainMomentDefPtr
+-testQemuBackupGetIncrementalMoment(const char *name)
+-{
+-    virDomainCheckpointDefPtr checkpoint = NULL;
+-
+-    if (!(checkpoint = virDomainCheckpointDefNew()))
+-        abort();
+-
+-    checkpoint->disks = g_new0(virDomainCheckpointDiskDef, 1);
+-    checkpoint->ndisks = 1;
+-
+-    checkpoint->disks[0].name = g_strdup("testdisk");
+-    checkpoint->disks[0].type = VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP;
+-
+-    checkpoint->parent.name = g_strdup(name);
+-
+-    return (virDomainMomentDefPtr) checkpoint;
+-}
+-
+-
+-static virDomainMomentDefPtr *
+-testQemuBackupGetIncremental(const char *incFrom)
+-{
+-    const char *checkpoints[] = {"current", "d", "c", "b", "a"};
+-    virDomainMomentDefPtr *incr;
+-    size_t i;
+-
+-    incr = g_new0(virDomainMomentDefPtr, G_N_ELEMENTS(checkpoints) + 1);
+-
+-    for (i = 0; i < G_N_ELEMENTS(checkpoints); i++) {
+-        incr[i] = testQemuBackupGetIncrementalMoment(checkpoints[i]);
+-
+-        if (STREQ(incFrom, checkpoints[i]))
+-            break;
+-    }
+-
+-    return incr;
+-}
+-
+ static const char *backupDataPrefix = "qemublocktestdata/backupmerge/";
+ 
+ struct testQemuBackupIncrementalBitmapCalculateData {
+@@ -791,10 +732,10 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
+     const struct testQemuBackupIncrementalBitmapCalculateData *data = opaque;
+     g_autoptr(virJSONValue) nodedatajson = NULL;
+     g_autoptr(virHashTable) nodedata = NULL;
+-    g_autoptr(virJSONValue) mergebitmaps = NULL;
+-    g_autofree char *actual = NULL;
++    g_autoptr(virJSONValue) actions = virJSONValueNewArray();
+     g_autofree char *expectpath = NULL;
+-    g_autoptr(testMomentList) incremental = NULL;
++    g_autoptr(virStorageSource) target = NULL;
++    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+ 
+     expectpath = g_strdup_printf("%s/%s%s-out.json", abs_srcdir,
+                                  backupDataPrefix, data->name);
+@@ -808,19 +749,24 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
+         return -1;
+     }
+ 
+-    incremental = testQemuBackupGetIncremental(data->incremental);
++    if (!(target = virStorageSourceNew()))
++        return -1;
+ 
+-    if ((mergebitmaps = qemuBackupDiskPrepareOneBitmapsChain(incremental,
+-                                                             data->chain,
+-                                                             nodedata,
+-                                                             "testdisk"))) {
+-        if (!(actual = virJSONValueToString(mergebitmaps, true)))
++    target->nodeformat = g_strdup_printf("target_node");
++
++    if (qemuBackupDiskPrepareOneBitmapsChain(data->chain,
++                                             target,
++                                             "target-bitmap-name",
++                                             data->incremental,
++                                             actions,
++                                             nodedata) >= 0) {
++        if (virJSONValueToBuffer(actions, &buf, true) < 0)
+             return -1;
+     } else {
+-        actual = g_strdup("NULL\n");
++        virBufferAddLit(&buf, "NULL\n");
+     }
+ 
+-    return virTestCompareToFile(actual, expectpath);
++    return virTestCompareToFile(virBufferCurrentContent(&buf), expectpath);
+ }
+ 
+ 
+diff --git a/tests/qemublocktestdata/backupmerge/empty-out.json b/tests/qemublocktestdata/backupmerge/empty-out.json
+index 7951defec1..41b42e677b 100644
+--- a/tests/qemublocktestdata/backupmerge/empty-out.json
++++ b/tests/qemublocktestdata/backupmerge/empty-out.json
+@@ -1 +1,3 @@
+-NULL
++[
++
++]
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-backup-Split-up-code-traversing-checkpoint-list-looking-for-bitmaps.patch b/SOURCES/libvirt-qemu-backup-Split-up-code-traversing-checkpoint-list-looking-for-bitmaps.patch
new file mode 100644
index 0000000..ca1b634
--- /dev/null
+++ b/SOURCES/libvirt-qemu-backup-Split-up-code-traversing-checkpoint-list-looking-for-bitmaps.patch
@@ -0,0 +1,165 @@
+From d0dc4217142fda8ce8850a30b7d89a344bb55d5e Mon Sep 17 00:00:00 2001
+Message-Id: <d0dc4217142fda8ce8850a30b7d89a344bb55d5e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:35 +0200
+Subject: [PATCH] qemu: backup: Split up code traversing checkpoint list
+ looking for bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The algorithm is getting quite complex. Split out the lookup of range of
+backing chain storage sources and bitmaps contained in them which
+correspond to one checkpoint.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 562511afa6cef5948e6339596ba5954cb5ed0565)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <b3a1485033a5bb425f261caeb299973b2f39bbff.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 111 ++++++++++++++++++++++-------------------
+ 1 file changed, 61 insertions(+), 50 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 5d18720f53..400b711f79 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -173,72 +173,83 @@ qemuBackupDiskDataCleanup(virDomainObjPtr vm,
+ }
+ 
+ 
++static int
++qemuBackupGetBitmapMergeRange(virStorageSourcePtr from,
++                              const char *bitmapname,
++                              virJSONValuePtr *actions,
++                              virStorageSourcePtr *to,
++                              const char *diskdst,
++                              virHashTablePtr blockNamedNodeData)
++{
++    g_autoptr(virJSONValue) act = virJSONValueNewArray();
++    virStorageSourcePtr tmpsrc = NULL;
++    virStorageSourcePtr n;
++    bool foundbitmap = false;
++
++    for (n = from; virStorageSourceIsBacking(n); n = n->backingStore) {
++        qemuBlockNamedNodeDataBitmapPtr bitmap = NULL;
++
++        if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                             n,
++                                                             bitmapname)))
++            break;
++
++        foundbitmap = true;
++
++        if (bitmap->inconsistent) {
++            virReportError(VIR_ERR_INVALID_ARG,
++                           _("bitmap '%s' for image '%s%u' is inconsistent"),
++                           bitmap->name, diskdst, n->id);
++            return -1;
++        }
++
++        if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(act,
++                                                             n->nodeformat,
++                                                             bitmapname) < 0)
++            return -1;
++
++        tmpsrc = n;
++    }
++
++    if (!foundbitmap) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("failed to find bitmap '%s' in image '%s%u'"),
++                       bitmapname, diskdst, from->id);
++        return -1;
++    }
++
++    *actions = g_steal_pointer(&act);
++    *to = tmpsrc;
++
++    return 0;
++}
++
++
+ virJSONValuePtr
+ qemuBackupDiskPrepareOneBitmapsChain(virDomainMomentDefPtr *incremental,
+                                      virStorageSourcePtr backingChain,
+                                      virHashTablePtr blockNamedNodeData,
+                                      const char *diskdst)
+ {
+-    qemuBlockNamedNodeDataBitmapPtr bitmap;
+     g_autoptr(virJSONValue) ret = NULL;
+     size_t incridx = 0;
++    virStorageSourcePtr n = backingChain;
+ 
+     ret = virJSONValueNewArray();
+ 
+-    if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                         backingChain,
+-                                                         incremental[0]->name))) {
+-        virReportError(VIR_ERR_INVALID_ARG,
+-                       _("failed to find bitmap '%s' in image '%s%u'"),
+-                       incremental[0]->name, diskdst, backingChain->id);
+-        return NULL;
+-    }
++    for (incridx = 0; incremental[incridx]; incridx++) {
++        g_autoptr(virJSONValue) tmp = virJSONValueNewArray();
++        virStorageSourcePtr tmpsrc = NULL;
+ 
+-    while (bitmap) {
+-        if (bitmap->inconsistent) {
+-            virReportError(VIR_ERR_INVALID_ARG,
+-                           _("bitmap '%s' for image '%s%u' is inconsistent"),
+-                           bitmap->name, diskdst, backingChain->id);
++        if (qemuBackupGetBitmapMergeRange(n, incremental[incridx]->name,
++                                          &tmp, &tmpsrc, diskdst,
++                                          blockNamedNodeData) < 0)
+             return NULL;
+-        }
+ 
+-        if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(ret,
+-                                                             backingChain->nodeformat,
+-                                                             bitmap->name) < 0)
++        if (virJSONValueArrayConcat(ret, tmp) < 0)
+             return NULL;
+ 
+-        if (backingChain->backingStore &&
+-            (bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                            backingChain->backingStore,
+-                                                            incremental[incridx]->name))) {
+-            backingChain = backingChain->backingStore;
+-            continue;
+-        }
+-
+-        if (incremental[incridx + 1]) {
+-            if ((bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                                backingChain,
+-                                                                incremental[incridx + 1]->name))) {
+-                incridx++;
+-                continue;
+-            }
+-
+-            if (backingChain->backingStore &&
+-                (bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                                backingChain->backingStore,
+-                                                                incremental[incridx + 1]->name))) {
+-                incridx++;
+-                backingChain = backingChain->backingStore;
+-                continue;
+-            }
+-
+-            virReportError(VIR_ERR_INVALID_ARG,
+-                           _("failed to find bitmap '%s' in image '%s%u'"),
+-                           incremental[incridx]->name, diskdst, backingChain->id);
+-            return NULL;
+-        } else {
+-            break;
+-        }
++        n = tmpsrc;
+     }
+ 
+     return g_steal_pointer(&ret);
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-block-Add-support-for-HTTP-cookies.patch b/SOURCES/libvirt-qemu-block-Add-support-for-HTTP-cookies.patch
new file mode 100644
index 0000000..32be511
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Add-support-for-HTTP-cookies.patch
@@ -0,0 +1,122 @@
+From 79e5b82ba66bbf8cbf55701013749ed155d92633 Mon Sep 17 00:00:00 2001
+Message-Id: <79e5b82ba66bbf8cbf55701013749ed155d92633@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:05 +0100
+Subject: [PATCH] qemu: block: Add support for HTTP cookies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Pass the alias of the secret object holding the cookie data as
+'cookie-secret' to qemu.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 06d3e8d5398f9ed292b84a18c3bb6ea4034a772e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <1bed750b384b4f553f36cff4782fc29e32af7ca4.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                              | 14 +++++++++++---
+ .../disk-network-http.x86_64-latest.args           | 11 +++++++++--
+ tests/qemuxml2argvdata/disk-network-http.xml       |  8 ++++++++
+ 3 files changed, 28 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index f07420b6e2..80a8c7296d 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -680,6 +680,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+ {
+     qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
+     const char *passwordalias = NULL;
++    const char *cookiealias = NULL;
+     const char *username = NULL;
+     virJSONValuePtr ret = NULL;
+     g_autoptr(virURI) uri = NULL;
+@@ -704,9 +705,15 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+     if (!(uristr = virURIFormat(uri)))
+         return NULL;
+ 
+-    if (!onlytarget && src->auth) {
+-        username = src->auth->username;
+-        passwordalias = srcPriv->secinfo->s.aes.alias;
++    if (!onlytarget) {
++        if (src->auth) {
++            username = src->auth->username;
++            passwordalias = srcPriv->secinfo->s.aes.alias;
++        }
++
++        if (srcPriv &&
++            srcPriv->httpcookie)
++            cookiealias = srcPriv->httpcookie->s.aes.alias;
+     }
+ 
+     ignore_value(virJSONValueObjectCreate(&ret,
+@@ -714,6 +721,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+                                           "S:username", username,
+                                           "S:password-secret", passwordalias,
+                                           "T:sslverify", src->sslverify,
++                                          "S:cookie-secret", cookiealias,
+                                           NULL));
+ 
+     return ret;
+diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+index 86e4597a81..cbb69e16a9 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+@@ -39,15 +39,22 @@ id=virtio-disk0,bootindex=1 \
+ "file":"libvirt-3-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
+ id=virtio-disk1 \
++-object secret,id=libvirt-2-storage-httpcookie-secret0,\
++data=DrPR9NA6GKJb7qi1KbjHad3f3UIGTTDmAmOZHHv1F5w5T8rhnk3f+uSKStHe0J2O,\
++keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\
++"cookie-secret":"libvirt-2-storage-httpcookie-secret0",\
+ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-2-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
+ id=virtio-disk2 \
++-object secret,id=libvirt-1-storage-httpcookie-secret0,\
++data=DrPR9NA6GKJb7qi1KbjHad3f3UIGTTDmAmOZHHv1F5w5T8rhnk3f+uSKStHe0J2O,\
++keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
+-"sslverify":false,"node-name":"libvirt-1-storage","auto-read-only":true,\
+-"discard":"unmap"}' \
++"sslverify":false,"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\
++"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-1-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
+diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
+index 8c475aec1d..6acf75cf65 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.xml
++++ b/tests/qemuxml2argvdata/disk-network-http.xml
+@@ -31,6 +31,10 @@
+       <driver name='qemu' type='raw'/>
+       <source protocol='http' name='test3.img'>
+         <host name='example.org' port='1234'/>
++        <cookies>
++          <cookie name='test'>testcookievalue</cookie>
++          <cookie name='test2'>blurb</cookie>
++        </cookies>
+       </source>
+       <target dev='vdc' bus='virtio'/>
+     </disk>
+@@ -39,6 +43,10 @@
+       <source protocol='https' name='test4.img'>
+         <host name='example.org' port='1234'/>
+         <ssl verify='no'/>
++        <cookies>
++          <cookie name='test'>testcookievalue</cookie>
++          <cookie name='test2'>blurb</cookie>
++        </cookies>
+       </source>
+       <target dev='vdd' bus='virtio'/>
+     </disk>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-block-Add-universal-helper-for-merging-dirty-bitmaps-for-all-scenarios.patch b/SOURCES/libvirt-qemu-block-Add-universal-helper-for-merging-dirty-bitmaps-for-all-scenarios.patch
new file mode 100644
index 0000000..2195f0d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Add-universal-helper-for-merging-dirty-bitmaps-for-all-scenarios.patch
@@ -0,0 +1,238 @@
+From 629e54cc030235909720da73d6367fc0b703d062 Mon Sep 17 00:00:00 2001
+Message-Id: <629e54cc030235909720da73d6367fc0b703d062@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:56 +0200
+Subject: [PATCH] qemu: block: Add universal helper for merging dirty bitmaps
+ for all scenarios
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a function which allows merging bitmaps according to the new
+semantics and will allow replacing all the specific ad-hoc functions
+currently in use for 'backup', 'block commit', 'block copy' and will
+also be usable in the future for 'block pull' and non-shared storage
+migration.
+
+The semantics are a bit quirky for the 'backup' case but these quirks
+are documented and will prevent us from having two slightly different
+algorithms.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 4fa8654eced8b0362d3f3ff33eebb108fe833869)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <25acdc313844a20a9c884048498c42b9a8105de7.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 172 ++++++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_block.h |  10 +++
+ 2 files changed, 182 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 38c8269721..b2296c2b4c 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2832,6 +2832,178 @@ qemuBlockGetNamedNodeData(virDomainObjPtr vm,
+ }
+ 
+ 
++/**
++ * qemuBlockGetBitmapMergeActionsGetBitmaps:
++ *
++ * Collect a list of bitmaps which need to be handled in
++ * qemuBlockGetBitmapMergeActions. The list contains only valid bitmaps in the
++ * sub-chain which is being processed.
++ *
++ * Note that the returned GSList contains bitmap names string pointers borrowed
++ * from @blockNamedNodeData so they must not be freed.
++ */
++static GSList *
++qemuBlockGetBitmapMergeActionsGetBitmaps(virStorageSourcePtr topsrc,
++                                         const char *bitmapname,
++                                         virHashTablePtr blockNamedNodeData)
++{
++    g_autoptr(GSList) ret = NULL;
++    qemuBlockNamedNodeDataPtr entry;
++    size_t i;
++
++    /* for now it doesn't make sense to consider bitmaps which are not present
++     * in @topsrc as we can't recreate a bitmap for a layer if it's missing */
++
++    if (!(entry = virHashLookup(blockNamedNodeData, topsrc->nodeformat)))
++        return NULL;
++
++    for (i = 0; i < entry->nbitmaps; i++) {
++        qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
++
++        if (bitmapname &&
++            STRNEQ(bitmapname, bitmap->name))
++            continue;
++
++        if (!qemuBlockBitmapChainIsValid(topsrc, bitmap->name, blockNamedNodeData))
++            continue;
++
++        ret = g_slist_prepend(ret, bitmap->name);
++    }
++
++    return g_steal_pointer(&ret);
++}
++
++
++/**
++ * qemuBlockGetBitmapMergeActions:
++ * @topsrc: top of the chain to merge bitmaps in
++ * @basesrc: bottom of the chain to merge bitmaps in (NULL for full chain)
++ * @target: destination storage source of the merge (may be part of original chain)
++ * @bitmapname: name of bitmap to perform the merge (NULL for all bitmaps)
++ * @dstbitmapname: name of destination bitmap of the merge (see below for caveats)
++ * @writebitmapsrc: storage source corresponding to the node containing the write temporary bitmap
++ * @actions: returns actions for a 'transaction' QMP command for executing the merge
++ * @blockNamedNodeData: hash table filled with qemuBlockNamedNodeData
++ *
++ * Calculate handling of dirty block bitmaps between @topsrc and @basesrc. If
++ * @basesrc is NULL the end of the chain is considered. @target is the destination
++ * storage source definition of the merge and may or may not be part of the
++ * merged chain.
++ *
++ * Specifically the merging algorithm ensures that each considered bitmap is
++ * merged with the appropriate bitmaps so that it properly describes
++ * the state of dirty blocks when looked at from @topsrc based on the depth
++ * of the backing chain where the bitmap is placed.
++ *
++ * If @bitmapname is non-NULL only bitmaps with that name are handled, otherwise
++ * all bitmaps are considered.
++ *
++ * If @dstbitmap is non-NULL everything is merged into a bitmap with that name,
++ * otherwise each bitmap is merged into a bitmap with the same name into @target.
++ * Additionally if @dstbitmap is non-NULL the target bitmap is created as 'inactive'
++ * and 'transient' as a special case for the backup operation.
++ *
++ * If @writebitmapsrc is non-NULL, the 'libvirt-tmp-activewrite' bitmap from
++ * given node is merged along with others. This bitmap corresponds to the writes
++ * which occurred between an active layer job finished and the rest of the bitmap
++ * merging.
++ *
++ * If the bitmap is not valid somehow (see qemuBlockBitmapChainIsValid) given
++ * bitmap is silently skipped, so callers must ensure that given bitmap is valid
++ * if they care about it.
++ *
++ * The resulting 'transaction' QMP command actions are filled in and returned via
++ * @actions.
++ *
++ * Note that @actions may be NULL if no merging is required.
++ */
++int
++qemuBlockGetBitmapMergeActions(virStorageSourcePtr topsrc,
++                               virStorageSourcePtr basesrc,
++                               virStorageSourcePtr target,
++                               const char *bitmapname,
++                               const char *dstbitmapname,
++                               virStorageSourcePtr writebitmapsrc,
++                               virJSONValuePtr *actions,
++                               virHashTablePtr blockNamedNodeData)
++{
++    g_autoptr(virJSONValue) act = virJSONValueNewArray();
++    virStorageSourcePtr n;
++
++    g_autoptr(GSList) bitmaps = NULL;
++    GSList *next;
++
++    if (!(bitmaps = qemuBlockGetBitmapMergeActionsGetBitmaps(topsrc, bitmapname,
++                                                             blockNamedNodeData)))
++        return 0;
++
++    for (next = bitmaps; next; next = next->next) {
++        const char *curbitmap = next->data;
++        const char *mergebitmapname = dstbitmapname;
++        bool mergebitmappersistent = false;
++        bool mergebitmapdisabled = true;
++        g_autoptr(virJSONValue) merge = virJSONValueNewArray();
++        unsigned long long granularity = 0;
++        qemuBlockNamedNodeDataBitmapPtr bitmap;
++
++        /* explicitly named destinations mean that we want a temporary
++         * disabled bitmap only, so undo the default for non-explicit cases  */
++        if (!mergebitmapname) {
++            mergebitmapname = curbitmap;
++            mergebitmappersistent = true;
++            mergebitmapdisabled = false;
++        }
++
++        for (n = topsrc; virStorageSourceIsBacking(n) && n != basesrc; n = n->backingStore) {
++            if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                                 n, curbitmap)))
++                continue;
++
++            if (granularity == 0)
++                granularity = bitmap->granularity;
++
++            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(merge,
++                                                                 n->nodeformat,
++                                                                 bitmap->name) < 0)
++                return -1;
++        }
++
++        if (dstbitmapname ||
++            !(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                             target, curbitmap))) {
++
++            if (qemuMonitorTransactionBitmapAdd(act,
++                                                target->nodeformat,
++                                                mergebitmapname,
++                                                mergebitmappersistent,
++                                                mergebitmapdisabled,
++                                                granularity) < 0)
++                return -1;
++        }
++
++        if (writebitmapsrc &&
++            qemuMonitorTransactionBitmapMergeSourceAddBitmap(merge,
++                                                             writebitmapsrc->nodeformat,
++                                                             "libvirt-tmp-activewrite") < 0)
++            return -1;
++
++        if (qemuMonitorTransactionBitmapMerge(act, target->nodeformat,
++                                              mergebitmapname, &merge) < 0)
++            return -1;
++    }
++
++    if (writebitmapsrc &&
++        qemuMonitorTransactionBitmapRemove(act, writebitmapsrc->nodeformat,
++                                           "libvirt-tmp-activewrite") < 0)
++        return -1;
++
++    if (virJSONValueArraySize(act) > 0)
++        *actions = g_steal_pointer(&act);
++
++    return 0;
++}
++
++
+ /**
+  * qemuBlockBitmapChainIsValid:
+  *
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 06afa54115..2500390734 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -221,6 +221,16 @@ virHashTablePtr
+ qemuBlockGetNamedNodeData(virDomainObjPtr vm,
+                           qemuDomainAsyncJob asyncJob);
+ 
++int
++qemuBlockGetBitmapMergeActions(virStorageSourcePtr topsrc,
++                               virStorageSourcePtr basesrc,
++                               virStorageSourcePtr target,
++                               const char *bitmapname,
++                               const char *dstbitmapname,
++                               virStorageSourcePtr writebitmapsrc,
++                               virJSONValuePtr *actions,
++                               virHashTablePtr blockNamedNodeData);
++
+ bool
+ qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
+                             const char *bitmapname,
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-block-Add-validator-for-bitmap-chains-accross-backing-chains.patch b/SOURCES/libvirt-qemu-block-Add-validator-for-bitmap-chains-accross-backing-chains.patch
new file mode 100644
index 0000000..d4ea716
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Add-validator-for-bitmap-chains-accross-backing-chains.patch
@@ -0,0 +1,196 @@
+From eeb1315a8015aeda4d2fb7ce590c85c40ffb567d Mon Sep 17 00:00:00 2001
+Message-Id: <eeb1315a8015aeda4d2fb7ce590c85c40ffb567d@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:23 +0100
+Subject: [PATCH] qemu: block: Add validator for bitmap chains accross backing
+ chains
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a validator which checks that a bitmap spanning multiple backing
+chain members doesn't look broken. The current rules are that no
+intermediate birmaps are missing (unfortunately it's hard to know
+whether the topmost or bottommost bitmap is missing) and none of the
+components is inconsistent.
+
+We can obviously improve it over time.
+
+The validator is also tested against the existing bitmap data we have
+for the backup merging test as well as some of the existing broken
+bitmap synthetic test cases.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 41c7e5c2a689a4ad091cec40b61beeeb3dde49b8)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <a1020495b33e99b2c1bb847dff26565d4def1e20.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 41 +++++++++++++++++++++++++
+ src/qemu/qemu_block.h |  5 ++++
+ tests/qemublocktest.c | 70 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 116 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 03f029368e..b19290e677 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2687,3 +2687,44 @@ qemuBlockGetNamedNodeData(virDomainObjPtr vm,
+ 
+     return g_steal_pointer(&blockNamedNodeData);
+ }
++
++
++/**
++ * qemuBlockBitmapChainIsValid:
++ *
++ * Validates that the backing chain of @src contains proper consistent bitmap
++ * data for a chain of bitmaps named @bitmapname.
++ *
++ * A valid chain:
++ * 1) bitmaps of same name are in a consecutive subset of images without gap
++ * 2) don't have any inconsistent bitmaps
++ */
++bool
++qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
++                            const char *bitmapname,
++                            virHashTablePtr blockNamedNodeData)
++{
++    qemuBlockNamedNodeDataBitmapPtr bitmap;
++    virStorageSourcePtr n;
++    bool chain_started = false;
++    bool chain_ended = false;
++
++    for (n = src; n; n = n->backingStore) {
++        if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData, n, bitmapname))) {
++            if (chain_started)
++                chain_ended = true;
++
++            continue;
++        }
++
++        if (chain_ended)
++            return false;
++
++        chain_started = true;
++
++        if (bitmap->inconsistent)
++            return false;
++    }
++
++    return chain_started;
++}
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 68646cbf2e..cf51b9bf4e 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -212,3 +212,8 @@ qemuBlockNamedNodeDataGetBitmapByName(virHashTablePtr blockNamedNodeData,
+ virHashTablePtr
+ qemuBlockGetNamedNodeData(virDomainObjPtr vm,
+                           qemuDomainAsyncJob asyncJob);
++
++bool
++qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
++                            const char *bitmapname,
++                            virHashTablePtr blockNamedNodeData);
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 5946cd6c6b..6a7b07cfee 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -764,6 +764,41 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+ }
+ 
+ 
++struct testQemuBlockBitmapValidateData {
++    const char *name;
++    const char *bitmapname;
++    virStorageSourcePtr chain;
++    bool expect;
++};
++
++static int
++testQemuBlockBitmapValidate(const void *opaque)
++{
++    const struct testQemuBlockBitmapValidateData *data = opaque;
++    g_autoptr(virJSONValue) nodedatajson = NULL;
++    g_autoptr(virHashTable) nodedata = NULL;
++    bool actual;
++
++    if (!(nodedatajson = virTestLoadFileJSON(bitmapDetectPrefix, data->name,
++                                             ".json", NULL)))
++        return -1;
++
++    if (!(nodedata = qemuMonitorJSONBlockGetNamedNodeDataJSON(nodedatajson))) {
++        VIR_TEST_VERBOSE("failed to load nodedata JSON\n");
++        return -1;
++    }
++
++    actual = qemuBlockBitmapChainIsValid(data->chain, data->bitmapname, nodedata);
++
++    if (actual != data->expect) {
++        VIR_TEST_VERBOSE("expected rv:'%d' actual rv:'%d'\n", data->expect, actual);
++        return -1;
++    }
++
++    return 0;
++}
++
++
+ static int
+ mymain(void)
+ {
+@@ -774,6 +809,7 @@ mymain(void)
+     struct testQemuImageCreateData imagecreatedata;
+     struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
+     struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
++    struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
+     char *capslatest_x86_64 = NULL;
+     virQEMUCapsPtr caps_x86_64 = NULL;
+     g_autoptr(virStorageSource) bitmapSourceChain = NULL;
+@@ -1041,7 +1077,41 @@ mymain(void)
+     TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate3", "d", "c", "snapshots-synthetic-checkpoint");
+     TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-current", "current", "d", "snapshots-synthetic-checkpoint");
+ 
++#define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
++    do { \
++        blockbitmapvalidatedata.name = testname; \
++        blockbitmapvalidatedata.chain = bitmapSourceChain; \
++        blockbitmapvalidatedata.bitmapname = bitmap; \
++        blockbitmapvalidatedata.expect = rc; \
++        if (virTestRun("bitmap validate " testname " " bitmap, \
++                       testQemuBlockBitmapValidate, \
++                       &blockbitmapvalidatedata) < 0) \
++            ret = -1; \
++    } while (0)
+ 
++    TEST_BITMAP_VALIDATE("basic", "a", true);
++    TEST_BITMAP_VALIDATE("basic", "b", true);
++    TEST_BITMAP_VALIDATE("basic", "c", true);
++    TEST_BITMAP_VALIDATE("basic", "d", true);
++    TEST_BITMAP_VALIDATE("basic", "current", true);
++
++    TEST_BITMAP_VALIDATE("snapshots", "a", true);
++    TEST_BITMAP_VALIDATE("snapshots", "b", true);
++    TEST_BITMAP_VALIDATE("snapshots", "c", true);
++    TEST_BITMAP_VALIDATE("snapshots", "d", true);
++    TEST_BITMAP_VALIDATE("snapshots", "current", true);
++
++    TEST_BITMAP_VALIDATE("synthetic", "a", false);
++    TEST_BITMAP_VALIDATE("synthetic", "b", true);
++    TEST_BITMAP_VALIDATE("synthetic", "c", true);
++    TEST_BITMAP_VALIDATE("synthetic", "d", true);
++    TEST_BITMAP_VALIDATE("synthetic", "current", true);
++
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "a", true);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "b", true);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "c", true);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "d", true);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "current", true);
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-block-Don-t-skip-creation-of-luks-formatted-images.patch b/SOURCES/libvirt-qemu-block-Don-t-skip-creation-of-luks-formatted-images.patch
new file mode 100644
index 0000000..fa76d45
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Don-t-skip-creation-of-luks-formatted-images.patch
@@ -0,0 +1,59 @@
+From b3285cc15d305161dd0f3730690d6a441c906456 Mon Sep 17 00:00:00 2001
+Message-Id: <b3285cc15d305161dd0f3730690d6a441c906456@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:45 +0100
+Subject: [PATCH] qemu: block: Don't skip creation of 'luks' formatted images
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libvirt treats 'luks' images as raw+encryption. The logic in
+qemuBlockStorageSourceCreateFormat skipped the creation if the requested
+image was raw but didn't take into account the encryption.
+
+This manifested itself e.g. when attempting to do a virsh blockcopy with
+the following XML:
+
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/enccpy'>
+        <encryption format='luks'>
+          <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/>
+        </encryption>
+      </source>
+    </disk>
+
+Where qemu would report the following error:
+
+ unable to execute QEMU command 'blockdev-add': Volume is not in LUKS format
+
+rather than actually formatting the image first.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit f4e7c792d58cbd7318fc30519c551e4fe0cd98de)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1371022
+Message-Id: <1a89d76526af86e4d0437852802a5da0d2aed701.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index eab21bc107..22f03da485 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2479,7 +2479,8 @@ qemuBlockStorageSourceCreateFormat(virDomainObjPtr vm,
+     g_autoptr(virJSONValue) createformatprops = NULL;
+     int ret;
+ 
+-    if (src->format == VIR_STORAGE_FILE_RAW)
++    if (src->format == VIR_STORAGE_FILE_RAW &&
++        !src->encryption)
+         return 0;
+ 
+     if (qemuBlockStorageSourceCreateGetFormatProps(src, backingStore,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-block-Extract-calls-of-qemuBlockGetNamedNodeData-into-a-helper-function.patch b/SOURCES/libvirt-qemu-block-Extract-calls-of-qemuBlockGetNamedNodeData-into-a-helper-function.patch
new file mode 100644
index 0000000..0b7e65e
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Extract-calls-of-qemuBlockGetNamedNodeData-into-a-helper-function.patch
@@ -0,0 +1,122 @@
+From 70cf28f452df43cec98387b3039c3b8c5dda10d4 Mon Sep 17 00:00:00 2001
+Message-Id: <70cf28f452df43cec98387b3039c3b8c5dda10d4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:16 +0100
+Subject: [PATCH] qemu: block: Extract calls of qemuBlockGetNamedNodeData into
+ a helper function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Create a wrapper for qemuBlockGetNamedNodeData named
+qemuBlockGetNamedNodeData. The purpose of the wrapper is to integrate
+the monitor handling functionality and in the future possible
+qemuCaps-based flags.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5ddfac11698ec230626e12d077206210424c9bb2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <5527853a9417cf84812cadb842b934ff67de1ea4.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c |  5 +----
+ src/qemu/qemu_block.c  | 20 ++++++++++++++++++++
+ src/qemu/qemu_block.h  |  4 ++++
+ src/qemu/qemu_driver.c | 16 ++++------------
+ 4 files changed, 29 insertions(+), 16 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 23518a5d40..8b1e9a7e19 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -830,10 +830,7 @@ qemuBackupBegin(virDomainObjPtr vm,
+             goto endjob;
+     }
+ 
+-    if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, QEMU_ASYNC_JOB_BACKUP) < 0)
+-        goto endjob;
+-    blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon);
+-    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || !blockNamedNodeData)
++    if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_BACKUP)))
+         goto endjob;
+ 
+     if ((ndd = qemuBackupDiskPrepareData(vm, def, incremental, blockNamedNodeData,
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 22f03da485..13e240fdac 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2670,3 +2670,23 @@ qemuBlockNamedNodeDataGetBitmapByName(virHashTablePtr blockNamedNodeData,
+ 
+     return NULL;
+ }
++
++
++virHashTablePtr
++qemuBlockGetNamedNodeData(virDomainObjPtr vm,
++                          qemuDomainAsyncJob asyncJob)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    virQEMUDriverPtr driver = priv->driver;
++    g_autoptr(virHashTable) blockNamedNodeData = NULL;
++
++    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
++        return NULL;
++
++    blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon);
++
++    if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockNamedNodeData)
++        return NULL;
++
++    return g_steal_pointer(&blockNamedNodeData);
++}
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 1a38e0eccf..68646cbf2e 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -208,3 +208,7 @@ qemuBlockNamedNodeDataBitmapPtr
+ qemuBlockNamedNodeDataGetBitmapByName(virHashTablePtr blockNamedNodeData,
+                                       virStorageSourcePtr src,
+                                       const char *bitmap);
++
++virHashTablePtr
++qemuBlockGetNamedNodeData(virDomainObjPtr vm,
++                          qemuDomainAsyncJob asyncJob);
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index e19e1da0bb..f7ad2dca28 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15622,15 +15622,9 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
+     if (!(actions = virJSONValueNewArray()))
+         return -1;
+ 
+-    if (blockdev) {
+-        if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
+-            return -1;
+-
+-        blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon);
+-
+-        if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockNamedNodeData)
+-            return -1;
+-    }
++    if (blockdev &&
++        !(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
++        return -1;
+ 
+     /* prepare a list of objects to use in the vm definition so that we don't
+      * have to roll back later */
+@@ -18334,9 +18328,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+                                                                           priv->qemuCaps)))
+                 goto endjob;
+         } else {
+-            qemuDomainObjEnterMonitor(driver, vm);
+-            blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon);
+-            if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockNamedNodeData)
++            if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+                 goto endjob;
+ 
+             if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-block-Extract-formatting-of-cookie-string.patch b/SOURCES/libvirt-qemu-block-Extract-formatting-of-cookie-string.patch
new file mode 100644
index 0000000..aae59f8
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Extract-formatting-of-cookie-string.patch
@@ -0,0 +1,108 @@
+From 41504cefb5ab3f473680bd7498fc940811cefc26 Mon Sep 17 00:00:00 2001
+Message-Id: <41504cefb5ab3f473680bd7498fc940811cefc26@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:06 +0100
+Subject: [PATCH] qemu: block: Extract formatting of cookie string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce qemuBlockStorageSourceGetCookieString which does the
+concatenation so that we can reuse it later.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit bafd2e94fabfe12bdc64c9972f56af536e6ad0eb)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+
+Conflicts:
+	src/qemu/qemu_block.c
+	src/qemu/qemu_block.h
+
+        Context, a8bcbb42172 not backported
+
+	src/qemu/qemu_domain.c
+
+        virBufferTrim change not backported, the conflict is on a
+        previous conflict resolution
+Message-Id: <bbc4bf3b1ebdc99aec680487c22d2a68c1cdda5f.1585063415.git.pkrempa@redhat.com>
+
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c  | 25 +++++++++++++++++++++++++
+ src/qemu/qemu_block.h  |  3 +++
+ src/qemu/qemu_domain.c | 13 +------------
+ 3 files changed, 29 insertions(+), 12 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 73a424f7a8..1f48f559e3 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3306,3 +3306,28 @@ qemuBlockReopenReadOnly(virDomainObjPtr vm,
+ 
+     return 0;
+ }
++
++
++/**
++ * qemuBlockStorageSourceGetCookieString:
++ * @src: storage source
++ *
++ * Returns a properly formatted string representing cookies of @src in format
++ * accepted by qemu.
++ */
++char *
++qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src)
++{
++    virBuffer buf = VIR_BUFFER_INITIALIZER;
++    size_t i;
++
++    for (i = 0; i < src->ncookies; i++) {
++        virStorageNetCookieDefPtr cookie = src->cookies[i];
++
++        virBufferAsprintf(&buf, "%s=%s; ", cookie->name, cookie->value);
++    }
++
++    virBufferTrim(&buf, "; ", -1);
++
++    return virBufferContentAndReset(&buf);
++}
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 506957c3d5..4e7708ce74 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -255,3 +255,6 @@ int
+ qemuBlockReopenReadOnly(virDomainObjPtr vm,
+                         virStorageSourcePtr src,
+                         qemuDomainAsyncJob asyncJob);
++
++char *
++qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src);
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 3d31e176d1..4007b4dbda 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1747,18 +1747,7 @@ qemuDomainSecretStorageSourcePrepareCookies(qemuDomainObjPrivatePtr priv,
+                                             const char *aliasprotocol)
+ {
+     g_autofree char *secretalias = qemuAliasForSecret(aliasprotocol, "httpcookie");
+-    g_autofree char *cookies = NULL;
+-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+-    size_t i;
+-
+-    for (i = 0; i < src->ncookies; i++) {
+-        virStorageNetCookieDefPtr cookie = src->cookies[i];
+-
+-        virBufferAsprintf(&buf, "%s=%s; ", cookie->name, cookie->value);
+-    }
+-
+-    virBufferTrim(&buf, "; ", -1);
+-    cookies = virBufferContentAndReset(&buf);
++    g_autofree char *cookies = qemuBlockStorageSourceGetCookieString(src);
+ 
+     return qemuDomainSecretAESSetup(priv, secretalias, NULL,
+                                     (uint8_t *) cookies, strlen(cookies));
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemu-block-Implement-helpers-for-dealing-with-bitmaps-during-block-commit.patch b/SOURCES/libvirt-qemu-block-Implement-helpers-for-dealing-with-bitmaps-during-block-commit.patch
new file mode 100644
index 0000000..5080fe1
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Implement-helpers-for-dealing-with-bitmaps-during-block-commit.patch
@@ -0,0 +1,287 @@
+From 3e71c9c766a0452e0bae3b4593f3cba3d1caec60 Mon Sep 17 00:00:00 2001
+Message-Id: <3e71c9c766a0452e0bae3b4593f3cba3d1caec60@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:24 +0100
+Subject: [PATCH] qemu: block: Implement helpers for dealing with bitmaps
+ during block commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+qemuBlockBitmapsHandleCommitStart prepares for disabling the bitmaps in
+the 'base' of the commit job so that the bitmaps are not dirtied by the
+commit job. This needs to be done prior to start of the commit job.
+
+qemuBlockBitmapsHandleCommitFinish then calculates the necessary merges
+that agregate all the bitmaps between the commited images and write them
+into the base bitmap.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 1753f605506e28eb42bc5bb6fa9abe8fcbe6fb9b)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <c0624f94e802043ca10819aaaa9111ae230cfb7f.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 219 ++++++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_block.h |  14 +++
+ 2 files changed, 233 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index b4da323610..21c1ad9618 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2988,6 +2988,225 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+ }
+ 
+ 
++/**
++ * @topsrc: virStorageSource representing 'top' of the job
++ * @basesrc: virStorageSource representing 'base' of the job
++ * @blockNamedNodeData: hash table containing data about bitmaps
++ * @actions: filled with arguments for a 'transaction' command
++ * @disabledBitmapsBase: filled with a list of bitmap names which must be disabled
++ *
++ * Prepares data for correctly handling bitmaps during the start of a commit
++ * job. The bitmaps in the 'base' image must be disabled, so that the writes
++ * done by the blockjob don't dirty the enabled bitmaps.
++ *
++ * @actions and @disabledBitmapsBase are untouched if no bitmaps need
++ * to be disabled.
++ */
++int
++qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
++                                  virStorageSourcePtr basesrc,
++                                  virHashTablePtr blockNamedNodeData,
++                                  virJSONValuePtr *actions,
++                                  char ***disabledBitmapsBase)
++{
++    g_autoptr(virJSONValue) act = virJSONValueNewArray();
++    VIR_AUTOSTRINGLIST bitmaplist = NULL;
++    size_t curbitmapstr = 0;
++    qemuBlockNamedNodeDataPtr entry;
++    bool disable_bitmaps = false;
++    size_t i;
++
++    if (!(entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat)))
++        return 0;
++
++    bitmaplist = g_new0(char *, entry->nbitmaps);
++
++    for (i = 0; i < entry->nbitmaps; i++) {
++        qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
++
++        if (!bitmap->recording || bitmap->inconsistent ||
++            !qemuBlockBitmapChainIsValid(topsrc, bitmap->name, blockNamedNodeData))
++            continue;
++
++        disable_bitmaps = true;
++
++        if (qemuMonitorTransactionBitmapDisable(act, basesrc->nodeformat,
++                                                bitmap->name) < 0)
++            return -1;
++
++        bitmaplist[curbitmapstr++] = g_strdup(bitmap->name);
++    }
++
++    if (disable_bitmaps) {
++        *actions = g_steal_pointer(&act);
++        *disabledBitmapsBase = g_steal_pointer(&bitmaplist);
++    }
++
++    return 0;
++}
++
++
++struct qemuBlockBitmapsHandleCommitData {
++    bool skip;
++    bool create;
++    bool enable;
++    const char *basenode;
++    virJSONValuePtr merge;
++    unsigned long long granularity;
++    bool persistent;
++};
++
++
++static void
++qemuBlockBitmapsHandleCommitDataFree(void *opaque)
++{
++    struct qemuBlockBitmapsHandleCommitData *data = opaque;
++
++    virJSONValueFree(data->merge);
++    g_free(data);
++}
++
++
++static int
++qemuBlockBitmapsHandleCommitFinishIterate(void *payload,
++                                          const void *entryname,
++                                          void *opaque)
++{
++    struct qemuBlockBitmapsHandleCommitData *data = payload;
++    const char *bitmapname = entryname;
++    virJSONValuePtr actions = opaque;
++
++    if (data->skip)
++        return 0;
++
++    if (data->create) {
++        if (qemuMonitorTransactionBitmapAdd(actions, data->basenode, bitmapname,
++                                            data->persistent, !data->enable,
++                                            data->granularity) < 0)
++            return -1;
++    } else {
++        if (data->enable &&
++            qemuMonitorTransactionBitmapEnable(actions, data->basenode, bitmapname) < 0)
++            return -1;
++    }
++
++    if (data->merge &&
++        qemuMonitorTransactionBitmapMerge(actions, data->basenode, bitmapname,
++                                          &data->merge) < 0)
++        return -1;
++
++    return 0;
++}
++
++
++/**
++ * @topsrc: virStorageSource representing 'top' of the job
++ * @basesrc: virStorageSource representing 'base' of the job
++ * @blockNamedNodeData: hash table containing data about bitmaps
++ * @actions: filled with arguments for a 'transaction' command
++ * @disabledBitmapsBase: bitmap names which were disabled
++ *
++ * Calculates the necessary bitmap merges/additions/enablements to properly
++ * handle commit of images from 'top' into 'base'. The necessary operations
++ * in the form of arguments of the 'transaction' command are filled into
++ * 'actions' if there is anything to do. Otherwise NULL is returned.
++ */
++int
++qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
++                                   virStorageSourcePtr basesrc,
++                                   virHashTablePtr blockNamedNodeData,
++                                   virJSONValuePtr *actions,
++                                   char **disabledBitmapsBase)
++{
++    g_autoptr(virJSONValue) act = virJSONValueNewArray();
++    virStorageSourcePtr n;
++    qemuBlockNamedNodeDataPtr entry;
++    g_autoptr(virHashTable) commitdata = NULL;
++    struct qemuBlockBitmapsHandleCommitData *bitmapdata;
++    size_t i;
++
++    commitdata = virHashNew(qemuBlockBitmapsHandleCommitDataFree);
++
++    for (n = topsrc; n != basesrc; n = n->backingStore) {
++        if (!(entry = virHashLookup(blockNamedNodeData, n->nodeformat)))
++            continue;
++
++        for (i = 0; i < entry->nbitmaps; i++) {
++            qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
++
++            if (!(bitmapdata = virHashLookup(commitdata, bitmap->name))) {
++                bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
++
++                /* we must mirror the state of the topmost bitmap and merge
++                 * everything else */
++                bitmapdata->create = true;
++                bitmapdata->enable = bitmap->recording;
++                bitmapdata->basenode = basesrc->nodeformat;
++                bitmapdata->merge = virJSONValueNewArray();
++                bitmapdata->granularity = bitmap->granularity;
++                bitmapdata->persistent = bitmap->persistent;
++
++                if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) < 0) {
++                    qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
++                    return -1;
++                }
++            }
++
++            if (bitmap->inconsistent ||
++                !qemuBlockBitmapChainIsValid(topsrc, bitmap->name, blockNamedNodeData))
++                bitmapdata->skip = true;
++
++            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(bitmapdata->merge,
++                                                                 n->nodeformat,
++                                                                 bitmap->name) < 0)
++                return -1;
++        }
++    }
++
++    if ((entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat))) {
++        /* note that all bitmaps in 'base' were disabled when commit was started */
++        for (i = 0; i < entry->nbitmaps; i++) {
++            qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
++
++            if ((bitmapdata = virHashLookup(commitdata, bitmap->name))) {
++                bitmapdata->create = false;
++            } else {
++                if (disabledBitmapsBase) {
++                    char **disabledbitmaps;
++
++                    for (disabledbitmaps = disabledBitmapsBase; *disabledbitmaps; disabledbitmaps++) {
++                        if (STREQ(*disabledBitmapsBase, bitmap->name)) {
++                            bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
++
++                            bitmapdata->create = false;
++                            bitmapdata->enable = true;
++                            bitmapdata->basenode = basesrc->nodeformat;
++                            bitmapdata->granularity = bitmap->granularity;
++                            bitmapdata->persistent = bitmap->persistent;
++
++                            if (virHashAddEntry(commitdata, bitmap->name, bitmapdata) < 0) {
++                                qemuBlockBitmapsHandleCommitDataFree(bitmapdata);
++                                return -1;
++                            }
++
++                            break;
++                        }
++                    }
++                }
++            }
++        }
++    }
++
++    if (virHashForEach(commitdata, qemuBlockBitmapsHandleCommitFinishIterate, act) < 0)
++        return -1;
++
++    if (virJSONValueArraySize(act) > 0)
++        *actions = g_steal_pointer(&act);
++
++    return 0;
++}
++
++
+ /**
+  * qemuBlockReopenFormat:
+  * @vm: domain object
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index e012052352..75b25bfea5 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -232,6 +232,20 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+                                 bool shallow,
+                                 virJSONValuePtr *actions);
+ 
++int
++qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
++                                  virStorageSourcePtr basesrc,
++                                  virHashTablePtr blockNamedNodeData,
++                                  virJSONValuePtr *actions,
++                                  char ***disabledBitmapsBase);
++
++int
++qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
++                                   virStorageSourcePtr basesrc,
++                                   virHashTablePtr blockNamedNodeData,
++                                   virJSONValuePtr *actions,
++                                   char **disabledBitmapsBase);
++
+ int
+ qemuBlockReopenReadWrite(virDomainObjPtr vm,
+                          virStorageSourcePtr src,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-block-Implement-readahead-and-timeout-properties-for-curl-driver.patch b/SOURCES/libvirt-qemu-block-Implement-readahead-and-timeout-properties-for-curl-driver.patch
new file mode 100644
index 0000000..39c4c85
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Implement-readahead-and-timeout-properties-for-curl-driver.patch
@@ -0,0 +1,82 @@
+From f1650a0ed4fc226325e5a9772e6d04a95457f470 Mon Sep 17 00:00:00 2001
+Message-Id: <f1650a0ed4fc226325e5a9772e6d04a95457f470@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:06 +0100
+Subject: [PATCH] qemu: block: Implement readahead and timeout properties for
+ 'curl' driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Pass in the correct fields.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9cac141cd67d2213074fd146b58812da8fe30603)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <71cba24b72024183752fe9873d0fd5f01caf122b.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                                       | 2 ++
+ tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args | 6 ++++--
+ tests/qemuxml2argvdata/disk-network-http.xml                | 2 ++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 80a8c7296d..b077e2e02f 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -722,6 +722,8 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+                                           "S:password-secret", passwordalias,
+                                           "T:sslverify", src->sslverify,
+                                           "S:cookie-secret", cookiealias,
++                                          "P:timeout", src->timeout,
++                                          "P:readahead", src->readahead,
+                                           NULL));
+ 
+     return ret;
+diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+index cbb69e16a9..2f2849ebdf 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+@@ -28,13 +28,15 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -boot strict=on \
+ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+ -blockdev '{"driver":"http","url":"http://example.org:80/test.img",\
+-"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
++"timeout":1234,"node-name":"libvirt-4-storage","auto-read-only":true,\
++"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-4-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
+ id=virtio-disk0,bootindex=1 \
+ -blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\
+-"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
++"readahead":1024,"node-name":"libvirt-3-storage","auto-read-only":true,\
++"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-3-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
+diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
+index 6acf75cf65..20024c732e 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.xml
++++ b/tests/qemuxml2argvdata/disk-network-http.xml
+@@ -17,6 +17,7 @@
+       <driver name='qemu' type='raw'/>
+       <source protocol='http' name='test.img'>
+         <host name='example.org'/>
++        <timeout seconds='1234'/>
+       </source>
+       <target dev='vda' bus='virtio'/>
+     </disk>
+@@ -24,6 +25,7 @@
+       <driver name='qemu' type='raw'/>
+       <source protocol='https' name='test2.img'>
+         <host name='example.org'/>
++        <readahead size='1024'/>
+       </source>
+       <target dev='vdb' bus='virtio'/>
+     </disk>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-block-Implement-ssl-verification-configuration.patch b/SOURCES/libvirt-qemu-block-Implement-ssl-verification-configuration.patch
new file mode 100644
index 0000000..d285e0b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Implement-ssl-verification-configuration.patch
@@ -0,0 +1,65 @@
+From 35ea15a7ddb570301c6dceb01e13e6f8ef6ba478 Mon Sep 17 00:00:00 2001
+Message-Id: <35ea15a7ddb570301c6dceb01e13e6f8ef6ba478@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:01 +0100
+Subject: [PATCH] qemu: block: Implement ssl verification configuration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow disabling of SSL certificate validation for HTTPS and FTPS drives
+in qemu.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 304da9376c972413d77cc6c7f094a1b39d651ea8)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <a36c004cf393076f7d6cbfa377909c91b99e768d.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                                       | 1 +
+ tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args | 3 ++-
+ tests/qemuxml2argvdata/disk-network-http.xml                | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 5144cf266f..e60975a142 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -713,6 +713,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+                                           "s:url", uristr,
+                                           "S:username", username,
+                                           "S:password-secret", passwordalias,
++                                          "T:sslverify", src->sslverify,
+                                           NULL));
+ 
+     return ret;
+diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+index d39f357072..86e4597a81 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+@@ -46,7 +46,8 @@ id=virtio-disk1 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
+ id=virtio-disk2 \
+ -blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
+-"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
++"sslverify":false,"node-name":"libvirt-1-storage","auto-read-only":true,\
++"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-1-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
+diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
+index 83a9865c83..8c475aec1d 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.xml
++++ b/tests/qemuxml2argvdata/disk-network-http.xml
+@@ -38,6 +38,7 @@
+       <driver name='qemu' type='raw'/>
+       <source protocol='https' name='test4.img'>
+         <host name='example.org' port='1234'/>
++        <ssl verify='no'/>
+       </source>
+       <target dev='vdd' bus='virtio'/>
+     </disk>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-block-Introduce-function-to-calculate-bitmap-handling-for-block-copy.patch b/SOURCES/libvirt-qemu-block-Introduce-function-to-calculate-bitmap-handling-for-block-copy.patch
new file mode 100644
index 0000000..89209e3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Introduce-function-to-calculate-bitmap-handling-for-block-copy.patch
@@ -0,0 +1,189 @@
+From 0890cd78e9391625a591a7a9327601ee79ba6636 Mon Sep 17 00:00:00 2001
+Message-Id: <0890cd78e9391625a591a7a9327601ee79ba6636@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:25 +0100
+Subject: [PATCH] qemu: block: Introduce function to calculate bitmap handling
+ for block-copy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a function calculating which bitmaps to copy to the mirror during
+a block-copy operation.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 26f07f68707e16bef3d48e1c0b138791ab5df346)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <6d4bd72b975f9f690cb34784ed22bb5fad6bbf2c.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 138 ++++++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_block.h |   7 +++
+ 2 files changed, 145 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index b19290e677..63116ef5f2 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2728,3 +2728,141 @@ qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
+ 
+     return chain_started;
+ }
++
++
++struct qemuBlockBitmapsHandleBlockcopyConcatData {
++    virHashTablePtr bitmaps_merge;
++    virJSONValuePtr actions;
++    const char *mirrornodeformat;
++    bool has_bitmaps;
++};
++
++
++static int
++qemuBlockBitmapsHandleBlockcopyConcatActions(void *payload,
++                                             const void *name,
++                                             void *opaque)
++{
++    struct qemuBlockBitmapsHandleBlockcopyConcatData *data = opaque;
++    virJSONValuePtr createactions = payload;
++    const char *bitmapname = name;
++    g_autoptr(virJSONValue) mergebitmaps = virHashSteal(data->bitmaps_merge, bitmapname);
++
++    data->has_bitmaps = true;
++
++    virJSONValueArrayConcat(data->actions, createactions);
++
++    if (qemuMonitorTransactionBitmapMerge(data->actions,
++                                          data->mirrornodeformat,
++                                          bitmapname,
++                                          &mergebitmaps) < 0)
++        return -1;
++
++    return 0;
++}
++
++
++/**
++ * qemuBlockBitmapsHandleBlockcopy:
++ * @src: disk source
++ * @mirror: mirror source
++ * @blockNamedNodeData: hash table containing data about bitmaps
++ * @shallow: whether shallow copy is requested
++ * @actions: filled with arguments for a 'transaction' command
++ *
++ * Calculates which bitmaps to copy and merge during a virDomainBlockCopy job.
++ * This is designed to be called when the job is already synchronised as it
++ * may result in active bitmaps being created.
++ *
++ * Returns 0 on success and -1 on error. If @actions is NULL when 0 is returned
++ * there are no actions to perform for the given job.
++ */
++int
++qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
++                                virStorageSourcePtr mirror,
++                                virHashTablePtr blockNamedNodeData,
++                                bool shallow,
++                                virJSONValuePtr *actions)
++{
++    g_autoptr(virHashTable) bitmaps = virHashNew(virJSONValueHashFree);
++    g_autoptr(virHashTable) bitmaps_merge = virHashNew(virJSONValueHashFree);
++    g_autoptr(virHashTable) bitmaps_skip = virHashNew(NULL);
++    g_autoptr(virJSONValue) tmpactions = virJSONValueNewArray();
++    qemuBlockNamedNodeDataPtr entry;
++    virStorageSourcePtr n;
++    size_t i;
++    struct qemuBlockBitmapsHandleBlockcopyConcatData data = { .bitmaps_merge = bitmaps_merge,
++                                                              .actions = tmpactions,
++                                                              .mirrornodeformat = mirror->nodeformat,
++                                                              .has_bitmaps = false, };
++
++    for (n = src; n; n = n->backingStore) {
++        if (!(entry = virHashLookup(blockNamedNodeData, n->nodeformat)))
++            continue;
++
++        for (i = 0; i < entry->nbitmaps; i++) {
++            qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
++            virJSONValuePtr bitmap_merge;
++
++            if (virHashHasEntry(bitmaps_skip, bitmap->name))
++                continue;
++
++            if (!(bitmap_merge = virHashLookup(bitmaps_merge, bitmap->name))) {
++                g_autoptr(virJSONValue) tmp = NULL;
++                bool disabled = !bitmap->recording;
++
++                /* disable any non top-layer bitmaps */
++                if (n != src)
++                    disabled = true;
++
++                if (!bitmap->persistent ||
++                    !(qemuBlockBitmapChainIsValid(n, bitmap->name,
++                                                  blockNamedNodeData))) {
++                    ignore_value(virHashAddEntry(bitmaps_skip, bitmap->name, NULL));
++                    continue;
++                }
++
++                /* prepare the data for adding the bitmap to the mirror */
++                tmp = virJSONValueNewArray();
++
++                if (qemuMonitorTransactionBitmapAdd(tmp,
++                                                    mirror->nodeformat,
++                                                    bitmap->name,
++                                                    true,
++                                                    disabled,
++                                                    bitmap->granularity) < 0)
++                    return -1;
++
++                if (virHashAddEntry(bitmaps, bitmap->name, tmp) < 0)
++                    return -1;
++
++                tmp = NULL;
++
++                /* prepare array for merging all the bitmaps from the original chain */
++                tmp = virJSONValueNewArray();
++
++                if (virHashAddEntry(bitmaps_merge, bitmap->name, tmp) < 0)
++                    return -1;
++
++                bitmap_merge = g_steal_pointer(&tmp);
++            }
++
++            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(bitmap_merge,
++                                                                 n->nodeformat,
++                                                                 bitmap->name) < 0)
++                return -1;
++        }
++
++        if (shallow)
++            break;
++    }
++
++    if (virHashForEach(bitmaps, qemuBlockBitmapsHandleBlockcopyConcatActions,
++                       &data) < 0)
++        return -1;
++
++    if (data.has_bitmaps)
++        *actions = g_steal_pointer(&tmpactions);
++
++    return 0;
++}
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index cf51b9bf4e..a816190bb7 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -217,3 +217,10 @@ bool
+ qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
+                             const char *bitmapname,
+                             virHashTablePtr blockNamedNodeData);
++
++int
++qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
++                                virStorageSourcePtr mirror,
++                                virHashTablePtr blockNamedNodeData,
++                                bool shallow,
++                                virJSONValuePtr *actions);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-block-Properly-format-storage-slice-into-backing-store-strings.patch b/SOURCES/libvirt-qemu-block-Properly-format-storage-slice-into-backing-store-strings.patch
new file mode 100644
index 0000000..7c28b70
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Properly-format-storage-slice-into-backing-store-strings.patch
@@ -0,0 +1,138 @@
+From 4d6f00b6dc1d17761ea5bd3656d0e60e2f6cfa61 Mon Sep 17 00:00:00 2001
+Message-Id: <4d6f00b6dc1d17761ea5bd3656d0e60e2f6cfa61@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:22 +0100
+Subject: [PATCH] qemu: block: Properly format storage slice into backing store
+ strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When creating overlay images e.g. for snapshots or when merging
+snapshots we often specify the backing store string to use. Make the
+formatter aware of backing chain entries which have a <slice>
+configured so that we record it properly. Otherwise such images
+would not work without the XML (when detecting the backing chain).
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 73ca20146700c82e257b02ff8296e42a92629c58)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <68328ece6d627b223d5c7f56c5286fc5d0d04502.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 84 ++++++++++++++++++++++++++-----------------
+ 1 file changed, 51 insertions(+), 33 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 1147f4d3af..387a2db2e6 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1930,44 +1930,48 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src)
+ {
+     int actualType = virStorageSourceGetActualType(src);
+     g_autoptr(virJSONValue) backingProps = NULL;
++    g_autoptr(virJSONValue) sliceProps = NULL;
++    virJSONValuePtr props = NULL;
+     g_autoptr(virURI) uri = NULL;
+     g_autofree char *backingJSON = NULL;
+     char *ret = NULL;
+ 
+-    if (virStorageSourceIsLocalStorage(src)) {
+-        ret = g_strdup(src->path);
+-        return ret;
+-    }
+-
+-    /* generate simplified URIs for the easy cases */
+-    if (actualType == VIR_STORAGE_TYPE_NETWORK &&
+-        src->nhosts == 1 &&
+-        src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) {
+-
+-        switch ((virStorageNetProtocol) src->protocol) {
+-        case VIR_STORAGE_NET_PROTOCOL_NBD:
+-        case VIR_STORAGE_NET_PROTOCOL_HTTP:
+-        case VIR_STORAGE_NET_PROTOCOL_HTTPS:
+-        case VIR_STORAGE_NET_PROTOCOL_FTP:
+-        case VIR_STORAGE_NET_PROTOCOL_FTPS:
+-        case VIR_STORAGE_NET_PROTOCOL_TFTP:
+-        case VIR_STORAGE_NET_PROTOCOL_ISCSI:
+-        case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
+-            if (!(uri = qemuBlockStorageSourceGetURI(src)))
+-                return NULL;
+-
+-            if (!(ret = virURIFormat(uri)))
+-                return NULL;
+-
++    if (!src->sliceStorage) {
++        if (virStorageSourceIsLocalStorage(src)) {
++            ret = g_strdup(src->path);
+             return ret;
++        }
+ 
+-        case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+-        case VIR_STORAGE_NET_PROTOCOL_RBD:
+-        case VIR_STORAGE_NET_PROTOCOL_VXHS:
+-        case VIR_STORAGE_NET_PROTOCOL_SSH:
+-        case VIR_STORAGE_NET_PROTOCOL_LAST:
+-        case VIR_STORAGE_NET_PROTOCOL_NONE:
+-            break;
++        /* generate simplified URIs for the easy cases */
++        if (actualType == VIR_STORAGE_TYPE_NETWORK &&
++            src->nhosts == 1 &&
++            src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) {
++
++            switch ((virStorageNetProtocol) src->protocol) {
++            case VIR_STORAGE_NET_PROTOCOL_NBD:
++            case VIR_STORAGE_NET_PROTOCOL_HTTP:
++            case VIR_STORAGE_NET_PROTOCOL_HTTPS:
++            case VIR_STORAGE_NET_PROTOCOL_FTP:
++            case VIR_STORAGE_NET_PROTOCOL_FTPS:
++            case VIR_STORAGE_NET_PROTOCOL_TFTP:
++            case VIR_STORAGE_NET_PROTOCOL_ISCSI:
++            case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
++                if (!(uri = qemuBlockStorageSourceGetURI(src)))
++                    return NULL;
++
++                if (!(ret = virURIFormat(uri)))
++                    return NULL;
++
++                return ret;
++
++            case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
++            case VIR_STORAGE_NET_PROTOCOL_RBD:
++            case VIR_STORAGE_NET_PROTOCOL_VXHS:
++            case VIR_STORAGE_NET_PROTOCOL_SSH:
++            case VIR_STORAGE_NET_PROTOCOL_LAST:
++            case VIR_STORAGE_NET_PROTOCOL_NONE:
++                break;
++            }
+         }
+     }
+ 
+@@ -1975,7 +1979,21 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src)
+     if (!(backingProps = qemuBlockStorageSourceGetBackendProps(src, false, true, false)))
+         return NULL;
+ 
+-    if (!(backingJSON = virJSONValueToString(backingProps, false)))
++    props = backingProps;
++
++    if (src->sliceStorage) {
++        if (virJSONValueObjectCreate(&sliceProps,
++                                     "s:driver", "raw",
++                                     "U:offset", src->sliceStorage->offset,
++                                     "U:size", src->sliceStorage->size,
++                                     "a:file", &backingProps,
++                                     NULL) < 0)
++            return NULL;
++
++        props = sliceProps;
++    }
++
++    if (!(backingJSON = virJSONValueToString(props, false)))
+         return NULL;
+ 
+     ret = g_strdup_printf("json:%s", backingJSON);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-block-Remove-active-write-bitmap-even-if-there-are-no-bitmaps-to-merge.patch b/SOURCES/libvirt-qemu-block-Remove-active-write-bitmap-even-if-there-are-no-bitmaps-to-merge.patch
new file mode 100644
index 0000000..78fb8d3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Remove-active-write-bitmap-even-if-there-are-no-bitmaps-to-merge.patch
@@ -0,0 +1,105 @@
+From cb297cdd8dc75abc8fd0d60dddf54cbe305d4c14 Mon Sep 17 00:00:00 2001
+Message-Id: <cb297cdd8dc75abc8fd0d60dddf54cbe305d4c14@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 21 Jul 2020 13:56:23 +0200
+Subject: [PATCH] qemu: block: Remove 'active-write' bitmap even if there are
+ no bitmaps to merge
+
+The 'libvirt-tmp-activewrite' bitmap is added during the 'pivot'
+operation of block copy and active layer block commit operations
+regardless of whether there are any bitmaps to merge, but was not
+removed unless a bitmap was merged. This meant that subsequent attempts
+to merge into the same image would fail.
+
+Fix it by checking whether the 'libvirt-tmp-activewrite' would be used
+by the code and don't skip the code which would delete it.
+
+This is a regression introduced when we switched to the new code for
+block commit in <20a7abc2d2d> and for block copy in <7bfff40fdfe5>. The
+actual bug originates from <4fa8654ece>.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1857735
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 9d039863e2cae227cc73b7a886b40be5e5218a12)
+
+rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
+rhel-av-8.2.1: not cloned yet
+Message-Id: <4fea6a40be534d5a6fe7aad88d6bee1c3e77dcfb.1595332476.git.pkrempa@redhat.com>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_block.c                                    | 3 ++-
+ tests/qemublocktestdata/bitmapblockcommit/empty          | 9 +++++++++
+ .../bitmapblockcopy/empty-deep-out.json                  | 9 +++++++++
+ .../bitmapblockcopy/empty-shallow-out.json               | 9 +++++++++
+ 4 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 18c3861a2e..dc5fa3da03 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2935,7 +2935,7 @@ qemuBlockGetBitmapMergeActions(virStorageSourcePtr topsrc,
+ 
+     if (!(bitmaps = qemuBlockGetBitmapMergeActionsGetBitmaps(topsrc, bitmapname,
+                                                              blockNamedNodeData)))
+-        return 0;
++        goto done;
+ 
+     for (next = bitmaps; next; next = next->next) {
+         const char *curbitmap = next->data;
+@@ -2992,6 +2992,7 @@ qemuBlockGetBitmapMergeActions(virStorageSourcePtr topsrc,
+             return -1;
+     }
+ 
++ done:
+     if (writebitmapsrc &&
+         qemuMonitorTransactionBitmapRemove(act, writebitmapsrc->nodeformat,
+                                            "libvirt-tmp-activewrite") < 0)
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/empty b/tests/qemublocktestdata/bitmapblockcommit/empty
+index 9260011852..eddef0ddcd 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/empty
++++ b/tests/qemublocktestdata/bitmapblockcommit/empty
+@@ -1 +1,10 @@
+ merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
+index e69de29bb2..99f2589ed4 100644
+--- a/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
++++ b/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
+index e69de29bb2..99f2589ed4 100644
+--- a/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
++++ b/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-block-Support-VIR_DOMAIN_BLOCK_COMMIT-PULL-REBASE_RELATIVE-with-blockdev.patch b/SOURCES/libvirt-qemu-block-Support-VIR_DOMAIN_BLOCK_COMMIT-PULL-REBASE_RELATIVE-with-blockdev.patch
new file mode 100644
index 0000000..01f5c05
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-Support-VIR_DOMAIN_BLOCK_COMMIT-PULL-REBASE_RELATIVE-with-blockdev.patch
@@ -0,0 +1,127 @@
+From 9990d25b88bd2a03c5badb1e40da01030c4b68e4 Mon Sep 17 00:00:00 2001
+Message-Id: <9990d25b88bd2a03c5badb1e40da01030c4b68e4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:41 +0200
+Subject: [PATCH] qemu: block: Support
+ VIR_DOMAIN_BLOCK_COMMIT/PULL/REBASE_RELATIVE with blockdev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Preservation of the relative relationship requires us to load the
+backing store strings from the disk images. With blockdev we stopped
+detecting the backing chain if it's specified in the XML so the relative
+links were not loaded at that point. To preserve the functionality from
+the pre-blockdev without accessing the backing chain unnecessarily
+during VM startup we must refresh the relative links when relative
+block commit or block pull is requested.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1818655
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit ffc6249c79dbf980d116af7c7ed20222538a7c1c)
+Message-Id: <05fc4389e00afd4b8bf5653fb730c4d8f6a4516d.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_block.c  | 46 ++++++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_block.h  |  5 +++++
+ src/qemu/qemu_driver.c |  8 ++++++++
+ 3 files changed, 59 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index ba7318b074..e7577c1312 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3341,3 +3341,49 @@ qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src)
+ 
+     return virBufferContentAndReset(&buf);
+ }
++
++
++/**
++ * qemuBlockUpdateRelativeBacking:
++ * @vm: domain object
++ * @src: starting point of the update
++ * @topsrc: top level image in the backing chain (used to get security label)
++ *
++ * Reload data necessary for keeping backing store links starting from @src
++ * relative.
++ */
++int
++qemuBlockUpdateRelativeBacking(virDomainObjPtr vm,
++                               virStorageSourcePtr src,
++                               virStorageSourcePtr topsrc)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    virQEMUDriverPtr driver = priv->driver;
++    virStorageSourcePtr n;
++
++    for (n = src; virStorageSourceHasBacking(n); n = n->backingStore) {
++        g_autofree char *backingStoreStr = NULL;
++        int rc;
++
++        if (n->backingStore->relPath)
++            break;
++
++        if (!virStorageFileSupportsBackingChainTraversal(n))
++            continue;
++
++        if (qemuDomainStorageFileInit(driver, vm, n, topsrc) < 0)
++            return -1;
++
++        rc = virStorageFileGetBackingStoreStr(n, &backingStoreStr);
++
++        virStorageFileDeinit(n);
++
++        if (rc < 0)
++            return rc;
++
++        if (backingStoreStr && virStorageIsRelative(backingStoreStr))
++            n->backingStore->relPath = g_steal_pointer(&backingStoreStr);
++    }
++
++    return 0;
++}
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 4e7708ce74..06afa54115 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -258,3 +258,8 @@ qemuBlockReopenReadOnly(virDomainObjPtr vm,
+ 
+ char *
+ qemuBlockStorageSourceGetCookieString(virStorageSourcePtr src);
++
++int
++qemuBlockUpdateRelativeBacking(virDomainObjPtr vm,
++                               virStorageSourcePtr src,
++                               virStorageSourcePtr topsrc);
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 3c3c7b6041..27a50f60ef 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17740,6 +17740,10 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm,
+                 goto endjob;
+             }
+ 
++            if (blockdev &&
++                qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
++                goto endjob;
++
+             if (virStorageFileGetRelativeBackingPath(disk->src->backingStore,
+                                                      baseSource,
+                                                      &backingPath) < 0)
+@@ -18867,6 +18871,10 @@ qemuDomainBlockCommit(virDomainPtr dom,
+             goto endjob;
+         }
+ 
++        if (blockdev && top_parent &&
++            qemuBlockUpdateRelativeBacking(vm, top_parent, disk->src) < 0)
++            goto endjob;
++
+         if (virStorageFileGetRelativeBackingPath(topSource, baseSource,
+                                                  &backingPath) < 0)
+             goto endjob;
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemu-block-forbid-creation-of-storage-sources-with-slice.patch b/SOURCES/libvirt-qemu-block-forbid-creation-of-storage-sources-with-slice.patch
new file mode 100644
index 0000000..89cbf1f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-forbid-creation-of-storage-sources-with-slice.patch
@@ -0,0 +1,43 @@
+From eb3af538c22a06297d7f423210cbebcdd008e0c1 Mon Sep 17 00:00:00 2001
+Message-Id: <eb3af538c22a06297d7f423210cbebcdd008e0c1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:18 +0100
+Subject: [PATCH] qemu: block: forbid creation of storage sources with <slice>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Specifically creating such images via libvirt during blockjobs would
+be much more hassle than it's worth. Just forbid them for now.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 8c4303768846834893687db68ec265ce35aab5df)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <756f5928f4ba944fdec54f60724194a046276a01.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index b408d4c81f..1147f4d3af 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2529,6 +2529,12 @@ qemuBlockStorageSourceCreate(virDomainObjPtr vm,
+     int ret = -1;
+     int rc;
+ 
++    if (src->sliceStorage) {
++        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                       _("creation of images with slice type='storage' is not supported"));
++        return -1;
++    }
++
+     if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+         goto cleanup;
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-block-implement-helpers-for-blockdev-reopen.patch b/SOURCES/libvirt-qemu-block-implement-helpers-for-blockdev-reopen.patch
new file mode 100644
index 0000000..0917faa
--- /dev/null
+++ b/SOURCES/libvirt-qemu-block-implement-helpers-for-blockdev-reopen.patch
@@ -0,0 +1,155 @@
+From 416b12099e379ec4c19e55a0414a448d140f3dc1 Mon Sep 17 00:00:00 2001
+Message-Id: <416b12099e379ec4c19e55a0414a448d140f3dc1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:16 +0100
+Subject: [PATCH] qemu: block: implement helpers for blockdev-reopen
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce a set of helpers to call blockdev-reopen in certain scenarios
+
+Libvirt will use the QMP command to turn certain members of the backing
+chain read-write for bitmap manipulation and we'll also want to use it
+to replace/install the backing chain of a qcow2 format node.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 96063ce280a398493d7a78a35f674ed25078d849)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <f7b3a9cc523a22b9f1678483b6b8bf302ae7e1cc.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 101 ++++++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_block.h |   9 ++++
+ 2 files changed, 110 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 141059ae81..b4da323610 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2986,3 +2986,104 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+ 
+     return 0;
+ }
++
++
++/**
++ * qemuBlockReopenFormat:
++ * @vm: domain object
++ * @src: storage source to reopen
++ * @asyncJob: qemu async job type
++ *
++ * Invokes the 'blockdev-reopen' command on the format layer of @src. This means
++ * that @src must be already properly configured for the desired outcome. The
++ * nodenames of @src are used to identify the specific image in qemu.
++ */
++static int
++qemuBlockReopenFormat(virDomainObjPtr vm,
++                      virStorageSourcePtr src,
++                      qemuDomainAsyncJob asyncJob)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    virQEMUDriverPtr driver = priv->driver;
++    g_autoptr(virJSONValue) reopenprops = NULL;
++    int rc;
++
++    /* If we are lacking the object here, qemu might have opened an image with
++     * a node name unknown to us */
++    if (!src->backingStore) {
++        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                       _("can't reopen image with unknown presence of backing store"));
++        return -1;
++    }
++
++    if (!(reopenprops = qemuBlockStorageSourceGetBlockdevProps(src, src->backingStore)))
++        return -1;
++
++    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
++        return -1;
++
++    rc = qemuMonitorBlockdevReopen(priv->mon, &reopenprops);
++
++    if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
++        return -1;
++
++    return 0;
++}
++
++
++/**
++ * qemuBlockReopenReadWrite:
++ * @vm: domain object
++ * @src: storage source to reopen
++ * @asyncJob: qemu async job type
++ *
++ * Wrapper that reopens @src read-write. We currently depend on qemu
++ * reopening the storage with 'auto-read-only' enabled for us.
++ * After successful reopen @src's 'readonly' flag is modified. Does nothing
++ * if @src is already read-write.
++ */
++int
++qemuBlockReopenReadWrite(virDomainObjPtr vm,
++                         virStorageSourcePtr src,
++                         qemuDomainAsyncJob asyncJob)
++{
++    if (!src->readonly)
++        return 0;
++
++    src->readonly = false;
++    if (qemuBlockReopenFormat(vm, src, asyncJob) < 0) {
++        src->readonly = true;
++        return -1;
++    }
++
++    return 0;
++}
++
++
++/**
++ * qemuBlockReopenReadOnly:
++ * @vm: domain object
++ * @src: storage source to reopen
++ * @asyncJob: qemu async job type
++ *
++ * Wrapper that reopens @src read-only. We currently depend on qemu
++ * reopening the storage with 'auto-read-only' enabled for us.
++ * After successful reopen @src's 'readonly' flag is modified. Does nothing
++ * if @src is already read-only.
++ */
++int
++qemuBlockReopenReadOnly(virDomainObjPtr vm,
++                         virStorageSourcePtr src,
++                         qemuDomainAsyncJob asyncJob)
++{
++    if (src->readonly)
++        return 0;
++
++    src->readonly = true;
++    if (qemuBlockReopenFormat(vm, src, asyncJob) < 0) {
++        src->readonly = false;
++        return -1;
++    }
++
++    return 0;
++}
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 197f5dae97..e012052352 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -231,3 +231,12 @@ qemuBlockBitmapsHandleBlockcopy(virStorageSourcePtr src,
+                                 virHashTablePtr blockNamedNodeData,
+                                 bool shallow,
+                                 virJSONValuePtr *actions);
++
++int
++qemuBlockReopenReadWrite(virDomainObjPtr vm,
++                         virStorageSourcePtr src,
++                         qemuDomainAsyncJob asyncJob);
++int
++qemuBlockReopenReadOnly(virDomainObjPtr vm,
++                        virStorageSourcePtr src,
++                        qemuDomainAsyncJob asyncJob);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-blockcopy-Actually-unplug-unused-images-when-mirror-job-fails-to-start.patch b/SOURCES/libvirt-qemu-blockcopy-Actually-unplug-unused-images-when-mirror-job-fails-to-start.patch
new file mode 100644
index 0000000..f6b9f59
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockcopy-Actually-unplug-unused-images-when-mirror-job-fails-to-start.patch
@@ -0,0 +1,43 @@
+From 830d5044f0069e3e34e826d27478c9a19503adcf Mon Sep 17 00:00:00 2001
+Message-Id: <830d5044f0069e3e34e826d27478c9a19503adcf@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:36 +0100
+Subject: [PATCH] qemu: blockcopy: Actually unplug unused images when mirror
+ job fails to start
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a mirror job fails to start in -blockdev mode we'd not unplug the
+backing files we added first because the code on the error path checked
+the wrong value. 'rc' is used as status of the code which added the
+images, but the state of the 'block(dev)-mirror' call is stored in 'ret'
+at that point.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 623366d13066174e60067fa763ddc2c3d1db20ef)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1792195
+Message-Id: <5e9e1dd3db0f3137079f2fb29974778f8cf32879.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 6163b13e91..83f24d7231 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18415,7 +18415,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+     qemuBlockJobStarted(job, vm);
+ 
+  endjob:
+-    if (rc < 0 &&
++    if (ret < 0 &&
+         virDomainObjIsActive(vm) &&
+         (data || crdata)) {
+         qemuDomainObjEnterMonitor(driver, vm);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-blockcopy-Allow-copy-of-read-only-disks-with-blockdev.patch b/SOURCES/libvirt-qemu-blockcopy-Allow-copy-of-read-only-disks-with-blockdev.patch
new file mode 100644
index 0000000..c2f5b77
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockcopy-Allow-copy-of-read-only-disks-with-blockdev.patch
@@ -0,0 +1,71 @@
+From 352140578bbab5afe3f711c88732b24c6332da1a Mon Sep 17 00:00:00 2001
+Message-Id: <352140578bbab5afe3f711c88732b24c6332da1a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 12 May 2020 17:24:11 +0200
+Subject: [PATCH] qemu: blockcopy: Allow copy of read-only disks with -blockdev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+'blockdev-mirror' requires the write permission internally to do the
+copy. This means that we have to force the image to be read-write for
+the duration of the copy and can fix it after the copy is done.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1832204
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 65a12c467cd683809b4d445b8cf1c3ae250209b2)
+Message-Id: <296aeeaa0ab2b90e872c76c6f15eda080b749bdb.1589296861.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 5 +++++
+ src/qemu/qemu_driver.c   | 9 +++++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 21a043d369..c80c71295b 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1281,6 +1281,7 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriverPtr driver,
+                                            qemuBlockJobDataPtr job,
+                                            qemuDomainAsyncJob asyncJob)
+ {
++    qemuDomainObjPrivatePtr priv = vm->privateData;
+     VIR_DEBUG("copy job '%s' on VM '%s' pivoted", job->name, vm->def->name);
+ 
+     /* mirror may be NULL for copy job corresponding to migration */
+@@ -1296,6 +1297,10 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriverPtr driver,
+         !virStorageSourceIsBacking(job->disk->mirror->backingStore))
+         job->disk->mirror->backingStore = g_steal_pointer(&job->disk->src->backingStore);
+ 
++    if (job->disk->src->readonly &&
++        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
++        ignore_value(qemuBlockReopenReadOnly(vm, job->disk->mirror, asyncJob));
++
+     qemuBlockJobRewriteConfigDiskSource(vm, job->disk, job->disk->mirror);
+ 
+     qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job->disk->src);
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 7ae8641577..9f7d96c0b6 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18389,6 +18389,15 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+                                          keepParentLabel) < 0)
+         goto endjob;
+ 
++    if (mirror->readonly) {
++        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) {
++            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                           _("copy of read-only disks is not supported"));
++            goto endjob;
++        }
++        mirror->readonly = false;
++    }
++
+     /* we must initialize XML-provided chain prior to detecting to keep semantics
+      * with VM startup */
+     if (blockdev) {
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-blockcopy-Allow-late-opening-of-the-backing-chain-of-a-shallow-copy.patch b/SOURCES/libvirt-qemu-blockcopy-Allow-late-opening-of-the-backing-chain-of-a-shallow-copy.patch
new file mode 100644
index 0000000..c7cdc1d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockcopy-Allow-late-opening-of-the-backing-chain-of-a-shallow-copy.patch
@@ -0,0 +1,137 @@
+From 7e60e728bc225b3499a3d1fad6b56d0ce8c40908 Mon Sep 17 00:00:00 2001
+Message-Id: <7e60e728bc225b3499a3d1fad6b56d0ce8c40908@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:39 +0100
+Subject: [PATCH] qemu: blockcopy: Allow late opening of the backing chain of a
+ shallow copy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+oVirt used a quirk in the pre-blockdev semantics of drive-mirror which
+opened the backing chain of the mirror destination only once
+'block-job-complete' was called.
+
+Our introduction of blockdev made qemu open the backing chain images
+right at the start of the job. This broke oVirt's usage of this API
+because they copy the data into the backing chain during the time the
+block copy job is running.
+
+Re-introduce late open of the backing chain if qemu allows us to use
+blockdev-snapshot on write-only nodes as it can be used to install the
+backing chain even for an existing image now.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit cc7868a8b3cfa4a0062936c23e82e4a31923f724)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1803092
+Message-Id: <d37e660b9610d7a1cc42892ff3305cb477a8f98a.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 57 +++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 53 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 5a4e979907..441bb02b6b 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17556,10 +17556,12 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+                      qemuBlockJobDataPtr job,
+                      virDomainDiskDefPtr disk)
+ {
++    g_autoptr(qemuBlockStorageSourceChainData) chainattachdata = NULL;
+     int ret = -1;
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
+     g_autoptr(virJSONValue) actions = NULL;
++    g_autoptr(virJSONValue) reopenactions = NULL;
+ 
+     if (job->state != QEMU_BLOCKJOB_STATE_READY) {
+         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
+@@ -17590,6 +17592,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         if (blockdev && !job->jobflagsmissing) {
+             g_autoptr(virHashTable) blockNamedNodeData = NULL;
+             bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
++            bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;
+ 
+             if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+                 return -1;
+@@ -17598,6 +17601,27 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+                                                 blockNamedNodeData,
+                                                 shallow, &actions) < 0)
+                 return -1;
++
++            /* Open and install the backing chain of 'mirror' late if we can use
++             * blockdev-snapshot to do it. This is to appease oVirt that wants
++             * to copy data into the backing chain while the top image is being
++             * copied shallow */
++            if (reuse && shallow &&
++                virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY) &&
++                virStorageSourceHasBacking(disk->mirror)) {
++
++                if (!(chainattachdata = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->mirror->backingStore,
++                                                                                         priv->qemuCaps)))
++                    return -1;
++
++                reopenactions = virJSONValueNewArray();
++
++                if (qemuMonitorTransactionSnapshotBlockdev(reopenactions,
++                                                           disk->mirror->backingStore->nodeformat,
++                                                           disk->mirror->nodeformat))
++                    return -1;
++            }
++
+         }
+         break;
+ 
+@@ -17609,7 +17633,15 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+     if (blockdev) {
+         int rc = 0;
+ 
+-        if (actions)
++        if (chainattachdata) {
++            if ((rc = qemuBlockStorageSourceChainAttach(priv->mon, chainattachdata)) == 0) {
++                /* install backing images on success, or unplug them on failure */
++                if ((rc = qemuMonitorTransaction(priv->mon, &reopenactions)) != 0)
++                    qemuBlockStorageSourceChainDetach(priv->mon, chainattachdata);
++            }
++        }
++
++        if (actions && rc == 0)
+             rc = qemuMonitorTransaction(priv->mon, &actions);
+ 
+         if (rc == 0)
+@@ -18354,9 +18386,26 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+ 
+     if (blockdev) {
+         if (mirror_reuse) {
+-            if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror,
+-                                                                          priv->qemuCaps)))
+-                goto endjob;
++            /* oVirt depended on late-backing-chain-opening semantics the old
++             * qemu command had to copy the backing chain data while the top
++             * level is being copied. To restore this semantics if
++             * blockdev-reopen is supported defer opening of the backing chain
++             * of 'mirror' to the pivot step */
++            if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY)) {
++                g_autoptr(virStorageSource) terminator = virStorageSourceNew();
++
++                if (!terminator)
++                    goto endjob;
++
++                if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
++                                                                                 terminator,
++                                                                                 priv->qemuCaps)))
++                    goto endjob;
++            } else {
++                if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror,
++                                                                              priv->qemuCaps)))
++                    goto endjob;
++            }
+         } else {
+             if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
+                 goto endjob;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Actually-delete-temporary-bitmap-on-failed-active-commit.patch b/SOURCES/libvirt-qemu-blockjob-Actually-delete-temporary-bitmap-on-failed-active-commit.patch
new file mode 100644
index 0000000..3edbf3b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Actually-delete-temporary-bitmap-on-failed-active-commit.patch
@@ -0,0 +1,65 @@
+From 2069251b1f50e1aaec566909478f1443ccfe32e6 Mon Sep 17 00:00:00 2001
+Message-Id: <2069251b1f50e1aaec566909478f1443ccfe32e6@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 21 Jul 2020 13:56:22 +0200
+Subject: [PATCH] qemu: blockjob: Actually delete temporary bitmap on failed
+ active commit
+
+Commit 20a7abc2d2d tried to delete the possibly leftover bitmap but
+neglected to call the actual monitor to do so.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 378e4fbc795c607485799cbd060f34483f580544)
+
+rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
+rhel-av-8.2.1: not cloned yet
+Message-Id: <add765f8f49b70dbfe1c2adf7e63e6e21b480c6d.1595332476.git.pkrempa@redhat.com>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 7e2df1445d..486fca31f3 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1378,8 +1378,10 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDriverPtr driver,
+ static void
+ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
+                                            virDomainObjPtr vm,
+-                                           qemuBlockJobDataPtr job)
++                                           qemuBlockJobDataPtr job,
++                                           qemuDomainAsyncJob asyncJob)
+ {
++    qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(virJSONValue) actions = virJSONValueNewArray();
+     virDomainDiskDefPtr disk = job->disk;
+ 
+@@ -1391,6 +1393,13 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
+     ignore_value(qemuMonitorTransactionBitmapRemove(actions, disk->mirror->nodeformat,
+                                                     "libvirt-tmp-activewrite"));
+ 
++    if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
++        return;
++
++    qemuMonitorTransaction(priv->mon, &actions);
++
++    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
++        return;
+ 
+     /* Ideally, we would make the backing chain read only again (yes, SELinux
+      * can do that using different labels). But that is not implemented yet and
+@@ -1515,7 +1524,7 @@ qemuBlockJobEventProcessConcludedTransition(qemuBlockJobDataPtr job,
+         if (success) {
+             qemuBlockJobProcessEventCompletedActiveCommit(driver, vm, job, asyncJob);
+         } else {
+-            qemuBlockJobProcessEventFailedActiveCommit(driver, vm, job);
++            qemuBlockJobProcessEventFailedActiveCommit(driver, vm, job, asyncJob);
+         }
+         break;
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Don-t-base-bitmap-handling-of-active-layer-block-commit-on-QEMU_CAPS_BLOCKDEV_REOPEN.patch b/SOURCES/libvirt-qemu-blockjob-Don-t-base-bitmap-handling-of-active-layer-block-commit-on-QEMU_CAPS_BLOCKDEV_REOPEN.patch
new file mode 100644
index 0000000..13d121b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Don-t-base-bitmap-handling-of-active-layer-block-commit-on-QEMU_CAPS_BLOCKDEV_REOPEN.patch
@@ -0,0 +1,59 @@
+From 3c9641730c62ffae735d7984b3bc0632a9194b03 Mon Sep 17 00:00:00 2001
+Message-Id: <3c9641730c62ffae735d7984b3bc0632a9194b03@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 21 Jul 2020 13:56:21 +0200
+Subject: [PATCH] qemu: blockjob: Don't base bitmap handling of active-layer
+ block commit on QEMU_CAPS_BLOCKDEV_REOPEN
+
+The handler finalizing the active layer block commit doesn't actually
+reopen the file for active layer block commit, so the comment and check
+are invalid.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit d73f107469c8882a47ffbf1a55bd0b0370d6969e)
+
+rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
+rhel-av-8.2.1: not cloned yet
+Message-Id: <6946fb2535038e24dcef4884806c11c258f0fc70.1595332476.git.pkrempa@redhat.com>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 3 ++-
+ src/qemu/qemu_driver.c   | 6 +-----
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 6e33f8666c..7e2df1445d 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1063,7 +1063,8 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObjPtr vm,
+     g_autoptr(virJSONValue) actions = NULL;
+     bool active = job->type == QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT;
+ 
+-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
++    if (!active &&
++        !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
+         return 0;
+ 
+     if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 9e3a455814..ad5ef7d67d 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17631,11 +17631,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         break;
+ 
+     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+-        /* we technically don't need reopen here, but we couldn't prepare
+-         * the bitmaps if it wasn't present thus must skip this */
+-        if (blockdev &&
+-            virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) {
+-
++        if (blockdev) {
+             actions = virJSONValueNewArray();
+ 
+             if (qemuMonitorTransactionBitmapAdd(actions,
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Handle-bitmaps-after-finish-of-normal-block-commit.patch b/SOURCES/libvirt-qemu-blockjob-Handle-bitmaps-after-finish-of-normal-block-commit.patch
new file mode 100644
index 0000000..47341be
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Handle-bitmaps-after-finish-of-normal-block-commit.patch
@@ -0,0 +1,95 @@
+From 629629bccbaef81ab1e187fbf5aab4e07d49f350 Mon Sep 17 00:00:00 2001
+Message-Id: <629629bccbaef81ab1e187fbf5aab4e07d49f350@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:31 +0100
+Subject: [PATCH] qemu: blockjob: Handle bitmaps after finish of normal
+ block-commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Merge the bitmaps into base of the block commit after the job finishes.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit db450a742224fb96d8f4d45fde3d0c19faeabfdb)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <dcf1a67be965850ccd4b35f3ef4587dee5c77151.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 52 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 63f1cc79c3..0b7e1403e6 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1049,6 +1049,55 @@ qemuBlockJobDeleteImages(virQEMUDriverPtr driver,
+     }
+ }
+ 
++
++/**
++ * qemuBlockJobProcessEventCompletedCommitBitmaps:
++ *
++ * Handles the bitmap changes after commit. This returns -1 on monitor failures.
++ */
++static int
++qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObjPtr vm,
++                                               qemuBlockJobDataPtr job,
++                                               qemuDomainAsyncJob asyncJob)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    g_autoptr(virHashTable) blockNamedNodeData = NULL;
++    g_autoptr(virJSONValue) actions = NULL;
++
++    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
++        return 0;
++
++    if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
++        return -1;
++
++    if (qemuBlockBitmapsHandleCommitFinish(job->data.commit.top,
++                                           job->data.commit.base,
++                                           blockNamedNodeData,
++                                           &actions,
++                                           job->data.commit.disabledBitmapsBase) < 0)
++        return 0;
++
++    if (!actions)
++        return 0;
++
++    if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
++        return -1;
++
++    if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
++        return -1;
++
++    qemuMonitorTransaction(priv->mon, &actions);
++
++    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
++        return -1;
++
++    if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
++        return -1;
++
++    return 0;
++}
++
++
+ /**
+  * qemuBlockJobProcessEventCompletedCommit:
+  * @driver: qemu driver object
+@@ -1106,6 +1155,9 @@ qemuBlockJobProcessEventCompletedCommit(virQEMUDriverPtr driver,
+     if (!n)
+         return;
+ 
++    if (qemuBlockJobProcessEventCompletedCommitBitmaps(vm, job, asyncJob) < 0)
++        return;
++
+     /* revert access to images */
+     qemuDomainStorageSourceAccessAllow(driver, vm, job->data.commit.base,
+                                        true, false, false);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Re-enable-bitmaps-after-failed-block-commit.patch b/SOURCES/libvirt-qemu-blockjob-Re-enable-bitmaps-after-failed-block-commit.patch
new file mode 100644
index 0000000..538ca89
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Re-enable-bitmaps-after-failed-block-commit.patch
@@ -0,0 +1,90 @@
+From 8e5be603c7e3ab3679af498a30cc510177c20514 Mon Sep 17 00:00:00 2001
+Message-Id: <8e5be603c7e3ab3679af498a30cc510177c20514@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:32 +0100
+Subject: [PATCH] qemu: blockjob: Re-enable bitmaps after failed block-commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a block-commit fails we should at least re-enable the bitmaps so that
+the operation can be re-tried.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 4a39b25c81d40d8d2b5d4e33c53b3660aa4c9fda)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <34dd58f94ac59b5ef970070c07a36ced6bbe77af.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 42 ++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 0b7e1403e6..21a043d369 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1345,6 +1345,40 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
+ }
+ 
+ 
++static void
++qemuBlockJobProcessEventFailedCommitCommon(virDomainObjPtr vm,
++                                           qemuBlockJobDataPtr job,
++                                           qemuDomainAsyncJob asyncJob)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    g_autoptr(virJSONValue) actions = virJSONValueNewArray();
++    char **disabledBitmaps = job->data.commit.disabledBitmapsBase;
++
++    if (!disabledBitmaps || !*disabledBitmaps)
++        return;
++
++    for (; *disabledBitmaps; disabledBitmaps++) {
++        qemuMonitorTransactionBitmapEnable(actions,
++                                           job->data.commit.base->nodeformat,
++                                           *disabledBitmaps);
++    }
++
++    if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
++        return;
++
++    if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
++        return;
++
++    qemuMonitorTransaction(priv->mon, &actions);
++
++    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
++        return;
++
++    if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
++        return;
++}
++
++
+ static void
+ qemuBlockJobProcessEventConcludedCreate(virQEMUDriverPtr driver,
+                                         virDomainObjPtr vm,
+@@ -1452,13 +1486,17 @@ qemuBlockJobEventProcessConcludedTransition(qemuBlockJobDataPtr job,
+     case QEMU_BLOCKJOB_TYPE_COMMIT:
+         if (success)
+             qemuBlockJobProcessEventCompletedCommit(driver, vm, job, asyncJob);
++        else
++            qemuBlockJobProcessEventFailedCommitCommon(vm, job, asyncJob);
+         break;
+ 
+     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+-        if (success)
++        if (success) {
+             qemuBlockJobProcessEventCompletedActiveCommit(driver, vm, job, asyncJob);
+-        else
++        } else {
+             qemuBlockJobProcessEventFailedActiveCommit(driver, vm, job);
++            qemuBlockJobProcessEventFailedCommitCommon(vm, job, asyncJob);
++        }
+         break;
+ 
+     case QEMU_BLOCKJOB_TYPE_CREATE:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Remove-disabledBitmapsBase-field-from-commit-job-private-data.patch b/SOURCES/libvirt-qemu-blockjob-Remove-disabledBitmapsBase-field-from-commit-job-private-data.patch
new file mode 100644
index 0000000..fcf01f8
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Remove-disabledBitmapsBase-field-from-commit-job-private-data.patch
@@ -0,0 +1,219 @@
+From c23ec1c095a13e1279660ea9b27290c9ae0f3849 Mon Sep 17 00:00:00 2001
+Message-Id: <c23ec1c095a13e1279660ea9b27290c9ae0f3849@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:03 +0200
+Subject: [PATCH] qemu: blockjob: Remove 'disabledBitmapsBase' field from
+ commit job private data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+New semantics of the bitmap handling don't need this. Remove the field
+and all uses of it including the status XML.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 057e4bc591093a333624acb9ed065f8f796cca1e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <d003ac3f3f67fba9944e600cdf09f0aa4bb1001a.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.c                      | 39 -------------------
+ src/qemu/qemu_blockjob.h                      |  3 --
+ src/qemu/qemu_domain.c                        | 22 -----------
+ src/qemu/qemu_driver.c                        |  3 +-
+ .../blockjob-blockdev-in.xml                  |  4 --
+ 5 files changed, 1 insertion(+), 70 deletions(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index c63a691a0e..d106165175 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -285,7 +285,6 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+                           virStorageSourcePtr topparent,
+                           virStorageSourcePtr top,
+                           virStorageSourcePtr base,
+-                          char ***disabledBitmapsBase,
+                           bool delete_imgs,
+                           unsigned int jobflags)
+ {
+@@ -311,7 +310,6 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+     job->data.commit.top = top;
+     job->data.commit.base = base;
+     job->data.commit.deleteCommittedImages = delete_imgs;
+-    job->data.commit.disabledBitmapsBase = g_steal_pointer(disabledBitmapsBase);
+     job->jobflags = jobflags;
+ 
+     if (qemuBlockJobRegister(job, vm, disk, true) < 0)
+@@ -1363,40 +1361,6 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDriverPtr driver,
+ }
+ 
+ 
+-static void
+-qemuBlockJobProcessEventFailedCommitCommon(virDomainObjPtr vm,
+-                                           qemuBlockJobDataPtr job,
+-                                           qemuDomainAsyncJob asyncJob)
+-{
+-    qemuDomainObjPrivatePtr priv = vm->privateData;
+-    g_autoptr(virJSONValue) actions = virJSONValueNewArray();
+-    char **disabledBitmaps = job->data.commit.disabledBitmapsBase;
+-
+-    if (!disabledBitmaps || !*disabledBitmaps)
+-        return;
+-
+-    for (; *disabledBitmaps; disabledBitmaps++) {
+-        qemuMonitorTransactionBitmapEnable(actions,
+-                                           job->data.commit.base->nodeformat,
+-                                           *disabledBitmaps);
+-    }
+-
+-    if (qemuBlockReopenReadWrite(vm, job->data.commit.base, asyncJob) < 0)
+-        return;
+-
+-    if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+-        return;
+-
+-    qemuMonitorTransaction(priv->mon, &actions);
+-
+-    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0)
+-        return;
+-
+-    if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) < 0)
+-        return;
+-}
+-
+-
+ static void
+ qemuBlockJobProcessEventConcludedCreate(virQEMUDriverPtr driver,
+                                         virDomainObjPtr vm,
+@@ -1504,8 +1468,6 @@ qemuBlockJobEventProcessConcludedTransition(qemuBlockJobDataPtr job,
+     case QEMU_BLOCKJOB_TYPE_COMMIT:
+         if (success)
+             qemuBlockJobProcessEventCompletedCommit(driver, vm, job, asyncJob);
+-        else
+-            qemuBlockJobProcessEventFailedCommitCommon(vm, job, asyncJob);
+         break;
+ 
+     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+@@ -1513,7 +1475,6 @@ qemuBlockJobEventProcessConcludedTransition(qemuBlockJobDataPtr job,
+             qemuBlockJobProcessEventCompletedActiveCommit(driver, vm, job, asyncJob);
+         } else {
+             qemuBlockJobProcessEventFailedActiveCommit(driver, vm, job);
+-            qemuBlockJobProcessEventFailedCommitCommon(vm, job, asyncJob);
+         }
+         break;
+ 
+diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
+index ee83d318f3..4045878568 100644
+--- a/src/qemu/qemu_blockjob.h
++++ b/src/qemu/qemu_blockjob.h
+@@ -88,8 +88,6 @@ struct _qemuBlockJobCommitData {
+     virStorageSourcePtr top;
+     virStorageSourcePtr base;
+     bool deleteCommittedImages;
+-    char **disabledBitmapsBase; /* a NULL-terminated list of bitmap names which
+-                                   were disabled in @base for the commit job */
+ };
+ 
+ 
+@@ -187,7 +185,6 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+                           virStorageSourcePtr topparent,
+                           virStorageSourcePtr top,
+                           virStorageSourcePtr base,
+-                          char ***disabledBitmapsBase,
+                           bool delete_imgs,
+                           unsigned int jobflags);
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index a92183334f..1e968368ae 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2594,7 +2594,6 @@ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
+                                       virBufferPtr buf)
+ {
+     g_auto(virBuffer) disabledBitmapsBuf = VIR_BUFFER_INIT_CHILD(buf);
+-    char **bitmaps = job->data.commit.disabledBitmapsBase;
+ 
+     if (job->data.commit.base)
+         virBufferAsprintf(buf, "<base node='%s'/>\n", job->data.commit.base->nodeformat);
+@@ -2608,9 +2607,6 @@ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
+     if (job->data.commit.deleteCommittedImages)
+         virBufferAddLit(buf, "<deleteCommittedImages/>\n");
+ 
+-    while (bitmaps && *bitmaps)
+-        virBufferEscapeString(&disabledBitmapsBuf, "<bitmap name='%s'/>\n", *(bitmaps++));
+-
+     virXMLFormatElement(buf, "disabledBaseBitmaps", NULL, &disabledBitmapsBuf);
+ }
+ 
+@@ -3238,9 +3234,6 @@ static int
+ qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
+                                                xmlXPathContextPtr ctxt)
+ {
+-    g_autofree xmlNodePtr *nodes = NULL;
+-    ssize_t nnodes;
+-
+     if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) {
+         qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+                                                      "string(./topparent/@node)",
+@@ -3267,21 +3260,6 @@ qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
+         !job->data.commit.base)
+         return -1;
+ 
+-    if ((nnodes = virXPathNodeSet("./disabledBaseBitmaps/bitmap", ctxt, &nodes)) > 0) {
+-        size_t i;
+-
+-        job->data.commit.disabledBitmapsBase = g_new0(char *, nnodes + 1);
+-
+-        for (i = 0; i < nnodes; i++) {
+-            char *tmp;
+-
+-            if (!(tmp = virXMLPropString(nodes[i], "name")))
+-                return -1;
+-
+-            job->data.commit.disabledBitmapsBase[i] = g_steal_pointer(&tmp);
+-        }
+-    }
+-
+     return 0;
+ }
+ 
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 983d4a04a8..ed5498d2bc 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18757,7 +18757,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     const char *nodebase = NULL;
+     bool persistjob = false;
+     bool blockdev = false;
+-    VIR_AUTOSTRINGLIST bitmapDisableList = NULL;
+ 
+     virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW |
+                   VIR_DOMAIN_BLOCK_COMMIT_ACTIVE |
+@@ -18919,7 +18918,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     }
+ 
+     if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
+-                                          baseSource, &bitmapDisableList,
++                                          baseSource,
+                                           flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
+                                           flags)))
+         goto endjob;
+diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+index cc17a17ff4..ca6d110179 100644
+--- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
++++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+@@ -243,10 +243,6 @@
+       <base node='libvirt-19-format'/>
+       <top node='libvirt-17-format'/>
+       <deleteCommittedImages/>
+-      <disabledBaseBitmaps>
+-        <bitmap name='test'/>
+-        <bitmap name='test1'/>
+-      </disabledBaseBitmaps>
+     </blockjob>
+     <blockjob name='create-libvirt-1337-storage' type='create' state='running'>
+       <create mode='storage'/>
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Store-flags-for-all-the-block-job-types.patch b/SOURCES/libvirt-qemu-blockjob-Store-flags-for-all-the-block-job-types.patch
new file mode 100644
index 0000000..c2fa9f9
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Store-flags-for-all-the-block-job-types.patch
@@ -0,0 +1,154 @@
+From 51688727a7278bdbc9cdb49ab6bc11f38995ab26 Mon Sep 17 00:00:00 2001
+Message-Id: <51688727a7278bdbc9cdb49ab6bc11f38995ab26@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:22 +0100
+Subject: [PATCH] qemu: blockjob: Store 'flags' for all the block job types
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The flags may control important aspects of the block job which may
+influence also the termination of the job. Store the 'flags' for all
+the block job types.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit ccd4228afff22214ea9b9199b2228d79a5cb5877)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <27c11423760ca65573e2539ac822e88d20ad2916.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 13 ++++++++++---
+ src/qemu/qemu_blockjob.h |  9 ++++++---
+ src/qemu/qemu_driver.c   |  7 ++++---
+ 3 files changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index 3dc9222a6f..6b59bbeb2c 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -252,7 +252,8 @@ qemuBlockJobDiskNew(virDomainObjPtr vm,
+ qemuBlockJobDataPtr
+ qemuBlockJobDiskNewPull(virDomainObjPtr vm,
+                         virDomainDiskDefPtr disk,
+-                        virStorageSourcePtr base)
++                        virStorageSourcePtr base,
++                        unsigned int jobflags)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(qemuBlockJobData) job = NULL;
+@@ -269,6 +270,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm,
+         return NULL;
+ 
+     job->data.pull.base = base;
++    job->jobflags = jobflags;
+ 
+     if (qemuBlockJobRegister(job, vm, disk, true) < 0)
+         return NULL;
+@@ -283,7 +285,8 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+                           virStorageSourcePtr topparent,
+                           virStorageSourcePtr top,
+                           virStorageSourcePtr base,
+-                          bool delete_imgs)
++                          bool delete_imgs,
++                          unsigned int jobflags)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(qemuBlockJobData) job = NULL;
+@@ -307,6 +310,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+     job->data.commit.top = top;
+     job->data.commit.base = base;
+     job->data.commit.deleteCommittedImages = delete_imgs;
++    job->jobflags = jobflags;
+ 
+     if (qemuBlockJobRegister(job, vm, disk, true) < 0)
+         return NULL;
+@@ -350,7 +354,8 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm,
+                         virDomainDiskDefPtr disk,
+                         virStorageSourcePtr mirror,
+                         bool shallow,
+-                        bool reuse)
++                        bool reuse,
++                        unsigned int jobflags)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(qemuBlockJobData) job = NULL;
+@@ -371,6 +376,8 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm,
+     if (shallow && !reuse)
+         job->data.copy.shallownew = true;
+ 
++    job->jobflags = jobflags;
++
+     if (qemuBlockJobRegister(job, vm, disk, true) < 0)
+         return NULL;
+ 
+diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
+index 53c495fa8a..4045878568 100644
+--- a/src/qemu/qemu_blockjob.h
++++ b/src/qemu/qemu_blockjob.h
+@@ -176,7 +176,8 @@ qemuBlockJobDiskNew(virDomainObjPtr vm,
+ qemuBlockJobDataPtr
+ qemuBlockJobDiskNewPull(virDomainObjPtr vm,
+                         virDomainDiskDefPtr disk,
+-                        virStorageSourcePtr base);
++                        virStorageSourcePtr base,
++                        unsigned int jobflags);
+ 
+ qemuBlockJobDataPtr
+ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+@@ -184,7 +185,8 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+                           virStorageSourcePtr topparent,
+                           virStorageSourcePtr top,
+                           virStorageSourcePtr base,
+-                          bool delete_imgs);
++                          bool delete_imgs,
++                          unsigned int jobflags);
+ 
+ qemuBlockJobDataPtr
+ qemuBlockJobNewCreate(virDomainObjPtr vm,
+@@ -197,7 +199,8 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm,
+                         virDomainDiskDefPtr disk,
+                         virStorageSourcePtr mirror,
+                         bool shallow,
+-                        bool reuse);
++                        bool reuse,
++                        unsigned int jobflags);
+ 
+ qemuBlockJobDataPtr
+ qemuBlockJobDiskNewBackup(virDomainObjPtr vm,
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 0667402ebb..71c75b25a6 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17686,7 +17686,7 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm,
+         speed <<= 20;
+     }
+ 
+-    if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource)))
++    if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource, flags)))
+         goto endjob;
+ 
+     if (blockdev) {
+@@ -18373,7 +18373,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+             goto endjob;
+     }
+ 
+-    if (!(job = qemuBlockJobDiskNewCopy(vm, disk, mirror, mirror_shallow, mirror_reuse)))
++    if (!(job = qemuBlockJobDiskNewCopy(vm, disk, mirror, mirror_shallow, mirror_reuse, flags)))
+         goto endjob;
+ 
+     disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
+@@ -18794,7 +18794,8 @@ qemuDomainBlockCommit(virDomainPtr dom,
+ 
+     if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
+                                           baseSource,
+-                                          flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE)))
++                                          flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
++                                          flags)))
+         goto endjob;
+ 
+     disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Store-jobflags-with-block-job-data.patch b/SOURCES/libvirt-qemu-blockjob-Store-jobflags-with-block-job-data.patch
new file mode 100644
index 0000000..f074852
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Store-jobflags-with-block-job-data.patch
@@ -0,0 +1,125 @@
+From 5278c00147b0ac777d5ddd73062d0c6146da4908 Mon Sep 17 00:00:00 2001
+Message-Id: <5278c00147b0ac777d5ddd73062d0c6146da4908@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:21 +0100
+Subject: [PATCH] qemu: blockjob: Store 'jobflags' with block job data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a variable which will store the contents of the 'flags' variable as
+passed in by the individual block jobs. Since the flags may influence
+behaviour of the jobs it's important to preserve them to the
+finalization steps.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9ba804a1d16b12dac2ec2edbd0f384c21d4bc5c8)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <81db2d5e281716bf385d6d9c634136e36e8bd391.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.h                             | 3 +++
+ src/qemu/qemu_domain.c                               | 7 +++++++
+ tests/qemustatusxml2xmldata/backup-pull-in.xml       | 2 +-
+ tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml | 8 ++++----
+ 4 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
+index 7d584a2980..53c495fa8a 100644
+--- a/src/qemu/qemu_blockjob.h
++++ b/src/qemu/qemu_blockjob.h
+@@ -129,6 +129,9 @@ struct _qemuBlockJobData {
+     virStorageSourcePtr chain; /* Reference to the chain the job operates on. */
+     virStorageSourcePtr mirrorChain; /* reference to 'mirror' part of the job */
+ 
++    unsigned int jobflags; /* per job flags */
++    bool jobflagsmissing; /* job flags were not stored */
++
+     union {
+         qemuBlockJobPullData pull;
+         qemuBlockJobCommitData commit;
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 94efcdf9b1..846d1ecb29 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2582,6 +2582,8 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
+     virBufferEscapeString(&attrBuf, " newstate='%s'", newstate);
+     if (job->brokentype != QEMU_BLOCKJOB_TYPE_NONE)
+         virBufferEscapeString(&attrBuf, " brokentype='%s'", qemuBlockjobTypeToString(job->brokentype));
++    if (!job->jobflagsmissing)
++        virBufferAsprintf(&attrBuf, " jobflags='0x%x'", job->jobflags);
+     virBufferEscapeString(&childBuf, "<errmsg>%s</errmsg>", job->errmsg);
+ 
+     if (job->disk) {
+@@ -3294,6 +3296,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm,
+     int newstate = -1;
+     bool invalidData = false;
+     xmlNodePtr tmp;
++    unsigned long jobflags = 0;
+ 
+     ctxt->node = node;
+ 
+@@ -3333,6 +3336,9 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm,
+         STRNEQ(mirror, "yes"))
+         invalidData = true;
+ 
++    if (virXPathULongHex("string(./@jobflags)", ctxt, &jobflags) != 0)
++        job->jobflagsmissing = true;
++
+     if (!disk && !invalidData) {
+         if ((tmp = virXPathNode("./chains/disk", ctxt)) &&
+             !(job->chain = qemuDomainObjPrivateXMLParseBlockjobChain(tmp, ctxt, xmlopt)))
+@@ -3352,6 +3358,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObjPtr vm,
+ 
+     job->state = state;
+     job->newstate = newstate;
++    job->jobflags = jobflags;
+     job->errmsg = virXPathString("string(./errmsg)", ctxt);
+     job->invalidData = invalidData;
+     job->disk = disk;
+diff --git a/tests/qemustatusxml2xmldata/backup-pull-in.xml b/tests/qemustatusxml2xmldata/backup-pull-in.xml
+index 3c69c41840..1db978a3ac 100644
+--- a/tests/qemustatusxml2xmldata/backup-pull-in.xml
++++ b/tests/qemustatusxml2xmldata/backup-pull-in.xml
+@@ -235,7 +235,7 @@
+   <allowReboot value='yes'/>
+   <nodename index='0'/>
+   <blockjobs active='yes'>
+-    <blockjob name='backup-vda-libvirt-3-format' type='backup' state='running'>
++    <blockjob name='backup-vda-libvirt-3-format' type='backup' state='running' jobflags='0x0'>
+       <disk dst='vda'/>
+       <bitmap name='bitmapname'/>
+       <store type='file' format='qcow2'>
+diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+index b5d62fd4ab..ca6d110179 100644
+--- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
++++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+@@ -261,19 +261,19 @@
+         </source>
+       </src>
+     </blockjob>
+-    <blockjob name='copy-vdd-libvirt-4321-format' type='copy' state='ready' shallownew='yes'>
++    <blockjob name='copy-vdd-libvirt-4321-format' type='copy' state='ready' jobflags='0x0' shallownew='yes'>
+       <disk dst='vdd'/>
+     </blockjob>
+-    <blockjob name='commit-vdc-libvirt-9-format' type='commit' state='running'>
++    <blockjob name='commit-vdc-libvirt-9-format' type='commit' state='running' jobflags='0x0'>
+       <disk dst='vdc'/>
+       <base node='libvirt-11-format'/>
+       <top node='libvirt-9-format'/>
+       <topparent node='libvirt-2-format'/>
+     </blockjob>
+-    <blockjob name='drive-virtio-disk0' type='copy' state='ready'>
++    <blockjob name='drive-virtio-disk0' type='copy' state='ready' jobflags='0x0'>
+       <disk dst='vda' mirror='yes'/>
+     </blockjob>
+-    <blockjob name='create-libvirt-1338-format' type='create' state='running'>
++    <blockjob name='create-libvirt-1338-format' type='create' state='running' jobflags='0xabcd'>
+       <chains>
+         <disk type='file' format='qcow2'>
+           <source file='/create/src1.qcow2' index='1339'>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-blockjob-Store-list-of-bitmaps-disabled-prior-to-commit.patch b/SOURCES/libvirt-qemu-blockjob-Store-list-of-bitmaps-disabled-prior-to-commit.patch
new file mode 100644
index 0000000..2a4d1ae
--- /dev/null
+++ b/SOURCES/libvirt-qemu-blockjob-Store-list-of-bitmaps-disabled-prior-to-commit.patch
@@ -0,0 +1,117 @@
+From 7322bb9f51c7c2c35d2e65734e03ff0056b5af22 Mon Sep 17 00:00:00 2001
+Message-Id: <7322bb9f51c7c2c35d2e65734e03ff0056b5af22@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:22 +0100
+Subject: [PATCH] qemu: blockjob: Store list of bitmaps disabled prior to
+ commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting a commit job will require disabling bitmaps in the base image
+so that they are not dirtied by the commit job. We need to store a list
+of the bitmaps so that we can later re-enable them.
+
+Add a field and status XML handling code as well as a test.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 41de7230ab169e80237f3e3a29bfecd9baf1a578)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <f009cdda8b29df504d19bddffea5638913f8c931.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.h                      |  2 ++
+ src/qemu/qemu_domain.c                        | 26 +++++++++++++++++++
+ .../blockjob-blockdev-in.xml                  |  4 +++
+ 3 files changed, 32 insertions(+)
+
+diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
+index 4045878568..c1d95ea3d8 100644
+--- a/src/qemu/qemu_blockjob.h
++++ b/src/qemu/qemu_blockjob.h
+@@ -88,6 +88,8 @@ struct _qemuBlockJobCommitData {
+     virStorageSourcePtr top;
+     virStorageSourcePtr base;
+     bool deleteCommittedImages;
++    char **disabledBitmapsBase; /* a NULL-terminated list of bitmap names which
++                                   were disabled in @base for the commit job */
+ };
+ 
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 0faf042145..a273aefa6b 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2603,6 +2603,9 @@ static void
+ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
+                                       virBufferPtr buf)
+ {
++    g_auto(virBuffer) disabledBitmapsBuf = VIR_BUFFER_INIT_CHILD(buf);
++    char **bitmaps = job->data.commit.disabledBitmapsBase;
++
+     if (job->data.commit.base)
+         virBufferAsprintf(buf, "<base node='%s'/>\n", job->data.commit.base->nodeformat);
+ 
+@@ -2614,6 +2617,11 @@ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
+ 
+     if (job->data.commit.deleteCommittedImages)
+         virBufferAddLit(buf, "<deleteCommittedImages/>\n");
++
++    while (bitmaps && *bitmaps)
++        virBufferEscapeString(&disabledBitmapsBuf, "<bitmap name='%s'/>\n", *(bitmaps++));
++
++    virXMLFormatElement(buf, "disabledBaseBitmaps", NULL, &disabledBitmapsBuf);
+ }
+ 
+ 
+@@ -3240,6 +3248,9 @@ static int
+ qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
+                                                xmlXPathContextPtr ctxt)
+ {
++    g_autofree xmlNodePtr *nodes = NULL;
++    ssize_t nnodes;
++
+     if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) {
+         qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+                                                      "string(./topparent/@node)",
+@@ -3266,6 +3277,21 @@ qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
+         !job->data.commit.base)
+         return -1;
+ 
++    if ((nnodes = virXPathNodeSet("./disabledBaseBitmaps/bitmap", ctxt, &nodes)) > 0) {
++        size_t i;
++
++        job->data.commit.disabledBitmapsBase = g_new0(char *, nnodes + 1);
++
++        for (i = 0; i < nnodes; i++) {
++            char *tmp;
++
++            if (!(tmp = virXMLPropString(nodes[i], "name")))
++                return -1;
++
++            job->data.commit.disabledBitmapsBase[i] = g_steal_pointer(&tmp);
++        }
++    }
++
+     return 0;
+ }
+ 
+diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+index ca6d110179..cc17a17ff4 100644
+--- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
++++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+@@ -243,6 +243,10 @@
+       <base node='libvirt-19-format'/>
+       <top node='libvirt-17-format'/>
+       <deleteCommittedImages/>
++      <disabledBaseBitmaps>
++        <bitmap name='test'/>
++        <bitmap name='test1'/>
++      </disabledBaseBitmaps>
+     </blockjob>
+     <blockjob name='create-libvirt-1337-storage' type='create' state='running'>
+       <create mode='storage'/>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-build-vhost-user-fs-device-command-line.patch b/SOURCES/libvirt-qemu-build-vhost-user-fs-device-command-line.patch
new file mode 100644
index 0000000..c6634f3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-build-vhost-user-fs-device-command-line.patch
@@ -0,0 +1,222 @@
+From eb7fe047e08a536a6c888e61fbe5b149ecb6ce6a Mon Sep 17 00:00:00 2001
+Message-Id: <eb7fe047e08a536a6c888e61fbe5b149ecb6ce6a@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:49 +0100
+Subject: [PATCH] qemu: build vhost-user-fs device command line
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Format the 'vhost-user-fs' device on the QEMU command line.
+
+This device provides shared file system access using the FUSE protocol
+carried over virtio.
+The actual file server is implemented in an external vhost-user-fs device
+backend process.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 0627150a56fd53841918d558d8466feceb18552a)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <2df3adbe3991cb97a06707e818c30dfcb1f6de26.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_command.c                       | 46 +++++++++++++++++-
+ ...vhost-user-fs-fd-memory.x86_64-latest.args | 39 +++++++++++++++
+ ...vhost-user-fs-hugepages.x86_64-latest.args | 47 +++++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  3 ++
+ 4 files changed, 133 insertions(+), 2 deletions(-)
+ create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
+ create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 7fdf58f067..fc5366d88d 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -2589,6 +2589,46 @@ qemuBuildDisksCommandLine(virCommandPtr cmd,
+ }
+ 
+ 
++static int
++qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
++                                virDomainFSDef *fs,
++                                const virDomainDef *def,
++                                qemuDomainObjPrivatePtr priv)
++{
++    g_autofree char *chardev_alias = NULL;
++    g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
++
++    chardev_alias = g_strdup_printf("chr-vu-%s", fs->info.alias);
++
++    virCommandAddArg(cmd, "-chardev");
++    virBufferAddLit(&opt, "socket");
++    virBufferAsprintf(&opt, ",id=%s", chardev_alias);
++    virBufferAddLit(&opt, ",path=");
++    virQEMUBuildBufferEscapeComma(&opt, QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock);
++    virCommandAddArgBuffer(cmd, &opt);
++
++    virCommandAddArg(cmd, "-device");
++
++    if (qemuBuildVirtioDevStr(&opt, "vhost-user-fs", priv->qemuCaps,
++                              VIR_DOMAIN_DEVICE_FS, fs) < 0)
++        return -1;
++
++    virBufferAsprintf(&opt, ",chardev=%s", chardev_alias);
++    if (fs->queue_size)
++        virBufferAsprintf(&opt, ",queue-size=%llu", fs->queue_size);
++    virBufferAddLit(&opt, ",tag=");
++    virQEMUBuildBufferEscapeComma(&opt, fs->dst);
++    if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, priv->qemuCaps) < 0)
++        return -1;
++
++    if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < 0)
++        return -1;
++
++    virCommandAddArgBuffer(cmd, &opt);
++    return 0;
++}
++
++
+ static char *
+ qemuBuildFSStr(virDomainFSDefPtr fs)
+ {
+@@ -2681,7 +2721,7 @@ static int
+ qemuBuildFilesystemCommandLine(virCommandPtr cmd,
+                                const virDomainDef *def,
+                                virQEMUCapsPtr qemuCaps,
+-                               qemuDomainObjPrivatePtr priv G_GNUC_UNUSED)
++                               qemuDomainObjPrivatePtr priv)
+ {
+     size_t i;
+ 
+@@ -2696,7 +2736,9 @@ qemuBuildFilesystemCommandLine(virCommandPtr cmd,
+             break;
+ 
+         case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS:
+-            /* TODO: vhost-user-fs-pci */
++            /* vhost-user-fs-pci */
++            if (qemuBuildVHostUserFsCommandLine(cmd, def->fss[i], def, priv) < 0)
++                return -1;
+             break;
+ 
+         case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP:
+diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
+new file mode 100644
+index 0000000000..a7df45a7f0
+--- /dev/null
++++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
+@@ -0,0 +1,39 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-guest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-x86_64 \
++-name guest=guest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-guest/master-key.aes \
++-machine pc,accel=kvm,usb=off,dump-guest-core=off \
++-cpu qemu64 \
++-m 14336 \
++-overcommit mem-lock=off \
++-smp 2,sockets=2,cores=1,threads=1 \
++-object memory-backend-file,id=ram-node0,\
++mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-guest/ram-node0,share=yes,\
++size=15032385536 \
++-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
++-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-boot strict=on \
++-chardev socket,id=chr-vu-fs0,path=/tmp/lib/domain--1-guest/fs0.vhost-fs.sock \
++-device vhost-user-fs-pci,chardev=chr-vu-fs0,queue-size=1024,tag=mount_tag,\
++bus=pci.0,addr=0x2 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+new file mode 100644
+index 0000000000..39190b8d3e
+--- /dev/null
++++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+@@ -0,0 +1,47 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-guest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-x86_64 \
++-name guest=guest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-guest/master-key.aes \
++-machine q35,accel=tcg,usb=off,dump-guest-core=off \
++-cpu qemu64 \
++-m 2048 \
++-overcommit mem-lock=off \
++-smp 2,sockets=2,cores=1,threads=1 \
++-object memory-backend-file,id=ram-node0,prealloc=yes,\
++mem-path=/dev/hugepages2M/libvirt/qemu/-1-guest,share=yes,size=2147483648 \
++-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
++-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
++addr=0x1 \
++-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
++-device pcie-root-port,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
++-device pcie-root-port,port=0xb,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
++-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
++"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
++"file":"libvirt-1-storage"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
++id=virtio-disk0,bootindex=1 \
++-chardev socket,id=chr-vu-fs0,path=/tmp/lib/domain--1-guest/fs0.vhost-fs.sock \
++-device vhost-user-fs-pci,chardev=chr-vu-fs0,tag=mount_tag,bus=pci.1,addr=0x0 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index a391823090..265ffce465 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -3053,6 +3053,9 @@ mymain(void)
+ 
+     DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
+ 
++    DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory");
++    DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
++
+     DO_TEST("riscv64-virt",
+             QEMU_CAPS_DEVICE_VIRTIO_MMIO);
+     DO_TEST("riscv64-virt-pci",
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-capabilities-Add-QEMU_CAPS_BLOCKDEV_REOPEN.patch b/SOURCES/libvirt-qemu-capabilities-Add-QEMU_CAPS_BLOCKDEV_REOPEN.patch
new file mode 100644
index 0000000..808eade
--- /dev/null
+++ b/SOURCES/libvirt-qemu-capabilities-Add-QEMU_CAPS_BLOCKDEV_REOPEN.patch
@@ -0,0 +1,53 @@
+From e76712462c74fad141b5d63563c554447fdc497a Mon Sep 17 00:00:00 2001
+Message-Id: <e76712462c74fad141b5d63563c554447fdc497a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:14 +0100
+Subject: [PATCH] qemu: capabilities: Add QEMU_CAPS_BLOCKDEV_REOPEN
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This capability will be asserted once qemu stabilizes 'blockdev-reopen'.
+For now we just add the capability so that we can introduce some code
+that will use the reopening call. This will show our willingness to
+adopt use of reopen and help qemu developers stabilize it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit ecdd92976144ba9caeae3ce781e39b5e9cc08807)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <f3d864a179b997038d3c06e7de54c6ba77fff3d7.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_capabilities.c | 1 +
+ src/qemu/qemu_capabilities.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 663017157b..a4046b09d6 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -560,6 +560,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "cpu.kvm-no-adjvtime",
+               "vhost-user-fs",
+               "blockdev-snapshot.allow-write-only-overlay",
++              "blockdev-reopen",
+     );
+ 
+ 
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 2eb8599525..8fdbe05638 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -541,6 +541,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */
+     QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */
+     QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
++    QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-capabilities-Add-capability-for-werror-rerror-for-usb-device-frontend.patch b/SOURCES/libvirt-qemu-capabilities-Add-capability-for-werror-rerror-for-usb-device-frontend.patch
deleted file mode 100644
index 2999acd..0000000
--- a/SOURCES/libvirt-qemu-capabilities-Add-capability-for-werror-rerror-for-usb-device-frontend.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 81505bfde8f4acf9b94a1c6dc010d707dcd49b6a Mon Sep 17 00:00:00 2001
-Message-Id: <81505bfde8f4acf9b94a1c6dc010d707dcd49b6a@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:48 +0200
-Subject: [PATCH] qemu: capabilities: Add capability for werror/rerror for
- 'usb-device' frontend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Support for specifying it with the -device frontend was added recently.
-Add a capability for it.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a087a8e60ad62a719165e3c2c9970480b9531062)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                     | 2 ++
- src/qemu/qemu_capabilities.h                     | 1 +
- tests/qemucapabilitiesdata/caps_3.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 c7da916f9a..23b483349f 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -502,6 +502,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "sev-guest",
-               "machine.pseries.cap-hpt-max-page-size",
-               "machine.pseries.cap-htm",
-+              "usb-storage.werror",
-     );
- 
- 
-@@ -1240,6 +1241,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBStorage[] = {
-     { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE },
-     { "share-rw", QEMU_CAPS_DISK_SHARE_RW },
-     { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE },
-+    { "werror", QEMU_CAPS_USB_STORAGE_WERROR },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsKVMPit[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index a048a1cf02..1fa0ebfea3 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -486,6 +486,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.cap-hpt-max-page-size */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
-+    QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index 07e3de8677..d7c25c65dd 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -209,6 +209,7 @@
-   <flag name='mch'/>
-   <flag name='mch.extended-tseg-mbytes'/>
-   <flag name='sev-guest'/>
-+  <flag name='usb-storage.werror'/>
-   <version>2012050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>437827</microcodeVersion>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY.patch b/SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY.patch
new file mode 100644
index 0000000..cfd1e2b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-capabilities-Introduce-QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY.patch
@@ -0,0 +1,71 @@
+From b28ebb2480fb205ff10059a04745ff989d4f04b0 Mon Sep 17 00:00:00 2001
+Message-Id: <b28ebb2480fb205ff10059a04745ff989d4f04b0@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:38 +0100
+Subject: [PATCH] qemu: capabilities: Introduce
+ QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The capability is based on qemu's support of using blockdev-snapshot to
+install backing chain also for images which are in use by a block-copy
+job.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit d6498be16565f23750f7e906050bdbc30678101f)
+
+ Conflicts:
+	src/qemu/qemu_capabilities.c
+	src/qemu/qemu_capabilities.h
+
+        QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT not backported
+
+	tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+
+        Capability file update not backported
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1803092
+Message-Id: <8240acbad794e65a4e3c61be3fa6713e0cb181ae.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ 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 34df4d89b3..663017157b 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -559,6 +559,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "virtio-net.failover",
+               "cpu.kvm-no-adjvtime",
+               "vhost-user-fs",
++              "blockdev-snapshot.allow-write-only-overlay",
+     );
+ 
+ 
+@@ -1432,6 +1433,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
+     { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
+     { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
+     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
++    { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
+ };
+ 
+ typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index e3449a9ca3..2eb8599525 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -540,6 +540,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
+     QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */
+     QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */
++    QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-caps-Add-vfio-pci.display-capability.patch b/SOURCES/libvirt-qemu-caps-Add-vfio-pci.display-capability.patch
deleted file mode 100644
index db8ec77..0000000
--- a/SOURCES/libvirt-qemu-caps-Add-vfio-pci.display-capability.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 93a2ea36d65b36b542b1a96f16ea0ef271baad37 Mon Sep 17 00:00:00 2001
-Message-Id: <93a2ea36d65b36b542b1a96f16ea0ef271baad37@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:59 +0200
-Subject: [PATCH] qemu: caps: Add vfio-pci.display capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU 2.12 introduced a new vfio-pci device option 'display=on/off/auto'.
-This patch introduces the necessary capability.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 11c7bdac6dbe8659c2f8bf7a35b97288b0acb207)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                       | 4 ++++
- src/qemu/qemu_capabilities.h                       | 3 +++
- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   | 1 +
- 8 files changed, 13 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index df358f8967..0fb800589a 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -504,6 +504,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "machine.pseries.cap-htm",
-               "usb-storage.werror",
-               "egl-headless",
-+
-+              /* 315 */
-+              "vfio-pci.display",
-     );
- 
- 
-@@ -1197,6 +1200,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
-     { "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
-+    { "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIDisk[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 55221e7e57..9e8ad5f5c3 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -489,6 +489,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
-     QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
- 
-+    /* 315 */
-+    QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
-+
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
- 
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-index 80e7afec04..0cc6327573 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-@@ -170,6 +170,7 @@
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-   <flag name='egl-headless'/>
-+  <flag name='vfio-pci.display'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>347550</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-index c4b09c0003..a88da6193e 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-@@ -168,6 +168,7 @@
-   <flag name='tpm-emulator'/>
-   <flag name='machine.pseries.cap-htm'/>
-   <flag name='egl-headless'/>
-+  <flag name='vfio-pci.display'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>428334</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-index 1ff2fe45e1..7121da27a0 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-@@ -134,6 +134,7 @@
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-   <flag name='egl-headless'/>
-+  <flag name='vfio-pci.display'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>375999</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index 37d17786cf..78889facce 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -212,6 +212,7 @@
-   <flag name='mch.extended-tseg-mbytes'/>
-   <flag name='sev-guest'/>
-   <flag name='egl-headless'/>
-+  <flag name='vfio-pci.display'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>416196</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-index 57bf5dba11..01bb968938 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-@@ -168,6 +168,7 @@
-   <flag name='machine.pseries.cap-hpt-max-page-size'/>
-   <flag name='machine.pseries.cap-htm'/>
-   <flag name='egl-headless'/>
-+  <flag name='vfio-pci.display'/>
-   <version>2012050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>446771</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index 431910a9e3..4bc7cfeebc 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -215,6 +215,7 @@
-   <flag name='sev-guest'/>
-   <flag name='usb-storage.werror'/>
-   <flag name='egl-headless'/>
-+  <flag name='vfio-pci.display'/>
-   <version>2012090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>438109</microcodeVersion>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-caps-Don-t-try-to-ask-for-CAP_DAC_OVERRIDE-if-non-root.patch b/SOURCES/libvirt-qemu-caps-Don-t-try-to-ask-for-CAP_DAC_OVERRIDE-if-non-root.patch
deleted file mode 100644
index 94e595d..0000000
--- a/SOURCES/libvirt-qemu-caps-Don-t-try-to-ask-for-CAP_DAC_OVERRIDE-if-non-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e22ab3412457f4d804ad7b0f62bd37ae07ec186d Mon Sep 17 00:00:00 2001
-Message-Id: <e22ab3412457f4d804ad7b0f62bd37ae07ec186d@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 5 Feb 2019 10:20:33 +0100
-Subject: [PATCH] qemu: caps: Don't try to ask for CAP_DAC_OVERRIDE if non-root
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It will not work. This breaks qemu capabilities probing as a user.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 620d9dd598fde388f56ac37bcd3b31168c2f9fc6)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1665400
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index f71cd08f4d..912f758bcd 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -4482,7 +4482,8 @@ virQEMUCapsInitQMPCommandRun(virQEMUCapsInitQMPCommandPtr cmd,
- #if WITH_CAPNG
-     /* QEMU might run into permission issues, e.g. /dev/sev (0600), override
-      * them just for the purpose of probing */
--    virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE);
-+    if (geteuid() == 0)
-+        virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE);
- #endif
- 
-     virCommandSetGID(cmd->cmd, cmd->runGid);
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-caps-Format-SEV-platform-data-into-qemuCaps-cache.patch b/SOURCES/libvirt-qemu-caps-Format-SEV-platform-data-into-qemuCaps-cache.patch
deleted file mode 100644
index 898a6ae..0000000
--- a/SOURCES/libvirt-qemu-caps-Format-SEV-platform-data-into-qemuCaps-cache.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From 9f03a9e4bf2c5aad056f44ef1fe6c57eac3a7e74 Mon Sep 17 00:00:00 2001
-Message-Id: <9f03a9e4bf2c5aad056f44ef1fe6c57eac3a7e74@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Mon, 20 Aug 2018 17:18:53 +0200
-Subject: [PATCH] qemu: caps: Format SEV platform data into qemuCaps cache
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since we're not saving the platform-specific data into a cache, we're
-not going to populate the structure, which in turn will cause a crash
-upon calling virNodeGetSEVInfo because of a NULL pointer dereference.
-Ultimately, we should start caching this data along with host-specific
-capabilities like NUMA and SELinux stuff into a separate cache, but for
-the time being, this is a semi-proper fix for a potential crash.
-
-Backtrace (requires libvirtd restart to load qemu caps from cache):
-    #0 qemuGetSEVInfoToParams
-    #1 qemuNodeGetSEVInfo
-    #2 virNodeGetSEVInfo
-    #3 remoteDispatchNodeGetSevInfo
-    #4 remoteDispatchNodeGetSevInfoHelper
-    #5 virNetServerProgramDispatchCall
-    #6 virNetServerProgramDispatch
-    #7 virNetServerProcessMsg
-    #8 virNetServerHandleJob
-    #9 virThreadPoolWorker
-    #10 virThreadHelper
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1612009
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Acked-by: Peter Krempa <pkrempa@redhat.com>
-Tested-by: Brijesh Singh <brijesh.singh@amd.com>
-(cherry picked from commit 77f51ab52049734d80a8ccb79b80189c7fb95c41)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1612009
-https://bugzilla.redhat.com/show_bug.cgi?id=1619150
-
-Amend:
-    - fixed the VIR_AUTOPTR bits which downstream doesn't support
-    and wouldn't compile
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                  | 109 ++++++++++++++++++
- .../qemu_2.12.0.x86_64.xml                    |   5 +-
- .../caps_2.12.0.x86_64.xml                    |   6 +
- 3 files changed, 119 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 55024ad735..1321696d11 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -1572,6 +1572,30 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
- }
- 
- 
-+static int
-+virQEMUCapsSEVInfoCopy(virSEVCapabilityPtr *dst,
-+                       virSEVCapabilityPtr src)
-+{
-+    int ret = -1;
-+    virSEVCapabilityPtr tmp = NULL;
-+
-+    if (VIR_ALLOC(tmp) < 0 ||
-+        VIR_STRDUP(tmp->pdh, src->pdh) < 0 ||
-+        VIR_STRDUP(tmp->cert_chain, src->cert_chain) < 0)
-+        goto cleanup;
-+
-+    tmp->cbitpos = src->cbitpos;
-+    tmp->reduced_phys_bits = src->reduced_phys_bits;
-+
-+    VIR_STEAL_PTR(*dst, tmp);
-+
-+    ret = 0;
-+ cleanup:
-+    virSEVCapabilitiesFree(tmp);
-+    return ret;
-+}
-+
-+
- virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
- {
-     virQEMUCapsPtr ret = virQEMUCapsNew();
-@@ -1634,6 +1658,11 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
-     for (i = 0; i < qemuCaps->ngicCapabilities; i++)
-         ret->gicCapabilities[i] = qemuCaps->gicCapabilities[i];
- 
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST) &&
-+        virQEMUCapsSEVInfoCopy(&ret->sevCapabilities,
-+                               qemuCaps->sevCapabilities) < 0)
-+        goto error;
-+
-     return ret;
- 
-  error:
-@@ -3272,6 +3301,62 @@ virQEMUCapsCachePrivFree(void *privData)
- }
- 
- 
-+static int
-+virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt)
-+{
-+    int ret = -1;
-+    virSEVCapabilityPtr sev = NULL;
-+
-+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST))
-+        return 0;
-+
-+    if (virXPathBoolean("boolean(./sev)", ctxt) == 0) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing SEV platform data in QEMU "
-+                         "capabilities cache"));
-+        return -1;
-+    }
-+
-+    if (VIR_ALLOC(sev) < 0)
-+        return -1;
-+
-+    if (virXPathUInt("string(./sev/cbitpos)", ctxt, &sev->cbitpos) < 0) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing or malformed SEV cbitpos information "
-+                         "in QEMU capabilities cache"));
-+        goto cleanup;
-+    }
-+
-+    if (virXPathUInt("string(./sev/reducedPhysBits)", ctxt,
-+                     &sev->reduced_phys_bits) < 0) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing or malformed SEV reducedPhysBits information "
-+                         "in QEMU capabilities cache"));
-+        goto cleanup;
-+    }
-+
-+    if (!(sev->pdh = virXPathString("string(./sev/pdh)", ctxt)))  {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing SEV pdh information "
-+                         "in QEMU capabilities cache"));
-+        goto cleanup;
-+    }
-+
-+    if (!(sev->cert_chain = virXPathString("string(./sev/certChain)", ctxt))) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing SEV certChain information "
-+                         "in QEMU capabilities cache"));
-+        goto cleanup;
-+    }
-+
-+    VIR_STEAL_PTR(qemuCaps->sevCapabilities, sev);
-+    ret = 0;
-+ cleanup:
-+    virSEVCapabilitiesFree(sev);
-+    return ret;
-+}
-+
-+
- /*
-  * Parsing a doc that looks like
-  *
-@@ -3520,6 +3605,9 @@ virQEMUCapsLoadCache(virArch hostArch,
-     }
-     VIR_FREE(nodes);
- 
-+    if (virQEMUCapsParseSEVInfo(qemuCaps, ctxt) < 0)
-+        goto cleanup;
-+
-     virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);
-     virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU);
- 
-@@ -3637,6 +3725,24 @@ virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+static void
-+virQEMUCapsFormatSEVInfo(virQEMUCapsPtr qemuCaps, virBufferPtr buf)
-+{
-+    virSEVCapabilityPtr sev = virQEMUCapsGetSEVCapabilities(qemuCaps);
-+
-+    virBufferAddLit(buf, "<sev>\n");
-+    virBufferAdjustIndent(buf, 2);
-+    virBufferAsprintf(buf, "<cbitpos>%u</cbitpos>\n", sev->cbitpos);
-+    virBufferAsprintf(buf, "<reducedPhysBits>%u</reducedPhysBits>\n",
-+                      sev->reduced_phys_bits);
-+    virBufferEscapeString(buf, "<pdh>%s</pdh>\n", sev->pdh);
-+    virBufferEscapeString(buf, "<certChain>%s</certChain>\n",
-+                          sev->cert_chain);
-+    virBufferAdjustIndent(buf, -2);
-+    virBufferAddLit(buf, "</sev>\n");
-+}
-+
-+
- char *
- virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
- {
-@@ -3718,6 +3824,9 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
-                           emulated ? "yes" : "no");
-     }
- 
-+    if (qemuCaps->sevCapabilities)
-+        virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
-+
-     virBufferAdjustIndent(&buf, -2);
-     virBufferAddLit(&buf, "</qemuCaps>\n");
- 
-diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
-index 7a1be4c093..a8d6a4d629 100644
---- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
-+++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml
-@@ -142,6 +142,9 @@
-     <gic supported='no'/>
-     <vmcoreinfo supported='yes'/>
-     <genid supported='yes'/>
--    <sev supported='no'/>
-+    <sev supported='yes'>
-+      <cbitpos>47</cbitpos>
-+      <reducedPhysBits>1</reducedPhysBits>
-+    </sev>
-   </features>
- </domainCapabilities>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index 78889facce..f0dc082640 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -1254,4 +1254,10 @@
-   <machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <sev>
-+    <cbitpos>47</cbitpos>
-+    <reducedPhysBits>1</reducedPhysBits>
-+    <pdh>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</pdh>
-+    <certChain>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</certChain>
-+  </sev>
- </qemuCaps>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-caps-Introduce-a-capability-for-egl-headless.patch b/SOURCES/libvirt-qemu-caps-Introduce-a-capability-for-egl-headless.patch
deleted file mode 100644
index c8239d6..0000000
--- a/SOURCES/libvirt-qemu-caps-Introduce-a-capability-for-egl-headless.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From 4628d3e178430d418703f39e86d63e22a6af209f Mon Sep 17 00:00:00 2001
-Message-Id: <4628d3e178430d418703f39e86d63e22a6af209f@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:57 +0200
-Subject: [PATCH] qemu: caps: Introduce a capability for egl-headless
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since QEMU 2.10, it's possible to use a new type of display -
-egl-headless which uses drm nodes to provide OpenGL support. This patch
-adds a capability for that. However, since QEMU doesn't provide a QMP
-command to probe it, we have to base the capability on specific QEMU
-version.
-
-Acked-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 7ab7d0ed49d8501198b33c655cc646667d333f8c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                       | 6 ++++++
- src/qemu/qemu_capabilities.h                       | 1 +
- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   | 1 +
- 14 files changed, 19 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 23b483349f..df358f8967 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -503,6 +503,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "machine.pseries.cap-hpt-max-page-size",
-               "machine.pseries.cap-htm",
-               "usb-storage.werror",
-+              "egl-headless",
-     );
- 
- 
-@@ -4030,6 +4031,11 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
-         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-     }
- 
-+    /* '-display egl-headless' cmdline option is supported since QEMU 2.10, but
-+     * there's no way to probe it */
-+    if (qemuCaps->version >= 2010000)
-+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
-+
-     /* no way to query for -numa dist */
-     if (qemuCaps->version >= 2010000)
-         virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 1fa0ebfea3..55221e7e57 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -487,6 +487,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.cap-hpt-max-page-size */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
-     QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
-+    QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-index 169641063c..a70e050765 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-@@ -159,6 +159,7 @@
-   <flag name='hda-output'/>
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-+  <flag name='egl-headless'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>307647</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-index 92c095abd2..72709905d8 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-@@ -158,6 +158,7 @@
-   <flag name='hda-output'/>
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-+  <flag name='egl-headless'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>386992</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-index 5e22e21224..7347f5683f 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-@@ -119,6 +119,7 @@
-   <flag name='sdl-gl'/>
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-+  <flag name='egl-headless'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>307899</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-index 10b066bff1..d69a148cd2 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-@@ -203,6 +203,7 @@
-   <flag name='vmgenid'/>
-   <flag name='vhost-vsock'/>
-   <flag name='mch'/>
-+  <flag name='egl-headless'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>367995</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-index 6ca2e57ef8..b359f9a049 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-@@ -126,6 +126,7 @@
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-   <flag name='tpm-emulator'/>
-+  <flag name='egl-headless'/>
-   <version>2011000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>346751</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-index c52e44a498..210f774c4e 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-@@ -207,6 +207,7 @@
-   <flag name='tpm-emulator'/>
-   <flag name='mch'/>
-   <flag name='mch.extended-tseg-mbytes'/>
-+  <flag name='egl-headless'/>
-   <version>2011000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>371455</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-index ecc029f403..80e7afec04 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-@@ -169,6 +169,7 @@
-   <flag name='vhost-vsock'/>
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-+  <flag name='egl-headless'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>347550</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-index 7139179304..c4b09c0003 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-@@ -167,6 +167,7 @@
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-   <flag name='machine.pseries.cap-htm'/>
-+  <flag name='egl-headless'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>428334</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-index 87d189e58d..1ff2fe45e1 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-@@ -133,6 +133,7 @@
-   <flag name='vhost-vsock'/>
-   <flag name='chardev-fd-pass'/>
-   <flag name='tpm-emulator'/>
-+  <flag name='egl-headless'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>375999</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index 9c1f6c327c..37d17786cf 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -211,6 +211,7 @@
-   <flag name='mch'/>
-   <flag name='mch.extended-tseg-mbytes'/>
-   <flag name='sev-guest'/>
-+  <flag name='egl-headless'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>416196</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-index 33cd00e613..57bf5dba11 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-@@ -167,6 +167,7 @@
-   <flag name='tpm-emulator'/>
-   <flag name='machine.pseries.cap-hpt-max-page-size'/>
-   <flag name='machine.pseries.cap-htm'/>
-+  <flag name='egl-headless'/>
-   <version>2012050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>446771</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index cd036d9323..431910a9e3 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -214,6 +214,7 @@
-   <flag name='mch.extended-tseg-mbytes'/>
-   <flag name='sev-guest'/>
-   <flag name='usb-storage.werror'/>
-+  <flag name='egl-headless'/>
-   <version>2012090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>438109</microcodeVersion>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-caps-Use-CAP_DAC_OVERRIDE-for-probing-to-avoid-permission-issues.patch b/SOURCES/libvirt-qemu-caps-Use-CAP_DAC_OVERRIDE-for-probing-to-avoid-permission-issues.patch
deleted file mode 100644
index e2f4672..0000000
--- a/SOURCES/libvirt-qemu-caps-Use-CAP_DAC_OVERRIDE-for-probing-to-avoid-permission-issues.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 0b90fc0c5d4bd3eecbf8b51ff996116bc137d199 Mon Sep 17 00:00:00 2001
-Message-Id: <0b90fc0c5d4bd3eecbf8b51ff996116bc137d199@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 1 Feb 2019 17:21:58 +0100
-Subject: [PATCH] qemu: caps: Use CAP_DAC_OVERRIDE for probing to avoid
- permission issues
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is mainly about /dev/sev and its default permissions 0600. Of
-course, rule of 'tinfoil' would be that we can't trust anything, but the
-probing code in QEMU is considered safe from security's perspective + we
-can't create an udev rule for this at the moment, because ioctls and
-file system permissions aren't cross-checked in kernel and therefore a
-user with read permissions could issue a 'privileged' operation on SEV
-which is currently only limited to root.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1665400
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit a2d3dea9d41dba313d9566120a8ec9d358567bd0)
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 11 +++++++++++
- src/util/virutil.c           | 31 +++++++++++++++++++++++++++++--
- 2 files changed, 40 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index ba8c717e22..f71cd08f4d 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -55,6 +55,10 @@
- #include <stdarg.h>
- #include <sys/utsname.h>
- 
-+#if WITH_CAPNG
-+# include <cap-ng.h>
-+#endif
-+
- #define VIR_FROM_THIS VIR_FROM_QEMU
- 
- VIR_LOG_INIT("qemu.qemu_capabilities");
-@@ -4474,6 +4478,13 @@ virQEMUCapsInitQMPCommandRun(virQEMUCapsInitQMPCommandPtr cmd,
-                                     NULL);
-     virCommandAddEnvPassCommon(cmd->cmd);
-     virCommandClearCaps(cmd->cmd);
-+
-+#if WITH_CAPNG
-+    /* QEMU might run into permission issues, e.g. /dev/sev (0600), override
-+     * them just for the purpose of probing */
-+    virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE);
-+#endif
-+
-     virCommandSetGID(cmd->cmd, cmd->runGid);
-     virCommandSetUID(cmd->cmd, cmd->runUid);
- 
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index a908422feb..88e17e2c0f 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1474,8 +1474,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
- {
-     size_t i;
-     int capng_ret, ret = -1;
--    bool need_setgid = false, need_setuid = false;
-+    bool need_setgid = false;
-+    bool need_setuid = false;
-     bool need_setpcap = false;
-+    const char *capstr = NULL;
- 
-     /* First drop all caps (unless the requested uid is "unchanged" or
-      * root and clearExistingCaps wasn't requested), then add back
-@@ -1484,14 +1486,18 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
-      */
- 
-     if (clearExistingCaps || (uid != (uid_t)-1 && uid != 0))
--       capng_clear(CAPNG_SELECT_BOTH);
-+        capng_clear(CAPNG_SELECT_BOTH);
- 
-     for (i = 0; i <= CAP_LAST_CAP; i++) {
-+        capstr = capng_capability_to_name(i);
-+
-         if (capBits & (1ULL << i)) {
-             capng_update(CAPNG_ADD,
-                          CAPNG_EFFECTIVE|CAPNG_INHERITABLE|
-                          CAPNG_PERMITTED|CAPNG_BOUNDING_SET,
-                          i);
-+
-+            VIR_DEBUG("Added '%s' to child capabilities' set", capstr);
-         }
-     }
- 
-@@ -1551,6 +1557,27 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
-         goto cleanup;
-     }
- 
-+# ifdef PR_CAP_AMBIENT
-+    /* we couldn't do this in the loop earlier above, because the capabilities
-+     * were not applied yet, since in order to add a capability into the AMBIENT
-+     * set, it has to be present in both the PERMITTED and INHERITABLE sets
-+     * (capabilities(7))
-+     */
-+    for (i = 0; i <= CAP_LAST_CAP; i++) {
-+        capstr = capng_capability_to_name(i);
-+
-+        if (capBits & (1ULL << i)) {
-+            if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i, 0, 0) < 0) {
-+                virReportSystemError(errno,
-+                                     _("prctl failed to enable '%s' in the "
-+                                       "AMBIENT set"),
-+                                     capstr);
-+                goto cleanup;
-+            }
-+        }
-+    }
-+# endif
-+
-     /* Set bounding set while we have CAP_SETPCAP.  Unfortunately we cannot
-      * do this if we failed to get the capability above, so ignore the
-      * return value.
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-cgroup-Expose-dev-sev-only-to-domains-that-require-SEV.patch b/SOURCES/libvirt-qemu-cgroup-Expose-dev-sev-only-to-domains-that-require-SEV.patch
deleted file mode 100644
index c641d4b..0000000
--- a/SOURCES/libvirt-qemu-cgroup-Expose-dev-sev-only-to-domains-that-require-SEV.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 03cf4bcbcfa55297b2359875640819a755b7860c Mon Sep 17 00:00:00 2001
-Message-Id: <03cf4bcbcfa55297b2359875640819a755b7860c@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 1 Feb 2019 17:21:55 +0100
-Subject: [PATCH] qemu: cgroup: Expose /dev/sev/ only to domains that require
- SEV
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-SEV has a limit on number of concurrent guests. From security POV we
-should only expose resources (any resources for that matter) to domains
-that truly need them.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit a404ac34768e975bd420d1eeac3811563da67e3f)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1665400
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_cgroup.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
-index fd54333fb9..9f2fc1b062 100644
---- a/src/qemu/qemu_cgroup.c
-+++ b/src/qemu/qemu_cgroup.c
-@@ -695,6 +695,22 @@ qemuTeardownChardevCgroup(virDomainObjPtr vm,
- }
- 
- 
-+static int
-+qemuSetupSEVCgroup(virDomainObjPtr vm)
-+{
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-+    int ret;
-+
-+    if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
-+        return 0;
-+
-+    ret = virCgroupAllowDevicePath(priv->cgroup, "/dev/sev",
-+                                   VIR_CGROUP_DEVICE_RW, false);
-+    virDomainAuditCgroupPath(vm, priv->cgroup, "allow", "/dev/sev",
-+                             "rw", ret);
-+    return ret;
-+}
-+
- static int
- qemuSetupDevicesCgroup(virDomainObjPtr vm)
- {
-@@ -802,6 +818,9 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm)
-             goto cleanup;
-     }
- 
-+    if (vm->def->sev && qemuSetupSEVCgroup(vm) < 0)
-+        goto cleanup;
-+
-     ret = 0;
-  cleanup:
-     virObjectUnref(cfg);
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-checkpoint-Allow-checkpoint-redefine-for-offline-VMs.patch b/SOURCES/libvirt-qemu-checkpoint-Allow-checkpoint-redefine-for-offline-VMs.patch
new file mode 100644
index 0000000..e09952b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Allow-checkpoint-redefine-for-offline-VMs.patch
@@ -0,0 +1,59 @@
+From 3d1a4ab1ce9fce88a759e11532b6891903f86a4a Mon Sep 17 00:00:00 2001
+Message-Id: <3d1a4ab1ce9fce88a759e11532b6891903f86a4a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 3 Apr 2020 14:32:57 +0200
+Subject: [PATCH] qemu: checkpoint: Allow checkpoint redefine for offline VMs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Skip the liveness and capability checks when redefining checkpoints as
+we don't need qemu interactions to update the metadata.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 135a0b3f7142a8d4f591bb24b3ae7d0f36877bf7)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1819755
+
+Message-Id: <f1d392d78abde1ffbe1c0244d442bc0ec6aa18a6.1585916255.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 16480518fa..34cf122eb3 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -649,16 +649,18 @@ qemuCheckpointCreateXML(virDomainPtr domain,
+         update_current = false;
+     }
+ 
+-    if (!virDomainObjIsActive(vm)) {
+-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+-                       _("cannot create checkpoint for inactive domain"));
+-        return NULL;
+-    }
++    if (!redefine) {
++        if (!virDomainObjIsActive(vm)) {
++            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                           _("cannot create checkpoint for inactive domain"));
++            return NULL;
++        }
+ 
+-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
+-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+-                       _("incremental backup is not supported yet"));
+-        return NULL;
++        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
++            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                           _("incremental backup is not supported yet"));
++            return NULL;
++        }
+     }
+ 
+     if (!(def = virDomainCheckpointDefParseString(xmlDesc, driver->xmlopt,
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Don-t-chain-bitmaps-for-checkpoints.patch b/SOURCES/libvirt-qemu-checkpoint-Don-t-chain-bitmaps-for-checkpoints.patch
new file mode 100644
index 0000000..0362acc
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Don-t-chain-bitmaps-for-checkpoints.patch
@@ -0,0 +1,97 @@
+From 6c139a45537d021f6fd4287bd3c74cba06e6a264 Mon Sep 17 00:00:00 2001
+Message-Id: <6c139a45537d021f6fd4287bd3c74cba06e6a264@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:47 +0200
+Subject: [PATCH] qemu: checkpoint: Don't chain bitmaps for checkpoints
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Chaining bitmaps for checkpoints (disabling the active one and creating
+a new) severely overcomplicated all operations in regards to bitmaps.
+
+Specifically it requires us re-matching the on-disk state to the
+internal metadata and in case of merging during block jobs it makes it
+almost impossible to cover all corner cases.
+
+Since the checkpoints and incremental backups were not yet enabled,
+let's change the design to keep one bitmap per checkpoint. In case of
+layered snapshots this will be filled in by using dirty-bitmap-populate.
+
+Finally the main reason for this unnecessary complexity was the fear
+that qemu's performance could degrade. In the end I think that
+addressing the performance issue will be better done in qemu (e.g by
+keeping an internal bitmap updated with changes and merging it
+periodically back to the real bitmaps. QEMU writes out changes to disk
+at shutdown so consistency is not a problem).
+
+Removing the relationships between bitmaps frees us from complex
+handling and also makes all the surrounding code more robust as one
+broken bitmap doesn't necessarily invalidate whole chains of backups.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 1f92aa454aa3b04ece9f7479d517bf08ba547f0a)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <a863b2015f72690ebd90fd518e8163e194909214.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 34cf122eb3..9762a3eb9d 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -460,7 +460,6 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
+ static int
+ qemuCheckpointAddActions(virDomainObjPtr vm,
+                          virJSONValuePtr actions,
+-                         virDomainMomentObjPtr old_current,
+                          virDomainCheckpointDefPtr def)
+ {
+     size_t i;
+@@ -468,7 +467,6 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+     for (i = 0; i < def->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &def->disks[i];
+         virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
+-        virDomainCheckpointDiskDef *parentchkdisk = NULL;
+ 
+         /* checkpoint definition validator mandates that the corresponding
+          * domdisk should exist */
+@@ -479,23 +477,6 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+         if (qemuMonitorTransactionBitmapAdd(actions, domdisk->src->nodeformat,
+                                             chkdisk->bitmap, true, false, 0) < 0)
+             return -1;
+-
+-        /* We only want one active bitmap for a disk along the
+-         * checkpoint chain, then later differential backups will
+-         * merge the bitmaps (only one active) between the bounding
+-         * checkpoint and the leaf checkpoint.  If the same disks are
+-         * involved in each checkpoint, this search terminates in one
+-         * iteration; but it is also possible to have to search
+-         * further than the immediate parent to find another
+-         * checkpoint with a bitmap on the same disk.  */
+-        if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, old_current,
+-                                                                  chkdisk->name))) {
+-
+-            if (qemuMonitorTransactionBitmapDisable(actions,
+-                                                    domdisk->src->nodeformat,
+-                                                    parentchkdisk->bitmap) < 0)
+-                return -1;
+-        }
+     }
+     return 0;
+ }
+@@ -544,7 +525,7 @@ qemuCheckpointCreateCommon(virQEMUDriverPtr driver,
+ 
+     tmpactions = virJSONValueNewArray();
+ 
+-    if (qemuCheckpointAddActions(vm, tmpactions, parent, *def) < 0)
++    if (qemuCheckpointAddActions(vm, tmpactions, *def) < 0)
+         return -1;
+ 
+     if (!(*chk = virDomainCheckpointAssignDef(vm->checkpoints, *def)))
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Don-t-merge-checkpoints-during-deletion.patch b/SOURCES/libvirt-qemu-checkpoint-Don-t-merge-checkpoints-during-deletion.patch
new file mode 100644
index 0000000..13e9be6
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Don-t-merge-checkpoints-during-deletion.patch
@@ -0,0 +1,312 @@
+From e7b1604c5848861db0896b3c7869c0ad1d971084 Mon Sep 17 00:00:00 2001
+Message-Id: <e7b1604c5848861db0896b3c7869c0ad1d971084@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:53 +0200
+Subject: [PATCH] qemu: checkpoint: Don't merge checkpoints during deletion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Now that we've switched to the simple handling, the first thing that can
+be massively simplified is checkpoint deletion. We now need to only go
+through the backing chain and find the appropriately named bitmaps and
+delete them, no complex lookups or merging.
+
+Note that compared to other functions this deletes the bitmap in all
+layers compared to others where we expect only exactly 1 bitmap of a
+name in the backing chain to prevent potential problems.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 4c33c5568c3ee3c5952e5f3b217d78df95683b71)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <aa99845392d5d5141672bf8d50655034e6783794.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 153 ++++++-------------------------------
+ src/qemu/qemu_checkpoint.h |   1 -
+ tests/qemublocktest.c      |   7 +-
+ 3 files changed, 25 insertions(+), 136 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 9762a3eb9d..b44ff05c32 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -105,140 +105,41 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm,
+ }
+ 
+ 
+-/**
+- * qemuCheckpointFindActiveDiskInParent:
+- * @vm: domain object
+- * @from: starting moment object
+- * @diskname: name (target) of the disk to find
+- *
+- * Find the first checkpoint starting from @from continuing through parents
+- * of the checkpoint which describes disk @diskname. Return the pointer to the
+- * definition of the disk.
+- */
+-static virDomainCheckpointDiskDef *
+-qemuCheckpointFindActiveDiskInParent(virDomainObjPtr vm,
+-                                     virDomainMomentObjPtr from,
+-                                     const char *diskname)
+-{
+-    virDomainMomentObjPtr parent = from;
+-    virDomainCheckpointDefPtr parentdef = NULL;
+-    size_t i;
+-
+-    while (parent) {
+-        parentdef = virDomainCheckpointObjGetDef(parent);
+-
+-        for (i = 0; i < parentdef->ndisks; i++) {
+-            virDomainCheckpointDiskDef *chkdisk = &parentdef->disks[i];
+-
+-            if (STRNEQ(chkdisk->name, diskname))
+-                continue;
+-
+-            /* currently inspected checkpoint doesn't describe the disk,
+-             * continue into parent checkpoint */
+-            if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+-                break;
+-
+-            return chkdisk;
+-        }
+-
+-        parent = virDomainCheckpointFindByName(vm->checkpoints,
+-                                               parentdef->parent.parent_name);
+-    }
+-
+-    return NULL;
+-}
+-
+-
+ int
+ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+                                  virHashTablePtr blockNamedNodeData,
+                                  const char *delbitmap,
+-                                 const char *parentbitmap,
+                                  virJSONValuePtr actions,
+                                  const char *diskdst,
+                                  GSList **reopenimages)
+ {
+-    virStorageSourcePtr n = src;
++    virStorageSourcePtr n;
++    bool found = false;
+ 
+     /* find the backing chain entry with bitmap named '@delbitmap' */
+-    while (n) {
+-        qemuBlockNamedNodeDataBitmapPtr tmp;
+-
+-        if ((tmp = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                         n, delbitmap))) {
+-            break;
+-        }
+-
+-        n = n->backingStore;
+-    }
+-
+-    if (!n) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-                       _("bitmap '%s' not found in backing chain of '%s'"),
+-                       delbitmap, diskdst);
+-        return -1;
+-    }
+-
+-    while (n) {
+-        qemuBlockNamedNodeDataBitmapPtr srcbitmap;
+-
+-        if (!(srcbitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                                n, delbitmap)))
+-            break;
+-
+-        /* For the actual checkpoint deletion we will merge any bitmap into the
+-         * bitmap of the parent checkpoint (@parentbitmap) or for any image
+-         * where the parent checkpoint bitmap is not present we must rename
+-         * the bitmap of the deleted checkpoint into the bitmap of the parent
+-         * checkpoint as qemu can't currently take the allocation map and turn
+-         * it into a bitmap and thus we wouldn't be able to do a backup. */
+-        if (parentbitmap) {
+-            qemuBlockNamedNodeDataBitmapPtr dstbitmap;
+-            g_autoptr(virJSONValue) arr = NULL;
+-
+-            dstbitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+-                                                              n, parentbitmap);
+-
+-            if (dstbitmap) {
+-                if (srcbitmap->recording && !dstbitmap->recording) {
+-                    if (qemuMonitorTransactionBitmapEnable(actions,
+-                                                           n->nodeformat,
+-                                                           dstbitmap->name) < 0)
+-                        return -1;
+-                }
+-
+-            } else {
+-                if (qemuMonitorTransactionBitmapAdd(actions,
+-                                                    n->nodeformat,
+-                                                    parentbitmap,
+-                                                    true,
+-                                                    !srcbitmap->recording,
+-                                                    srcbitmap->granularity) < 0)
+-                    return -1;
+-            }
++    for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
++        qemuBlockNamedNodeDataBitmapPtr bitmapdata;
+ 
+-            arr = virJSONValueNewArray();
+-
+-            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
+-                                                                 n->nodeformat,
+-                                                                 srcbitmap->name) < 0)
+-                return -1;
++        if (!(bitmapdata = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                                 n, delbitmap)))
++            continue;
+ 
+-            if (qemuMonitorTransactionBitmapMerge(actions,
+-                                                  n->nodeformat,
+-                                                  parentbitmap, &arr) < 0)
+-                return -1;
+-        }
++        found = true;
+ 
+         if (qemuMonitorTransactionBitmapRemove(actions,
+                                                n->nodeformat,
+-                                               srcbitmap->name) < 0)
++                                               bitmapdata->name) < 0)
+             return -1;
+ 
+         if (n != src)
+             *reopenimages = g_slist_prepend(*reopenimages, n);
++    }
+ 
+-        n = n->backingStore;
++    if (!found) {
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("bitmap '%s' not found in backing chain of '%s'"),
++                       delbitmap, diskdst);
++        return -1;
+     }
+ 
+     return 0;
+@@ -247,8 +148,7 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+ 
+ static int
+ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+-                             virDomainCheckpointDefPtr chkdef,
+-                             virDomainMomentObjPtr parent)
++                             virDomainCheckpointDefPtr chkdef)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     virQEMUDriverPtr driver = priv->driver;
+@@ -270,8 +170,6 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     for (i = 0; i < chkdef->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &chkdef->disks[i];
+         virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
+-        virDomainCheckpointDiskDef *parentchkdisk = NULL;
+-        const char *parentbitmap = NULL;
+ 
+         /* domdisk can be missing e.g. when it was unplugged */
+         if (!domdisk)
+@@ -280,15 +178,8 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+         if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+             continue;
+ 
+-        /* If any ancestor checkpoint has a bitmap for the same
+-         * disk, then this bitmap must be merged to the
+-         * ancestor. */
+-        if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, parent,
+-                                                                  chkdisk->name)))
+-            parentbitmap = parentchkdisk->bitmap;
+-
+         if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, blockNamedNodeData,
+-                                             chkdisk->bitmap, parentbitmap,
++                                             chkdisk->bitmap,
+                                              actions, domdisk->dst,
+                                              &reopenimages) < 0)
+             return -1;
+@@ -336,7 +227,6 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+                       bool update_parent,
+                       bool metadata_only)
+ {
+-    virDomainMomentObjPtr parent = NULL;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     g_autofree char *chkFile = NULL;
+     bool chkcurrent = chk == virDomainCheckpointGetCurrent(vm->checkpoints);
+@@ -352,14 +242,17 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+ 
+     if (!metadata_only) {
+         virDomainCheckpointDefPtr chkdef = virDomainCheckpointObjGetDef(chk);
+-        parent = virDomainCheckpointFindByName(vm->checkpoints,
+-                                               chk->def->parent_name);
+-        if (qemuCheckpointDiscardBitmaps(vm, chkdef, parent) < 0)
++        if (qemuCheckpointDiscardBitmaps(vm, chkdef) < 0)
+             return -1;
+     }
+ 
+     if (chkcurrent) {
++        virDomainMomentObjPtr parent = NULL;
++
+         virDomainCheckpointSetCurrent(vm->checkpoints, NULL);
++        parent = virDomainCheckpointFindByName(vm->checkpoints,
++                                               chk->def->parent_name);
++
+         if (update_parent && parent) {
+             virDomainCheckpointSetCurrent(vm->checkpoints, parent);
+             if (qemuCheckpointWriteMetadata(vm, parent,
+diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h
+index cf1e9e46cb..0d267a188c 100644
+--- a/src/qemu/qemu_checkpoint.h
++++ b/src/qemu/qemu_checkpoint.h
+@@ -76,7 +76,6 @@ int
+ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+                                  virHashTablePtr blockNamedNodeData,
+                                  const char *delbitmap,
+-                                 const char *parentbitmap,
+                                  virJSONValuePtr actions,
+                                  const char *diskdst,
+                                  GSList **reopenimages);
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 2f675d7e03..201e5df6b4 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -830,7 +830,6 @@ struct testQemuCheckpointDeleteMergeData {
+     const char *name;
+     virStorageSourcePtr chain;
+     const char *deletebitmap;
+-    const char *parentbitmap;
+     const char *nodedatafile;
+ };
+ 
+@@ -864,7 +863,6 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+     if (qemuCheckpointDiscardDiskBitmaps(data->chain,
+                                          nodedata,
+                                          data->deletebitmap,
+-                                         data->parentbitmap,
+                                          actions,
+                                          "testdisk",
+                                          &reopenimages) >= 0) {
+@@ -1318,19 +1316,18 @@ mymain(void)
+ 
+     TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
+ 
+-#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, parbmp, named) \
++#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, named) \
+     do { \
+         checkpointdeletedata.name = testname; \
+         checkpointdeletedata.chain = bitmapSourceChain; \
+         checkpointdeletedata.deletebitmap = delbmp; \
+-        checkpointdeletedata.parentbitmap = parbmp; \
+         checkpointdeletedata.nodedatafile = named; \
+         if (virTestRun("checkpoint delete " testname, \
+                        testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \
+         ret = -1; \
+     } while (0)
+ 
+-    TEST_CHECKPOINT_DELETE_MERGE("empty", "a", NULL, "empty");
++    TEST_CHECKPOINT_DELETE_MERGE("empty", "a", "empty");
+ 
+ #define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
+     do { \
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Extract-calculation-of-bitmap-merging-for-checkpoint-deletion.patch b/SOURCES/libvirt-qemu-checkpoint-Extract-calculation-of-bitmap-merging-for-checkpoint-deletion.patch
new file mode 100644
index 0000000..6bf6c32
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Extract-calculation-of-bitmap-merging-for-checkpoint-deletion.patch
@@ -0,0 +1,140 @@
+From 2de41b514449c5ab85a7a0943456a44909122874 Mon Sep 17 00:00:00 2001
+Message-Id: <2de41b514449c5ab85a7a0943456a44909122874@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:57 +0100
+Subject: [PATCH] qemu: checkpoint: Extract calculation of bitmap merging for
+ checkpoint deletion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This will allow some testing before refactoring.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit d9dfc1f7de2e54c015504e0a0370e8a89b5e971a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <2b3c69597aa8f99af55e30f71d4496b6ae620d31.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 72 ++++++++++++++++++++++++--------------
+ src/qemu/qemu_checkpoint.h |  7 ++++
+ 2 files changed, 53 insertions(+), 26 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 1100f6e744..e75cdd0458 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -148,6 +148,46 @@ qemuCheckpointFindActiveDiskInParent(virDomainObjPtr vm,
+ }
+ 
+ 
++int
++qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
++                                 const char *delbitmap,
++                                 const char *parentbitmap,
++                                 bool chkcurrent,
++                                 virJSONValuePtr actions)
++{
++    if (parentbitmap) {
++        g_autoptr(virJSONValue) arr = NULL;
++
++        if (!(arr = virJSONValueNewArray()))
++            return -1;
++
++        if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
++                                                             src->nodeformat,
++                                                             delbitmap) < 0)
++            return -1;
++
++        if (chkcurrent) {
++            if (qemuMonitorTransactionBitmapEnable(actions,
++                                                   src->nodeformat,
++                                                   parentbitmap) < 0)
++                return -1;
++        }
++
++        if (qemuMonitorTransactionBitmapMerge(actions,
++                                              src->nodeformat,
++                                              parentbitmap, &arr) < 0)
++            return -1;
++    }
++
++    if (qemuMonitorTransactionBitmapRemove(actions,
++                                           src->nodeformat,
++                                           delbitmap) < 0)
++        return -1;
++
++    return 0;
++}
++
++
+ static int
+ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                              virDomainCheckpointDefPtr chkdef,
+@@ -167,6 +207,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+         virDomainCheckpointDiskDef *chkdisk = &chkdef->disks[i];
+         virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
+         virDomainCheckpointDiskDef *parentchkdisk = NULL;
++        const char *parentbitmap = NULL;
+ 
+         /* domdisk can be missing e.g. when it was unplugged */
+         if (!domdisk)
+@@ -178,33 +219,12 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+         /* If any ancestor checkpoint has a bitmap for the same
+          * disk, then this bitmap must be merged to the
+          * ancestor. */
+-        if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, parent, chkdisk->name))) {
+-            g_autoptr(virJSONValue) arr = NULL;
++        if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, parent,
++                                                                  chkdisk->name)))
++            parentbitmap = parentchkdisk->name;
+ 
+-            if (!(arr = virJSONValueNewArray()))
+-                return -1;
+-
+-            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
+-                                                                 domdisk->src->nodeformat,
+-                                                                 chkdisk->bitmap) < 0)
+-                return -1;
+-
+-            if (chkcurrent) {
+-                if (qemuMonitorTransactionBitmapEnable(actions,
+-                                                       domdisk->src->nodeformat,
+-                                                       parentchkdisk->bitmap) < 0)
+-                    return -1;
+-            }
+-
+-            if (qemuMonitorTransactionBitmapMerge(actions,
+-                                                  domdisk->src->nodeformat,
+-                                                  parentchkdisk->bitmap, &arr) < 0)
+-                return -1;
+-        }
+-
+-        if (qemuMonitorTransactionBitmapRemove(actions,
+-                                               domdisk->src->nodeformat,
+-                                               chkdisk->bitmap) < 0)
++        if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, chkdisk->bitmap,
++                                             parentbitmap, chkcurrent, actions) < 0)
+             return -1;
+     }
+ 
+diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h
+index eb85611ea6..85fd453d50 100644
+--- a/src/qemu/qemu_checkpoint.h
++++ b/src/qemu/qemu_checkpoint.h
+@@ -71,3 +71,10 @@ qemuCheckpointCreateFinalize(virQEMUDriverPtr driver,
+ void
+ qemuCheckpointRollbackMetadata(virDomainObjPtr vm,
+                                virDomainMomentObjPtr chk);
++
++int
++qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
++                                 const char *delbitmap,
++                                 const char *parentbitmap,
++                                 bool chkcurrent,
++                                 virJSONValuePtr actions);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Introduce-helper-to-find-checkpoint-disk-definition-in-parents.patch b/SOURCES/libvirt-qemu-checkpoint-Introduce-helper-to-find-checkpoint-disk-definition-in-parents.patch
new file mode 100644
index 0000000..c1357b6
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Introduce-helper-to-find-checkpoint-disk-definition-in-parents.patch
@@ -0,0 +1,215 @@
+From a7a774b357e4f56ef4860dbc04065197e3dd9640 Mon Sep 17 00:00:00 2001
+Message-Id: <a7a774b357e4f56ef4860dbc04065197e3dd9640@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:56 +0100
+Subject: [PATCH] qemu: checkpoint: Introduce helper to find checkpoint disk
+ definition in parents
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The algorithm is used in two places to find the parent checkpoint object
+which contains given disk and then uses data from the disk. Additionally
+the code is written in a very non-obvious way. Factor out the lookup of
+the disk into a function which also simplifies the callers.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 6796194a28bd42bcbb237ffae6faea262fcce660)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <4b9ca38d8272158c6d254cb1d3dad21cc736ad9f.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 127 ++++++++++++++++++++-----------------
+ 1 file changed, 70 insertions(+), 57 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 326707e098..1100f6e744 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -104,6 +104,50 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm,
+ }
+ 
+ 
++/**
++ * qemuCheckpointFindActiveDiskInParent:
++ * @vm: domain object
++ * @from: starting moment object
++ * @diskname: name (target) of the disk to find
++ *
++ * Find the first checkpoint starting from @from continuing through parents
++ * of the checkpoint which describes disk @diskname. Return the pointer to the
++ * definition of the disk.
++ */
++static virDomainCheckpointDiskDef *
++qemuCheckpointFindActiveDiskInParent(virDomainObjPtr vm,
++                                     virDomainMomentObjPtr from,
++                                     const char *diskname)
++{
++    virDomainMomentObjPtr parent = from;
++    virDomainCheckpointDefPtr parentdef = NULL;
++    size_t i;
++
++    while (parent) {
++        parentdef = virDomainCheckpointObjGetDef(parent);
++
++        for (i = 0; i < parentdef->ndisks; i++) {
++            virDomainCheckpointDiskDef *chkdisk = &parentdef->disks[i];
++
++            if (STRNEQ(chkdisk->name, diskname))
++                continue;
++
++            /* currently inspected checkpoint doesn't describe the disk,
++             * continue into parent checkpoint */
++            if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++                break;
++
++            return chkdisk;
++        }
++
++        parent = virDomainCheckpointFindByName(vm->checkpoints,
++                                               parentdef->parent.parent_name);
++    }
++
++    return NULL;
++}
++
++
+ static int
+ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                              virDomainCheckpointDefPtr chkdef,
+@@ -112,13 +156,9 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     virQEMUDriverPtr driver = priv->driver;
+-    virDomainMomentObjPtr moment;
+-    virDomainCheckpointDefPtr parentdef = NULL;
+-    bool search_parents;
+     int rc;
+     g_autoptr(virJSONValue) actions = NULL;
+     size_t i;
+-    size_t j;
+ 
+     if (!(actions = virJSONValueNewArray()))
+         return -1;
+@@ -126,6 +166,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     for (i = 0; i < chkdef->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &chkdef->disks[i];
+         virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
++        virDomainCheckpointDiskDef *parentchkdisk = NULL;
+ 
+         /* domdisk can be missing e.g. when it was unplugged */
+         if (!domdisk)
+@@ -137,42 +178,28 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+         /* If any ancestor checkpoint has a bitmap for the same
+          * disk, then this bitmap must be merged to the
+          * ancestor. */
+-        search_parents = true;
+-        for (moment = parent;
+-             search_parents && moment;
+-             moment = virDomainCheckpointFindByName(vm->checkpoints,
+-                                                    parentdef->parent.parent_name)) {
+-            parentdef = virDomainCheckpointObjGetDef(moment);
+-            for (j = 0; j < parentdef->ndisks; j++) {
+-                virDomainCheckpointDiskDef *disk2;
+-                g_autoptr(virJSONValue) arr = NULL;
++        if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, parent, chkdisk->name))) {
++            g_autoptr(virJSONValue) arr = NULL;
+ 
+-                disk2 = &parentdef->disks[j];
+-                if (STRNEQ(chkdisk->name, disk2->name) ||
+-                    disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+-                    continue;
+-                search_parents = false;
++            if (!(arr = virJSONValueNewArray()))
++                return -1;
+ 
+-                if (!(arr = virJSONValueNewArray()))
+-                    return -1;
++            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
++                                                                 domdisk->src->nodeformat,
++                                                                 chkdisk->bitmap) < 0)
++                return -1;
+ 
+-                if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
+-                                                                     domdisk->src->nodeformat,
+-                                                                     chkdisk->bitmap) < 0)
+-                    return -1;
+-
+-                if (chkcurrent) {
+-                    if (qemuMonitorTransactionBitmapEnable(actions,
+-                                                           domdisk->src->nodeformat,
+-                                                           disk2->bitmap) < 0)
+-                        return -1;
+-                }
+-
+-                if (qemuMonitorTransactionBitmapMerge(actions,
+-                                                      domdisk->src->nodeformat,
+-                                                      disk2->bitmap, &arr) < 0)
++            if (chkcurrent) {
++                if (qemuMonitorTransactionBitmapEnable(actions,
++                                                       domdisk->src->nodeformat,
++                                                       parentchkdisk->bitmap) < 0)
+                     return -1;
+             }
++
++            if (qemuMonitorTransactionBitmapMerge(actions,
++                                                  domdisk->src->nodeformat,
++                                                  parentchkdisk->bitmap, &arr) < 0)
++                return -1;
+         }
+ 
+         if (qemuMonitorTransactionBitmapRemove(actions,
+@@ -324,14 +351,12 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+                          virDomainMomentObjPtr old_current,
+                          virDomainCheckpointDefPtr def)
+ {
+-    size_t i, j;
+-    virDomainCheckpointDefPtr olddef;
+-    virDomainMomentObjPtr parent;
+-    bool search_parents;
++    size_t i;
+ 
+     for (i = 0; i < def->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &def->disks[i];
+         virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
++        virDomainCheckpointDiskDef *parentchkdisk = NULL;
+ 
+         /* checkpoint definition validator mandates that the corresponding
+          * domdisk should exist */
+@@ -351,25 +376,13 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+          * iteration; but it is also possible to have to search
+          * further than the immediate parent to find another
+          * checkpoint with a bitmap on the same disk.  */
+-        search_parents = true;
+-        for (parent = old_current; search_parents && parent;
+-             parent = virDomainCheckpointFindByName(vm->checkpoints,
+-                                                    olddef->parent.parent_name)) {
+-            olddef = virDomainCheckpointObjGetDef(parent);
+-            for (j = 0; j < olddef->ndisks; j++) {
+-                virDomainCheckpointDiskDef *disk2;
++        if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, old_current,
++                                                                  chkdisk->name))) {
+ 
+-                disk2 = &olddef->disks[j];
+-                if (STRNEQ(chkdisk->name, disk2->name) ||
+-                    disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+-                    continue;
+-                if (qemuMonitorTransactionBitmapDisable(actions,
+-                                                        domdisk->src->nodeformat,
+-                                                        disk2->bitmap) < 0)
+-                    return -1;
+-                search_parents = false;
+-                break;
+-            }
++            if (qemuMonitorTransactionBitmapDisable(actions,
++                                                    domdisk->src->nodeformat,
++                                                    parentchkdisk->bitmap) < 0)
++                return -1;
+         }
+     }
+     return 0;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Introduce-support-for-deleting-checkpoints-accross-snapshots.patch b/SOURCES/libvirt-qemu-checkpoint-Introduce-support-for-deleting-checkpoints-accross-snapshots.patch
new file mode 100644
index 0000000..b62d94f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Introduce-support-for-deleting-checkpoints-accross-snapshots.patch
@@ -0,0 +1,298 @@
+From 30377cd627a919e51cc4bb60a8a57e94e73f016c Mon Sep 17 00:00:00 2001
+Message-Id: <30377cd627a919e51cc4bb60a8a57e94e73f016c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:12 +0100
+Subject: [PATCH] qemu: checkpoint: Introduce support for deleting checkpoints
+ accross snapshots
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow deleting of checkpoints when snapshots were created along. The
+code tracks and modifies the checkpoint list so that backups can still
+be taken with such a backing chain. This unfortunately requires to
+rename few bitmaps (by copying and deleting them) in some cases.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 30bc426071c0f5957af01181c063cd68ade97899)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <e9f416811658b2ba03968ae5fca783b7fb7649f7.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 112 ++++++++++++++++++++++++++++---------
+ src/qemu/qemu_checkpoint.h |   5 +-
+ tests/qemublocktest.c      |  34 +++++++----
+ 3 files changed, 111 insertions(+), 40 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index e75cdd0458..55061bbf76 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -24,6 +24,7 @@
+ #include "qemu_capabilities.h"
+ #include "qemu_monitor.h"
+ #include "qemu_domain.h"
++#include "qemu_block.h"
+ 
+ #include "virerror.h"
+ #include "virlog.h"
+@@ -150,39 +151,92 @@ qemuCheckpointFindActiveDiskInParent(virDomainObjPtr vm,
+ 
+ int
+ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
++                                 virHashTablePtr blockNamedNodeData,
+                                  const char *delbitmap,
+                                  const char *parentbitmap,
+-                                 bool chkcurrent,
+-                                 virJSONValuePtr actions)
++                                 virJSONValuePtr actions,
++                                 const char *diskdst)
+ {
+-    if (parentbitmap) {
+-        g_autoptr(virJSONValue) arr = NULL;
++    virStorageSourcePtr n = src;
+ 
+-        if (!(arr = virJSONValueNewArray()))
+-            return -1;
++    /* find the backing chain entry with bitmap named '@delbitmap' */
++    while (n) {
++        qemuBlockNamedNodeDataBitmapPtr tmp;
+ 
+-        if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
+-                                                             src->nodeformat,
+-                                                             delbitmap) < 0)
+-            return -1;
++        if ((tmp = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                         n, delbitmap))) {
++            break;
++        }
+ 
+-        if (chkcurrent) {
+-            if (qemuMonitorTransactionBitmapEnable(actions,
+-                                                   src->nodeformat,
+-                                                   parentbitmap) < 0)
++        n = n->backingStore;
++    }
++
++    if (!n) {
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("bitmap '%s' not found in backing chain of '%s'"),
++                       delbitmap, diskdst);
++        return -1;
++    }
++
++    while (n) {
++        qemuBlockNamedNodeDataBitmapPtr srcbitmap;
++
++        if (!(srcbitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                                n, delbitmap)))
++            break;
++
++        /* For the actual checkpoint deletion we will merge any bitmap into the
++         * bitmap of the parent checkpoint (@parentbitmap) or for any image
++         * where the parent checkpoint bitmap is not present we must rename
++         * the bitmap of the deleted checkpoint into the bitmap of the parent
++         * checkpoint as qemu can't currently take the allocation map and turn
++         * it into a bitmap and thus we wouldn't be able to do a backup. */
++        if (parentbitmap) {
++            qemuBlockNamedNodeDataBitmapPtr dstbitmap;
++            g_autoptr(virJSONValue) arr = NULL;
++
++            dstbitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                              n, parentbitmap);
++
++            if (dstbitmap) {
++                if (srcbitmap->recording && !dstbitmap->recording) {
++                    if (qemuMonitorTransactionBitmapEnable(actions,
++                                                           n->nodeformat,
++                                                           dstbitmap->name) < 0)
++                        return -1;
++                }
++
++            } else {
++                if (qemuMonitorTransactionBitmapAdd(actions,
++                                                    n->nodeformat,
++                                                    parentbitmap,
++                                                    true,
++                                                    !srcbitmap->recording,
++                                                    srcbitmap->granularity) < 0)
++                    return -1;
++            }
++
++            if (!(arr = virJSONValueNewArray()))
++                return -1;
++
++            if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
++                                                                 n->nodeformat,
++                                                                 srcbitmap->name) < 0)
++                return -1;
++
++            if (qemuMonitorTransactionBitmapMerge(actions,
++                                                  n->nodeformat,
++                                                  parentbitmap, &arr) < 0)
+                 return -1;
+         }
+ 
+-        if (qemuMonitorTransactionBitmapMerge(actions,
+-                                              src->nodeformat,
+-                                              parentbitmap, &arr) < 0)
++        if (qemuMonitorTransactionBitmapRemove(actions,
++                                               n->nodeformat,
++                                               srcbitmap->name) < 0)
+             return -1;
+-    }
+ 
+-    if (qemuMonitorTransactionBitmapRemove(actions,
+-                                           src->nodeformat,
+-                                           delbitmap) < 0)
+-        return -1;
++        n = n->backingStore;
++    }
+ 
+     return 0;
+ }
+@@ -191,11 +245,11 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+ static int
+ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                              virDomainCheckpointDefPtr chkdef,
+-                             bool chkcurrent,
+                              virDomainMomentObjPtr parent)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     virQEMUDriverPtr driver = priv->driver;
++    g_autoptr(virHashTable) blockNamedNodeData = NULL;
+     int rc;
+     g_autoptr(virJSONValue) actions = NULL;
+     size_t i;
+@@ -203,6 +257,11 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     if (!(actions = virJSONValueNewArray()))
+         return -1;
+ 
++    qemuDomainObjEnterMonitor(driver, vm);
++    blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon);
++    if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || !blockNamedNodeData)
++        return -1;
++
+     for (i = 0; i < chkdef->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &chkdef->disks[i];
+         virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
+@@ -223,8 +282,9 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                                                                   chkdisk->name)))
+             parentbitmap = parentchkdisk->name;
+ 
+-        if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, chkdisk->bitmap,
+-                                             parentbitmap, chkcurrent, actions) < 0)
++        if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, blockNamedNodeData,
++                                             chkdisk->bitmap, parentbitmap,
++                                             actions, domdisk->dst) < 0)
+             return -1;
+     }
+ 
+@@ -262,7 +322,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+         virDomainCheckpointDefPtr chkdef = virDomainCheckpointObjGetDef(chk);
+         parent = virDomainCheckpointFindByName(vm->checkpoints,
+                                                chk->def->parent_name);
+-        if (qemuCheckpointDiscardBitmaps(vm, chkdef, chkcurrent, parent) < 0)
++        if (qemuCheckpointDiscardBitmaps(vm, chkdef, parent) < 0)
+             return -1;
+     }
+ 
+diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h
+index 85fd453d50..976b1eed0f 100644
+--- a/src/qemu/qemu_checkpoint.h
++++ b/src/qemu/qemu_checkpoint.h
+@@ -74,7 +74,8 @@ qemuCheckpointRollbackMetadata(virDomainObjPtr vm,
+ 
+ int
+ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
++                                 virHashTablePtr blockNamedNodeData,
+                                  const char *delbitmap,
+                                  const char *parentbitmap,
+-                                 bool chkcurrent,
+-                                 virJSONValuePtr actions);
++                                 virJSONValuePtr actions,
++                                 const char *diskdst);
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index edaf82053d..e56f813424 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -704,6 +704,7 @@ struct testQemuCheckpointDeleteMergeData {
+     virStorageSourcePtr chain;
+     const char *deletebitmap;
+     const char *parentbitmap;
++    const char *nodedatafile;
+ };
+ 
+ 
+@@ -714,22 +715,30 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+     g_autofree char *actual = NULL;
+     g_autofree char *expectpath = NULL;
+     g_autoptr(virJSONValue) actions = NULL;
+-    bool currentcheckpoint;
++    g_autoptr(virJSONValue) nodedatajson = NULL;
++    g_autoptr(virHashTable) nodedata = NULL;
+ 
+     expectpath = g_strdup_printf("%s/%s%s-out.json", abs_srcdir,
+                                  checkpointDeletePrefix, data->name);
+ 
++    if (!(nodedatajson = virTestLoadFileJSON(bitmapDetectPrefix, data->nodedatafile,
++                                             ".json", NULL)))
++        return -1;
++
++    if (!(nodedata = qemuMonitorJSONBlockGetNamedNodeDataJSON(nodedatajson))) {
++        VIR_TEST_VERBOSE("failed to load nodedata JSON\n");
++        return -1;
++    }
++
+     if (!(actions = virJSONValueNewArray()))
+         return -1;
+ 
+-    /* hack to get the 'current' state until the function stops accepting it */
+-    currentcheckpoint = STREQ("current", data->deletebitmap);
+-
+     if (qemuCheckpointDiscardDiskBitmaps(data->chain,
++                                         nodedata,
+                                          data->deletebitmap,
+                                          data->parentbitmap,
+-                                         currentcheckpoint,
+-                                         actions) < 0) {
++                                         actions,
++                                         "testdisk") < 0) {
+         VIR_TEST_VERBOSE("failed to generate checkpoint delete transaction\n");
+         return -1;
+     }
+@@ -988,22 +997,23 @@ mymain(void)
+     TEST_BACKUP_BITMAP_CALCULATE("snapshot-intermediate", bitmapSourceChain, "d", "snapshots");
+     TEST_BACKUP_BITMAP_CALCULATE("snapshot-deep", bitmapSourceChain, "a", "snapshots");
+ 
+-#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, parbmp) \
++#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, parbmp, named) \
+     do { \
+         checkpointdeletedata.name = testname; \
+         checkpointdeletedata.chain = bitmapSourceChain; \
+         checkpointdeletedata.deletebitmap = delbmp; \
+         checkpointdeletedata.parentbitmap = parbmp; \
++        checkpointdeletedata.nodedatafile = named; \
+         if (virTestRun("checkpoint delete " testname, \
+                        testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \
+         ret = -1; \
+     } while (0)
+ 
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL);
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL, "basic");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a", "basic");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b", "basic");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c", "basic");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d", "basic");
+ 
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Store-whether-deleted-checkpoint-is-current-in-a-variable.patch b/SOURCES/libvirt-qemu-checkpoint-Store-whether-deleted-checkpoint-is-current-in-a-variable.patch
new file mode 100644
index 0000000..5941741
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Store-whether-deleted-checkpoint-is-current-in-a-variable.patch
@@ -0,0 +1,56 @@
+From f259cc67ba390d0d88f2db616514503714462742 Mon Sep 17 00:00:00 2001
+Message-Id: <f259cc67ba390d0d88f2db616514503714462742@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:49 +0100
+Subject: [PATCH] qemu: checkpoint: Store whether deleted checkpoint is current
+ in a variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Avoid two computations by using a boolean.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 606dc66b0958fe3545a318ae9bc6a62a67786378)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <d2da4b96b189a8ac30f8be642d854a8a71e35083.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 2fa5c1ae00..d13d4c2a37 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -117,6 +117,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+     size_t i, j;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     g_autofree char *chkFile = NULL;
++    bool chkcurrent = chk == virDomainCheckpointGetCurrent(vm->checkpoints);
+ 
+     if (!metadata_only && !virDomainObjIsActive(vm)) {
+         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+@@ -172,7 +173,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+                     if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, disk->bitmap) < 0)
+                         return -1;
+ 
+-                    if (chk == virDomainCheckpointGetCurrent(vm->checkpoints)) {
++                    if (chkcurrent) {
+                         if (qemuMonitorTransactionBitmapEnable(actions, node, disk2->bitmap) < 0)
+                             return -1;
+                     }
+@@ -192,7 +193,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+             return -1;
+     }
+ 
+-    if (chk == virDomainCheckpointGetCurrent(vm->checkpoints)) {
++    if (chkcurrent) {
+         virDomainCheckpointSetCurrent(vm->checkpoints, NULL);
+         if (update_parent && parent) {
+             virDomainCheckpointSetCurrent(vm->checkpoints, parent);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Track-and-relabel-images-for-bitmap-merging.patch b/SOURCES/libvirt-qemu-checkpoint-Track-and-relabel-images-for-bitmap-merging.patch
new file mode 100644
index 0000000..a591845
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Track-and-relabel-images-for-bitmap-merging.patch
@@ -0,0 +1,257 @@
+From eee9a7173898212632d42ef74777d6726ce29d5f Mon Sep 17 00:00:00 2001
+Message-Id: <eee9a7173898212632d42ef74777d6726ce29d5f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:15 +0100
+Subject: [PATCH] qemu: checkpoint: Track and relabel images for bitmap merging
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow qemu access to modify backing files in case when we want to delete
+a checkpoint.
+
+This patch adds tracking of which images need to be relabelled when
+calculating the transaction, the code to relabel them and rollback.
+
+To verify that stuff works we also output the list of images to relabel
+into the test case output files in qemublocktest.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 8e94e290104ffb5d9db051ab0b0ff36f58dbc943)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <36c2dc7f5d0d59aac90b2e272983f72476b00661.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c                    | 35 ++++++++++++++++---
+ src/qemu/qemu_checkpoint.h                    |  3 +-
+ tests/qemublocktest.c                         | 19 ++++++++--
+ .../snapshots-intermediate1-out.json          |  2 ++
+ .../snapshots-intermediate2-out.json          |  3 ++
+ .../snapshots-intermediate3-out.json          |  2 ++
+ .../snapshots-noparent-out.json               |  4 +++
+ ...ynthetic-checkpoint-intermediate1-out.json |  2 ++
+ ...ynthetic-checkpoint-intermediate2-out.json |  2 ++
+ ...ynthetic-checkpoint-intermediate3-out.json |  2 ++
+ ...ots-synthetic-checkpoint-noparent-out.json |  4 +++
+ 11 files changed, 70 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 55061bbf76..59b7f63fdc 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -155,7 +155,8 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+                                  const char *delbitmap,
+                                  const char *parentbitmap,
+                                  virJSONValuePtr actions,
+-                                 const char *diskdst)
++                                 const char *diskdst,
++                                 GSList **reopenimages)
+ {
+     virStorageSourcePtr n = src;
+ 
+@@ -235,6 +236,9 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+                                                srcbitmap->name) < 0)
+             return -1;
+ 
++        if (n != src)
++            *reopenimages = g_slist_prepend(*reopenimages, n);
++
+         n = n->backingStore;
+     }
+ 
+@@ -250,9 +254,12 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     virQEMUDriverPtr driver = priv->driver;
+     g_autoptr(virHashTable) blockNamedNodeData = NULL;
+-    int rc;
++    int rc = -1;
+     g_autoptr(virJSONValue) actions = NULL;
+     size_t i;
++    g_autoptr(GSList) reopenimages = NULL;
++    g_autoptr(GSList) relabelimages = NULL;
++    GSList *next;
+ 
+     if (!(actions = virJSONValueNewArray()))
+         return -1;
+@@ -284,16 +291,34 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+ 
+         if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, blockNamedNodeData,
+                                              chkdisk->bitmap, parentbitmap,
+-                                             actions, domdisk->dst) < 0)
++                                             actions, domdisk->dst,
++                                             &reopenimages) < 0)
+             return -1;
+     }
+ 
++    /* label any non-top images for read-write access */
++    for (next = reopenimages; next; next = next->next) {
++        virStorageSourcePtr src = next->data;
++
++        if (qemuDomainStorageSourceAccessAllow(driver, vm, src, false, false) < 0)
++            goto relabel;
++
++        relabelimages = g_slist_prepend(relabelimages, src);
++    }
++
+     qemuDomainObjEnterMonitor(driver, vm);
+     rc = qemuMonitorTransaction(priv->mon, &actions);
+-    if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
++    if (qemuDomainObjExitMonitor(driver, vm) < 0)
+         return -1;
+ 
+-    return 0;
++ relabel:
++    for (next = relabelimages; next; next = next->next) {
++        virStorageSourcePtr src = next->data;
++
++        ignore_value(qemuDomainStorageSourceAccessAllow(driver, vm, src, true, false));
++    }
++
++    return rc;
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h
+index 976b1eed0f..cf1e9e46cb 100644
+--- a/src/qemu/qemu_checkpoint.h
++++ b/src/qemu/qemu_checkpoint.h
+@@ -78,4 +78,5 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+                                  const char *delbitmap,
+                                  const char *parentbitmap,
+                                  virJSONValuePtr actions,
+-                                 const char *diskdst);
++                                 const char *diskdst,
++                                 GSList **reopenimages);
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 2e5927f3c1..ed8b061e2e 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -717,6 +717,9 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+     g_autoptr(virJSONValue) actions = NULL;
+     g_autoptr(virJSONValue) nodedatajson = NULL;
+     g_autoptr(virHashTable) nodedata = NULL;
++    g_autoptr(GSList) reopenimages = NULL;
++    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
++    GSList *tmp;
+ 
+     expectpath = g_strdup_printf("%s/%s%s-out.json", abs_srcdir,
+                                  checkpointDeletePrefix, data->name);
+@@ -738,14 +741,26 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+                                          data->deletebitmap,
+                                          data->parentbitmap,
+                                          actions,
+-                                         "testdisk") < 0) {
++                                         "testdisk",
++                                         &reopenimages) < 0) {
+         VIR_TEST_VERBOSE("failed to generate checkpoint delete transaction\n");
+         return -1;
+     }
+ 
+-    if (!(actual = virJSONValueToString(actions, true)))
++    if (virJSONValueToBuffer(actions, &buf, true) < 0)
+         return -1;
+ 
++    if (reopenimages) {
++        virBufferAddLit(&buf, "reopen nodes:\n");
++
++        for (tmp = reopenimages; tmp; tmp = tmp->next) {
++            virStorageSourcePtr src = tmp->data;
++            virBufferAsprintf(&buf, "%s\n", src->nodeformat);
++        }
++    }
++
++    actual = virBufferContentAndReset(&buf);
++
+     return virTestCompareToFile(actual, expectpath);
+ }
+ 
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+index 29fefeea63..c9bda3a17a 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+@@ -20,3 +20,5 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+index 4da21a9df7..8a0e3f2cff 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+@@ -57,3 +57,6 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-3-format
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+index dc87dd60b8..211bc40baf 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+@@ -57,3 +57,5 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+index 45a84b47c2..f750f44da2 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+@@ -21,3 +21,7 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-5-format
++libvirt-4-format
++libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+index e979691e6f..d7e6d18637 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+@@ -27,3 +27,5 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+index e82098918a..cfbff010c2 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+@@ -30,3 +30,5 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+index dc87dd60b8..211bc40baf 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+@@ -57,3 +57,5 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+index 45a84b47c2..f750f44da2 100644
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+@@ -21,3 +21,7 @@
+     }
+   }
+ ]
++reopen nodes:
++libvirt-5-format
++libvirt-4-format
++libvirt-3-format
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-Use-disk-definition-directly-when-creating-checkpoint.patch b/SOURCES/libvirt-qemu-checkpoint-Use-disk-definition-directly-when-creating-checkpoint.patch
new file mode 100644
index 0000000..5185ed5
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-Use-disk-definition-directly-when-creating-checkpoint.patch
@@ -0,0 +1,62 @@
+From dc4997ee498486135e46ca0e121835935bbf26db Mon Sep 17 00:00:00 2001
+Message-Id: <dc4997ee498486135e46ca0e121835935bbf26db@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:53 +0100
+Subject: [PATCH] qemu: checkpoint: Use disk definition directly when creating
+ checkpoint
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Lookup the whole disk definition rather than just the node name.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 7973f7d7926ac9dbc5464e6be6eb2aaacecc2251)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <d4ad0d55d36cfc8c1af9a997930936364e94648c.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 0aa854324b..03a8321135 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -320,12 +320,16 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+ 
+     for (i = 0; i < def->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &def->disks[i];
+-        const char *node;
++        virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
+ 
+-        if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++        /* checkpoint definition validator mandates that the corresponding
++         * domdisk should exist */
++        if (!domdisk ||
++            chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+             continue;
+-        node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
+-        if (qemuMonitorTransactionBitmapAdd(actions, node, chkdisk->bitmap, true, false, 0) < 0)
++
++        if (qemuMonitorTransactionBitmapAdd(actions, domdisk->src->nodeformat,
++                                            chkdisk->bitmap, true, false, 0) < 0)
+             return -1;
+ 
+         /* We only want one active bitmap for a disk along the
+@@ -348,7 +352,9 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+                 if (STRNEQ(chkdisk->name, disk2->name) ||
+                     disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+                     continue;
+-                if (qemuMonitorTransactionBitmapDisable(actions, node, disk2->bitmap) < 0)
++                if (qemuMonitorTransactionBitmapDisable(actions,
++                                                        domdisk->src->nodeformat,
++                                                        disk2->bitmap) < 0)
+                     return -1;
+                 search_parents = false;
+                 break;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointAddActions.patch b/SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointAddActions.patch
new file mode 100644
index 0000000..d407d7d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointAddActions.patch
@@ -0,0 +1,58 @@
+From 7a23710e912348efb55a98e7c6e6d1cc7f452b1f Mon Sep 17 00:00:00 2001
+Message-Id: <7a23710e912348efb55a98e7c6e6d1cc7f452b1f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:52 +0100
+Subject: [PATCH] qemu: checkpoint: rename disk->chkdisk in
+ qemuCheckpointAddActions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upcoming patches will also use the domain disk definition. Rename disk
+to chkdisk for clarity.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit f3e0a45a00465a6f19f510f7806ade1764a7e162)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <ef78ad0aa581d70c4f007665cd00988796c02c8f.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index d347b8fc6c..0aa854324b 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -319,13 +319,13 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+     bool search_parents;
+ 
+     for (i = 0; i < def->ndisks; i++) {
+-        virDomainCheckpointDiskDef *disk = &def->disks[i];
++        virDomainCheckpointDiskDef *chkdisk = &def->disks[i];
+         const char *node;
+ 
+-        if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++        if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+             continue;
+-        node = qemuDomainDiskNodeFormatLookup(vm, disk->name);
+-        if (qemuMonitorTransactionBitmapAdd(actions, node, disk->bitmap, true, false, 0) < 0)
++        node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
++        if (qemuMonitorTransactionBitmapAdd(actions, node, chkdisk->bitmap, true, false, 0) < 0)
+             return -1;
+ 
+         /* We only want one active bitmap for a disk along the
+@@ -345,7 +345,7 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
+                 virDomainCheckpointDiskDef *disk2;
+ 
+                 disk2 = &olddef->disks[j];
+-                if (STRNEQ(disk->name, disk2->name) ||
++                if (STRNEQ(chkdisk->name, disk2->name) ||
+                     disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+                     continue;
+                 if (qemuMonitorTransactionBitmapDisable(actions, node, disk2->bitmap) < 0)
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointDiscardBitmaps.patch b/SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointDiscardBitmaps.patch
new file mode 100644
index 0000000..8ea84ba
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointDiscardBitmaps.patch
@@ -0,0 +1,75 @@
+From 4a0a0c37c0f3ea2c8eb6b96b07c990d7a4ce1c8b Mon Sep 17 00:00:00 2001
+Message-Id: <4a0a0c37c0f3ea2c8eb6b96b07c990d7a4ce1c8b@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:51 +0100
+Subject: [PATCH] qemu: checkpoint: rename disk->chkdisk in
+ qemuCheckpointDiscardBitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upcoming patches will also use the domain disk definition. Rename disk
+to chkdisk for clarity.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit a303e8ea47c9a2caa39ae744c0bf9a2f724a6137)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <0799859ad288a747f1d12dd07bbb403053d78457.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 9ff3129570..d347b8fc6c 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -124,13 +124,13 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+         return -1;
+ 
+     for (i = 0; i < chkdef->ndisks; i++) {
+-        virDomainCheckpointDiskDef *disk = &chkdef->disks[i];
++        virDomainCheckpointDiskDef *chkdisk = &chkdef->disks[i];
+         const char *node;
+ 
+-        if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++        if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+             continue;
+ 
+-        node = qemuDomainDiskNodeFormatLookup(vm, disk->name);
++        node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
+         /* If any ancestor checkpoint has a bitmap for the same
+          * disk, then this bitmap must be merged to the
+          * ancestor. */
+@@ -145,7 +145,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                 g_autoptr(virJSONValue) arr = NULL;
+ 
+                 disk2 = &parentdef->disks[j];
+-                if (STRNEQ(disk->name, disk2->name) ||
++                if (STRNEQ(chkdisk->name, disk2->name) ||
+                     disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+                     continue;
+                 search_parents = false;
+@@ -153,7 +153,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                 if (!(arr = virJSONValueNewArray()))
+                     return -1;
+ 
+-                if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, disk->bitmap) < 0)
++                if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, chkdisk->bitmap) < 0)
+                     return -1;
+ 
+                 if (chkcurrent) {
+@@ -166,7 +166,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+             }
+         }
+ 
+-        if (qemuMonitorTransactionBitmapRemove(actions, node, disk->bitmap) < 0)
++        if (qemuMonitorTransactionBitmapRemove(actions, node, chkdisk->bitmap) < 0)
+             return -1;
+     }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-split-out-checkpoint-deletion-bitmaps.patch b/SOURCES/libvirt-qemu-checkpoint-split-out-checkpoint-deletion-bitmaps.patch
new file mode 100644
index 0000000..6beba43
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-split-out-checkpoint-deletion-bitmaps.patch
@@ -0,0 +1,192 @@
+From 628b1f392c5fb2e3a492640a9069edd244a7b150 Mon Sep 17 00:00:00 2001
+Message-Id: <628b1f392c5fb2e3a492640a9069edd244a7b150@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:50 +0100
+Subject: [PATCH] qemu: checkpoint: split out checkpoint deletion bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+qemuCheckpointDiscard is a massive function that can be separated into
+smaller bits. Extract the part that actually modifies the disk from the
+metadata handling.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 44e1b85717b9a4e6df24f9cbf846627e4f29b859)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <b6cdc7883d1f3b16e8a496dac6e9ec046ec2c4ea.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 137 ++++++++++++++++++++-----------------
+ 1 file changed, 76 insertions(+), 61 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index d13d4c2a37..9ff3129570 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -104,6 +104,81 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm,
+ }
+ 
+ 
++static int
++qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
++                             virDomainCheckpointDefPtr chkdef,
++                             bool chkcurrent,
++                             virDomainMomentObjPtr parent)
++{
++    qemuDomainObjPrivatePtr priv = vm->privateData;
++    virQEMUDriverPtr driver = priv->driver;
++    virDomainMomentObjPtr moment;
++    virDomainCheckpointDefPtr parentdef = NULL;
++    bool search_parents;
++    int rc;
++    g_autoptr(virJSONValue) actions = NULL;
++    size_t i;
++    size_t j;
++
++    if (!(actions = virJSONValueNewArray()))
++        return -1;
++
++    for (i = 0; i < chkdef->ndisks; i++) {
++        virDomainCheckpointDiskDef *disk = &chkdef->disks[i];
++        const char *node;
++
++        if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++            continue;
++
++        node = qemuDomainDiskNodeFormatLookup(vm, disk->name);
++        /* If any ancestor checkpoint has a bitmap for the same
++         * disk, then this bitmap must be merged to the
++         * ancestor. */
++        search_parents = true;
++        for (moment = parent;
++             search_parents && moment;
++             moment = virDomainCheckpointFindByName(vm->checkpoints,
++                                                    parentdef->parent.parent_name)) {
++            parentdef = virDomainCheckpointObjGetDef(moment);
++            for (j = 0; j < parentdef->ndisks; j++) {
++                virDomainCheckpointDiskDef *disk2;
++                g_autoptr(virJSONValue) arr = NULL;
++
++                disk2 = &parentdef->disks[j];
++                if (STRNEQ(disk->name, disk2->name) ||
++                    disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
++                    continue;
++                search_parents = false;
++
++                if (!(arr = virJSONValueNewArray()))
++                    return -1;
++
++                if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, disk->bitmap) < 0)
++                    return -1;
++
++                if (chkcurrent) {
++                    if (qemuMonitorTransactionBitmapEnable(actions, node, disk2->bitmap) < 0)
++                        return -1;
++                }
++
++                if (qemuMonitorTransactionBitmapMerge(actions, node, disk2->bitmap, &arr) < 0)
++                    return -1;
++            }
++        }
++
++        if (qemuMonitorTransactionBitmapRemove(actions, node, disk->bitmap) < 0)
++            return -1;
++    }
++
++    qemuDomainObjEnterMonitor(driver, vm);
++    rc = qemuMonitorTransaction(priv->mon, &actions);
++    if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
++        return -1;
++
++    return 0;
++}
++
++
+ static int
+ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+                       virDomainObjPtr vm,
+@@ -112,9 +187,6 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+                       bool metadata_only)
+ {
+     virDomainMomentObjPtr parent = NULL;
+-    virDomainMomentObjPtr moment;
+-    virDomainCheckpointDefPtr parentdef = NULL;
+-    size_t i, j;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     g_autofree char *chkFile = NULL;
+     bool chkcurrent = chk == virDomainCheckpointGetCurrent(vm->checkpoints);
+@@ -129,67 +201,10 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver,
+                               chk->def->name);
+ 
+     if (!metadata_only) {
+-        qemuDomainObjPrivatePtr priv = vm->privateData;
+-        bool search_parents;
+         virDomainCheckpointDefPtr chkdef = virDomainCheckpointObjGetDef(chk);
+-        int rc;
+-        g_autoptr(virJSONValue) actions = NULL;
+-
+-        if (!(actions = virJSONValueNewArray()))
+-            return -1;
+-
+         parent = virDomainCheckpointFindByName(vm->checkpoints,
+                                                chk->def->parent_name);
+-        for (i = 0; i < chkdef->ndisks; i++) {
+-            virDomainCheckpointDiskDef *disk = &chkdef->disks[i];
+-            const char *node;
+-
+-            if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+-                continue;
+-
+-            node = qemuDomainDiskNodeFormatLookup(vm, disk->name);
+-            /* If any ancestor checkpoint has a bitmap for the same
+-             * disk, then this bitmap must be merged to the
+-             * ancestor. */
+-            search_parents = true;
+-            for (moment = parent;
+-                 search_parents && moment;
+-                 moment = virDomainCheckpointFindByName(vm->checkpoints,
+-                                                        parentdef->parent.parent_name)) {
+-                parentdef = virDomainCheckpointObjGetDef(moment);
+-                for (j = 0; j < parentdef->ndisks; j++) {
+-                    virDomainCheckpointDiskDef *disk2;
+-                    g_autoptr(virJSONValue) arr = NULL;
+-
+-                    disk2 = &parentdef->disks[j];
+-                    if (STRNEQ(disk->name, disk2->name) ||
+-                        disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+-                        continue;
+-                    search_parents = false;
+-
+-                    if (!(arr = virJSONValueNewArray()))
+-                        return -1;
+-
+-                    if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, disk->bitmap) < 0)
+-                        return -1;
+-
+-                    if (chkcurrent) {
+-                        if (qemuMonitorTransactionBitmapEnable(actions, node, disk2->bitmap) < 0)
+-                            return -1;
+-                    }
+-
+-                    if (qemuMonitorTransactionBitmapMerge(actions, node, disk2->bitmap, &arr) < 0)
+-                        return -1;
+-                }
+-            }
+-
+-            if (qemuMonitorTransactionBitmapRemove(actions, node, disk->bitmap) < 0)
+-                return -1;
+-        }
+-
+-        qemuDomainObjEnterMonitor(driver, vm);
+-        rc = qemuMonitorTransaction(priv->mon, &actions);
+-        if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
++        if (qemuCheckpointDiscardBitmaps(vm, chkdef, chkcurrent, parent) < 0)
+             return -1;
+     }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-checkpoint-tolerate-missing-disks-on-checkpoint-deletion.patch b/SOURCES/libvirt-qemu-checkpoint-tolerate-missing-disks-on-checkpoint-deletion.patch
new file mode 100644
index 0000000..d638b92
--- /dev/null
+++ b/SOURCES/libvirt-qemu-checkpoint-tolerate-missing-disks-on-checkpoint-deletion.patch
@@ -0,0 +1,85 @@
+From d59261d209da6f3dd4dfef7fab327de7cbb6e7ff Mon Sep 17 00:00:00 2001
+Message-Id: <d59261d209da6f3dd4dfef7fab327de7cbb6e7ff@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:54 +0100
+Subject: [PATCH] qemu: checkpoint: tolerate missing disks on checkpoint
+ deletion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a disk is unplugged and then the user tries to delete a checkpoint
+the code would try to use NULL node name as it was not checked.
+
+Fix this by fetching the whole disk definition object and verifying it
+was found.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit f19248a1395e59abbd68ac31af3d9bd1273555bf)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <bab5a0f3d17855a657a6b7de4699a72e176780d6.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 03a8321135..326707e098 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -125,12 +125,15 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+ 
+     for (i = 0; i < chkdef->ndisks; i++) {
+         virDomainCheckpointDiskDef *chkdisk = &chkdef->disks[i];
+-        const char *node;
++        virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
++
++        /* domdisk can be missing e.g. when it was unplugged */
++        if (!domdisk)
++            continue;
+ 
+         if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+             continue;
+ 
+-        node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
+         /* If any ancestor checkpoint has a bitmap for the same
+          * disk, then this bitmap must be merged to the
+          * ancestor. */
+@@ -153,20 +156,28 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                 if (!(arr = virJSONValueNewArray()))
+                     return -1;
+ 
+-                if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, chkdisk->bitmap) < 0)
++                if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
++                                                                     domdisk->src->nodeformat,
++                                                                     chkdisk->bitmap) < 0)
+                     return -1;
+ 
+                 if (chkcurrent) {
+-                    if (qemuMonitorTransactionBitmapEnable(actions, node, disk2->bitmap) < 0)
++                    if (qemuMonitorTransactionBitmapEnable(actions,
++                                                           domdisk->src->nodeformat,
++                                                           disk2->bitmap) < 0)
+                         return -1;
+                 }
+ 
+-                if (qemuMonitorTransactionBitmapMerge(actions, node, disk2->bitmap, &arr) < 0)
++                if (qemuMonitorTransactionBitmapMerge(actions,
++                                                      domdisk->src->nodeformat,
++                                                      disk2->bitmap, &arr) < 0)
+                     return -1;
+             }
+         }
+ 
+-        if (qemuMonitorTransactionBitmapRemove(actions, node, chkdisk->bitmap) < 0)
++        if (qemuMonitorTransactionBitmapRemove(actions,
++                                               domdisk->src->nodeformat,
++                                               chkdisk->bitmap) < 0)
+             return -1;
+     }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-command-Don-t-format-image-properties-for-empty-drive.patch b/SOURCES/libvirt-qemu-command-Don-t-format-image-properties-for-empty-drive.patch
deleted file mode 100644
index 63a01c3..0000000
--- a/SOURCES/libvirt-qemu-command-Don-t-format-image-properties-for-empty-drive.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 47660a5a575b406cfe09ad0f7fae56a7ae429c6c Mon Sep 17 00:00:00 2001
-Message-Id: <47660a5a575b406cfe09ad0f7fae56a7ae429c6c@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 21 Jan 2019 18:43:13 +0100
-Subject: [PATCH] qemu: command: Don't format image properties for empty -drive
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If a -drive has no image, using image properties makes qemu whine that
-they should not be used.
-
-This patch stops formating cache/readonly/... for empty drives
-for the pre-blockdev syntax. Unfortunately those parameters can't be
-added later when inserting media, but on the other hand qemu will start
-with an empty drive.
-
-Since we already were able to start a VM with such config previously due
-to qemu ignoring them I've opted just to skip formatting them.
-Additionally with -blockdev support it will work as expected as the
-image properties will be formatted when adding the image itself which is
-not possible without it.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1651457
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f80eae8c2ae0c62ecaa550ab6353cf871bb17d4e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1553255
-
- Conflicts:
-	src/qemu/qemu_command.c
-	tests/qemuxml2argvdata/disk-cdrom.args
-            - context: bootindex not yet assumed, 'boot=on' code still
-            present
-	tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
-	tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
-            - missing refactor to capability file based tests
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                      | 55 ++++++++++----------
- tests/qemuxml2argvdata/disk-cdrom-empty.args |  2 +-
- tests/qemuxml2argvdata/disk-cdrom.args       |  2 +-
- 3 files changed, 30 insertions(+), 29 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index c706a4b095..e153c011f6 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -1695,37 +1695,38 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
-         disk->bus != VIR_DOMAIN_DISK_BUS_IDE)
-         virBufferAddLit(&opt, ",boot=on");
- 
--    if (disk->src->readonly)
--        virBufferAddLit(&opt, ",readonly=on");
-+    if (!virStorageSourceIsEmpty(disk->src)) {
-+        if (disk->src->readonly)
-+            virBufferAddLit(&opt, ",readonly=on");
- 
-+        if (disk->cachemode) {
-+            virBufferAsprintf(&opt, ",cache=%s",
-+                              qemuDiskCacheV2TypeToString(disk->cachemode));
-+        }
- 
--    if (disk->cachemode) {
--        virBufferAsprintf(&opt, ",cache=%s",
--                          qemuDiskCacheV2TypeToString(disk->cachemode));
-+        if (disk->copy_on_read) {
-+            virBufferAsprintf(&opt, ",copy-on-read=%s",
-+                              virTristateSwitchTypeToString(disk->copy_on_read));
-+        }
-+
-+        if (disk->discard) {
-+            virBufferAsprintf(&opt, ",discard=%s",
-+                              virDomainDiskDiscardTypeToString(disk->discard));
-+        }
-+
-+        if (detect_zeroes) {
-+            virBufferAsprintf(&opt, ",detect-zeroes=%s",
-+                              virDomainDiskDetectZeroesTypeToString(detect_zeroes));
-+        }
-+
-+        if (disk->iomode) {
-+            virBufferAsprintf(&opt, ",aio=%s",
-+                              virDomainDiskIoTypeToString(disk->iomode));
-+        }
-+
-+        qemuBuildDiskThrottling(disk, &opt);
-     }
- 
--    if (disk->copy_on_read) {
--        virBufferAsprintf(&opt, ",copy-on-read=%s",
--                          virTristateSwitchTypeToString(disk->copy_on_read));
--    }
--
--    if (disk->discard) {
--        virBufferAsprintf(&opt, ",discard=%s",
--                          virDomainDiskDiscardTypeToString(disk->discard));
--    }
--
--    if (detect_zeroes) {
--        virBufferAsprintf(&opt, ",detect-zeroes=%s",
--                          virDomainDiskDetectZeroesTypeToString(detect_zeroes));
--    }
--
--    if (disk->iomode) {
--        virBufferAsprintf(&opt, ",aio=%s",
--                          virDomainDiskIoTypeToString(disk->iomode));
--    }
--
--    qemuBuildDiskThrottling(disk, &opt);
--
-     if (virBufferCheckError(&opt) < 0)
-         goto error;
- 
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty.args b/tests/qemuxml2argvdata/disk-cdrom-empty.args
-index 1cbc76ab86..b84bdda143 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-empty.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-empty.args
-@@ -24,5 +24,5 @@ server,nowait \
- -usb \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
- -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \
-+-drive if=none,id=drive-ide0-1-0,media=cdrom \
- -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
-index 547263cbd8..f519ea5236 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom.args
-@@ -27,5 +27,5 @@ server,nowait \
- -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\
- readonly=on \
- -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
---drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on,cache=none \
-+-drive if=none,id=drive-ide0-1-0,media=cdrom \
- -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-command-Don-t-skip-readonly-and-throttling-info-for-empty-drive.patch b/SOURCES/libvirt-qemu-command-Don-t-skip-readonly-and-throttling-info-for-empty-drive.patch
deleted file mode 100644
index 8acc105..0000000
--- a/SOURCES/libvirt-qemu-command-Don-t-skip-readonly-and-throttling-info-for-empty-drive.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 56be87fe948f7534878880cb300f91550361c062 Mon Sep 17 00:00:00 2001
-Message-Id: <56be87fe948f7534878880cb300f91550361c062@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 4 Feb 2019 12:53:38 +0100
-Subject: [PATCH] qemu: command: Don't skip 'readonly' and throttling info for
- empty drive
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In commit f80eae8c2ae I was too agresive in removing properties of
--drive for empty drives. It turns out that qemu actually persists the
-state of 'readonly' and the throttling information even for the empty
-drive.
-
-Removing 'readonly' thus made qemu open any subsequent images added via
-the 'change' command as RW which was forbidden by selinux thanks to the
-restrictive sVirt label for readonly media.
-
-Fix this by formating the property again and bump the tests and leave a
-note detailing why the rest of the properties needs to be skipped.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 6db0d033839807aec885e10b5a45748da016e261)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1670337
-
- Conflicts:
-        src/qemu/qemu_command.c
-        tests/qemuxml2argvdata/disk-cdrom.args
-            - context: bootindex not yet assumed, 'boot=on' code still
-            present
-        tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
-        tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
-            - missing refactor to capability file based tests
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                      | 18 +++++++++++++-----
- tests/qemuxml2argvdata/disk-cdrom-empty.args |  2 +-
- tests/qemuxml2argvdata/disk-cdrom.args       |  2 +-
- 3 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index e153c011f6..66abd3fe86 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -1695,10 +1695,18 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
-         disk->bus != VIR_DOMAIN_DISK_BUS_IDE)
-         virBufferAddLit(&opt, ",boot=on");
- 
--    if (!virStorageSourceIsEmpty(disk->src)) {
--        if (disk->src->readonly)
--            virBufferAddLit(&opt, ",readonly=on");
-+    if (disk->src->readonly)
-+        virBufferAddLit(&opt, ",readonly=on");
- 
-+    /* qemu rejects some parameters for an empty -drive, so we need to skip
-+     * them in that case:
-+     * cache: modifies properties of the format driver which is not present
-+     * copy_on_read: really only works for floppies
-+     * discard: modifies properties of format driver
-+     * detect_zeroes: works but really depends on discard so it's useless
-+     * iomode: setting it to 'native' requires a specific cache mode
-+     */
-+    if (!virStorageSourceIsEmpty(disk->src)) {
-         if (disk->cachemode) {
-             virBufferAsprintf(&opt, ",cache=%s",
-                               qemuDiskCacheV2TypeToString(disk->cachemode));
-@@ -1723,10 +1731,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
-             virBufferAsprintf(&opt, ",aio=%s",
-                               virDomainDiskIoTypeToString(disk->iomode));
-         }
--
--        qemuBuildDiskThrottling(disk, &opt);
-     }
- 
-+    qemuBuildDiskThrottling(disk, &opt);
-+
-     if (virBufferCheckError(&opt) < 0)
-         goto error;
- 
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty.args b/tests/qemuxml2argvdata/disk-cdrom-empty.args
-index b84bdda143..1cbc76ab86 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-empty.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-empty.args
-@@ -24,5 +24,5 @@ server,nowait \
- -usb \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
- -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---drive if=none,id=drive-ide0-1-0,media=cdrom \
-+-drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \
- -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
-index f519ea5236..973d8e9af1 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom.args
-@@ -27,5 +27,5 @@ server,nowait \
- -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\
- readonly=on \
- -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
---drive if=none,id=drive-ide0-1-0,media=cdrom \
-+-drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \
- -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-command-Enable-formatting-vfio-pci.display-option-onto-cmdline.patch b/SOURCES/libvirt-qemu-command-Enable-formatting-vfio-pci.display-option-onto-cmdline.patch
deleted file mode 100644
index fbf0401..0000000
--- a/SOURCES/libvirt-qemu-command-Enable-formatting-vfio-pci.display-option-onto-cmdline.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-From 24aa8ecbce19a6f844669ed4a30010caea06b799 Mon Sep 17 00:00:00 2001
-Message-Id: <24aa8ecbce19a6f844669ed4a30010caea06b799@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:04:03 +0200
-Subject: [PATCH] qemu: command: Enable formatting vfio-pci.display option onto
- cmdline
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since QEMU 2.12, QEMU understands a new vfio-pci device option 'display'
-which can be used to turn on display capabilities on vgpu-enabled
-mediated devices, IOW emulated GPU devices like QXL will no longer be
-needed with vgpu-enable mdevs.
-QEMU defaults to 'auto' for the 'display' attribute, which is not
-foolproof, so we need to play it safe here and default to display='off'
-if this attribute wasn't provided in the XML explicitly.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit c0ca6dcf42549855b9ed75031f461a056ae1031c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                       |  4 ++
- .../hostdev-mdev-display-missing-graphics.xml | 35 ++++++++++++++++
- ...play-spice-egl-headless.x86_64-latest.args | 37 +++++++++++++++++
- ...ostdev-mdev-display-spice-egl-headless.xml | 40 ++++++++++++++++++
- ...ev-display-spice-opengl.x86_64-latest.args | 36 ++++++++++++++++
- .../hostdev-mdev-display-spice-opengl.xml     | 41 +++++++++++++++++++
- ...isplay-vnc-egl-headless.x86_64-latest.args | 37 +++++++++++++++++
- .../hostdev-mdev-display-vnc-egl-headless.xml | 40 ++++++++++++++++++
- ...ostdev-mdev-display-vnc.x86_64-latest.args | 36 ++++++++++++++++
- .../hostdev-mdev-display-vnc.xml              | 39 ++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  7 ++++
- 11 files changed, 352 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 8915040c6a..1fce45134f 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -5177,6 +5177,10 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def,
-     virBufferAdd(&buf, dev_str, -1);
-     virBufferAsprintf(&buf, ",id=%s,sysfsdev=%s", dev->info->alias, mdevPath);
- 
-+    if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT)
-+        virBufferAsprintf(&buf, ",display=%s",
-+                          virTristateSwitchTypeToString(mdevsrc->display));
-+
-     if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
-         goto cleanup;
- 
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
-new file mode 100644
-index 0000000000..ea559a6444
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
-@@ -0,0 +1,35 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+    </hostdev>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
-new file mode 100644
-index 0000000000..0ac90c81d2
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
-@@ -0,0 +1,37 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=spice \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest2,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-+-spice port=0,seamless-migration=on \
-+-display egl-headless \
-+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,\
-+vram64_size_mb=0,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x2 \
-+-device vfio-pci,id=hostdev0,\
-+sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=on,\
-+bus=pci.0,addr=0x3 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
-new file mode 100644
-index 0000000000..c8f10c2f3a
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
-@@ -0,0 +1,40 @@
-+<domain type='qemu' id='1'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <graphics type='spice'/>
-+    <graphics type='egl-headless'/>
-+    <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+    </hostdev>
-+    <video>
-+      <model type='qxl' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
-new file mode 100644
-index 0000000000..1fd9fdaa16
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
-@@ -0,0 +1,36 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=spice \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest2,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-+-spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \
-+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,\
-+vram64_size_mb=0,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x2 \
-+-device vfio-pci,id=hostdev0,\
-+sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=on,\
-+bus=pci.0,addr=0x3 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
-new file mode 100644
-index 0000000000..18c9817608
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
-@@ -0,0 +1,41 @@
-+<domain type='qemu' id='1'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <graphics type='spice'>
-+      <gl enable='yes' rendernode='/dev/dri/foo'/>
-+    </graphics>
-+    <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+    </hostdev>
-+    <video>
-+      <model type='qxl' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
-new file mode 100644
-index 0000000000..cdf545d0e0
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
-@@ -0,0 +1,37 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest2,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-+-vnc 127.0.0.1:0 \
-+-display egl-headless \
-+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,\
-+vram64_size_mb=0,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x2 \
-+-device vfio-pci,id=hostdev0,\
-+sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=on,\
-+bus=pci.0,addr=0x3 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
-new file mode 100644
-index 0000000000..b3eaeeef13
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
-@@ -0,0 +1,40 @@
-+<domain type='qemu' id='1'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <graphics type='vnc'/>
-+    <graphics type='egl-headless'/>
-+    <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+    </hostdev>
-+    <video>
-+      <model type='qxl' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
-new file mode 100644
-index 0000000000..19439afda9
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
-@@ -0,0 +1,36 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest2,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-+-vnc 127.0.0.1:0 \
-+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,\
-+vram64_size_mb=0,vgamem_mb=16,max_outputs=1,bus=pci.0,addr=0x2 \
-+-device vfio-pci,id=hostdev0,\
-+sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=on,\
-+bus=pci.0,addr=0x3 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
-new file mode 100644
-index 0000000000..f5b3575c04
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
-@@ -0,0 +1,39 @@
-+<domain type='qemu' id='1'>
-+  <name>QEMUGuest2</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='i686' 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-i686</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+    </controller>
-+    <graphics type='vnc'/>
-+    <hostdev mode='subsystem' type='mdev' model='vfio-pci' display='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+    </hostdev>
-+    <video>
-+      <model type='qxl' heads='1'/>
-+    </video>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 848e40440a..9237a4fb89 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1591,6 +1591,13 @@ mymain(void)
-             QEMU_CAPS_DEVICE_VFIO_PCI);
-     DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address",
-             QEMU_CAPS_DEVICE_VFIO_PCI);
-+    DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl");
-+    DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless");
-+    DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc");
-+    DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless");
-+    DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics",
-+            QEMU_CAPS_DEVICE_VFIO_PCI,
-+            QEMU_CAPS_VFIO_PCI_DISPLAY);
-     DO_TEST("pci-rom", NONE);
-     DO_TEST("pci-rom-disabled", NONE);
-     DO_TEST("pci-rom-disabled-invalid", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-command-Move-graphics-iteration-to-its-own-function.patch b/SOURCES/libvirt-qemu-command-Move-graphics-iteration-to-its-own-function.patch
deleted file mode 100644
index 053f110..0000000
--- a/SOURCES/libvirt-qemu-command-Move-graphics-iteration-to-its-own-function.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 5026bff75d5f489281c7f8ae3fe2c20e7679d5d6 Mon Sep 17 00:00:00 2001
-Message-Id: <5026bff75d5f489281c7f8ae3fe2c20e7679d5d6@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:49 +0200
-Subject: [PATCH] qemu: command: Move graphics iteration to its own function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It should be the command line helper who takes care of the iteration
-rather than the caller.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit afc107c20f6dc40529154a361222f9eca0cec94c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c | 57 ++++++++++++++++++++++++++---------------
- 1 file changed, 36 insertions(+), 21 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index f38ae668a7..8a8cbfd7f6 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8212,26 +8212,44 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
- static int
- qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
-                              virCommandPtr cmd,
--                             virQEMUCapsPtr qemuCaps,
--                             virDomainGraphicsDefPtr graphics)
-+                             virDomainDefPtr def,
-+                             virQEMUCapsPtr qemuCaps)
- {
--    switch (graphics->type) {
--    case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
--        return qemuBuildGraphicsSDLCommandLine(cfg, cmd, qemuCaps, graphics);
-+    size_t i;
- 
--    case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
--        return qemuBuildGraphicsVNCCommandLine(cfg, cmd, qemuCaps, graphics);
-+    for (i = 0; i < def->ngraphics; i++) {
-+        virDomainGraphicsDefPtr graphics = def->graphics[i];
- 
--    case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
--        return qemuBuildGraphicsSPICECommandLine(cfg, cmd, qemuCaps, graphics);
-+        switch (graphics->type) {
-+        case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-+            if (qemuBuildGraphicsSDLCommandLine(cfg, cmd,
-+                                                qemuCaps, graphics) < 0)
-+                return -1;
- 
--    case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
--    case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
--    case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
--        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                       _("unsupported graphics type '%s'"),
--                       virDomainGraphicsTypeToString(graphics->type));
--        return -1;
-+            break;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
-+            if (qemuBuildGraphicsVNCCommandLine(cfg, cmd,
-+                                                qemuCaps, graphics) < 0)
-+                return -1;
-+
-+            break;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
-+            if (qemuBuildGraphicsSPICECommandLine(cfg, cmd,
-+                                                  qemuCaps, graphics) < 0)
-+                return -1;
-+
-+            break;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
-+        case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("unsupported graphics type '%s'"),
-+                           virDomainGraphicsTypeToString(graphics->type));
-+            return -1;
-+        case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
-+        default:
-+            virReportEnumRangeError(virDomainGraphicsType, graphics->type);
-+            return -1;
-+        }
-     }
- 
-     return 0;
-@@ -10382,11 +10400,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-     if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0)
-         goto error;
- 
--    for (i = 0; i < def->ngraphics; ++i) {
--        if (qemuBuildGraphicsCommandLine(cfg, cmd, qemuCaps,
--                                         def->graphics[i]) < 0)
--            goto error;
--    }
-+    if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps) < 0)
-+        goto error;
- 
-     if (qemuBuildVideoCommandLine(cmd, def, qemuCaps) < 0)
-         goto error;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-conf-Remove-dev-sev-from-the-default-cgroup-device-acl-list.patch b/SOURCES/libvirt-qemu-conf-Remove-dev-sev-from-the-default-cgroup-device-acl-list.patch
deleted file mode 100644
index e16cdfa..0000000
--- a/SOURCES/libvirt-qemu-conf-Remove-dev-sev-from-the-default-cgroup-device-acl-list.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 17c0f51fb9981dbd372a24952b483a14222674ec Mon Sep 17 00:00:00 2001
-Message-Id: <17c0f51fb9981dbd372a24952b483a14222674ec@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 1 Feb 2019 17:21:54 +0100
-Subject: [PATCH] qemu: conf: Remove /dev/sev from the default cgroup device
- acl list
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We should not give domains access to something they don't necessarily
-need by default. Remove it from the qemu driver docs too.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit b6440119185a4e307654a8d26d6d551a2675bf82)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1665400
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- docs/drvqemu.html.in               | 2 +-
- src/qemu/qemu.conf                 | 2 +-
- src/qemu/qemu_cgroup.c             | 2 +-
- src/qemu/test_libvirtd_qemu.aug.in | 1 -
- 4 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
-index d51ccf2412..a692a6dab6 100644
---- a/docs/drvqemu.html.in
-+++ b/docs/drvqemu.html.in
-@@ -396,7 +396,7 @@ chmod o+x /path/to/directory
- /dev/null, /dev/full, /dev/zero,
- /dev/random, /dev/urandom,
- /dev/ptmx, /dev/kvm, /dev/kqemu,
--/dev/rtc, /dev/hpet, /dev/sev
-+/dev/rtc, /dev/hpet
- </pre>
- 
-     <p>
-diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
-index cd57b3cc69..76afe88b0c 100644
---- a/src/qemu/qemu.conf
-+++ b/src/qemu/qemu.conf
-@@ -485,7 +485,7 @@
- #    "/dev/null", "/dev/full", "/dev/zero",
- #    "/dev/random", "/dev/urandom",
- #    "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
--#    "/dev/rtc","/dev/hpet", "/dev/sev"
-+#    "/dev/rtc","/dev/hpet"
- #]
- #
- # RDMA migration requires the following extra files to be added to the list:
-diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
-index c8fba7f9e6..fd54333fb9 100644
---- a/src/qemu/qemu_cgroup.c
-+++ b/src/qemu/qemu_cgroup.c
-@@ -48,7 +48,7 @@ const char *const defaultDeviceACL[] = {
-     "/dev/null", "/dev/full", "/dev/zero",
-     "/dev/random", "/dev/urandom",
-     "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
--    "/dev/rtc", "/dev/hpet", "/dev/sev",
-+    "/dev/rtc", "/dev/hpet",
-     NULL,
- };
- #define DEVICE_PTY_MAJOR 136
-diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
-index f1e8806ad2..61690ee92c 100644
---- a/src/qemu/test_libvirtd_qemu.aug.in
-+++ b/src/qemu/test_libvirtd_qemu.aug.in
-@@ -62,7 +62,6 @@ module Test_libvirtd_qemu =
-     { "8" = "/dev/kqemu" }
-     { "9" = "/dev/rtc" }
-     { "10" = "/dev/hpet" }
--    { "11" = "/dev/sev" }
- }
- { "save_image_format" = "raw" }
- { "dump_image_format" = "raw" }
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-conf-set-HOTPLUGGABLE-connect-flag-during-PCI-address-set-init.patch b/SOURCES/libvirt-qemu-conf-set-HOTPLUGGABLE-connect-flag-during-PCI-address-set-init.patch
new file mode 100644
index 0000000..ae5307f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-conf-set-HOTPLUGGABLE-connect-flag-during-PCI-address-set-init.patch
@@ -0,0 +1,199 @@
+From 351bb3a04c1eb6de11efad54f809a6f3e3a868c8 Mon Sep 17 00:00:00 2001
+Message-Id: <351bb3a04c1eb6de11efad54f809a6f3e3a868c8@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:17:01 -0400
+Subject: [PATCH] qemu/conf: set HOTPLUGGABLE connect flag during PCI address
+ set init
+
+virDomainPCIAddressBusSetModel() is called for each PCI controller
+when building an address set prior to assiging PCI addresses to
+devices.
+
+This patch adds a new argument, allowHotplug, to that function that
+can be set to false if we know for certain that a particular
+controller won't support hotplug
+
+The most interesting case is in qemuDomainPCIAddressSetCreate(), where
+the config of each existing controller is available while building the
+address set, so we can appropriately set allowHotplug = false when the
+user has "hotplug='off'" in the config of a controller that normally
+would support hotplug. In all other cases, it is set to true or false
+in accordance with the capability of the controller model.
+
+So far we aren't doing anything with this bus flag in the address set.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit aa15e9259f1f246e69fb9742581ced720c88695d)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426171703.18808-1-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_addr.c         | 31 +++++++++++++++++++++----------
+ src/conf/domain_addr.h         |  3 ++-
+ src/qemu/qemu_domain_address.c | 10 +++++++---
+ 3 files changed, 30 insertions(+), 14 deletions(-)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index 05f036e3e6..cc45a0bbf1 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -495,31 +495,40 @@ virDomainPCIAddressValidate(virDomainPCIAddressSetPtr addrs,
+ 
+ int
+ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+-                               virDomainControllerModelPCI model)
++                               virDomainControllerModelPCI model,
++                               bool allowHotplug)
+ {
+     /* set flags for what can be connected *downstream* from each
+      * bus.
+      */
++    virDomainPCIConnectFlags hotplugFlag = 0;
++
++    if (allowHotplug)
++        hotplugFlag = VIR_PCI_CONNECT_HOTPLUGGABLE;
++
+     switch (model) {
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
+         bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCI_BRIDGE |
+-                      VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS);
++                      VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS |
++                      hotplugFlag);
+         bus->minSlot = 1;
+         bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
+         break;
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
+         bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+-                      VIR_PCI_CONNECT_TYPE_PCI_BRIDGE);
++                      VIR_PCI_CONNECT_TYPE_PCI_BRIDGE |
++                      hotplugFlag);
+         bus->minSlot = 1;
+         bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
+         break;
+     case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS:
+         bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+-                      VIR_PCI_CONNECT_TYPE_PCI_BRIDGE);
++                      VIR_PCI_CONNECT_TYPE_PCI_BRIDGE |
++                      hotplugFlag);
+         bus->minSlot = 0;
+         bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
+         break;
+@@ -550,7 +559,8 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+          * the first of which is not usable because of the SHPC */
+         bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCI_DEVICE |
+-                      VIR_PCI_CONNECT_TYPE_PCI_BRIDGE);
++                      VIR_PCI_CONNECT_TYPE_PCI_BRIDGE |
++                      hotplugFlag);
+         bus->minSlot = 1;
+         bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST;
+         break;
+@@ -562,7 +572,8 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+         bus->flags = (VIR_PCI_CONNECT_AUTOASSIGN |
+                       VIR_PCI_CONNECT_TYPE_PCIE_DEVICE |
+                       VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT |
+-                      VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE);
++                      VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE |
++                      hotplugFlag);
+         bus->minSlot = 0;
+         bus->maxSlot = 0;
+         break;
+@@ -759,7 +770,7 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSetPtr addrs,
+          * rest are of the requested type
+          */
+         if (virDomainPCIAddressBusSetModel(&addrs->buses[i++],
+-                                           VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE) < 0) {
++                                           VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE, false) < 0) {
+             return -1;
+         }
+     }
+@@ -776,20 +787,20 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSetPtr addrs,
+          * will be allocated for the dummy PCIe device later on.
+          */
+         if (virDomainPCIAddressBusSetModel(&addrs->buses[i],
+-                                           VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT) < 0) {
++                                           VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT, true) < 0) {
+             return -1;
+         }
+         addrs->buses[i].flags = VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE;
+         i++;
+ 
+         if (virDomainPCIAddressBusSetModel(&addrs->buses[i++],
+-                                           VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE) < 0) {
++                                           VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE, true) < 0) {
+             return -1;
+         }
+     }
+ 
+     for (; i < addrs->nbuses; i++) {
+-        if (virDomainPCIAddressBusSetModel(&addrs->buses[i], model) < 0)
++        if (virDomainPCIAddressBusSetModel(&addrs->buses[i], model, true) < 0)
+             return -1;
+     }
+ 
+diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
+index 40738ddb72..c1363c1490 100644
+--- a/src/conf/domain_addr.h
++++ b/src/conf/domain_addr.h
+@@ -148,7 +148,8 @@ bool virDomainPCIAddressValidate(virDomainPCIAddressSetPtr addrs,
+ 
+ 
+ int virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus,
+-                                   virDomainControllerModelPCI model)
++                                   virDomainControllerModelPCI model,
++                                   bool allowHotplug)
+     ATTRIBUTE_NONNULL(1);
+ 
+ bool virDomainPCIAddressBusIsFullyReserved(virDomainPCIAddressBusPtr bus)
+diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
+index e81585bc6c..2ae1724696 100644
+--- a/src/qemu/qemu_domain_address.c
++++ b/src/qemu/qemu_domain_address.c
+@@ -1645,6 +1645,7 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
+     for (i = 0; i < def->ncontrollers; i++) {
+         virDomainControllerDefPtr cont = def->controllers[i];
+         size_t idx = cont->idx;
++        bool allowHotplug = false;
+ 
+         if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_PCI)
+             continue;
+@@ -1656,7 +1657,10 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
+             goto error;
+         }
+ 
+-        if (virDomainPCIAddressBusSetModel(&addrs->buses[idx], cont->model) < 0)
++        if (cont->opts.pciopts.hotplug != VIR_TRISTATE_SWITCH_OFF)
++            allowHotplug = true;
++
++        if (virDomainPCIAddressBusSetModel(&addrs->buses[idx], cont->model, allowHotplug) < 0)
+             goto error;
+ 
+         /* Forward the information about isolation groups */
+@@ -1674,7 +1678,7 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
+          * assigning addresses to devices.
+          */
+         if (virDomainPCIAddressBusSetModel(&addrs->buses[0],
+-                                           VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) < 0)
++                                           VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT, true) < 0)
+             goto error;
+     }
+ 
+@@ -1696,7 +1700,7 @@ qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
+         if (addrs->buses[i].model)
+             continue;
+ 
+-        if (virDomainPCIAddressBusSetModel(&addrs->buses[i], defaultModel) < 0)
++        if (virDomainPCIAddressBusSetModel(&addrs->buses[i], defaultModel, true) < 0)
+             goto error;
+ 
+         VIR_DEBUG("Auto-adding <controller type='pci' model='%s' index='%zu'/>",
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-consolidate-parameters-of-qemuBuildChrChardevStr-into-flags.patch b/SOURCES/libvirt-qemu-consolidate-parameters-of-qemuBuildChrChardevStr-into-flags.patch
deleted file mode 100644
index 3478c14..0000000
--- a/SOURCES/libvirt-qemu-consolidate-parameters-of-qemuBuildChrChardevStr-into-flags.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From 018a9185c4889bdd49d0e27cd81d324a1477d9af Mon Sep 17 00:00:00 2001
-Message-Id: <018a9185c4889bdd49d0e27cd81d324a1477d9af@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 6 Jul 2018 15:47:00 +0100
-Subject: [PATCH] qemu: consolidate parameters of qemuBuildChrChardevStr into
- flags
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1597940
-
-There are two boolean parameters passed to qemuBuildChrChardevStr,
-and soon there will be a third. It will be clearer to understand
-from callers' POV if we use named flags instead.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 0140d4c59b7fb26432b520bb7e85bd6834f560b0)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_command.c | 94 ++++++++++++++++++++++++++---------------
- 1 file changed, 61 insertions(+), 33 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 41050bfea3..0c3ce98caf 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -4934,6 +4934,12 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
-     return -1;
- }
- 
-+
-+enum {
-+    QEMU_BUILD_CHARDEV_TCP_NOWAIT = (1 << 0),
-+    QEMU_BUILD_CHARDEV_FILE_LOGD  = (1 << 1),
-+};
-+
- /* This function outputs a -chardev command line option which describes only the
-  * host side of the character device */
- static char *
-@@ -4945,8 +4951,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-                        const virDomainChrSourceDef *dev,
-                        const char *alias,
-                        virQEMUCapsPtr qemuCaps,
--                       bool nowait,
--                       bool chardevStdioLogd)
-+                       unsigned int flags)
- {
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     bool telnet;
-@@ -4985,7 +4990,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-                            _("append not supported in this QEMU binary"));
-             goto cleanup;
-         }
--        if (qemuBuildChrChardevFileStr(chardevStdioLogd ? logManager : NULL,
-+        if (qemuBuildChrChardevFileStr(flags & QEMU_BUILD_CHARDEV_FILE_LOGD ?
-+                                       logManager : NULL,
-                                        cmd, def, &buf,
-                                        "path", dev->data.file.path,
-                                        "append", dev->data.file.append) < 0)
-@@ -5031,8 +5037,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-                           dev->data.tcp.service,
-                           telnet ? ",telnet" : "");
- 
--        if (dev->data.tcp.listen)
--            virBufferAdd(&buf, nowait ? ",server,nowait" : ",server", -1);
-+        if (dev->data.tcp.listen) {
-+            virBufferAddLit(&buf, ",server");
-+            if (flags & QEMU_BUILD_CHARDEV_TCP_NOWAIT)
-+                virBufferAddLit(&buf, ",nowait");
-+        }
- 
-         qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect);
- 
-@@ -5090,8 +5099,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-             virBufferAsprintf(&buf, "socket,id=%s,path=", charAlias);
-             virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path);
-         }
--        if (dev->data.nix.listen)
--            virBufferAdd(&buf, nowait ? ",server,nowait" : ",server", -1);
-+        if (dev->data.nix.listen) {
-+            virBufferAddLit(&buf, ",server");
-+            if (flags & QEMU_BUILD_CHARDEV_TCP_NOWAIT)
-+                virBufferAddLit(&buf, ",nowait");
-+        }
- 
-         qemuBuildChrChardevReconnectStr(&buf, &dev->data.nix.reconnect);
-         break;
-@@ -5425,6 +5437,9 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager,
-                             qemuDomainObjPrivatePtr priv)
- {
-     char *chrdev;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (priv->chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     if (!priv->monConfig)
-         return 0;
-@@ -5432,8 +5447,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager,
-     if (!(chrdev = qemuBuildChrChardevStr(logManager, secManager,
-                                           cmd, cfg, def,
-                                           priv->monConfig, "monitor",
--                                          priv->qemuCaps, true,
--                                          priv->chardevStdioLogd)))
-+                                          priv->qemuCaps, cdevflags)))
-         return -1;
-     virCommandAddArg(cmd, "-chardev");
-     virCommandAddArg(cmd, chrdev);
-@@ -5558,6 +5572,9 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager,
-                              char **chr,
-                              bool chardevStdioLogd)
- {
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
-     *chr = NULL;
- 
-     switch ((virDomainRNGBackend) rng->backend) {
-@@ -5570,8 +5587,8 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager,
-         if (!(*chr = qemuBuildChrChardevStr(logManager, secManager,
-                                             cmd, cfg, def,
-                                             rng->source.chardev,
--                                            rng->info.alias, qemuCaps, true,
--                                            chardevStdioLogd)))
-+                                            rng->info.alias, qemuCaps,
-+                                            cdevflags)))
-             return -1;
-     }
- 
-@@ -8243,8 +8260,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
-         if (!(chardev = qemuBuildChrChardevStr(logManager, secManager,
-                                                cmd, cfg, def,
-                                                net->data.vhostuser,
--                                               net->info.alias, qemuCaps, false,
--                                               false)))
-+                                               net->info.alias, qemuCaps, 0)))
-             goto cleanup;
-         break;
- 
-@@ -8724,6 +8740,9 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
-     virBuffer opt = VIR_BUFFER_INITIALIZER;
-     const char *database;
-     const char *contAlias = NULL;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     if (!def->nsmartcards)
-         return 0;
-@@ -8789,8 +8808,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
-                                               cmd, cfg, def,
-                                               smartcard->data.passthru,
-                                               smartcard->info.alias,
--                                              qemuCaps, true,
--                                              chardevStdioLogd))) {
-+                                              qemuCaps, cdevflags))) {
-             virBufferFreeAndReset(&opt);
-             return -1;
-         }
-@@ -8958,6 +8976,9 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     char *devstr = NULL;
-     int rc;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     if (shmem->size) {
-         /*
-@@ -9021,8 +9042,8 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
-         devstr = qemuBuildChrChardevStr(logManager, secManager,
-                                         cmd, cfg, def,
-                                         &shmem->server.chr,
--                                        shmem->info.alias, qemuCaps, true,
--                                        chardevStdioLogd);
-+                                        shmem->info.alias, qemuCaps,
-+                                        cdevflags);
-         if (!devstr)
-             return -1;
- 
-@@ -9115,6 +9136,9 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager,
- {
-     size_t i;
-     bool havespice = false;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     if (def->nserials) {
-         for (i = 0; i < def->ngraphics && !havespice; i++) {
-@@ -9134,8 +9158,7 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager,
-                                               cmd, cfg, def,
-                                               serial->source,
-                                               serial->info.alias,
--                                              qemuCaps, true,
--                                              chardevStdioLogd)))
-+                                              qemuCaps, cdevflags)))
-             return -1;
-         virCommandAddArg(cmd, "-chardev");
-         virCommandAddArg(cmd, devstr);
-@@ -9176,6 +9199,9 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager,
-                               bool chardevStdioLogd)
- {
-     size_t i;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     for (i = 0; i < def->nparallels; i++) {
-         virDomainChrDefPtr parallel = def->parallels[i];
-@@ -9185,8 +9211,7 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager,
-                                               cmd, cfg, def,
-                                               parallel->source,
-                                               parallel->info.alias,
--                                              qemuCaps, true,
--                                              chardevStdioLogd)))
-+                                              qemuCaps, cdevflags)))
-             return -1;
-         virCommandAddArg(cmd, "-chardev");
-         virCommandAddArg(cmd, devstr);
-@@ -9211,6 +9236,9 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-                              bool chardevStdioLogd)
- {
-     size_t i;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     for (i = 0; i < def->nchannels; i++) {
-         virDomainChrDefPtr channel = def->channels[i];
-@@ -9222,8 +9250,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-                                                   cmd, cfg, def,
-                                                   channel->source,
-                                                   channel->info.alias,
--                                                  qemuCaps, true,
--                                                  chardevStdioLogd)))
-+                                                  qemuCaps, cdevflags)))
-                 return -1;
-             virCommandAddArg(cmd, "-chardev");
-             virCommandAddArg(cmd, devstr);
-@@ -9240,8 +9267,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-                                                   cmd, cfg, def,
-                                                   channel->source,
-                                                   channel->info.alias,
--                                                  qemuCaps, true,
--                                                  chardevStdioLogd)))
-+                                                  qemuCaps, cdevflags)))
-                 return -1;
-             virCommandAddArg(cmd, "-chardev");
-             virCommandAddArg(cmd, devstr);
-@@ -9267,6 +9293,9 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
-                             bool chardevStdioLogd)
- {
-     size_t i;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     /* Explicit console devices */
-     for (i = 0; i < def->nconsoles; i++) {
-@@ -9285,8 +9314,7 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
-                                                   cmd, cfg, def,
-                                                   console->source,
-                                                   console->info.alias,
--                                                  qemuCaps, true,
--                                                  chardevStdioLogd)))
-+                                                  qemuCaps, cdevflags)))
-                 return -1;
-             virCommandAddArg(cmd, "-chardev");
-             virCommandAddArg(cmd, devstr);
-@@ -9307,8 +9335,7 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
-                                                   cmd, cfg, def,
-                                                   console->source,
-                                                   console->info.alias,
--                                                  qemuCaps, true,
--                                                  chardevStdioLogd)))
-+                                                  qemuCaps, cdevflags)))
-                 return -1;
-             virCommandAddArg(cmd, "-chardev");
-             virCommandAddArg(cmd, devstr);
-@@ -9323,8 +9350,7 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
-                                                   cmd, cfg, def,
-                                                   console->source,
-                                                   console->info.alias,
--                                                  qemuCaps, true,
--                                                  chardevStdioLogd)))
-+                                                  qemuCaps, cdevflags)))
-                 return -1;
-             virCommandAddArg(cmd, "-chardev");
-             virCommandAddArg(cmd, devstr);
-@@ -9447,6 +9473,9 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
-                              bool chardevStdioLogd)
- {
-     size_t i;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    if (chardevStdioLogd)
-+        cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-     for (i = 0; i < def->nredirdevs; i++) {
-         virDomainRedirdevDefPtr redirdev = def->redirdevs[i];
-@@ -9456,8 +9485,7 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
-                                               cmd, cfg, def,
-                                               redirdev->source,
-                                               redirdev->info.alias,
--                                              qemuCaps, true,
--                                              chardevStdioLogd))) {
-+                                              qemuCaps, cdevflags))) {
-             return -1;
-         }
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-do-not-revert-to-NULL-bandwidth.patch b/SOURCES/libvirt-qemu-do-not-revert-to-NULL-bandwidth.patch
new file mode 100644
index 0000000..370f87d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-do-not-revert-to-NULL-bandwidth.patch
@@ -0,0 +1,45 @@
+From ce01c67e13d27e578d13192bb20b585f1707f672 Mon Sep 17 00:00:00 2001
+Message-Id: <ce01c67e13d27e578d13192bb20b585f1707f672@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Mon, 10 Feb 2020 17:05:53 +0100
+Subject: [PATCH] qemu: do not revert to NULL bandwidth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise an attempt to set an invalid value:
+  virsh domiftune rhel8.2 vnet0 --outbound 4294968
+on an interface with no bandwidth set crashes.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Fixes: f02e21cb3379a41cd42f2d8116f2d10dabace83b
+https://bugzilla.redhat.com/show_bug.cgi?id=1800505
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit bd622e2a211aad449b54683e2ebd5e980418dd7c)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <6096c4347521d1493728cc7842f6ad455665b744.1581350626.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index caeb76a20c..08f492fa24 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -11646,8 +11646,10 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
+                                                net->bandwidth,
+                                                false,
+                                                !virDomainNetTypeSharesHostView(net)));
+-            ignore_value(virDomainNetBandwidthUpdate(net,
+-                                                     net->bandwidth));
++            if (net->bandwidth) {
++                ignore_value(virDomainNetBandwidthUpdate(net,
++                                                         net->bandwidth));
++            }
+             goto endjob;
+         }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-domain-Add-dev-sev-into-the-domain-mount-namespace-selectively.patch b/SOURCES/libvirt-qemu-domain-Add-dev-sev-into-the-domain-mount-namespace-selectively.patch
deleted file mode 100644
index 6130e0b..0000000
--- a/SOURCES/libvirt-qemu-domain-Add-dev-sev-into-the-domain-mount-namespace-selectively.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d0f98bd3ab59c5c4fa085f22df4763caabcef3b0 Mon Sep 17 00:00:00 2001
-Message-Id: <d0f98bd3ab59c5c4fa085f22df4763caabcef3b0@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 1 Feb 2019 17:21:56 +0100
-Subject: [PATCH] qemu: domain: Add /dev/sev into the domain mount namespace
- selectively
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Instead of exposing /dev/sev to every domain, do it selectively.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 6fd4c8f8785a063112c8161a3a3f5ad3cb6647ea)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1665400
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 0ddc6ef4a7..c530733e97 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -118,6 +118,7 @@ VIR_ENUM_IMPL(qemuDomainNamespace, QEMU_DOMAIN_NS_LAST,
- #define DEVPREFIX "/dev/"
- #define DEV_VFIO "/dev/vfio/vfio"
- #define DEVICE_MAPPER_CONTROL_PATH "/dev/mapper/control"
-+#define DEV_SEV "/dev/sev"
- 
- 
- struct _qemuDomainLogContext {
-@@ -11652,6 +11653,26 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
- }
- 
- 
-+static int
-+qemuDomainSetupLaunchSecurity(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
-+                              virDomainObjPtr vm,
-+                              const struct qemuDomainCreateDeviceData *data)
-+{
-+    virDomainSEVDefPtr sev = vm->def->sev;
-+
-+    if (!sev || sev->sectype != VIR_DOMAIN_LAUNCH_SECURITY_SEV)
-+        return 0;
-+
-+    VIR_DEBUG("Setting up launch security");
-+
-+    if (qemuDomainCreateDevice(DEV_SEV, data, false) < 0)
-+        return -1;
-+
-+    VIR_DEBUG("Set up launch security");
-+    return 0;
-+}
-+
-+
- int
- qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
-                          virSecurityManagerPtr mgr,
-@@ -11723,6 +11744,9 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
-     if (qemuDomainSetupLoader(cfg, vm, &data) < 0)
-         goto cleanup;
- 
-+    if (qemuDomainSetupLaunchSecurity(cfg, vm, &data) < 0)
-+        goto cleanup;
-+
-     /* Save some mount points because we want to share them with the host */
-     for (i = 0; i < ndevMountsPath; i++) {
-         struct stat sb;
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-domain-Convert-detected-iso-image-format-into-raw.patch b/SOURCES/libvirt-qemu-domain-Convert-detected-iso-image-format-into-raw.patch
new file mode 100644
index 0000000..94191ec
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Convert-detected-iso-image-format-into-raw.patch
@@ -0,0 +1,43 @@
+From 627b980c628dd06fb9995e83130fbaa858d4087f Mon Sep 17 00:00:00 2001
+Message-Id: <627b980c628dd06fb9995e83130fbaa858d4087f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:42 +0100
+Subject: [PATCH] qemu: domain: Convert detected 'iso' image format into 'raw'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+While our code can detect ISO as a separate format, qemu does not use it
+as such and just passes it through as raw. Add conversion for detected
+parts of the backing chain so that the validation code does not reject
+it right away.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 3c6e6f55a5ded357c39b92629cd523e51f6ca8f9)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <2c6cfa942acf0d7fe56046122b23780ee5c0d777.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index f037f0812e..ed35260712 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -11598,6 +11598,10 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
+         return -1;
+ 
+     for (n = src->backingStore; virStorageSourceIsBacking(n); n = n->backingStore) {
++        /* convert detected ISO format to 'raw' as qemu would not understand it */
++        if (n->format == VIR_STORAGE_FILE_ISO)
++            n->format = VIR_STORAGE_FILE_RAW;
++
+         if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0)
+             return -1;
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-domain-Extract-code-to-determine-topmost-nodename-to-qemuDomainDiskGetTopNodename.patch b/SOURCES/libvirt-qemu-domain-Extract-code-to-determine-topmost-nodename-to-qemuDomainDiskGetTopNodename.patch
new file mode 100644
index 0000000..7687f0f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Extract-code-to-determine-topmost-nodename-to-qemuDomainDiskGetTopNodename.patch
@@ -0,0 +1,106 @@
+From 4ad02094b6166037a04310dbf9a3eb2dcc21ca61 Mon Sep 17 00:00:00 2001
+Message-Id: <4ad02094b6166037a04310dbf9a3eb2dcc21ca61@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:37 +0100
+Subject: [PATCH] qemu: domain: Extract code to determine topmost nodename to
+ qemuDomainDiskGetTopNodename
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are more places which require getting the topmost nodename to be
+passed to qemu. Separate it out into a new function.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 0b0f389335e5d11150fa60561cae960f20d5ca44)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1792195
+Message-Id: <b3c89cd0893677d101bc8f491bbd323db6133b19.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++++++------------
+ src/qemu/qemu_domain.h |  4 ++++
+ 2 files changed, 30 insertions(+), 12 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index e37404340f..be9de75909 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -11598,6 +11598,31 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
+ }
+ 
+ 
++/**
++ * qemuDomainDiskGetTopNodename:
++ *
++ * @disk: disk definition object
++ *
++ * Returns the pointer to the node-name of the topmost layer used by @disk as
++ * backend. Currently returns the nodename of the copy-on-read filter if enabled
++ * or the nodename of the top image's format driver. Empty disks return NULL.
++ * This must be used only when VIR_QEMU_CAPS_BLOCKDEV is enabled.
++ */
++const char *
++qemuDomainDiskGetTopNodename(virDomainDiskDefPtr disk)
++{
++    qemuDomainDiskPrivatePtr priv = QEMU_DOMAIN_DISK_PRIVATE(disk);
++
++    if (virStorageSourceIsEmpty(disk->src))
++        return NULL;
++
++    if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON)
++        return priv->nodeCopyOnRead;
++
++    return disk->src->nodeformat;
++}
++
++
+ /**
+  * qemuDomainDiskGetBackendAlias:
+  * @disk: disk definition
+@@ -11617,8 +11642,6 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk,
+                               virQEMUCapsPtr qemuCaps,
+                               char **backendAlias)
+ {
+-    qemuDomainDiskPrivatePtr priv = QEMU_DOMAIN_DISK_PRIVATE(disk);
+-    const char *nodename = NULL;
+     *backendAlias = NULL;
+ 
+     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+@@ -11628,16 +11651,7 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk,
+         return 0;
+     }
+ 
+-    if (virStorageSourceIsEmpty(disk->src))
+-        return 0;
+-
+-    if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON)
+-        nodename = priv->nodeCopyOnRead;
+-    else
+-        nodename = disk->src->nodeformat;
+-
+-    *backendAlias = g_strdup(nodename);
+-
++    *backendAlias = g_strdup(qemuDomainDiskGetTopNodename(disk));
+     return 0;
+ }
+ 
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 60b80297fa..d1ab5da2c7 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -881,6 +881,10 @@ int qemuDomainStorageFileInit(virQEMUDriverPtr driver,
+                               virStorageSourcePtr parent);
+ char *qemuDomainStorageAlias(const char *device, int depth);
+ 
++const char *
++qemuDomainDiskGetTopNodename(virDomainDiskDefPtr disk)
++    ATTRIBUTE_NONNULL(1);
++
+ int qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk,
+                                   virQEMUCapsPtr qemuCaps,
+                                   char **backendAlias)
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-domain-Extract-formatting-of-commit-blockjob-data-into-a-function.patch b/SOURCES/libvirt-qemu-domain-Extract-formatting-of-commit-blockjob-data-into-a-function.patch
new file mode 100644
index 0000000..607dc57
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Extract-formatting-of-commit-blockjob-data-into-a-function.patch
@@ -0,0 +1,72 @@
+From f306de1577b94e303cc6e6d50e48459751dfa02a Mon Sep 17 00:00:00 2001
+Message-Id: <f306de1577b94e303cc6e6d50e48459751dfa02a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:20 +0100
+Subject: [PATCH] qemu: domain: Extract formatting of 'commit' blockjob data
+ into a function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+I'll be adding more fields to care about so splitting the code out will
+be better long-term.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Mores <pmores@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit c72e9064ce2fd114aa5ac046f935d2a5661c8d20)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <98f3090755fcdb4b54deb37a004c9f0d0e40db31.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index cc47e7a2f0..a8ac68af92 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2599,6 +2599,24 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr buf,
+ }
+ 
+ 
++static void
++qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobDataPtr job,
++                                      virBufferPtr buf)
++{
++    if (job->data.commit.base)
++        virBufferAsprintf(buf, "<base node='%s'/>\n", job->data.commit.base->nodeformat);
++
++    if (job->data.commit.top)
++        virBufferAsprintf(buf, "<top node='%s'/>\n", job->data.commit.top->nodeformat);
++
++    if (job->data.commit.topparent)
++        virBufferAsprintf(buf, "<topparent node='%s'/>\n", job->data.commit.topparent->nodeformat);
++
++    if (job->data.commit.deleteCommittedImages)
++        virBufferAddLit(buf, "<deleteCommittedImages/>\n");
++}
++
++
+ static int
+ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
+                                               const void *name G_GNUC_UNUSED,
+@@ -2658,14 +2676,7 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
+ 
+         case QEMU_BLOCKJOB_TYPE_COMMIT:
+         case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+-            if (job->data.commit.base)
+-                virBufferAsprintf(&childBuf, "<base node='%s'/>\n", job->data.commit.base->nodeformat);
+-            if (job->data.commit.top)
+-                virBufferAsprintf(&childBuf, "<top node='%s'/>\n", job->data.commit.top->nodeformat);
+-            if (job->data.commit.topparent)
+-                virBufferAsprintf(&childBuf, "<topparent node='%s'/>\n", job->data.commit.topparent->nodeformat);
+-            if (job->data.commit.deleteCommittedImages)
+-                virBufferAddLit(&childBuf, "<deleteCommittedImages/>\n");
++            qemuDomainPrivateBlockJobFormatCommit(job, &childBuf);
+             break;
+ 
+         case QEMU_BLOCKJOB_TYPE_CREATE:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-domain-Extract-parsing-of-commit-blockjob-data-into-a-function.patch b/SOURCES/libvirt-qemu-domain-Extract-parsing-of-commit-blockjob-data-into-a-function.patch
new file mode 100644
index 0000000..0dddbe1
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Extract-parsing-of-commit-blockjob-data-into-a-function.patch
@@ -0,0 +1,104 @@
+From 4cbdc7ecefe8351e9e354c1906aba46869f220fd Mon Sep 17 00:00:00 2001
+Message-Id: <4cbdc7ecefe8351e9e354c1906aba46869f220fd@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:21 +0100
+Subject: [PATCH] qemu: domain: Extract parsing of 'commit' blockjob data into
+ a function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+I'll be adding more fields to care about so splitting the code out will
+be better long-term.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Pavel Mores <pmores@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 38d0dd08d61446455ff54e0a7b97b1a48054b7c5)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <9689f027815d6fc799bae46ce9c12c3d55d9c728.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 57 ++++++++++++++++++++++++++----------------
+ 1 file changed, 36 insertions(+), 21 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index a8ac68af92..0faf042145 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -3236,6 +3236,40 @@ qemuDomainObjPrivateXMLParseBlockjobNodename(qemuBlockJobDataPtr job,
+ }
+ 
+ 
++static int
++qemuDomainObjPrivateXMLParseBlockjobDataCommit(qemuBlockJobDataPtr job,
++                                               xmlXPathContextPtr ctxt)
++{
++    if (job->type == QEMU_BLOCKJOB_TYPE_COMMIT) {
++        qemuDomainObjPrivateXMLParseBlockjobNodename(job,
++                                                     "string(./topparent/@node)",
++                                                     &job->data.commit.topparent,
++                                                     ctxt);
++
++        if (!job->data.commit.topparent)
++            return -1;
++    }
++
++    qemuDomainObjPrivateXMLParseBlockjobNodename(job,
++                                                 "string(./top/@node)",
++                                                 &job->data.commit.top,
++                                                 ctxt);
++    qemuDomainObjPrivateXMLParseBlockjobNodename(job,
++                                                 "string(./base/@node)",
++                                                 &job->data.commit.base,
++                                                 ctxt);
++
++    if (virXPathNode("./deleteCommittedImages", ctxt))
++        job->data.commit.deleteCommittedImages = true;
++
++    if (!job->data.commit.top ||
++        !job->data.commit.base)
++        return -1;
++
++    return 0;
++}
++
++
+ static void
+ qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
+                                                  xmlXPathContextPtr ctxt,
+@@ -3255,29 +3289,10 @@ qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
+             break;
+ 
+         case QEMU_BLOCKJOB_TYPE_COMMIT:
+-            qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+-                                                         "string(./topparent/@node)",
+-                                                         &job->data.commit.topparent,
+-                                                         ctxt);
+-
+-            if (!job->data.commit.topparent)
+-                goto broken;
+-
+-            G_GNUC_FALLTHROUGH;
+         case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+-            qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+-                                                         "string(./top/@node)",
+-                                                         &job->data.commit.top,
+-                                                         ctxt);
+-            qemuDomainObjPrivateXMLParseBlockjobNodename(job,
+-                                                         "string(./base/@node)",
+-                                                         &job->data.commit.base,
+-                                                         ctxt);
+-            if (virXPathNode("./deleteCommittedImages", ctxt))
+-                job->data.commit.deleteCommittedImages = true;
+-            if (!job->data.commit.top ||
+-                !job->data.commit.base)
++            if (qemuDomainObjPrivateXMLParseBlockjobDataCommit(job, ctxt) < 0)
+                 goto broken;
++
+             break;
+ 
+         case QEMU_BLOCKJOB_TYPE_CREATE:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-domain-Refactor-formatting-of-node-names-into-status-XML.patch b/SOURCES/libvirt-qemu-domain-Refactor-formatting-of-node-names-into-status-XML.patch
new file mode 100644
index 0000000..6b8c059
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Refactor-formatting-of-node-names-into-status-XML.patch
@@ -0,0 +1,51 @@
+From 3559a27948b48c93295867ff5c8390aad0456a34 Mon Sep 17 00:00:00 2001
+Message-Id: <3559a27948b48c93295867ff5c8390aad0456a34@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:12 +0100
+Subject: [PATCH] qemu: domain: Refactor formatting of node names into status
+ XML
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use virXMLFormatElement to simplify the logic.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9fb7ccb3cfc13fc58d9575813f276fa049368cd9)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <772d21f8bcf6d76ceec0d4dc0dc2c507cab70912.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 8e0e919f9a..cf069e2b79 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2402,15 +2402,12 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
+ {
+     g_auto(virBuffer) tmp = VIR_BUFFER_INIT_CHILD(buf);
+     qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
++    g_auto(virBuffer) nodenamesChildBuf = VIR_BUFFER_INIT_CHILD(buf);
+ 
+-    if (src->nodestorage || src->nodeformat) {
+-        virBufferAddLit(buf, "<nodenames>\n");
+-        virBufferAdjustIndent(buf, 2);
+-        virBufferEscapeString(buf, "<nodename type='storage' name='%s'/>\n", src->nodestorage);
+-        virBufferEscapeString(buf, "<nodename type='format' name='%s'/>\n", src->nodeformat);
+-        virBufferAdjustIndent(buf, -2);
+-        virBufferAddLit(buf, "</nodenames>\n");
+-    }
++    virBufferEscapeString(&nodenamesChildBuf, "<nodename type='storage' name='%s'/>\n", src->nodestorage);
++    virBufferEscapeString(&nodenamesChildBuf, "<nodename type='format' name='%s'/>\n", src->nodeformat);
++
++    virXMLFormatElement(buf, "nodenames", NULL, &nodenamesChildBuf);
+ 
+     if (src->pr)
+         virBufferAsprintf(buf, "<reservations mgralias='%s'/>\n", src->pr->mgralias);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-domain-Remove-unused-qemuDomainDiskNodeFormatLookup.patch b/SOURCES/libvirt-qemu-domain-Remove-unused-qemuDomainDiskNodeFormatLookup.patch
new file mode 100644
index 0000000..404af1c
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Remove-unused-qemuDomainDiskNodeFormatLookup.patch
@@ -0,0 +1,66 @@
+From 448ed3bee3e5b3a12a7bd0acd40ca0729214fba3 Mon Sep 17 00:00:00 2001
+Message-Id: <448ed3bee3e5b3a12a7bd0acd40ca0729214fba3@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:55 +0100
+Subject: [PATCH] qemu: domain: Remove unused qemuDomainDiskNodeFormatLookup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function has no users now and there's no need for it as the common
+pattern is to look up the whole disk object anyways.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 180b3422e9a3391a0ee59d0076730ba85778fc7a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <b6ab98ea54aced2d9aeb9abdca30fc4669b92bbe.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 14 --------------
+ src/qemu/qemu_domain.h |  3 ---
+ 2 files changed, 17 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index be9de75909..94efcdf9b1 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -12092,20 +12092,6 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk,
+ }
+ 
+ 
+-/* Return the format node name for a given disk of an online guest */
+-const char *
+-qemuDomainDiskNodeFormatLookup(virDomainObjPtr vm,
+-                               const char *disk)
+-{
+-    size_t i;
+-
+-    for (i = 0; i < vm->def->ndisks; i++) {
+-        if (STREQ(vm->def->disks[i]->dst, disk))
+-            return vm->def->disks[i]->src->nodeformat;
+-    }
+-    return NULL;
+-}
+-
+ bool
+ qemuDomainDiskBlockJobIsActive(virDomainDiskDefPtr disk)
+ {
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index d1ab5da2c7..cdcb6ecc7a 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -865,9 +865,6 @@ int qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
+ bool qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk,
+                                    virDomainDiskDefPtr orig_disk);
+ 
+-const char *qemuDomainDiskNodeFormatLookup(virDomainObjPtr vm,
+-                                           const char *disk);
+-
+ void qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg,
+                            virDomainObjPtr vm,
+                            virStorageSourcePtr src,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-domain-Simplify-non-VFIO-memLockLimit-calculation-for-PPC64.patch b/SOURCES/libvirt-qemu-domain-Simplify-non-VFIO-memLockLimit-calculation-for-PPC64.patch
deleted file mode 100644
index 6931e00..0000000
--- a/SOURCES/libvirt-qemu-domain-Simplify-non-VFIO-memLockLimit-calculation-for-PPC64.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 18f38f4aee3a3472f5e50786ee221d8d397bc6a8 Mon Sep 17 00:00:00 2001
-Message-Id: <18f38f4aee3a3472f5e50786ee221d8d397bc6a8@dist-git>
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Fri, 3 May 2019 13:54:50 +0200
-Subject: [PATCH] qemu: domain: Simplify non-VFIO memLockLimit calculation for
- PPC64
-
-@passthroughLimit is being calculated even if @usesVFIO is false. After
-that, an if-else conditional is used to check if we're going to sum it
-up with @baseLimit.
-
-This patch initializes @passthroughLimit to zero and always returns
-@memKB = @baseLimit + @passthroughLimit. The conditional is then used to
-calculate @passthroughLimit if @usesVFIO == true. This results in some
-cycles being spared for the @usesVFIO == false scenario, but the real
-motivation is to make the code simpler to add an alternative formula to
-calculate @passthroughLimit for NVLink2.
-
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit cf7c5212876b2403de5b0fafedec33af4439526e)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1505998
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <a6380e14dfb1c8cb463f5e3eb25bda78dc9d7dd8.1556884442.git.eskultet@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_domain.c | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index cc2a896a07..d936090d87 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9840,7 +9840,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def)
-         unsigned long long maxMemory;
-         unsigned long long memory;
-         unsigned long long baseLimit;
--        unsigned long long passthroughLimit;
-+        unsigned long long passthroughLimit = 0;
-         size_t nPCIHostBridges = 0;
-         bool usesVFIO = false;
- 
-@@ -9906,15 +9906,12 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def)
-          * kiB pages, less still if the guest is mapped with hugepages (unlike
-          * the default 32-bit DMA window, DDW windows can use large IOMMU
-          * pages). 8 MiB is for second and further level overheads, like (b) */
--        passthroughLimit = MAX(2 * 1024 * 1024 * nPCIHostBridges,
--                               memory +
--                               memory / 512 * nPCIHostBridges + 8192);
--
-         if (usesVFIO)
--            memKB = baseLimit + passthroughLimit;
--        else
--            memKB = baseLimit;
-+            passthroughLimit = MAX(2 * 1024 * 1024 * nPCIHostBridges,
-+                                   memory +
-+                                   memory / 512 * nPCIHostBridges + 8192);
- 
-+        memKB = baseLimit + passthroughLimit;
-         goto done;
-     }
- 
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu-domain-Store-data-for-secret-object-representing-http-cookies.patch b/SOURCES/libvirt-qemu-domain-Store-data-for-secret-object-representing-http-cookies.patch
new file mode 100644
index 0000000..cb10075
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Store-data-for-secret-object-representing-http-cookies.patch
@@ -0,0 +1,105 @@
+From 270be96a2730304de8f5dd1d24dd367c9ed52b22 Mon Sep 17 00:00:00 2001
+Message-Id: <270be96a2730304de8f5dd1d24dd367c9ed52b22@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:02 +0100
+Subject: [PATCH] qemu: domain: Store data for 'secret' object representing
+ http cookies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The http cookies can have potentially sensitive values and thus should
+not be leaked into the command line. This means that we'll need to
+instantiate a 'secret' object in qemu to pass the value encrypted.
+
+This patch adds infrastructure for storing of the alias in the status
+XML.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4e8faa5cdc54ce637f760ad4513753e17d2b9a4f)
+
+ Conflicts:
+	src/qemu/qemu_domain.c:
+        Context conflict with missing backport of cleanups. (mentioned
+                                                             earlier)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <b51659e22b0840ca6c5431c4e212445bdeb4c12d.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c                    | 8 +++++++-
+ src/qemu/qemu_domain.h                    | 3 +++
+ tests/qemustatusxml2xmldata/modern-in.xml | 1 +
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 2920e699f6..9391bc37e0 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2341,6 +2341,7 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
+     char *authalias = NULL;
+     char *encalias = NULL;
+     int ret = -1;
++    g_autofree char *httpcookiealias = NULL;
+ 
+     src->nodestorage = virXPathString("string(./nodenames/nodename[@type='storage']/@name)", ctxt);
+     src->nodeformat = virXPathString("string(./nodenames/nodename[@type='format']/@name)", ctxt);
+@@ -2354,8 +2355,9 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
+ 
+     authalias = virXPathString("string(./objects/secret[@type='auth']/@alias)", ctxt);
+     encalias = virXPathString("string(./objects/secret[@type='encryption']/@alias)", ctxt);
++    httpcookiealias = virXPathString("string(./objects/secret[@type='httpcookie']/@alias)", ctxt);
+ 
+-    if (authalias || encalias) {
++    if (authalias || encalias || httpcookiealias) {
+         if (!src->privateData &&
+             !(src->privateData = qemuDomainStorageSourcePrivateNew()))
+             goto cleanup;
+@@ -2367,6 +2369,9 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
+ 
+         if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &encalias) < 0)
+             goto cleanup;
++
++        if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->httpcookie, &httpcookiealias) < 0)
++            goto cleanup;
+     }
+ 
+     if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0)
+@@ -2423,6 +2428,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
+     if (srcPriv) {
+         qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->secinfo, "auth");
+         qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->encinfo, "encryption");
++        qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->httpcookie, "httpcookie");
+     }
+ 
+     if (src->tlsAlias)
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index bd9ac85ae2..5733954679 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -460,6 +460,9 @@ struct _qemuDomainStorageSourcePrivate {
+ 
+     /* data required for decryption of encrypted storage source */
+     qemuDomainSecretInfoPtr encinfo;
++
++    /* secure passthrough of the http cookie */
++    qemuDomainSecretInfoPtr httpcookie;
+ };
+ 
+ virObjectPtr qemuDomainStorageSourcePrivateNew(void);
+diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml
+index c8d21ceada..cb56cdcef9 100644
+--- a/tests/qemustatusxml2xmldata/modern-in.xml
++++ b/tests/qemustatusxml2xmldata/modern-in.xml
+@@ -332,6 +332,7 @@
+               <objects>
+                 <secret type='auth' alias='test-auth-alias'/>
+                 <secret type='encryption' alias='test-encryption-alias'/>
++                <secret type='httpcookie' alias='http-cookie-alias'/>
+                 <TLSx509 alias='transport-alias'/>
+               </objects>
+             </privateData>
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-domain-Store-nodenames-of-slice-in-status-XML.patch b/SOURCES/libvirt-qemu-domain-Store-nodenames-of-slice-in-status-XML.patch
new file mode 100644
index 0000000..d754855
--- /dev/null
+++ b/SOURCES/libvirt-qemu-domain-Store-nodenames-of-slice-in-status-XML.patch
@@ -0,0 +1,74 @@
+From 32e26f3aff542e642641c32d9fa65577c891e337 Mon Sep 17 00:00:00 2001
+Message-Id: <32e26f3aff542e642641c32d9fa65577c891e337@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:21 +0100
+Subject: [PATCH] qemu: domain: Store nodenames of slice in status XML
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The storage slice will require a specific node name in cases when the
+image format is not raw. Store and format them in the status XML.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit f36d751fa6d091af5f1c2331f607e0ec3d8993fb)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <83b00663d313ed032a6b7723b8427c3224f2c9c8.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c                    | 7 +++++++
+ tests/qemustatusxml2xmldata/modern-in.xml | 4 ++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 7b414b79c7..948bf3011c 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -2348,6 +2348,9 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
+     src->nodeformat = virXPathString("string(./nodenames/nodename[@type='format']/@name)", ctxt);
+     src->tlsAlias = virXPathString("string(./objects/TLSx509/@alias)", ctxt);
+ 
++    if (src->sliceStorage)
++        src->sliceStorage->nodename = virXPathString("string(./nodenames/nodename[@type='slice-storage']/@name)", ctxt);
++
+     if (src->pr)
+         src->pr->mgralias = virXPathString("string(./reservations/@mgralias)", ctxt);
+ 
+@@ -2407,6 +2410,10 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
+     virBufferEscapeString(&nodenamesChildBuf, "<nodename type='storage' name='%s'/>\n", src->nodestorage);
+     virBufferEscapeString(&nodenamesChildBuf, "<nodename type='format' name='%s'/>\n", src->nodeformat);
+ 
++    if (src->sliceStorage)
++        virBufferEscapeString(&nodenamesChildBuf, "<nodename type='slice-storage' name='%s'/>\n",
++                              src->sliceStorage->nodename);
++
+     virXMLFormatElement(buf, "nodenames", NULL, &nodenamesChildBuf);
+ 
+     if (src->pr)
+diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml
+index 8a2718293f..c8d21ceada 100644
+--- a/tests/qemustatusxml2xmldata/modern-in.xml
++++ b/tests/qemustatusxml2xmldata/modern-in.xml
+@@ -312,6 +312,9 @@
+         <backingStore type='file' index='1'>
+           <format type='qcow2'/>
+           <source file='/var/lib/libvirt/images/base.qcow2'>
++            <slices>
++              <slice type='storage' offset='1234' size='3456'/>
++            </slices>
+             <seclabel model='dac' relabel='yes'>
+               <label>qemu:qemu</label>
+             </seclabel>
+@@ -322,6 +325,7 @@
+               <nodenames>
+                 <nodename type='storage' name='test-storage'/>
+                 <nodename type='format' name='test-format'/>
++                <nodename type='slice-storage' name='test-slice-storage'/>
+               </nodenames>
+               <reservations mgralias='test-alias'/>
+               <relPath>base.qcow2</relPath>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-don-t-access-vmdef-within-qemu_agent.c.patch b/SOURCES/libvirt-qemu-don-t-access-vmdef-within-qemu_agent.c.patch
new file mode 100644
index 0000000..23a3544
--- /dev/null
+++ b/SOURCES/libvirt-qemu-don-t-access-vmdef-within-qemu_agent.c.patch
@@ -0,0 +1,947 @@
+From 314e0b35249ff662cb76d9b03f33aeb700c6a43a Mon Sep 17 00:00:00 2001
+Message-Id: <314e0b35249ff662cb76d9b03f33aeb700c6a43a@dist-git>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Thu, 20 Feb 2020 10:52:26 -0600
+Subject: [PATCH] qemu: don't access vmdef within qemu_agent.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In order to avoid holding an agent job and a normal job at the same
+time, we want to avoid accessing the domain's definition while holding
+the agent job. To achieve this, qemuAgentGetFSInfo() only returns the
+raw information from the agent query to the caller. The caller can then
+release the agent job and then proceed to look up the disk alias from
+the vm definition. This necessitates moving a few helper functions to
+qemu_driver.c and exposing the agent data structure (qemuAgentFSInfo) in
+the header.
+
+In addition, because the agent function no longer returns the looked-up
+disk alias, we can't test the alias within qemuagenttest.  Instead we
+simply test that we parse and return the raw agent data correctly.
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 599ae372d8cf0923757c5a3792acb07dcf3e8802)
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1759566
+Message-Id: <20200220165227.11491-5-jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_agent.c  | 219 +----------------------------------
+ src/qemu/qemu_agent.h  |  33 ++++--
+ src/qemu/qemu_driver.c | 255 ++++++++++++++++++++++++++++++++++++++---
+ tests/qemuagenttest.c  | 196 +++++--------------------------
+ 4 files changed, 299 insertions(+), 404 deletions(-)
+
+diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
+index 4739faeed8..ef2d2c500b 100644
+--- a/src/qemu/qemu_agent.c
++++ b/src/qemu/qemu_agent.c
+@@ -1844,30 +1844,6 @@ qemuAgentSetTime(qemuAgentPtr mon,
+     return ret;
+ }
+ 
+-typedef struct _qemuAgentDiskInfo qemuAgentDiskInfo;
+-typedef qemuAgentDiskInfo *qemuAgentDiskInfoPtr;
+-struct _qemuAgentDiskInfo {
+-    char *serial;
+-    virPCIDeviceAddress pci_controller;
+-    char *bus_type;
+-    unsigned int bus;
+-    unsigned int target;
+-    unsigned int unit;
+-    char *devnode;
+-};
+-
+-typedef struct _qemuAgentFSInfo qemuAgentFSInfo;
+-typedef qemuAgentFSInfo *qemuAgentFSInfoPtr;
+-struct _qemuAgentFSInfo {
+-    char *mountpoint; /* path to mount point */
+-    char *name;       /* device name in the guest (e.g. "sda1") */
+-    char *fstype;     /* filesystem type */
+-    long long total_bytes;
+-    long long used_bytes;
+-    size_t ndisks;
+-    qemuAgentDiskInfoPtr *disks;
+-};
+-
+ static void
+ qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info)
+ {
+@@ -1880,7 +1856,7 @@ qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info)
+     VIR_FREE(info);
+ }
+ 
+-static void
++void
+ qemuAgentFSInfoFree(qemuAgentFSInfoPtr info)
+ {
+     size_t i;
+@@ -1899,47 +1875,6 @@ qemuAgentFSInfoFree(qemuAgentFSInfoPtr info)
+     VIR_FREE(info);
+ }
+ 
+-static virDomainFSInfoPtr
+-qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent,
+-                        virDomainDefPtr vmdef)
+-{
+-    virDomainFSInfoPtr ret = NULL;
+-    size_t i;
+-
+-    if (VIR_ALLOC(ret) < 0)
+-        goto error;
+-
+-    ret->mountpoint = g_strdup(agent->mountpoint);
+-    ret->name = g_strdup(agent->name);
+-    ret->fstype = g_strdup(agent->fstype);
+-
+-    if (agent->disks &&
+-        VIR_ALLOC_N(ret->devAlias, agent->ndisks) < 0)
+-        goto error;
+-
+-    ret->ndevAlias = agent->ndisks;
+-
+-    for (i = 0; i < ret->ndevAlias; i++) {
+-        qemuAgentDiskInfoPtr agentdisk = agent->disks[i];
+-        virDomainDiskDefPtr diskDef;
+-
+-        if (!(diskDef = virDomainDiskByAddress(vmdef,
+-                                               &agentdisk->pci_controller,
+-                                               agentdisk->bus,
+-                                               agentdisk->target,
+-                                               agentdisk->unit)))
+-            continue;
+-
+-        ret->devAlias[i] = g_strdup(diskDef->dst);
+-    }
+-
+-    return ret;
+-
+- error:
+-    virDomainFSInfoFree(ret);
+-    return NULL;
+-}
+-
+ static int
+ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+                             qemuAgentFSInfoPtr fsinfo)
+@@ -2013,7 +1948,6 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+         GET_DISK_ADDR(pci, &disk->pci_controller.bus, "bus");
+         GET_DISK_ADDR(pci, &disk->pci_controller.slot, "slot");
+         GET_DISK_ADDR(pci, &disk->pci_controller.function, "function");
+-
+ #undef GET_DISK_ADDR
+     }
+ 
+@@ -2024,9 +1958,9 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+  *          -2 when agent command is not supported by the agent
+  *          -1 otherwise
+  */
+-static int
+-qemuAgentGetFSInfoInternal(qemuAgentPtr mon,
+-                           qemuAgentFSInfoPtr **info)
++int
++qemuAgentGetFSInfo(qemuAgentPtr mon,
++                   qemuAgentFSInfoPtr **info)
+ {
+     size_t i;
+     int ret = -1;
+@@ -2158,151 +2092,6 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon,
+     return ret;
+ }
+ 
+-/* Returns: 0 on success
+- *          -1 otherwise
+- */
+-int
+-qemuAgentGetFSInfo(qemuAgentPtr mon,
+-                   virDomainFSInfoPtr **info,
+-                   virDomainDefPtr vmdef)
+-{
+-    int ret = -1;
+-    qemuAgentFSInfoPtr *agentinfo = NULL;
+-    virDomainFSInfoPtr *info_ret = NULL;
+-    size_t i;
+-    int nfs;
+-
+-    nfs = qemuAgentGetFSInfoInternal(mon, &agentinfo);
+-    if (nfs < 0)
+-        return ret;
+-    if (VIR_ALLOC_N(info_ret, nfs) < 0)
+-        goto cleanup;
+-
+-    for (i = 0; i < nfs; i++) {
+-        if (!(info_ret[i] = qemuAgentFSInfoToPublic(agentinfo[i], vmdef)))
+-            goto cleanup;
+-    }
+-
+-    *info = g_steal_pointer(&info_ret);
+-    ret = nfs;
+-
+- cleanup:
+-    for (i = 0; i < nfs; i++) {
+-        qemuAgentFSInfoFree(agentinfo[i]);
+-        /* if there was an error, free any memory we've allocated for the
+-         * return value */
+-        if (info_ret)
+-            virDomainFSInfoFree(info_ret[i]);
+-    }
+-    VIR_FREE(agentinfo);
+-    VIR_FREE(info_ret);
+-    return ret;
+-}
+-
+-/* Returns: 0 on success
+- *          -2 when agent command is not supported by the agent
+- *          -1 otherwise
+- */
+-int
+-qemuAgentGetFSInfoParams(qemuAgentPtr mon,
+-                         virTypedParameterPtr *params,
+-                         int *nparams, int *maxparams,
+-                         virDomainDefPtr vmdef)
+-{
+-    int ret = -1;
+-    qemuAgentFSInfoPtr *fsinfo = NULL;
+-    size_t i, j;
+-    int nfs;
+-
+-    if ((nfs = qemuAgentGetFSInfoInternal(mon, &fsinfo)) < 0)
+-        return nfs;
+-
+-    if (virTypedParamsAddUInt(params, nparams, maxparams,
+-                              "fs.count", nfs) < 0)
+-        goto cleanup;
+-
+-    for (i = 0; i < nfs; i++) {
+-        char param_name[VIR_TYPED_PARAM_FIELD_LENGTH];
+-        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                   "fs.%zu.name", i);
+-        if (virTypedParamsAddString(params, nparams, maxparams,
+-                                    param_name, fsinfo[i]->name) < 0)
+-            goto cleanup;
+-        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                   "fs.%zu.mountpoint", i);
+-        if (virTypedParamsAddString(params, nparams, maxparams,
+-                                    param_name, fsinfo[i]->mountpoint) < 0)
+-            goto cleanup;
+-        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                   "fs.%zu.fstype", i);
+-        if (virTypedParamsAddString(params, nparams, maxparams,
+-                                    param_name, fsinfo[i]->fstype) < 0)
+-            goto cleanup;
+-
+-        /* disk usage values are not returned by older guest agents, so
+-         * only add the params if the value is set */
+-        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                   "fs.%zu.total-bytes", i);
+-        if (fsinfo[i]->total_bytes != -1 &&
+-            virTypedParamsAddULLong(params, nparams, maxparams,
+-                                    param_name, fsinfo[i]->total_bytes) < 0)
+-            goto cleanup;
+-
+-        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                   "fs.%zu.used-bytes", i);
+-        if (fsinfo[i]->used_bytes != -1 &&
+-            virTypedParamsAddULLong(params, nparams, maxparams,
+-                                    param_name, fsinfo[i]->used_bytes) < 0)
+-            goto cleanup;
+-
+-        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                   "fs.%zu.disk.count", i);
+-        if (virTypedParamsAddUInt(params, nparams, maxparams,
+-                                  param_name, fsinfo[i]->ndisks) < 0)
+-            goto cleanup;
+-        for (j = 0; j < fsinfo[i]->ndisks; j++) {
+-            virDomainDiskDefPtr diskdef = NULL;
+-            qemuAgentDiskInfoPtr d = fsinfo[i]->disks[j];
+-            /* match the disk to the target in the vm definition */
+-            diskdef = virDomainDiskByAddress(vmdef,
+-                                             &d->pci_controller,
+-                                             d->bus,
+-                                             d->target,
+-                                             d->unit);
+-            if (diskdef) {
+-                g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                           "fs.%zu.disk.%zu.alias", i, j);
+-                if (diskdef->dst &&
+-                    virTypedParamsAddString(params, nparams, maxparams,
+-                                            param_name, diskdef->dst) < 0)
+-                    goto cleanup;
+-            }
+-
+-            g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                       "fs.%zu.disk.%zu.serial", i, j);
+-            if (d->serial &&
+-                virTypedParamsAddString(params, nparams, maxparams,
+-                                        param_name, d->serial) < 0)
+-                goto cleanup;
+-
+-            g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+-                       "fs.%zu.disk.%zu.device", i, j);
+-            if (d->devnode &&
+-                virTypedParamsAddString(params, nparams, maxparams,
+-                                        param_name, d->devnode) < 0)
+-                goto cleanup;
+-        }
+-    }
+-    ret = nfs;
+-
+- cleanup:
+-    for (i = 0; i < nfs; i++)
+-        qemuAgentFSInfoFree(fsinfo[i]);
+-    VIR_FREE(fsinfo);
+-
+-    return ret;
+-}
+-
+ /*
+  * qemuAgentGetInterfaces:
+  * @mon: Agent monitor
+diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
+index 85e436cf68..5656fe60ff 100644
+--- a/src/qemu/qemu_agent.h
++++ b/src/qemu/qemu_agent.h
+@@ -65,19 +65,38 @@ typedef enum {
+     QEMU_AGENT_SHUTDOWN_LAST,
+ } qemuAgentShutdownMode;
+ 
++typedef struct _qemuAgentDiskInfo qemuAgentDiskInfo;
++typedef qemuAgentDiskInfo *qemuAgentDiskInfoPtr;
++struct _qemuAgentDiskInfo {
++    char *serial;
++    virPCIDeviceAddress pci_controller;
++    char *bus_type;
++    unsigned int bus;
++    unsigned int target;
++    unsigned int unit;
++    char *devnode;
++};
++
++typedef struct _qemuAgentFSInfo qemuAgentFSInfo;
++typedef qemuAgentFSInfo *qemuAgentFSInfoPtr;
++struct _qemuAgentFSInfo {
++    char *mountpoint; /* path to mount point */
++    char *name;       /* device name in the guest (e.g. "sda1") */
++    char *fstype;     /* filesystem type */
++    long long total_bytes;
++    long long used_bytes;
++    size_t ndisks;
++    qemuAgentDiskInfoPtr *disks;
++};
++void qemuAgentFSInfoFree(qemuAgentFSInfoPtr info);
++
+ int qemuAgentShutdown(qemuAgentPtr mon,
+                       qemuAgentShutdownMode mode);
+ 
+ int qemuAgentFSFreeze(qemuAgentPtr mon,
+                       const char **mountpoints, unsigned int nmountpoints);
+ int qemuAgentFSThaw(qemuAgentPtr mon);
+-int qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info,
+-                       virDomainDefPtr vmdef);
+-
+-int qemuAgentGetFSInfoParams(qemuAgentPtr mon,
+-                             virTypedParameterPtr *params,
+-                             int *nparams, int *maxparams,
+-                             virDomainDefPtr vmdef);
++int qemuAgentGetFSInfo(qemuAgentPtr mon, qemuAgentFSInfoPtr **info);
+ 
+ int qemuAgentSuspend(qemuAgentPtr mon,
+                      unsigned int target);
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 69e4f7264b..ac3a7ad282 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -21839,6 +21839,111 @@ qemuNodeAllocPages(virConnectPtr conn,
+                                 startCell, cellCount, add);
+ }
+ 
++static int
++qemuDomainGetFSInfoAgent(virQEMUDriverPtr driver,
++                         virDomainObjPtr vm,
++                         qemuAgentFSInfoPtr **info)
++{
++    int ret = -1;
++    qemuAgentPtr agent;
++
++    if (qemuDomainObjBeginAgentJob(driver, vm,
++                                   QEMU_AGENT_JOB_QUERY) < 0)
++        return ret;
++
++    if (virDomainObjCheckActive(vm) < 0)
++        goto endjob;
++
++    if (!qemuDomainAgentAvailable(vm, true))
++        goto endjob;
++
++    agent = qemuDomainObjEnterAgent(vm);
++    ret = qemuAgentGetFSInfo(agent, info);
++    qemuDomainObjExitAgent(vm, agent);
++
++ endjob:
++    qemuDomainObjEndAgentJob(vm);
++    return ret;
++}
++
++static virDomainFSInfoPtr
++qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent,
++                        virDomainDefPtr vmdef)
++{
++    virDomainFSInfoPtr ret = NULL;
++    size_t i;
++
++    if (VIR_ALLOC(ret) < 0)
++        goto error;
++
++    ret->mountpoint = g_strdup(agent->mountpoint);
++    ret->name = g_strdup(agent->name);
++    ret->fstype = g_strdup(agent->fstype);
++
++    if (agent->disks &&
++        VIR_ALLOC_N(ret->devAlias, agent->ndisks) < 0)
++        goto error;
++
++    ret->ndevAlias = agent->ndisks;
++
++    for (i = 0; i < ret->ndevAlias; i++) {
++        qemuAgentDiskInfoPtr agentdisk = agent->disks[i];
++        virDomainDiskDefPtr diskDef;
++
++        if (!(diskDef = virDomainDiskByAddress(vmdef,
++                                               &agentdisk->pci_controller,
++                                               agentdisk->bus,
++                                               agentdisk->target,
++                                               agentdisk->unit)))
++            continue;
++
++        ret->devAlias[i] = g_strdup(diskDef->dst);
++    }
++
++    return ret;
++
++ error:
++    virDomainFSInfoFree(ret);
++    return NULL;
++}
++
++/* Returns: 0 on success
++ *          -1 otherwise
++ */
++static int
++virDomainFSInfoFormat(qemuAgentFSInfoPtr *agentinfo,
++                      int nagentinfo,
++                      virDomainDefPtr vmdef,
++                      virDomainFSInfoPtr **info)
++{
++    int ret = -1;
++    virDomainFSInfoPtr *info_ret = NULL;
++    size_t i;
++
++    if (nagentinfo < 0)
++        return ret;
++    if (VIR_ALLOC_N(info_ret, nagentinfo) < 0)
++        goto cleanup;
++
++    for (i = 0; i < nagentinfo; i++) {
++        if (!(info_ret[i] = qemuAgentFSInfoToPublic(agentinfo[i], vmdef)))
++            goto cleanup;
++    }
++
++    *info = g_steal_pointer(&info_ret);
++    ret = nagentinfo;
++
++ cleanup:
++    for (i = 0; i < nagentinfo; i++) {
++        qemuAgentFSInfoFree(agentinfo[i]);
++        /* if there was an error, free any memory we've allocated for the
++         * return value */
++        if (info_ret)
++            virDomainFSInfoFree(info_ret[i]);
++    }
++    VIR_FREE(info_ret);
++    return ret;
++}
+ 
+ static int
+ qemuDomainGetFSInfo(virDomainPtr dom,
+@@ -21847,8 +21952,9 @@ qemuDomainGetFSInfo(virDomainPtr dom,
+ {
+     virQEMUDriverPtr driver = dom->conn->privateData;
+     virDomainObjPtr vm;
+-    qemuAgentPtr agent;
++    qemuAgentFSInfoPtr *agentinfo = NULL;
+     int ret = -1;
++    int nfs;
+ 
+     virCheckFlags(0, ret);
+ 
+@@ -21858,25 +21964,22 @@ qemuDomainGetFSInfo(virDomainPtr dom,
+     if (virDomainGetFSInfoEnsureACL(dom->conn, vm->def) < 0)
+         goto cleanup;
+ 
+-    if (qemuDomainObjBeginJobWithAgent(driver, vm,
+-                                       QEMU_JOB_QUERY,
+-                                       QEMU_AGENT_JOB_QUERY) < 0)
++    if ((nfs = qemuDomainGetFSInfoAgent(driver, vm, &agentinfo)) < 0)
++        goto cleanup;
++
++    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
+         goto cleanup;
+ 
+     if (virDomainObjCheckActive(vm) < 0)
+         goto endjob;
+ 
+-    if (!qemuDomainAgentAvailable(vm, true))
+-        goto endjob;
+-
+-    agent = qemuDomainObjEnterAgent(vm);
+-    ret = qemuAgentGetFSInfo(agent, info, vm->def);
+-    qemuDomainObjExitAgent(vm, agent);
++    ret = virDomainFSInfoFormat(agentinfo, nfs, vm->def, info);
+ 
+  endjob:
+-    qemuDomainObjEndJobWithAgent(driver, vm);
++    qemuDomainObjEndJob(driver, vm);
+ 
+  cleanup:
++    g_free(agentinfo);
+     virDomainObjEndAPI(&vm);
+     return ret;
+ }
+@@ -22882,6 +22985,103 @@ qemuDomainGetGuestInfoCheckSupport(unsigned int *types)
+     *types = *types & supportedGuestInfoTypes;
+ }
+ 
++/* Returns: 0 on success
++ *          -1 otherwise
++ */
++static int
++qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo,
++                            int nfs,
++                            virDomainDefPtr vmdef,
++                            virTypedParameterPtr *params,
++                            int *nparams, int *maxparams)
++{
++    int ret = -1;
++    size_t i, j;
++
++    /* FIXME: get disk target */
++
++    if (virTypedParamsAddUInt(params, nparams, maxparams,
++                              "fs.count", nfs) < 0)
++        goto cleanup;
++
++    for (i = 0; i < nfs; i++) {
++        char param_name[VIR_TYPED_PARAM_FIELD_LENGTH];
++        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                   "fs.%zu.name", i);
++        if (virTypedParamsAddString(params, nparams, maxparams,
++                                    param_name, fsinfo[i]->name) < 0)
++            goto cleanup;
++        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                   "fs.%zu.mountpoint", i);
++        if (virTypedParamsAddString(params, nparams, maxparams,
++                                    param_name, fsinfo[i]->mountpoint) < 0)
++            goto cleanup;
++        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                   "fs.%zu.fstype", i);
++        if (virTypedParamsAddString(params, nparams, maxparams,
++                                    param_name, fsinfo[i]->fstype) < 0)
++            goto cleanup;
++
++        /* disk usage values are not returned by older guest agents, so
++         * only add the params if the value is set */
++        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                   "fs.%zu.total-bytes", i);
++        if (fsinfo[i]->total_bytes != -1 &&
++            virTypedParamsAddULLong(params, nparams, maxparams,
++                                    param_name, fsinfo[i]->total_bytes) < 0)
++            goto cleanup;
++
++        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                   "fs.%zu.used-bytes", i);
++        if (fsinfo[i]->used_bytes != -1 &&
++            virTypedParamsAddULLong(params, nparams, maxparams,
++                                    param_name, fsinfo[i]->used_bytes) < 0)
++            goto cleanup;
++
++        g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                   "fs.%zu.disk.count", i);
++        if (virTypedParamsAddUInt(params, nparams, maxparams,
++                                  param_name, fsinfo[i]->ndisks) < 0)
++            goto cleanup;
++        for (j = 0; j < fsinfo[i]->ndisks; j++) {
++            virDomainDiskDefPtr diskdef = NULL;
++            qemuAgentDiskInfoPtr d = fsinfo[i]->disks[j];
++            /* match the disk to the target in the vm definition */
++            diskdef = virDomainDiskByAddress(vmdef,
++                                             &d->pci_controller,
++                                             d->bus,
++                                             d->target,
++                                             d->unit);
++            if (diskdef) {
++                g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                           "fs.%zu.disk.%zu.alias", i, j);
++                if (diskdef->dst &&
++                    virTypedParamsAddString(params, nparams, maxparams,
++                                            param_name, diskdef->dst) < 0)
++                    goto cleanup;
++            }
++
++            g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                       "fs.%zu.disk.%zu.serial", i, j);
++            if (d->serial &&
++                virTypedParamsAddString(params, nparams, maxparams,
++                                        param_name, d->serial) < 0)
++                goto cleanup;
++
++            g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
++                       "fs.%zu.disk.%zu.device", i, j);
++            if (d->devnode &&
++                virTypedParamsAddString(params, nparams, maxparams,
++                                        param_name, d->devnode) < 0)
++                goto cleanup;
++        }
++    }
++    ret = nfs;
++
++ cleanup:
++    return ret;
++}
++
+ static int
+ qemuDomainGetGuestInfo(virDomainPtr dom,
+                        unsigned int types,
+@@ -22897,6 +23097,9 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+     g_autofree char *hostname = NULL;
+     unsigned int supportedTypes = types;
+     int rc;
++    int nfs = 0;
++    qemuAgentFSInfoPtr *agentfsinfo = NULL;
++    size_t i;
+ 
+     virCheckFlags(0, -1);
+     qemuDomainGetGuestInfoCheckSupport(&supportedTypes);
+@@ -22907,13 +23110,12 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+     if (virDomainGetGuestInfoEnsureACL(dom->conn, vm->def) < 0)
+         goto cleanup;
+ 
+-    if (qemuDomainObjBeginJobWithAgent(driver, vm,
+-                                       QEMU_JOB_QUERY,
+-                                       QEMU_AGENT_JOB_QUERY) < 0)
++    if (qemuDomainObjBeginAgentJob(driver, vm,
++                                   QEMU_AGENT_JOB_QUERY) < 0)
+         goto cleanup;
+ 
+     if (!qemuDomainAgentAvailable(vm, true))
+-        goto endjob;
++        goto endagentjob;
+ 
+     agent = qemuDomainObjEnterAgent(vm);
+ 
+@@ -22948,7 +23150,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+         }
+     }
+     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
+-        rc = qemuAgentGetFSInfoParams(agent, params, nparams, &maxparams, vm->def);
++        rc = nfs = qemuAgentGetFSInfo(agent, &agentfsinfo);
+         if (rc < 0 && !(rc == -2 && types == 0))
+             goto exitagent;
+     }
+@@ -22958,10 +23160,29 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+  exitagent:
+     qemuDomainObjExitAgent(vm, agent);
+ 
++ endagentjob:
++    qemuDomainObjEndAgentJob(vm);
++
++    if (nfs > 0) {
++        if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
++            goto cleanup;
++
++        if (virDomainObjCheckActive(vm) < 0)
++            goto endjob;
++
++        /* we need to convert the agent fsinfo struct to parameters and match
++         * it to the vm disk target */
++        qemuAgentFSInfoFormatParams(agentfsinfo, nfs, vm->def, params, nparams, &maxparams);
++
+  endjob:
+-    qemuDomainObjEndJobWithAgent(driver, vm);
++        qemuDomainObjEndJob(driver, vm);
++    }
+ 
+  cleanup:
++    for (i = 0; i < nfs; i++)
++        qemuAgentFSInfoFree(agentfsinfo[i]);
++    VIR_FREE(agentfsinfo);
++
+     virDomainObjEndAPI(&vm);
+     return ret;
+ }
+diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
+index 644dc9d08b..a45ce4f44a 100644
+--- a/tests/qemuagenttest.c
++++ b/tests/qemuagenttest.c
+@@ -247,14 +247,14 @@ testQemuAgentGetFSInfo(const void *data)
+     virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
+     qemuMonitorTestPtr test = NULL;
+     virDomainDefPtr def = NULL;
+-    virDomainFSInfoPtr *info = NULL;
++    qemuAgentFSInfoPtr *info = NULL;
+     int ret = -1, ninfo = 0, i;
+ 
+     if (testQemuAgentGetFSInfoCommon(xmlopt, &test, &def) < 0)
+         goto cleanup;
+ 
+     if ((ninfo = qemuAgentGetFSInfo(qemuMonitorTestGetAgent(test),
+-                                    &info, def)) < 0)
++                                    &info)) < 0)
+         goto cleanup;
+ 
+     if (ninfo != 3) {
+@@ -266,35 +266,48 @@ testQemuAgentGetFSInfo(const void *data)
+     if (STRNEQ(info[2]->name, "sda1") ||
+         STRNEQ(info[2]->mountpoint, "/") ||
+         STRNEQ(info[2]->fstype, "ext4") ||
+-        info[2]->ndevAlias != 1 ||
+-        !info[2]->devAlias || !info[2]->devAlias[0] ||
+-        STRNEQ(info[2]->devAlias[0], "hdc")) {
++        info[2]->ndisks != 1 ||
++        !info[2]->disks || !info[2]->disks[0]) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "unexpected filesystems information returned for sda1 (%s,%s)",
+-            info[2]->name, info[2]->devAlias ? info[2]->devAlias[0] : "null");
++            "unexpected filesystems information returned for sda1 (%s)",
++            info[2]->name);
+         ret = -1;
+         goto cleanup;
+     }
+     if (STRNEQ(info[1]->name, "dm-1") ||
+         STRNEQ(info[1]->mountpoint, "/opt") ||
+         STRNEQ(info[1]->fstype, "vfat") ||
+-        info[1]->ndevAlias != 2 ||
+-        !info[1]->devAlias || !info[1]->devAlias[0] || !info[1]->devAlias[1] ||
+-        STRNEQ(info[1]->devAlias[0], "vda") ||
+-        STRNEQ(info[1]->devAlias[1], "vdb")) {
++        info[1]->ndisks != 2 ||
++        !info[1]->disks || !info[1]->disks[0] || !info[1]->disks[1] ||
++        STRNEQ(info[1]->disks[0]->bus_type, "virtio") ||
++        info[1]->disks[0]->bus != 0 ||
++        info[1]->disks[0]->target != 0 ||
++        info[1]->disks[0]->unit != 0 ||
++        info[1]->disks[0]->pci_controller.domain != 0 ||
++        info[1]->disks[0]->pci_controller.bus != 0 ||
++        info[1]->disks[0]->pci_controller.slot != 6 ||
++        info[1]->disks[0]->pci_controller.function != 0 ||
++        STRNEQ(info[1]->disks[1]->bus_type, "virtio") ||
++        info[1]->disks[1]->bus != 0 ||
++        info[1]->disks[1]->target != 0 ||
++        info[1]->disks[1]->unit != 0 ||
++        info[1]->disks[1]->pci_controller.domain != 0 ||
++        info[1]->disks[1]->pci_controller.bus != 0 ||
++        info[1]->disks[1]->pci_controller.slot != 7 ||
++        info[1]->disks[1]->pci_controller.function != 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "unexpected filesystems information returned for dm-1 (%s,%s)",
+-            info[0]->name, info[0]->devAlias ? info[0]->devAlias[0] : "null");
++            "unexpected filesystems information returned for dm-1 (%s)",
++            info[0]->name);
+         ret = -1;
+         goto cleanup;
+     }
+     if (STRNEQ(info[0]->name, "sdb1") ||
+         STRNEQ(info[0]->mountpoint, "/mnt/disk") ||
+         STRNEQ(info[0]->fstype, "xfs") ||
+-        info[0]->ndevAlias != 0 || info[0]->devAlias) {
++        info[0]->ndisks != 0 || info[0]->disks) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "unexpected filesystems information returned for sdb1 (%s,%s)",
+-            info[0]->name, info[0]->devAlias ? info[0]->devAlias[0] : "null");
++            "unexpected filesystems information returned for sdb1 (%s)",
++            info[0]->name);
+         ret = -1;
+         goto cleanup;
+     }
+@@ -313,7 +326,7 @@ testQemuAgentGetFSInfo(const void *data)
+                                "}") < 0)
+         goto cleanup;
+ 
+-    if (qemuAgentGetFSInfo(qemuMonitorTestGetAgent(test), &info, def) != -1) {
++    if (qemuAgentGetFSInfo(qemuMonitorTestGetAgent(test), &info) >= 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        "agent get-fsinfo command should have failed");
+         goto cleanup;
+@@ -323,159 +336,13 @@ testQemuAgentGetFSInfo(const void *data)
+ 
+  cleanup:
+     for (i = 0; i < ninfo; i++)
+-        virDomainFSInfoFree(info[i]);
++        qemuAgentFSInfoFree(info[i]);
+     VIR_FREE(info);
+     virDomainDefFree(def);
+     qemuMonitorTestFree(test);
+     return ret;
+ }
+ 
+-static int
+-testQemuAgentGetFSInfoParams(const void *data)
+-{
+-    virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
+-    qemuMonitorTestPtr test = NULL;
+-    virDomainDefPtr def = NULL;
+-    virTypedParameterPtr params = NULL;
+-    int nparams = 0, maxparams = 0;
+-    int ret = -1;
+-    unsigned int count;
+-    const char *name, *mountpoint, *fstype, *alias, *serial;
+-    unsigned int diskcount;
+-    unsigned long long bytesused, bytestotal;
+-    const char *alias2;
+-
+-    if (testQemuAgentGetFSInfoCommon(xmlopt, &test, &def) < 0)
+-        goto cleanup;
+-
+-    if (qemuAgentGetFSInfoParams(qemuMonitorTestGetAgent(test),
+-                                 &params, &nparams, &maxparams, def) < 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                       "Failed to execute qemuAgentGetFSInfoParams()");
+-        goto cleanup;
+-    }
+-
+-    if (virTypedParamsGetUInt(params, nparams, "fs.count", &count) < 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                       "expected filesystem count");
+-        goto cleanup;
+-    }
+-
+-    if (count != 3) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-                       "expected 3 filesystems information, got %d", count);
+-        goto cleanup;
+-    }
+-
+-    if (virTypedParamsGetString(params, nparams, "fs.2.name", &name) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.2.mountpoint", &mountpoint) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.2.fstype", &fstype) < 0 ||
+-        virTypedParamsGetULLong(params, nparams, "fs.2.used-bytes", &bytesused) <= 0 ||
+-        virTypedParamsGetULLong(params, nparams, "fs.2.total-bytes", &bytestotal) <= 0 ||
+-        virTypedParamsGetUInt(params, nparams, "fs.2.disk.count", &diskcount) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.2.disk.0.alias", &alias) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.2.disk.0.serial", &serial) < 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "Missing an expected parameter for sda1 (%s,%s)",
+-            name, alias);
+-        goto cleanup;
+-    }
+-
+-    if (STRNEQ(name, "sda1") ||
+-        STRNEQ(mountpoint, "/") ||
+-        STRNEQ(fstype, "ext4") ||
+-        bytesused != 229019648 ||
+-        bytestotal != 952840192 ||
+-        diskcount != 1 ||
+-        STRNEQ(alias, "hdc") ||
+-        STRNEQ(serial, "ARBITRARYSTRING")) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "unexpected filesystems information returned for sda1 (%s,%s)",
+-            name, alias);
+-        goto cleanup;
+-    }
+-
+-    if (virTypedParamsGetString(params, nparams, "fs.1.name", &name) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.1.mountpoint", &mountpoint) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.1.fstype", &fstype) < 0 ||
+-        virTypedParamsGetULLong(params, nparams, "fs.1.used-bytes", &bytesused) == 1 ||
+-        virTypedParamsGetULLong(params, nparams, "fs.1.total-bytes", &bytestotal) == 1 ||
+-        virTypedParamsGetUInt(params, nparams, "fs.1.disk.count", &diskcount) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.1.disk.0.alias", &alias) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.1.disk.1.alias", &alias2) < 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "Incorrect parameters for dm-1 (%s,%s)",
+-            name, alias);
+-        goto cleanup;
+-    }
+-    if (STRNEQ(name, "dm-1") ||
+-        STRNEQ(mountpoint, "/opt") ||
+-        STRNEQ(fstype, "vfat") ||
+-        diskcount != 2 ||
+-        STRNEQ(alias, "vda") ||
+-        STRNEQ(alias2, "vdb")) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "unexpected filesystems information returned for dm-1 (%s,%s)",
+-            name, alias);
+-        goto cleanup;
+-    }
+-
+-    alias = NULL;
+-    if (virTypedParamsGetString(params, nparams, "fs.0.name", &name) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.0.mountpoint", &mountpoint) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.0.fstype", &fstype) < 0 ||
+-        virTypedParamsGetULLong(params, nparams, "fs.0.used-bytes", &bytesused) == 1 ||
+-        virTypedParamsGetULLong(params, nparams, "fs.0.total-bytes", &bytestotal) == 1 ||
+-        virTypedParamsGetUInt(params, nparams, "fs.0.disk.count", &diskcount) < 0 ||
+-        virTypedParamsGetString(params, nparams, "fs.0.disk.0.alias", &alias) == 1) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "Incorrect parameters for sdb1 (%s,%s)",
+-            name, alias);
+-        goto cleanup;
+-    }
+-
+-    if (STRNEQ(name, "sdb1") ||
+-        STRNEQ(mountpoint, "/mnt/disk") ||
+-        STRNEQ(fstype, "xfs") ||
+-        diskcount != 0 ||
+-        alias != NULL) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-            "unexpected filesystems information returned for sdb1 (%s,%s)",
+-            name, alias);
+-        goto cleanup;
+-    }
+-
+-    if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
+-        goto cleanup;
+-
+-    if (qemuMonitorTestAddItem(test, "guest-get-fsinfo",
+-                               "{\"error\":"
+-                               "    {\"class\":\"CommandDisabled\","
+-                               "     \"desc\":\"The command guest-get-fsinfo "
+-                                               "has been disabled for "
+-                                               "this instance\","
+-                               "     \"data\":{\"name\":\"guest-get-fsinfo\"}"
+-                               "    }"
+-                               "}") < 0)
+-        goto cleanup;
+-
+-    if (qemuAgentGetFSInfoParams(qemuMonitorTestGetAgent(test), &params,
+-                                 &nparams, &maxparams, def) != -2) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                       "agent get-fsinfo command should have failed");
+-        goto cleanup;
+-    }
+-
+-    ret = 0;
+-
+- cleanup:
+-    virTypedParamsFree(params, nparams);
+-    virDomainDefFree(def);
+-    qemuMonitorTestFree(test);
+-    return ret;
+-}
+-
+-
+ static int
+ testQemuAgentSuspend(const void *data)
+ {
+@@ -1438,7 +1305,6 @@ mymain(void)
+     DO_TEST(FSFreeze);
+     DO_TEST(FSThaw);
+     DO_TEST(FSTrim);
+-    DO_TEST(GetFSInfoParams);
+     DO_TEST(GetFSInfo);
+     DO_TEST(Suspend);
+     DO_TEST(Shutdown);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-for-vhostuser-backend.patch b/SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-for-vhostuser-backend.patch
deleted file mode 100644
index 300cf37..0000000
--- a/SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-for-vhostuser-backend.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 2f53c51bac4f9a9c7e490a13f1510eb553046bc3 Mon Sep 17 00:00:00 2001
-Message-Id: <2f53c51bac4f9a9c7e490a13f1510eb553046bc3@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 6 Jul 2018 15:47:01 +0100
-Subject: [PATCH] qemu: don't use chardev FD passing for vhostuser backend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1597940
-
-QEMU chardevs have a bug which makes the vhostuser backend complain
-about lack of support for FD passing when validating the chardev.
-While this is ultimately QEMU's responsibility to fix, libvirt needs to
-avoid tickling the bug.
-
-Simply disabling chardev FD passing just for vhostuser's chardev is
-the most prudent approach, avoiding need for a QEMU version number
-check.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit ed5aa85f371aebb0103e712f9a103d011ab9ae43)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_command.c                   | 31 +++++++++++++++--------
- tests/qemuxml2argvdata/net-vhostuser.args |  3 +--
- tests/qemuxml2argvtest.c                  |  2 +-
- 3 files changed, 23 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 0c3ce98caf..637e787d25 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -4938,6 +4938,7 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
- enum {
-     QEMU_BUILD_CHARDEV_TCP_NOWAIT = (1 << 0),
-     QEMU_BUILD_CHARDEV_FILE_LOGD  = (1 << 1),
-+    QEMU_BUILD_CHARDEV_UNIX_FD_PASS = (1 << 2),
- };
- 
- /* This function outputs a -chardev command line option which describes only the
-@@ -5081,7 +5082,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-         break;
- 
-     case VIR_DOMAIN_CHR_TYPE_UNIX:
--        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) {
-+        if ((flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) &&
-+            virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) {
-             if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)def) < 0)
-                 goto cleanup;
-             int fd = qemuOpenChrChardevUNIXSocket(dev);
-@@ -5437,7 +5439,8 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager,
-                             qemuDomainObjPrivatePtr priv)
- {
-     char *chrdev;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (priv->chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -5572,7 +5575,8 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager,
-                              char **chr,
-                              bool chardevStdioLogd)
- {
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
-     *chr = NULL;
-@@ -8740,7 +8744,8 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
-     virBuffer opt = VIR_BUFFER_INITIALIZER;
-     const char *database;
-     const char *contAlias = NULL;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -8976,7 +8981,8 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     char *devstr = NULL;
-     int rc;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -9136,7 +9142,8 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager,
- {
-     size_t i;
-     bool havespice = false;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -9199,7 +9206,8 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager,
-                               bool chardevStdioLogd)
- {
-     size_t i;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -9236,7 +9244,8 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-                              bool chardevStdioLogd)
- {
-     size_t i;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -9293,7 +9302,8 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
-                             bool chardevStdioLogd)
- {
-     size_t i;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-@@ -9473,7 +9483,8 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
-                              bool chardevStdioLogd)
- {
-     size_t i;
--    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT;
-+    unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-+        QEMU_BUILD_CHARDEV_UNIX_FD_PASS;
-     if (chardevStdioLogd)
-         cdevflags |= QEMU_BUILD_CHARDEV_FILE_LOGD;
- 
-diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
-index fc4557a1f2..513fc535ab 100644
---- a/tests/qemuxml2argvdata/net-vhostuser.args
-+++ b/tests/qemuxml2argvdata/net-vhostuser.args
-@@ -14,8 +14,7 @@ QEMU_AUDIO_DRV=none \
- -display none \
- -no-user-config \
- -nodefaults \
---chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
--server,nowait \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
- -mon chardev=charmonitor,id=monitor,mode=control \
- -rtc base=utc \
- -no-shutdown \
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index d6911f9344..2d52f352b0 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1266,7 +1266,7 @@ mymain(void)
-     DO_TEST("misc-no-reboot", NONE);
-     DO_TEST("misc-uuid", NONE);
-     DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE);
--    DO_TEST("net-vhostuser", NONE);
-+    DO_TEST("net-vhostuser", QEMU_CAPS_CHARDEV_FD_PASS);
-     DO_TEST("net-vhostuser-multiq",
-             QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
-     DO_TEST_FAILURE("net-vhostuser-multiq", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-with-standalone-args.patch b/SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-with-standalone-args.patch
deleted file mode 100644
index 4a1718b..0000000
--- a/SOURCES/libvirt-qemu-don-t-use-chardev-FD-passing-with-standalone-args.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bce02fd2af85630615cc0c46d64db7b7e1023171 Mon Sep 17 00:00:00 2001
-Message-Id: <bce02fd2af85630615cc0c46d64db7b7e1023171@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 6 Jul 2018 15:46:58 +0100
-Subject: [PATCH] qemu: don't use chardev FD passing with standalone args
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598281
-
-When using domxml-to-native, we must generate CLI args that can be used
-in a standalone scenario. This means no FD passing can be used. To
-achieve this we must clear the QEMU_CAPS_CHARDEV_FD_PASS capability bit.
-
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 7ac08cc929dc512e8682fbfcc5d33518058f20e4)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_process.c | 5 +++++
- src/qemu/qemu_process.h | 2 ++
- 2 files changed, 7 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index ac32dafcbe..40d35cbe6b 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5124,6 +5124,9 @@ qemuProcessInit(virQEMUDriverPtr driver,
-                                                       vm->def->os.machine)))
-         goto cleanup;
- 
-+    if (flags & VIR_QEMU_PROCESS_START_STANDALONE)
-+        virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS);
-+
-     if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0)
-         goto cleanup;
- 
-@@ -6632,6 +6635,8 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
- 
-     flags |= VIR_QEMU_PROCESS_START_PRETEND;
-     flags |= VIR_QEMU_PROCESS_START_NEW;
-+    if (standalone)
-+        flags |= VIR_QEMU_PROCESS_START_STANDALONE;
- 
-     if (qemuProcessInit(driver, vm, NULL, QEMU_ASYNC_JOB_NONE,
-                         !!migrateURI, flags) < 0)
-diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
-index 531c2a0cc7..07ce3a9915 100644
---- a/src/qemu/qemu_process.h
-+++ b/src/qemu/qemu_process.h
-@@ -81,6 +81,8 @@ typedef enum {
-     VIR_QEMU_PROCESS_START_PRETEND      = 1 << 3,
-     VIR_QEMU_PROCESS_START_NEW          = 1 << 4, /* internal, new VM is starting */
-     VIR_QEMU_PROCESS_START_GEN_VMID     = 1 << 5, /* Generate a new VMID */
-+    VIR_QEMU_PROCESS_START_STANDALONE   = 1 << 6, /* Require CLI args to be usable standalone,
-+                                                     ie no FD passing and the like */
- } qemuProcessStartFlags;
- 
- int qemuProcessStart(virConnectPtr conn,
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-eliminate-ret-in-qemuExtDevicesStart.patch b/SOURCES/libvirt-qemu-eliminate-ret-in-qemuExtDevicesStart.patch
new file mode 100644
index 0000000..21efa97
--- /dev/null
+++ b/SOURCES/libvirt-qemu-eliminate-ret-in-qemuExtDevicesStart.patch
@@ -0,0 +1,68 @@
+From 9c51a4657bf446bf2ccaba65b2f76d29e5b14f22 Mon Sep 17 00:00:00 2001
+Message-Id: <9c51a4657bf446bf2ccaba65b2f76d29e5b14f22@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:31 +0100
+Subject: [PATCH] qemu: eliminate ret in qemuExtDevicesStart
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+All the callees return either 0 or -1 so there is no need
+for propagating the value. And we bail on the first error.
+
+Remove the variable to make the function simpler.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit d5256cbd5575fb714714de1d543d1e5d41daf8ff)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <1a2cb184deb18bf67e3fdc50785e829f74d89352.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_extdevice.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index 1869a42f11..9c0c0fd573 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -156,7 +156,6 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
+                     bool incomingMigration)
+ {
+     virDomainDefPtr def = vm->def;
+-    int ret = 0;
+     size_t i;
+ 
+     if (qemuExtDevicesInitPaths(driver, def) < 0)
+@@ -166,14 +165,13 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
+         virDomainVideoDefPtr video = def->videos[i];
+ 
+         if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
+-            ret = qemuExtVhostUserGPUStart(driver, vm, video);
+-            if (ret < 0)
+-                return ret;
++            if (qemuExtVhostUserGPUStart(driver, vm, video) < 0)
++                return -1;
+         }
+     }
+ 
+-    if (def->tpm)
+-        ret = qemuExtTPMStart(driver, vm, incomingMigration);
++    if (def->tpm && qemuExtTPMStart(driver, vm, incomingMigration) < 0)
++        return -1;
+ 
+     for (i = 0; i < def->nnets; i++) {
+         virDomainNetDefPtr net = def->nets[i];
+@@ -184,7 +182,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
+             return -1;
+     }
+ 
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch b/SOURCES/libvirt-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch
new file mode 100644
index 0000000..b127622
--- /dev/null
+++ b/SOURCES/libvirt-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch
@@ -0,0 +1,41 @@
+From 24405105c86a955a028a915153d1c1dfe450f237 Mon Sep 17 00:00:00 2001
+Message-Id: <24405105c86a955a028a915153d1c1dfe450f237@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Mon, 20 Jan 2020 09:31:21 +0100
+Subject: [PATCH] qemu: end the agent job in qemuDomainSetTimeAgent
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This function grabs an agent job but ends a monitor job.
+End the agent job instead.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1792723
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reported-by: Dan Zheng <dzheng@redhat.com>
+Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd
+(cherry picked from commit d61f95cf6a6fbd564e104c168d325581acd9cd8d)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <d00e462cf0f84d7d2d105f30f0ec8edf49786403.1579509070.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 217d873671..6163b13e91 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -20373,7 +20373,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver,
+     qemuDomainObjExitAgent(vm, agent);
+ 
+  endjob:
+-    qemuDomainObjEndJob(driver, vm);
++    qemuDomainObjEndAgentJob(vm);
+     return ret;
+ }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-fix-UNIX-socket-chardevs-operating-in-client-mode.patch b/SOURCES/libvirt-qemu-fix-UNIX-socket-chardevs-operating-in-client-mode.patch
deleted file mode 100644
index 13a8f58..0000000
--- a/SOURCES/libvirt-qemu-fix-UNIX-socket-chardevs-operating-in-client-mode.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From e093a96f00590a93221fac3db6397ec1d2982fdb Mon Sep 17 00:00:00 2001
-Message-Id: <e093a96f00590a93221fac3db6397ec1d2982fdb@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 6 Jul 2018 15:47:02 +0100
-Subject: [PATCH] qemu: fix UNIX socket chardevs operating in client mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598440
-
-When support was adding for passing a pre-opened listener socket to UNIX
-chardevs, it accidentally passed the listener socket for client mode
-chardevs too with predictable amounts of fail resulting. This affects
-libvirt when using QEMU >= 2.12
-
-Expand the unit test coverage to validate that we are only doing FD
-passing when operating in server mode.
-
-  https://bugzilla.redhat.com/show_bug.cgi?id=1598440
-
-Tested-by: Richard W.M. Jones <rjones@redhat.com>
-Reported-by: Richard W.M. Jones <rjones@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 1bc1a7e3205f7ef75ebd8fd1ef7653f8e181e3d2)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_command.c                       |  3 +-
- .../qemuxml2argvdata/serial-unix-chardev.args |  2 ++
- .../serial-unix-chardev.x86_64-latest.args    | 36 +++++++++++++++++++
- .../qemuxml2argvdata/serial-unix-chardev.xml  |  4 +++
- tests/qemuxml2argvtest.c                      |  1 +
- 5 files changed, 45 insertions(+), 1 deletion(-)
- create mode 100644 tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 637e787d25..f38ae668a7 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -5082,7 +5082,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-         break;
- 
-     case VIR_DOMAIN_CHR_TYPE_UNIX:
--        if ((flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) &&
-+        if (dev->data.nix.listen &&
-+            (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) {
-             if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)def) < 0)
-                 goto cleanup;
-diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
-index 584f4a1dd1..873d3263c6 100644
---- a/tests/qemuxml2argvdata/serial-unix-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
-@@ -26,4 +26,6 @@ server,nowait \
- -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
- -chardev socket,id=charserial0,path=/tmp/serial.sock \
- -device isa-serial,chardev=charserial0,id=serial0 \
-+-chardev socket,id=charserial1,path=/tmp/serial-server.sock,server,nowait \
-+-device isa-serial,chardev=charserial1,id=serial1 \
- -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
-new file mode 100644
-index 0000000000..ce7a7f80d7
---- /dev/null
-+++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
-@@ -0,0 +1,36 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=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,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-+-chardev socket,id=charserial0,path=/tmp/serial.sock \
-+-device isa-serial,chardev=charserial0,id=serial0 \
-+-chardev socket,id=charserial1,fd=1729,server,nowait \
-+-device isa-serial,chardev=charserial1,id=serial1 \
-+-device 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/qemuxml2argvdata/serial-unix-chardev.xml b/tests/qemuxml2argvdata/serial-unix-chardev.xml
-index 04f83779ce..af513d6445 100644
---- a/tests/qemuxml2argvdata/serial-unix-chardev.xml
-+++ b/tests/qemuxml2argvdata/serial-unix-chardev.xml
-@@ -25,6 +25,10 @@
-       <source mode='connect' path='/tmp/serial.sock'/>
-       <target port='0'/>
-     </serial>
-+    <serial type='unix'>
-+      <source mode='bind' path='/tmp/serial-server.sock'/>
-+      <target port='1'/>
-+    </serial>
-     <console type='unix'>
-       <source mode='connect' path='/tmp/serial.sock'/>
-       <target port='0'/>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 2d52f352b0..3be5af03aa 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1335,6 +1335,7 @@ mymain(void)
-             QEMU_CAPS_CHARDEV_FILE_APPEND);
-     DO_TEST("serial-unix-chardev",
-             QEMU_CAPS_DEVICE_ISA_SERIAL);
-+    DO_TEST_CAPS_LATEST("serial-unix-chardev");
-     DO_TEST("serial-tcp-chardev",
-             QEMU_CAPS_DEVICE_ISA_SERIAL);
-     DO_TEST("serial-udp-chardev",
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-fix-detection-of-vCPU-pids-when-multiple-dies-are-present.patch b/SOURCES/libvirt-qemu-fix-detection-of-vCPU-pids-when-multiple-dies-are-present.patch
new file mode 100644
index 0000000..4aa455f
--- /dev/null
+++ b/SOURCES/libvirt-qemu-fix-detection-of-vCPU-pids-when-multiple-dies-are-present.patch
@@ -0,0 +1,136 @@
+From d97b868a9517173a7f805fd3232b3d9fdc2bad89 Mon Sep 17 00:00:00 2001
+Message-Id: <d97b868a9517173a7f805fd3232b3d9fdc2bad89@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 5 May 2020 16:49:12 +0100
+Subject: [PATCH] qemu: fix detection of vCPU pids when multiple dies are
+ present
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The logic for querying hotpluggable CPUs needs to sort the list
+of CPUs returned by QEMU. Unfortunately our sorting method failed
+to use the die_id field, so CPUs were not correctly sorted.
+
+This is seen when configuring a guest with partially populated
+CPUs
+
+  <vcpu placement='static' current='1'>16</vcpu>
+  <cpu...>
+    <topology sockets='4' dies='2' cores='1' threads='2'/>
+  </cpu>
+
+Then trying to start it would fail:
+
+  # virsh -c qemu:///system start demo
+  error: Failed to start domain demo
+  error: internal error: qemu didn't report thread id for vcpu '0'
+
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 8b789c6574454863acbd2511fc2094d1e63e8154)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1813395
+https://bugzilla.redhat.com/show_bug.cgi?id=1821592
+
+Message-Id: <20200505154912.950468-2-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_domain.c       | 10 ++++++++--
+ src/qemu/qemu_monitor.c      |  2 ++
+ src/qemu/qemu_monitor.h      |  2 ++
+ src/qemu/qemu_monitor_json.c |  5 +++++
+ 4 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 1509e41021..cdf7b3e692 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -13812,8 +13812,14 @@ qemuDomainRefreshVcpuInfo(virQEMUDriverPtr driver,
+         }
+ 
+         if (validTIDs)
+-            VIR_DEBUG("vCPU[%zu] PID %llu is valid",
+-                      i, (unsigned long long)info[i].tid);
++            VIR_DEBUG("vCPU[%zu] PID %llu is valid "
++                      "(node=%d socket=%d die=%d core=%d thread=%d)",
++                      i, (unsigned long long)info[i].tid,
++                      info[i].node_id,
++                      info[i].socket_id,
++                      info[i].die_id,
++                      info[i].core_id,
++                      info[i].thread_id);
+     }
+ 
+     VIR_DEBUG("Extracting vCPU information validTIDs=%d", validTIDs);
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index 5915035589..d8911066ab 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -1667,6 +1667,7 @@ qemuMonitorCPUInfoClear(qemuMonitorCPUInfoPtr cpus,
+         cpus[i].id = 0;
+         cpus[i].qemu_id = -1;
+         cpus[i].socket_id = -1;
++        cpus[i].die_id = -1;
+         cpus[i].core_id = -1;
+         cpus[i].thread_id = -1;
+         cpus[i].node_id = -1;
+@@ -1822,6 +1823,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl
+         vcpus[mastervcpu].hotpluggable = !!hotplugvcpus[i].alias ||
+                                          !vcpus[mastervcpu].online;
+         vcpus[mastervcpu].socket_id = hotplugvcpus[i].socket_id;
++        vcpus[mastervcpu].die_id = hotplugvcpus[i].die_id;
+         vcpus[mastervcpu].core_id = hotplugvcpus[i].core_id;
+         vcpus[mastervcpu].thread_id = hotplugvcpus[i].thread_id;
+         vcpus[mastervcpu].node_id = hotplugvcpus[i].node_id;
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index ca975d084c..6e83f250ed 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -567,6 +567,7 @@ struct qemuMonitorQueryHotpluggableCpusEntry {
+     /* topology information -1 if qemu didn't report given parameter */
+     int node_id;
+     int socket_id;
++    int die_id;
+     int core_id;
+     int thread_id;
+ 
+@@ -589,6 +590,7 @@ struct _qemuMonitorCPUInfo {
+     /* topology info for hotplug purposes. Hotplug of given vcpu impossible if
+      * all entries are -1 */
+     int socket_id;
++    int die_id;
+     int core_id;
+     int thread_id;
+     int node_id;
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 92d7317a82..d445a4904f 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -8576,11 +8576,13 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValuePtr vcpu,
+ 
+     entry->node_id = -1;
+     entry->socket_id = -1;
++    entry->die_id = -1;
+     entry->core_id = -1;
+     entry->thread_id = -1;
+ 
+     ignore_value(virJSONValueObjectGetNumberInt(props, "node-id", &entry->node_id));
+     ignore_value(virJSONValueObjectGetNumberInt(props, "socket-id", &entry->socket_id));
++    ignore_value(virJSONValueObjectGetNumberInt(props, "die-id", &entry->die_id));
+     ignore_value(virJSONValueObjectGetNumberInt(props, "core-id", &entry->core_id));
+     ignore_value(virJSONValueObjectGetNumberInt(props, "thread-id", &entry->thread_id));
+ 
+@@ -8615,6 +8617,9 @@ qemuMonitorQueryHotpluggableCpusEntrySort(const void *p1,
+     if (a->socket_id != b->socket_id)
+         return a->socket_id - b->socket_id;
+ 
++    if (a->die_id != b->die_id)
++        return a->die_id - b->die_id;
++
+     if (a->core_id != b->core_id)
+         return a->core_id - b->core_id;
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-fix-up-permissions-for-pre-created-UNIX-sockets.patch b/SOURCES/libvirt-qemu-fix-up-permissions-for-pre-created-UNIX-sockets.patch
deleted file mode 100644
index d09fcf2..0000000
--- a/SOURCES/libvirt-qemu-fix-up-permissions-for-pre-created-UNIX-sockets.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 863827760fc7550b9b454fadf1377bea616fdcfd Mon Sep 17 00:00:00 2001
-Message-Id: <863827760fc7550b9b454fadf1377bea616fdcfd@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Wed, 3 Oct 2018 16:58:18 +0200
-Subject: [PATCH] qemu: fix up permissions for pre-created UNIX sockets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-My commit d6b8838 fixed the uid:gid for the pre-created UNIX sockets
-but did not account for the different umask of libvirtd and QEMU.
-Since commit 0e1a1a8c we set umask to '0002' for the QEMU process.
-Manually tune-up the permissions to match what we would have gotten
-if QEMU had created the socket.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1633389
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 8ba65c4d95712b54362fd81c34bae99f51d45a0b)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-RHEL 7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1635228
-RHEL 8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634775
-
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_command.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 5c71abab96..028f48310b 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -4933,6 +4933,12 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev)
-         goto error;
-     }
- 
-+    /* We run QEMU with umask 0002. Compensate for the umask
-+     * libvirtd might be running under to get the same permission
-+     * QEMU would have. */
-+    if (virFileUpdatePerm(dev->data.nix.path, 0002, 0664) < 0)
-+        goto error;
-+
-     return fd;
- 
-  error:
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-qemu-fixing-auto-detecting-binary-in-domain-capabilities.patch b/SOURCES/libvirt-qemu-fixing-auto-detecting-binary-in-domain-capabilities.patch
new file mode 100644
index 0000000..42ec0ef
--- /dev/null
+++ b/SOURCES/libvirt-qemu-fixing-auto-detecting-binary-in-domain-capabilities.patch
@@ -0,0 +1,118 @@
+From 0f8f59eee031729fb17dd9b70285665a44517850 Mon Sep 17 00:00:00 2001
+Message-Id: <0f8f59eee031729fb17dd9b70285665a44517850@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Fri, 15 May 2020 19:18:50 +0200
+Subject: [PATCH] qemu: fixing auto-detecting binary in domain capabilities
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The virConnectGetDomainCapabilities API accepts either a binary path
+to the emulator, or desired guest arch. If guest arch is not given,
+then the host arch is assumed.
+
+In the case where the binary is not given, the code tried to find the
+emulator binary in the existing list of cached emulator capabilities.
+This is not valid since we switched to lazy population of the cache in:
+
+  commit 3dd91af01f30c5bda6328454ef49f3afece755d6
+  Author: Daniel P. Berrangé <berrange@redhat.com>
+  Date:   Mon Dec 2 13:04:26 2019 +0000
+
+    qemu: stop creating capabilities at driver startup
+
+As a result of this change, if there are no persistent guests defined
+using the requested guest architecture, virConnectGetDomainCapabilities
+will fail to find an emulator binary.
+
+The solution is to stop relying on the cached capabilities to find the
+binary and instead use the same logic we use to pick default a binary
+per arch when populating capabilities.
+
+Tested-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 6d786f95a366600e7bbae68c1b324a8131f5e2c5)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1836351
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200515171850.135870-2-abologna@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c | 45 ++++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 23 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 3bbfb64c03..5b16796c6b 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -5432,10 +5432,13 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
+                               const char **retMachine)
+ {
+     int virttype = VIR_DOMAIN_VIRT_NONE;
+-    int arch = virArchFromHost();
++    virArch hostarch = virArchFromHost();
++    virArch arch = hostarch;
+     virDomainVirtType capsType;
+     virQEMUCapsPtr qemuCaps = NULL;
+     virQEMUCapsPtr ret = NULL;
++    virArch arch_from_caps;
++    g_autofree char *probedbinary = NULL;
+ 
+     if (virttypeStr &&
+         (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) {
+@@ -5451,31 +5454,27 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
+         goto cleanup;
+     }
+ 
+-    if (binary) {
+-        virArch arch_from_caps;
++    if (!binary) {
++        probedbinary = virQEMUCapsGetDefaultEmulator(hostarch, arch);
++        binary = probedbinary;
++    }
+ 
+-        if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary)))
+-            goto cleanup;
++    if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary)))
++        goto cleanup;
+ 
+-        arch_from_caps = virQEMUCapsGetArch(qemuCaps);
++    arch_from_caps = virQEMUCapsGetArch(qemuCaps);
+ 
+-        if (arch_from_caps != arch &&
+-            !((ARCH_IS_X86(arch) && ARCH_IS_X86(arch_from_caps)) ||
+-              (ARCH_IS_PPC(arch) && ARCH_IS_PPC(arch_from_caps)) ||
+-              (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) ||
+-              (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) {
+-            virReportError(VIR_ERR_INVALID_ARG,
+-                           _("architecture from emulator '%s' doesn't "
+-                             "match given architecture '%s'"),
+-                           virArchToString(arch_from_caps),
+-                           virArchToString(arch));
+-            goto cleanup;
+-        }
+-    } else {
+-        if (!(qemuCaps = virQEMUCapsCacheLookupByArch(cache, arch)))
+-            goto cleanup;
+-
+-        binary = virQEMUCapsGetBinary(qemuCaps);
++    if (arch_from_caps != arch &&
++        !((ARCH_IS_X86(arch) && ARCH_IS_X86(arch_from_caps)) ||
++          (ARCH_IS_PPC(arch) && ARCH_IS_PPC(arch_from_caps)) ||
++          (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) ||
++          (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("architecture from emulator '%s' doesn't "
++                         "match given architecture '%s'"),
++                       virArchToString(arch_from_caps),
++                       virArchToString(arch));
++        goto cleanup;
+     }
+ 
+     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-forbid-migration-with-vhost-user-fs-device.patch b/SOURCES/libvirt-qemu-forbid-migration-with-vhost-user-fs-device.patch
new file mode 100644
index 0000000..7869a63
--- /dev/null
+++ b/SOURCES/libvirt-qemu-forbid-migration-with-vhost-user-fs-device.patch
@@ -0,0 +1,52 @@
+From 5ae52dc252691262663129e52dbf1a775cd92bb8 Mon Sep 17 00:00:00 2001
+Message-Id: <5ae52dc252691262663129e52dbf1a775cd92bb8@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:45 +0100
+Subject: [PATCH] qemu: forbid migration with vhost-user-fs device
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is not yet supported.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 5c0444a38bb37ddeb7049683ef72d02beab9e617)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+
+Conflicts: * downstream is missing commit 739bb1f26f9797f69023e221bef7c004adb9c522
+    qemu_migration: Rearrange some checks in qemuMigrationSrcIsAllowed()
+  src/qemu/qemu_migration.c
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <426a6270b1e0265b4977ad70029342ca43f7ff48.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_migration.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 03f058051d..a677e270d4 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -1281,6 +1281,16 @@ qemuMigrationSrcIsAllowed(virQEMUDriverPtr driver,
+                            _("migration with shmem device is not supported"));
+             return false;
+         }
++
++        for (i = 0; i < vm->def->nfss; i++) {
++            virDomainFSDefPtr fs = vm->def->fss[i];
++
++            if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
++                virReportError(VIR_ERR_OPERATION_INVALID, "%s",
++                               _("migration with virtiofs device is not supported"));
++                return false;
++            }
++        }
+     }
+ 
+     return true;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-hook-up-pcie-root-port-hotplug-off-option.patch b/SOURCES/libvirt-qemu-hook-up-pcie-root-port-hotplug-off-option.patch
new file mode 100644
index 0000000..c8e2c63
--- /dev/null
+++ b/SOURCES/libvirt-qemu-hook-up-pcie-root-port-hotplug-off-option.patch
@@ -0,0 +1,174 @@
+From c9d4140df5d22a1bfc895eb1049cc714eaadc86c Mon Sep 17 00:00:00 2001
+Message-Id: <c9d4140df5d22a1bfc895eb1049cc714eaadc86c@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:08 -0400
+Subject: [PATCH] qemu: hook up pcie-root-port hotplug='off' option
+
+If a pcie-root-port or pcie-downstream-port has hotplug='off' in its
+<target> subelement, and if the qemu binary supports the hotplug=false
+option, then it will be added to the commandline for the pcie
+controller. This controller will then not allow any hotplug/unplug of
+devices while the guest is running (and the hotplug capability won't
+be advertised to the guest OS, so the guest OS also won't present
+unplugging of PCI devices as an option).
+
+  <controller type='pci' model='pcie-root-port'>
+    <target hotplug='off'/>
+  </controller>
+
+For any PCI controllers other than pcie-downstream-port and
+pcie-root-port, of for qemu binaries that don't support the hotplug
+commandline option, an error will be logged during validation.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 2d3cf60328c138f7a8fd5905eb345d5f48227ff8)
+
+Conflicts:
+   src/qemu/qemu_domain.c:
+
+     This file was modified in lieu of modifying qemu_validate.c
+     upstream - that file has been added upstream (and device
+     post-parse validation functions moved there) but not downstream.
+
+   tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args:
+
+     These files had CPU model info upstream, but not downstream. Is
+     this due to the plain "q35" machinetype data missing from the
+     caps.replies file? Need to check...
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-6-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_command.c                       |  4 ++
+ src/qemu/qemu_domain.c                        | 31 +++++++++++++
+ ...cie-root-port-nohotplug.x86_64-latest.args | 45 +++++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  1 +
+ 4 files changed, 81 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 4653e6ac3c..ed5f60e82e 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -3023,6 +3023,10 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
+             virBufferAsprintf(&buf, "%s,port=0x%x,chassis=%d,id=%s",
+                               modelName, pciopts->port,
+                               pciopts->chassis, def->info.alias);
++            if (pciopts->hotplug != VIR_TRISTATE_SWITCH_ABSENT) {
++                virBufferAsprintf(&buf, ",hotplug=%s",
++                                  virTristateSwitchTypeToString(pciopts->hotplug));
++            }
+             break;
+         case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
+             virBufferAsprintf(&buf, "%s,index=%d,id=%s",
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 8f746cdf13..1509e41021 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -7932,6 +7932,37 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *cont,
+         virReportEnumRangeError(virDomainControllerModelPCI, cont->model);
+     }
+ 
++    /* hotplug */
++    if (pciopts->hotplug != VIR_TRISTATE_SWITCH_ABSENT) {
++        switch ((virDomainControllerModelPCI) cont->model) {
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT:
++            if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG)) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                               _("setting the hotplug property on a '%s' device is not supported by this QEMU binary"),
++                               modelName);
++                return -1;
++            }
++            break;
++
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE:
++        case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE:
++            virReportControllerInvalidOption(cont, model, modelName, "hotplug");
++            return -1;
++
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT:
++        case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST:
++        default:
++            virReportEnumRangeError(virDomainControllerModelPCI, cont->model);
++        }
++    }
++
+     /* QEMU device availability */
+     if (cap < 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
+new file mode 100644
+index 0000000000..73885eec24
+--- /dev/null
++++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
+@@ -0,0 +1,45 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-guest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-x86_64 \
++-name guest=guest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-guest/master-key.aes \
++-machine q35,accel=tcg,usb=off,dump-guest-core=off \
++-m 2048 \
++-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,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-boot strict=on \
++-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\
++addr=0x1 \
++-device pcie-root-port,port=0x9,chassis=2,id=pci.2,hotplug=off,bus=pcie.0,\
++addr=0x1.0x1 \
++-device ioh3420,port=0xa,chassis=3,id=pci.3,hotplug=off,bus=pcie.0,\
++addr=0x1.0x2 \
++-device x3130-upstream,id=pci.4,bus=pci.1,addr=0x0 \
++-device xio3130-downstream,port=0x0,chassis=5,id=pci.5,hotplug=off,bus=pci.4,\
++addr=0x0 \
++-device xio3130-downstream,port=0x1,chassis=6,id=pci.6,hotplug=on,bus=pci.4,\
++addr=0x1 \
++-device xio3130-downstream,port=0x2,chassis=7,id=pci.7,bus=pci.4,addr=0x2 \
++-device xio3130-downstream,port=0x27,chassis=30,id=pci.8,bus=pci.4,addr=0x3 \
++-device qemu-xhci,id=usb,bus=pci.2,addr=0x0 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index d6c5f436ae..ff92af606d 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -2427,6 +2427,7 @@ mymain(void)
+             QEMU_CAPS_DEVICE_IOH3420);
+     DO_TEST("pcie-root-port-model-ioh3420",
+             QEMU_CAPS_DEVICE_IOH3420);
++    DO_TEST_CAPS_LATEST("pcie-root-port-nohotplug");
+ 
+     DO_TEST("autoindex",
+             QEMU_CAPS_DEVICE_PCI_BRIDGE,
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-hotplug-Do-not-try-to-add-secret-object-for-TLS-if-it-does-not-exist.patch b/SOURCES/libvirt-qemu-hotplug-Do-not-try-to-add-secret-object-for-TLS-if-it-does-not-exist.patch
deleted file mode 100644
index f75d26f..0000000
--- a/SOURCES/libvirt-qemu-hotplug-Do-not-try-to-add-secret-object-for-TLS-if-it-does-not-exist.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5ed0c705400de3ae142813ea6089313805bbfc54 Mon Sep 17 00:00:00 2001
-Message-Id: <5ed0c705400de3ae142813ea6089313805bbfc54@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 10 Jul 2018 17:41:10 +0200
-Subject: [PATCH] qemu: hotplug: Do not try to add secret object for TLS if it
- does not exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The check whether the object holding secret for decryption of the TLS
-environment was wrong and would always attempt to add the object. This
-lead to a crash due to recent refactors.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1598015
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 62ef8227e2717618c96fa17f2d4f5b7570bbe980)
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 075f2fb72e..456bfa4493 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1338,7 +1338,7 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver,
-     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-         return -1;
- 
--    if (secProps &&
-+    if (secProps && *secProps &&
-         qemuMonitorAddObject(priv->mon, secProps, &secAlias) < 0)
-         goto error;
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-hotplug-Don-t-access-srcPriv-when-it-s-not-allocated.patch b/SOURCES/libvirt-qemu-hotplug-Don-t-access-srcPriv-when-it-s-not-allocated.patch
deleted file mode 100644
index b36f631..0000000
--- a/SOURCES/libvirt-qemu-hotplug-Don-t-access-srcPriv-when-it-s-not-allocated.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a97299d1417a7982ebdb3182eded45066b9f5425 Mon Sep 17 00:00:00 2001
-Message-Id: <a97299d1417a7982ebdb3182eded45066b9f5425@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 3 Jul 2018 16:48:38 +0200
-Subject: [PATCH] qemu: hotplug: Don't access srcPriv when it's not allocated
-
-The private data of a virStorageSource which is backing an iSCSI hostdev
-may be NULL if no authentication is present. The code handling the
-hotplug would attempt to extract the authentication info stored in
-'secinfo' without checking if it is allocated which resulted in a crash.
-
-Here we opt the easy way to check if srcPriv is not NULL so that we
-don't duplicate all the logic which selects whether the disk source has
-a secret.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1597550
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 33a475056fdd76c030528982e422bae79c0a0e4a)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hotplug.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index fcd8eb0ffa..075f2fb72e 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -2240,7 +2240,8 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driver,
-     if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
-         qemuDomainStorageSourcePrivatePtr srcPriv =
-             QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(scsisrc->u.iscsi.src);
--        secinfo = srcPriv->secinfo;
-+        if (srcPriv)
-+            secinfo = srcPriv->secinfo;
-     }
- 
-     if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) {
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-hotplug-Fix-asynchronous-unplug-of-shmem.patch b/SOURCES/libvirt-qemu-hotplug-Fix-asynchronous-unplug-of-shmem.patch
deleted file mode 100644
index e03f0ab..0000000
--- a/SOURCES/libvirt-qemu-hotplug-Fix-asynchronous-unplug-of-shmem.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b6b3d9d21c2b4a3587c5d85b3fef6c6193730d69 Mon Sep 17 00:00:00 2001
-Message-Id: <b6b3d9d21c2b4a3587c5d85b3fef6c6193730d69@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 17 Aug 2018 12:05:13 +0200
-Subject: [PATCH] qemu: hotplug: Fix asynchronous unplug of 'shmem'
-
-commit 5c81c342a7 forgot to skip the detaching of the shmem backend
-when async unplug is requested which meant that we've tried to unplug
-the backend prior to delivery of the DEVICE_DELETED event.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1618622
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 69c20e1090059d8b359fdd435e8ba50db7269be1)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1618680
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_hotplug.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 053ddb14ec..397a2bdde2 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -5262,11 +5262,16 @@ qemuDomainDetachShmemDevice(virQEMUDriverPtr driver,
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto cleanup;
- 
--    if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1)
--        ret = qemuDomainRemoveShmemDevice(driver, vm, shmem);
-+    if (async) {
-+        ret = 0;
-+    } else {
-+        if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1)
-+            ret = qemuDomainRemoveShmemDevice(driver, vm, shmem);
-+    }
- 
-  cleanup:
--    qemuDomainResetDeviceRemoval(vm);
-+    if (!async)
-+        qemuDomainResetDeviceRemoval(vm);
-     return ret;
- }
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-hotplug-Fix-handling-of-the-copy-on-read-layer-with-blockdev.patch b/SOURCES/libvirt-qemu-hotplug-Fix-handling-of-the-copy-on-read-layer-with-blockdev.patch
new file mode 100644
index 0000000..bcbb7c4
--- /dev/null
+++ b/SOURCES/libvirt-qemu-hotplug-Fix-handling-of-the-copy-on-read-layer-with-blockdev.patch
@@ -0,0 +1,94 @@
+From ec2f52e9e935136d8517567bbe0e56c6e8c40af1 Mon Sep 17 00:00:00 2001
+Message-Id: <ec2f52e9e935136d8517567bbe0e56c6e8c40af1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:05 +0100
+Subject: [PATCH] qemu: hotplug: Fix handling of the 'copy-on-read' layer with
+ blockdev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+My original implementation was completely broken because it attempted to
+use object-add/del instead of blockdev-add/del.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798366
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit b71cf8726c25ea135ac81051e332544e6b886ad2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798366
+Message-Id: <170358b3722e56fc308e7cf3b0a2625349346ae9.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index 31d455505b..12bc1f9dd5 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -680,6 +680,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     g_autoptr(virJSONValue) corProps = NULL;
+     g_autofree char *corAlias = NULL;
++    bool corAdded = false;
+     bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
+ 
+     if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0)
+@@ -692,9 +693,12 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
+         goto cleanup;
+ 
+     if (blockdev) {
+-        if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON &&
+-            !(corProps = qemuBlockStorageGetCopyOnReadProps(disk)))
+-        goto cleanup;
++        if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) {
++            if (!(corProps = qemuBlockStorageGetCopyOnReadProps(disk)))
++                goto cleanup;
++
++            corAlias = g_strdup(QEMU_DOMAIN_DISK_PRIVATE(disk)->nodeCopyOnRead);
++        }
+ 
+         if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src,
+                                                                       priv->qemuCaps)))
+@@ -719,9 +723,12 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
+     if (qemuBlockStorageSourceChainAttach(priv->mon, data) < 0)
+         goto exit_monitor;
+ 
+-    if (corProps &&
+-        qemuMonitorAddObject(priv->mon, &corProps, &corAlias) < 0)
+-        goto exit_monitor;
++    if (corProps) {
++        if (qemuMonitorBlockdevAdd(priv->mon, &corProps) < 0)
++            goto exit_monitor;
++
++        corAdded = true;
++    }
+ 
+     if (qemuDomainAttachExtensionDevice(priv->mon, &disk->info) < 0)
+         goto exit_monitor;
+@@ -763,8 +770,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
+     return ret;
+ 
+  exit_monitor:
+-    if (corAlias)
+-        ignore_value(qemuMonitorDelObject(priv->mon, corAlias));
++    if (corAdded)
++        ignore_value(qemuMonitorBlockdevDel(priv->mon, corAlias));
+     qemuBlockStorageSourceChainDetach(priv->mon, data);
+ 
+     if (qemuDomainObjExitMonitor(driver, vm) < 0)
+@@ -4252,7 +4259,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
+     qemuDomainObjEnterMonitor(driver, vm);
+ 
+     if (corAlias)
+-        ignore_value(qemuMonitorDelObject(priv->mon, corAlias));
++        ignore_value(qemuMonitorBlockdevDel(priv->mon, corAlias));
+ 
+     if (diskBackend)
+         qemuBlockStorageSourceChainDetach(priv->mon, diskBackend);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-hotplug-don-t-overwrite-error-message-in-qemuDomainAttachNetDevice.patch b/SOURCES/libvirt-qemu-hotplug-don-t-overwrite-error-message-in-qemuDomainAttachNetDevice.patch
deleted file mode 100644
index e54e407..0000000
--- a/SOURCES/libvirt-qemu-hotplug-don-t-overwrite-error-message-in-qemuDomainAttachNetDevice.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 60696c94a10c41997fe44478a3551dce50d29233 Mon Sep 17 00:00:00 2001
-Message-Id: <60696c94a10c41997fe44478a3551dce50d29233@dist-git>
-From: Katerina Koukiou <kkoukiou@redhat.com>
-Date: Mon, 16 Jul 2018 11:20:56 +0200
-Subject: [PATCH] qemu: hotplug: don't overwrite error message in
- qemuDomainAttachNetDevice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit f14c37, virDomainConfVMNWFilterTeardown is reporting errors
-thus any previously reported error gets overwritten.
-We need to save the errors in qemuDomainAttachNetDevice before calling
-this function when we are in cleanup code.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598311
-
-Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit f7b55665cc6b805bc4c34e1ec5908df31084ef5c)
-Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 456bfa4493..3d0f1055d9 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -790,6 +790,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-     bool charDevPlugged = false;
-     bool netdevPlugged = false;
-     char *netdev_name;
-+    virErrorPtr save_error = NULL;
- 
-     /* preallocate new slot for device */
-     if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0)
-@@ -1071,7 +1072,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-             qemuDomainReleaseDeviceAddress(vm, &net->info, NULL);
- 
-         if (iface_connected) {
-+            virErrorPreserveLast(&save_error);
-             virDomainConfNWFilterTeardown(net);
-+            virErrorRestore(&save_error);
- 
-             if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
-                 ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-hotplug-report-error-when-changing-rom-enabled-attr-for-net-iface.patch b/SOURCES/libvirt-qemu-hotplug-report-error-when-changing-rom-enabled-attr-for-net-iface.patch
deleted file mode 100644
index a3b6807..0000000
--- a/SOURCES/libvirt-qemu-hotplug-report-error-when-changing-rom-enabled-attr-for-net-iface.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ddc505c4dd054d6d92099d467ba255eabcb84922 Mon Sep 17 00:00:00 2001
-Message-Id: <ddc505c4dd054d6d92099d467ba255eabcb84922@dist-git>
-From: Katerina Koukiou <kkoukiou@redhat.com>
-Date: Mon, 16 Jul 2018 11:42:28 +0200
-Subject: [PATCH] qemu: hotplug: report error when changing rom enabled attr
- for net iface
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1599513
-
-Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 611b038fb60e23eb574148192090f33bc7264be2)
-Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 3d0f1055d9..91a751a2fe 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -3222,6 +3222,11 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
-                        _("cannot modify network device boot index setting"));
-         goto cleanup;
-     }
-+    if (olddev->info.romenabled != newdev->info.romenabled) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("cannot modify network device rom enabled setting"));
-+        goto cleanup;
-+    }
-     /* (end of device info checks) */
- 
-     if (STRNEQ_NULLABLE(olddev->filter, newdev->filter) ||
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-mdev-Use-vfio-pci-display-property-only-with-vfio-pci-mdevs.patch b/SOURCES/libvirt-qemu-mdev-Use-vfio-pci-display-property-only-with-vfio-pci-mdevs.patch
deleted file mode 100644
index 558d6bf..0000000
--- a/SOURCES/libvirt-qemu-mdev-Use-vfio-pci-display-property-only-with-vfio-pci-mdevs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f5ff3821c1171718af9164be9002d3acfeb12cf2 Mon Sep 17 00:00:00 2001
-Message-Id: <f5ff3821c1171718af9164be9002d3acfeb12cf2@dist-git>
-From: Farhan Ali <alifm@linux.ibm.com>
-Date: Mon, 3 Sep 2018 09:58:50 +0200
-Subject: [PATCH] qemu: mdev: Use vfio-pci 'display' property only with
- vfio-pci mdevs
-
-S390 is aware of both vfio-pci and vfio-ccw devices, so
-on S390 the capability QEMU_CAPS_VFIO_PCI_DISPLAY will be
-available. Add an extra check to make sure we only set the
-display to off for vfio-pci mediated devices. Otherwise we
-add display for vfio-ccw device and this breaks vfio-ccw
-device qemu command line.
-
-Fixes: d54e45b6e conf: Introduce new <hostdev> attribute 'display'
-Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
-Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d6f97d1338ba9470f7c745fab317d272cde84d38)
-
-RHEL-7.6: https://bugzilla.redhat.com/show_bug.cgi?id=1624735
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1624740
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-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 508846116b..17be6e5537 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -6272,6 +6272,7 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDevPtr mdevsrc,
-     /* QEMU 2.12 added support for vfio-pci display type, we default to
-      * 'display=off' to stay safe from future changes */
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) &&
-+        mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
-         mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
-         mdevsrc->display = VIR_TRISTATE_SWITCH_OFF;
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-monitor-Add-handler-for-blockdev-reopen.patch b/SOURCES/libvirt-qemu-monitor-Add-handler-for-blockdev-reopen.patch
new file mode 100644
index 0000000..2a394dd
--- /dev/null
+++ b/SOURCES/libvirt-qemu-monitor-Add-handler-for-blockdev-reopen.patch
@@ -0,0 +1,113 @@
+From 56a605626d81ee27ad220f3f949990cc46fca061 Mon Sep 17 00:00:00 2001
+Message-Id: <56a605626d81ee27ad220f3f949990cc46fca061@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:15 +0100
+Subject: [PATCH] qemu: monitor: Add handler for blockdev-reopen
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce the monitor code for using blockdev-reopen.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 9f436e067df2e4465228c8ba536dcf9f9445aabc)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <e74e172e1c5e73fcaeafb7fb3a09414a2fcbe9ad.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_monitor.c      | 13 +++++++++++++
+ src/qemu/qemu_monitor.h      |  3 +++
+ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++
+ src/qemu/qemu_monitor_json.h |  4 ++++
+ 4 files changed, 41 insertions(+)
+
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index e3ee48613a..c4202d59af 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -4407,6 +4407,19 @@ qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
+ }
+ 
+ 
++int
++qemuMonitorBlockdevReopen(qemuMonitorPtr mon,
++                          virJSONValuePtr *props)
++{
++    VIR_DEBUG("props=%p (node-name=%s)", *props,
++              NULLSTR(virJSONValueObjectGetString(*props, "node-name")));
++
++    QEMU_CHECK_MONITOR(mon);
++
++    return qemuMonitorJSONBlockdevReopen(mon, props);
++}
++
++
+ int
+ qemuMonitorBlockdevDel(qemuMonitorPtr mon,
+                        const char *nodename)
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index 6a6b8efaee..481fc8e12e 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -1325,6 +1325,9 @@ int qemuMonitorBlockdevCreate(qemuMonitorPtr mon,
+ int qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
+                            virJSONValuePtr *props);
+ 
++int qemuMonitorBlockdevReopen(qemuMonitorPtr mon,
++                              virJSONValuePtr *props);
++
+ int qemuMonitorBlockdevDel(qemuMonitorPtr mon,
+                            const char *nodename);
+ 
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 3827574ef6..0122b77259 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -8830,6 +8830,27 @@ qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+ }
+ 
+ 
++int
++qemuMonitorJSONBlockdevReopen(qemuMonitorPtr mon,
++                              virJSONValuePtr *props)
++{
++    g_autoptr(virJSONValue) cmd = NULL;
++    g_autoptr(virJSONValue) reply = NULL;
++    virJSONValuePtr pr = g_steal_pointer(props);
++
++    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", pr)))
++        return -1;
++
++    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
++        return -1;
++
++    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
++        return -1;
++
++    return 0;
++}
++
++
+ int
+ qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
+                            const char *nodename)
+diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
+index fd2e09025e..801babef97 100644
+--- a/src/qemu/qemu_monitor_json.h
++++ b/src/qemu/qemu_monitor_json.h
+@@ -600,6 +600,10 @@ int qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+                                virJSONValuePtr *props)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+ 
++int qemuMonitorJSONBlockdevReopen(qemuMonitorPtr mon,
++                                  virJSONValuePtr *props)
++    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
++
+ int qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
+                                const char *nodename)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-monitor-Improve-error-message-when-QEMU-reply-is-too-large.patch b/SOURCES/libvirt-qemu-monitor-Improve-error-message-when-QEMU-reply-is-too-large.patch
new file mode 100644
index 0000000..da7be2d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-monitor-Improve-error-message-when-QEMU-reply-is-too-large.patch
@@ -0,0 +1,51 @@
+From a3bea49c6960a468ee28b6d8dd0664c1ebcbcd02 Mon Sep 17 00:00:00 2001
+Message-Id: <a3bea49c6960a468ee28b6d8dd0664c1ebcbcd02@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:46 +0100
+Subject: [PATCH] qemu: monitor: Improve error message when QEMU reply is too
+ large
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Don't use ERANGE as it doesn't make much sense in the error message.
+Also point out that the reply from qemu was too large which is not
+obvious from the original error:
+
+ error: No complete monitor response found in 10485760 bytes: Numerical result out of range
+
+The new message will read:
+
+ error: internal error: QEMU monitor reply exceeds buffer size (10485760 bytes)
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 29d43bf96a3e5886f1b32c78bbb16d1507bd0d9e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1524278
+Message-Id: <0e03a38f096e556cb82eecdb72e7dd5f86eec752.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_monitor.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index 4f547bf5ec..0e67851690 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -485,9 +485,9 @@ qemuMonitorIORead(qemuMonitorPtr mon)
+ 
+     if (avail < 1024) {
+         if (mon->bufferLength >= QEMU_MONITOR_MAX_RESPONSE) {
+-            virReportSystemError(ERANGE,
+-                                 _("No complete monitor response found in %d bytes"),
+-                                 QEMU_MONITOR_MAX_RESPONSE);
++            virReportError(VIR_ERR_INTERNAL_ERROR,
++                           _("QEMU monitor reply exceeds buffer size (%d bytes)"),
++                           QEMU_MONITOR_MAX_RESPONSE);
+             return -1;
+         }
+         if (VIR_REALLOC_N(mon->buffer,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-monitor-Make-qemuMonitorAddObject-more-robust-against-programming-errors.patch b/SOURCES/libvirt-qemu-monitor-Make-qemuMonitorAddObject-more-robust-against-programming-errors.patch
deleted file mode 100644
index f3f1ca0..0000000
--- a/SOURCES/libvirt-qemu-monitor-Make-qemuMonitorAddObject-more-robust-against-programming-errors.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 08a2ab563571018ea8c4eb0ac34acc9f4913c714 Mon Sep 17 00:00:00 2001
-Message-Id: <08a2ab563571018ea8c4eb0ac34acc9f4913c714@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 10 Jul 2018 17:41:11 +0200
-Subject: [PATCH] qemu: monitor: Make qemuMonitorAddObject more robust against
- programming errors
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Document and check that @props contains a pointer to a json object and
-check that both necessary fields are present. Also mark @props as
-NONNULL.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fac0dacd54c02b842c995d0999d9450d09d1e7cd)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1598015
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor.c | 23 +++++++++++++++++------
- src/qemu/qemu_monitor.h |  3 ++-
- 2 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 6ed475ede0..ae5b23b9fc 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -3073,8 +3073,9 @@ qemuMonitorCreateObjectProps(virJSONValuePtr *propsret,
- /**
-  * qemuMonitorAddObject:
-  * @mon: Pointer to monitor object
-- * @props: Optional arguments for the given type. The object is consumed and
-- *         the pointer is cleared.
-+ * @props: Pointer to a JSON object holding configuration of the object to add.
-+ *         The object must be non-null and contain at least the "qom-type" and
-+ *         "id" field. The object is consumed and the pointer is cleared.
-  * @alias: If not NULL, returns the alias of the added object if it was added
-  *         successfully to qemu. Caller should free the returned pointer.
-  *
-@@ -3085,18 +3086,28 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
-                      virJSONValuePtr *props,
-                      char **alias)
- {
--    const char *type = virJSONValueObjectGetString(*props, "qom-type");
--    const char *id = virJSONValueObjectGetString(*props, "id");
-+    const char *type = NULL;
-+    const char *id = NULL;
-     char *tmp = NULL;
-     int ret = -1;
- 
-+    if (!*props) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("object props can't be NULL"));
-+        goto cleanup;
-+    }
-+
-+    type = virJSONValueObjectGetString(*props, "qom-type");
-+    id = virJSONValueObjectGetString(*props, "id");
-+
-     VIR_DEBUG("type=%s id=%s", NULLSTR(type), NULLSTR(id));
- 
-     QEMU_CHECK_MONITOR_GOTO(mon, cleanup);
- 
--    if (!id) {
-+    if (!id || !type) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("missing alias for qemu object '%s'"), NULLSTR(type));
-+                       _("missing alias or qom-type for qemu object '%s'"),
-+                       NULLSTR(type));
-         goto cleanup;
-     }
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index b3d62324b4..e8adda8aa0 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -812,7 +812,8 @@ int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret,
- 
- int qemuMonitorAddObject(qemuMonitorPtr mon,
-                          virJSONValuePtr *props,
--                         char **alias);
-+                         char **alias)
-+    ATTRIBUTE_NONNULL(1);
- 
- int qemuMonitorDelObject(qemuMonitorPtr mon,
-                          const char *objalias);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-monitor-Remove-qemuMonitorJSONExtractCPUArchInfo-wrapper.patch b/SOURCES/libvirt-qemu-monitor-Remove-qemuMonitorJSONExtractCPUArchInfo-wrapper.patch
deleted file mode 100644
index bc9726d..0000000
--- a/SOURCES/libvirt-qemu-monitor-Remove-qemuMonitorJSONExtractCPUArchInfo-wrapper.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a66c293aea0e989807b2a7850e597bf9514856d8 Mon Sep 17 00:00:00 2001
-Message-Id: <a66c293aea0e989807b2a7850e597bf9514856d8@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 4 Sep 2018 16:41:30 +0200
-Subject: [PATCH] qemu: monitor: Remove qemuMonitorJSONExtractCPUArchInfo
- wrapper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The wraper is quite pointless and also the 'arch' field may depend on
-whether query-cpus-fast is used.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 1e65d35b047959af7a033aad4cc364e4cf87b17b)
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1598829
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor_json.c | 27 +++++----------------------
- 1 file changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 8199556166..e7e6658075 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -1603,27 +1603,6 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValuePtr jsoncpu,
- }
- 
- 
--/**
-- * qemuMonitorJSONExtractCPUArchInfo:
-- * @jsoncpu: pointer to a single JSON cpu entry
-- * @cpu: pointer to a single cpu entry
-- *
-- * Extracts architecure specific virtual CPU data for a single
-- * CPU from the QAPI response using an architecture specific
-- * function.
-- *
-- */
--static void
--qemuMonitorJSONExtractCPUArchInfo(virJSONValuePtr jsoncpu,
--                                  struct qemuMonitorQueryCpusEntry *cpu)
--{
--    const char *arch = virJSONValueObjectGetString(jsoncpu, "arch");
--
--    if (STREQ_NULLABLE(arch, "s390"))
--        qemuMonitorJSONExtractCPUS390Info(jsoncpu, cpu);
--}
--
--
- /**
-  * qemuMonitorJSONExtractCPUInfo:
-  * @data: JSON response data
-@@ -1675,6 +1654,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
-                               size_t *nentries,
-                               bool fast)
- {
-+    const char *arch = NULL;
-     struct qemuMonitorQueryCpusEntry *cpus = NULL;
-     int ret = -1;
-     size_t i;
-@@ -1702,10 +1682,12 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
-          * The return data of query-cpus-fast has different field names
-          */
-         if (fast) {
-+            arch = virJSONValueObjectGetString(entry, "arch");
-             ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index", &cpuid));
-             ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id", &thread));
-             qom_path = virJSONValueObjectGetString(entry, "qom-path");
-         } else {
-+            arch = virJSONValueObjectGetString(entry, "arch");
-             ignore_value(virJSONValueObjectGetNumberInt(entry, "CPU", &cpuid));
-             ignore_value(virJSONValueObjectGetNumberInt(entry, "thread_id", &thread));
-             ignore_value(virJSONValueObjectGetBoolean(entry, "halted", &halted));
-@@ -1719,7 +1701,8 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
-             goto cleanup;
- 
-         /* process optional architecture-specific data */
--        qemuMonitorJSONExtractCPUArchInfo(entry, cpus + i);
-+        if (STREQ_NULLABLE(arch, "s390"))
-+            qemuMonitorJSONExtractCPUS390Info(entry, cpus + i);
-     }
- 
-     VIR_STEAL_PTR(*entries, cpus);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-monitor-Use-target-instead-of-arch-in-reply-of-query-cpus-fast.patch b/SOURCES/libvirt-qemu-monitor-Use-target-instead-of-arch-in-reply-of-query-cpus-fast.patch
deleted file mode 100644
index a79f941..0000000
--- a/SOURCES/libvirt-qemu-monitor-Use-target-instead-of-arch-in-reply-of-query-cpus-fast.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d801cf83a1f453f034147e83bce0c9665d911c26 Mon Sep 17 00:00:00 2001
-Message-Id: <d801cf83a1f453f034147e83bce0c9665d911c26@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 4 Sep 2018 16:41:31 +0200
-Subject: [PATCH] qemu: monitor: Use 'target' instead of 'arch' in reply of
- 'query-cpus-fast'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-qemu changed the output field name for the architecture from 'arch' to
-'target'. Note the change and fix the code so that the arch-specific
-extraction works.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598829
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 902f4bce098d68c48899fc1c42ec1552f2104995)
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1598829
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor_json.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index e7e6658075..d6c11666c5 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -1647,6 +1647,9 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValuePtr jsoncpu,
-  *    ...},
-  *    {...}
-  *  ]
-+ *
-+ *  Note that since QEMU 2.13.0 the "arch" output member of the
-+ *  "query-cpus-fast" command is replaced by "target".
-  */
- static int
- qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
-@@ -1682,7 +1685,8 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
-          * The return data of query-cpus-fast has different field names
-          */
-         if (fast) {
--            arch = virJSONValueObjectGetString(entry, "arch");
-+            if (!(arch = virJSONValueObjectGetString(entry, "target")))
-+                arch = virJSONValueObjectGetString(entry, "arch");
-             ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index", &cpuid));
-             ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id", &thread));
-             qom_path = virJSONValueObjectGetString(entry, "qom-path");
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-Add-QEMU-caps-data-for-future-4.1.0.patch b/SOURCES/libvirt-qemu-new-capabilities-flag-pcie-root-port.hotplug.patch
similarity index 55%
rename from SOURCES/libvirt-tests-Add-QEMU-caps-data-for-future-4.1.0.patch
rename to SOURCES/libvirt-qemu-new-capabilities-flag-pcie-root-port.hotplug.patch
index 3334ae5..e402e22 100644
--- a/SOURCES/libvirt-tests-Add-QEMU-caps-data-for-future-4.1.0.patch
+++ b/SOURCES/libvirt-qemu-new-capabilities-flag-pcie-root-port.hotplug.patch
@@ -1,43 +1,6318 @@
-From e4ded1e96b54db8f56af824a1e3e1acdf2f84e71 Mon Sep 17 00:00:00 2001
-Message-Id: <e4ded1e96b54db8f56af824a1e3e1acdf2f84e71@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:48 +0200
-Subject: [PATCH] tests: Add QEMU caps data for future 4.1.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From bc897af485b8ae39d93dfa974995a8a94ba217cf Mon Sep 17 00:00:00 2001
+Message-Id: <bc897af485b8ae39d93dfa974995a8a94ba217cf@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:06 -0400
+Subject: [PATCH] qemu: new capabilities flag pcie-root-port.hotplug
 
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fb5bde121fcc0dc99926fe71c17a0ff668003250)
+This caps flag is set when the qemu binary supports the option
+"hotplug" for pcie-root-port, ioh3420 (Intel pcie-root-port) and
+xio3130-downstream (Intel pcie-downstream-port). If it's available,
+it's possible to disable hotplugging/unplugging devices on a
+particular port by adding ",hotplug=off" to the qemu device
+commandline. This option first appears in qemu-5.0.0.
 
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit cbd4ab4cc6945e610b0a3061fcf3517755d65dcf)
 
-Conflicts:
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-	tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-            - different set of probed capabilities
+ Conflicts:
+ src/qemu/qemu_capabilities.c:
+ src/qemu/qemu_capabilities.h:
 
-	tests/qemucapabilitiestest.c
-            - upstream uses testQemuCapsIterate
+   new capabilities added upstream
 
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <baa57d2576fd4ddde8dc4808da0704fe7c5ee394.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
+ tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies:
+ tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml:
+
+   files didn't exist upstream (and some new capabilities aren't
+   included downstream, meaning the .xml is different from upstream)
+
+ tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args:
+ tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args:
+ tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args:
+ tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args:
+ tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml:
+
+   These files were not modified for this patch upstream, but had to
+   be modified downstream in order for tests to patch. This was due to
+   the "latest" qemu for tests switching from 4.2.0.x86_64 to
+   5.0.0.x86_64, which removes the deprecated "pc-0.12" and "pc-0.13"
+   machinetype used in those 5 tests. Upstream these tests were
+   changed (in commits 30518a3b and 44d32a0a) to use either the
+   generic "pc" machinetype, or the specific "pc-i440fx-2.12"
+   machinetype, but backporting those patches (and several others)
+   seemed overly disruptive, so instead this patch is carrying 5 extra
+   one-line changes to allow the tests to pass.
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-4-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 ---
- .../caps_4.1.0.x86_64.replies                 | 23762 ++++++++++++++++
- .../caps_4.1.0.x86_64.xml                     |  1424 +
- tests/qemucapabilitiestest.c                  |     1 +
- 3 files changed, 25187 insertions(+)
- create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
- create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+ src/qemu/qemu_capabilities.c                  |     8 +
+ src/qemu/qemu_capabilities.h                  |     1 +
+ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |   181 +
+ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |   191 +
+ tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |   181 +
+ .../caps_2.10.0.aarch64.replies               |   142 +-
+ .../caps_2.10.0.x86_64.replies                |   154 +-
+ .../caps_2.11.0.x86_64.replies                |   154 +-
+ .../caps_2.12.0.aarch64.replies               |   158 +-
+ .../caps_2.12.0.x86_64.replies                |   170 +-
+ .../caps_2.9.0.x86_64.replies                 |   154 +-
+ .../caps_3.0.0.x86_64.replies                 |   170 +-
+ .../caps_3.1.0.x86_64.replies                 |   170 +-
+ .../caps_4.0.0.aarch64.replies                |   158 +-
+ .../caps_4.0.0.ppc64.replies                  |   150 +-
+ .../caps_4.0.0.riscv32.replies                |   150 +-
+ .../caps_4.0.0.riscv64.replies                |   150 +-
+ .../caps_4.0.0.x86_64.replies                 |   170 +-
+ .../caps_4.1.0.x86_64.replies                 |   162 +-
+ .../caps_4.2.0.aarch64.replies                |   166 +-
+ .../caps_4.2.0.ppc64.replies                  |   150 +-
+ .../caps_4.2.0.x86_64.replies                 |   162 +-
+ .../caps_5.0.0.aarch64.replies                |   166 +-
+ .../caps_5.0.0.x86_64.replies                 | 28673 ++++++++++++++++
+ .../caps_5.0.0.x86_64.xml                     |  2842 ++
+ .../disk-cdrom-tray.x86_64-latest.args        |     1 -
+ .../disk-copy_on_read.x86_64-latest.args      |     1 -
+ .../disk-detect-zeroes.x86_64-latest.args     |     1 -
+ .../vhost-vsock.x86_64-latest.args            |     1 -
+ .../tpm-passthrough.x86_64-latest.xml         |     3 -
+ 30 files changed, 34495 insertions(+), 445 deletions(-)
+ create mode 100644 tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+ create mode 100644 tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+ create mode 100644 tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+ create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+ create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
 
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 9d744501b9..3bbfb64c03 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -565,6 +565,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               /* 355 */
+               "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api",
+               "storage.werror",
++              "pcie-root-port.hotplug",
+     );
+ 
+ 
+@@ -1315,6 +1316,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioNet[] = {
+     { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER },
+ };
+ 
++static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIeRootPort[] = {
++    { "hotplug", QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG },
++};
++
+ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSpaprPCIHostBridge[] = {
+     { "numa_node", QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE },
+ };
+@@ -1556,6 +1561,9 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
+     { "nvdimm", virQEMUCapsDevicePropsNVDIMM,
+       G_N_ELEMENTS(virQEMUCapsDevicePropsNVDIMM),
+       QEMU_CAPS_DEVICE_NVDIMM },
++    { "pcie-root-port", virQEMUCapsDevicePropsPCIeRootPort,
++      G_N_ELEMENTS(virQEMUCapsDevicePropsPCIeRootPort),
++      QEMU_CAPS_DEVICE_PCIE_ROOT_PORT },
+ };
+ 
+ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 78bddb3856..aad02fcda5 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -546,6 +546,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     /* 355 */
+     QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
+     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
++    QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
 new file mode 100644
-index 0000000000..ab0ac1e7bf
+index 0000000000..b635d573ef
 --- /dev/null
++++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+@@ -0,0 +1,181 @@
++<domainCapabilities>
++  <path>/usr/bin/qemu-system-x86_64</path>
++  <domain>kvm</domain>
++  <machine>pc-q35-5.0</machine>
++  <arch>x86_64</arch>
++  <vcpu max='288'/>
++  <iothreads supported='yes'/>
++  <os supported='yes'>
++    <enum name='firmware'>
++      <value>bios</value>
++      <value>efi</value>
++    </enum>
++    <loader supported='yes'>
++      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
++      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
++      <value>/usr/share/OVMF/OVMF_CODE.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'/>
++    <mode name='host-model' supported='yes'>
++      <model fallback='forbid'>Skylake-Client-IBRS</model>
++      <vendor>Intel</vendor>
++      <feature policy='require' name='ss'/>
++      <feature policy='require' name='vmx'/>
++      <feature policy='require' name='hypervisor'/>
++      <feature policy='require' name='tsc_adjust'/>
++      <feature policy='require' name='clflushopt'/>
++      <feature policy='require' name='umip'/>
++      <feature policy='require' name='md-clear'/>
++      <feature policy='require' name='stibp'/>
++      <feature policy='require' name='arch-capabilities'/>
++      <feature policy='require' name='ssbd'/>
++      <feature policy='require' name='xsaves'/>
++      <feature policy='require' name='pdpe1gb'/>
++      <feature policy='require' name='invtsc'/>
++      <feature policy='require' name='skip-l1dfl-vmentry'/>
++    </mode>
++    <mode name='custom' supported='yes'>
++      <model usable='yes'>qemu64</model>
++      <model usable='yes'>qemu32</model>
++      <model usable='no'>phenom</model>
++      <model usable='yes'>pentium3</model>
++      <model usable='yes'>pentium2</model>
++      <model usable='yes'>pentium</model>
++      <model usable='yes'>n270</model>
++      <model usable='yes'>kvm64</model>
++      <model usable='yes'>kvm32</model>
++      <model usable='yes'>coreduo</model>
++      <model usable='yes'>core2duo</model>
++      <model usable='no'>athlon</model>
++      <model usable='yes'>Westmere-IBRS</model>
++      <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-IBRS</model>
++      <model usable='no'>Skylake-Server</model>
++      <model usable='yes'>Skylake-Client-IBRS</model>
++      <model usable='yes'>Skylake-Client</model>
++      <model usable='yes'>SandyBridge-IBRS</model>
++      <model usable='yes'>SandyBridge</model>
++      <model usable='yes'>Penryn</model>
++      <model usable='no'>Opteron_G5</model>
++      <model usable='no'>Opteron_G4</model>
++      <model usable='no'>Opteron_G3</model>
++      <model usable='yes'>Opteron_G2</model>
++      <model usable='yes'>Opteron_G1</model>
++      <model usable='yes'>Nehalem-IBRS</model>
++      <model usable='yes'>Nehalem</model>
++      <model usable='yes'>IvyBridge-IBRS</model>
++      <model usable='yes'>IvyBridge</model>
++      <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client</model>
++      <model usable='yes'>Haswell-noTSX-IBRS</model>
++      <model usable='yes'>Haswell-noTSX</model>
++      <model usable='yes'>Haswell-IBRS</model>
++      <model usable='yes'>Haswell</model>
++      <model usable='no'>EPYC-IBPB</model>
++      <model usable='no'>EPYC</model>
++      <model usable='no'>Dhyana</model>
++      <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server</model>
++      <model usable='yes'>Broadwell-noTSX-IBRS</model>
++      <model usable='yes'>Broadwell-noTSX</model>
++      <model usable='yes'>Broadwell-IBRS</model>
++      <model usable='yes'>Broadwell</model>
++      <model usable='yes'>486</model>
++    </mode>
++  </cpu>
++  <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>
++      </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>
++      </enum>
++    </rng>
++  </devices>
++  <features>
++    <gic supported='no'/>
++    <vmcoreinfo supported='yes'/>
++    <genid supported='yes'/>
++    <backingStoreInput supported='yes'/>
++    <backup supported='no'/>
++    <sev supported='no'/>
++  </features>
++</domainCapabilities>
+diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+new file mode 100644
+index 0000000000..0fbc632267
+--- /dev/null
++++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+@@ -0,0 +1,191 @@
++<domainCapabilities>
++  <path>/usr/bin/qemu-system-x86_64</path>
++  <domain>qemu</domain>
++  <machine>pc-i440fx-5.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>/usr/share/AAVMF/AAVMF_CODE.fd</value>
++      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
++      <value>/usr/share/OVMF/OVMF_CODE.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='host-model' supported='yes'>
++      <model fallback='forbid'>EPYC</model>
++      <vendor>AMD</vendor>
++      <feature policy='require' name='acpi'/>
++      <feature policy='require' name='ss'/>
++      <feature policy='require' name='hypervisor'/>
++      <feature policy='require' name='erms'/>
++      <feature policy='require' name='mpx'/>
++      <feature policy='require' name='pcommit'/>
++      <feature policy='require' name='clwb'/>
++      <feature policy='require' name='pku'/>
++      <feature policy='require' name='la57'/>
++      <feature policy='require' name='3dnowext'/>
++      <feature policy='require' name='3dnow'/>
++      <feature policy='disable' name='vme'/>
++      <feature policy='disable' name='fma'/>
++      <feature policy='disable' name='avx'/>
++      <feature policy='disable' name='f16c'/>
++      <feature policy='disable' name='avx2'/>
++      <feature policy='disable' name='rdseed'/>
++      <feature policy='disable' name='sha-ni'/>
++      <feature policy='disable' name='xsavec'/>
++      <feature policy='disable' name='fxsr_opt'/>
++      <feature policy='disable' name='misalignsse'/>
++      <feature policy='disable' name='3dnowprefetch'/>
++      <feature policy='disable' name='osvw'/>
++      <feature policy='disable' name='topoext'/>
++    </mode>
++    <mode name='custom' supported='yes'>
++      <model usable='yes'>qemu64</model>
++      <model usable='yes'>qemu32</model>
++      <model usable='no'>phenom</model>
++      <model usable='yes'>pentium3</model>
++      <model usable='yes'>pentium2</model>
++      <model usable='yes'>pentium</model>
++      <model usable='yes'>n270</model>
++      <model usable='yes'>kvm64</model>
++      <model usable='yes'>kvm32</model>
++      <model usable='yes'>coreduo</model>
++      <model usable='yes'>core2duo</model>
++      <model usable='yes'>athlon</model>
++      <model usable='no'>Westmere-IBRS</model>
++      <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-IBRS</model>
++      <model usable='no'>Skylake-Server</model>
++      <model usable='no'>Skylake-Client-IBRS</model>
++      <model usable='no'>Skylake-Client</model>
++      <model usable='no'>SandyBridge-IBRS</model>
++      <model usable='no'>SandyBridge</model>
++      <model usable='yes'>Penryn</model>
++      <model usable='no'>Opteron_G5</model>
++      <model usable='no'>Opteron_G4</model>
++      <model usable='no'>Opteron_G3</model>
++      <model usable='yes'>Opteron_G2</model>
++      <model usable='yes'>Opteron_G1</model>
++      <model usable='no'>Nehalem-IBRS</model>
++      <model usable='yes'>Nehalem</model>
++      <model usable='no'>IvyBridge-IBRS</model>
++      <model usable='no'>IvyBridge</model>
++      <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client</model>
++      <model usable='no'>Haswell-noTSX-IBRS</model>
++      <model usable='no'>Haswell-noTSX</model>
++      <model usable='no'>Haswell-IBRS</model>
++      <model usable='no'>Haswell</model>
++      <model usable='no'>EPYC-IBPB</model>
++      <model usable='no'>EPYC</model>
++      <model usable='no'>Dhyana</model>
++      <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server</model>
++      <model usable='no'>Broadwell-noTSX-IBRS</model>
++      <model usable='no'>Broadwell-noTSX</model>
++      <model usable='no'>Broadwell-IBRS</model>
++      <model usable='no'>Broadwell</model>
++      <model usable='yes'>486</model>
++    </mode>
++  </cpu>
++  <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>
++      </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>
++      </enum>
++    </rng>
++  </devices>
++  <features>
++    <gic supported='no'/>
++    <vmcoreinfo supported='yes'/>
++    <genid supported='yes'/>
++    <backingStoreInput supported='yes'/>
++    <backup supported='no'/>
++    <sev supported='no'/>
++  </features>
++</domainCapabilities>
+diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+new file mode 100644
+index 0000000000..27f76a8a5e
+--- /dev/null
++++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+@@ -0,0 +1,181 @@
++<domainCapabilities>
++  <path>/usr/bin/qemu-system-x86_64</path>
++  <domain>kvm</domain>
++  <machine>pc-i440fx-5.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>/usr/share/AAVMF/AAVMF_CODE.fd</value>
++      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
++      <value>/usr/share/OVMF/OVMF_CODE.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'/>
++    <mode name='host-model' supported='yes'>
++      <model fallback='forbid'>Skylake-Client-IBRS</model>
++      <vendor>Intel</vendor>
++      <feature policy='require' name='ss'/>
++      <feature policy='require' name='vmx'/>
++      <feature policy='require' name='hypervisor'/>
++      <feature policy='require' name='tsc_adjust'/>
++      <feature policy='require' name='clflushopt'/>
++      <feature policy='require' name='umip'/>
++      <feature policy='require' name='md-clear'/>
++      <feature policy='require' name='stibp'/>
++      <feature policy='require' name='arch-capabilities'/>
++      <feature policy='require' name='ssbd'/>
++      <feature policy='require' name='xsaves'/>
++      <feature policy='require' name='pdpe1gb'/>
++      <feature policy='require' name='invtsc'/>
++      <feature policy='require' name='skip-l1dfl-vmentry'/>
++    </mode>
++    <mode name='custom' supported='yes'>
++      <model usable='yes'>qemu64</model>
++      <model usable='yes'>qemu32</model>
++      <model usable='no'>phenom</model>
++      <model usable='yes'>pentium3</model>
++      <model usable='yes'>pentium2</model>
++      <model usable='yes'>pentium</model>
++      <model usable='yes'>n270</model>
++      <model usable='yes'>kvm64</model>
++      <model usable='yes'>kvm32</model>
++      <model usable='yes'>coreduo</model>
++      <model usable='yes'>core2duo</model>
++      <model usable='no'>athlon</model>
++      <model usable='yes'>Westmere-IBRS</model>
++      <model usable='yes'>Westmere</model>
++      <model usable='no'>Skylake-Server-IBRS</model>
++      <model usable='no'>Skylake-Server</model>
++      <model usable='yes'>Skylake-Client-IBRS</model>
++      <model usable='yes'>Skylake-Client</model>
++      <model usable='yes'>SandyBridge-IBRS</model>
++      <model usable='yes'>SandyBridge</model>
++      <model usable='yes'>Penryn</model>
++      <model usable='no'>Opteron_G5</model>
++      <model usable='no'>Opteron_G4</model>
++      <model usable='no'>Opteron_G3</model>
++      <model usable='yes'>Opteron_G2</model>
++      <model usable='yes'>Opteron_G1</model>
++      <model usable='yes'>Nehalem-IBRS</model>
++      <model usable='yes'>Nehalem</model>
++      <model usable='yes'>IvyBridge-IBRS</model>
++      <model usable='yes'>IvyBridge</model>
++      <model usable='no'>Icelake-Server</model>
++      <model usable='no'>Icelake-Client</model>
++      <model usable='yes'>Haswell-noTSX-IBRS</model>
++      <model usable='yes'>Haswell-noTSX</model>
++      <model usable='yes'>Haswell-IBRS</model>
++      <model usable='yes'>Haswell</model>
++      <model usable='no'>EPYC-IBPB</model>
++      <model usable='no'>EPYC</model>
++      <model usable='no'>Dhyana</model>
++      <model usable='yes'>Conroe</model>
++      <model usable='no'>Cascadelake-Server</model>
++      <model usable='yes'>Broadwell-noTSX-IBRS</model>
++      <model usable='yes'>Broadwell-noTSX</model>
++      <model usable='yes'>Broadwell-IBRS</model>
++      <model usable='yes'>Broadwell</model>
++      <model usable='yes'>486</model>
++    </mode>
++  </cpu>
++  <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>
++      </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>
++      </enum>
++    </rng>
++  </devices>
++  <features>
++    <gic supported='no'/>
++    <vmcoreinfo supported='yes'/>
++    <genid supported='yes'/>
++    <backingStoreInput supported='yes'/>
++    <backup supported='no'/>
++    <sev supported='no'/>
++  </features>
++</domainCapabilities>
+diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+index 73a99a36ea..c75d4ab8a7 100644
+--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+@@ -4895,10 +4895,120 @@
+ }
+ 
+ {
+-  "execute": "query-machines",
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
+   "id": "libvirt-29"
+ }
+ 
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-29"
++}
++
++{
++  "execute": "query-machines",
++  "id": "libvirt-30"
++}
++
+ {
+   "return": [
+     {
+@@ -5163,12 +5273,12 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-29"
++  "id": "libvirt-30"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -5334,34 +5444,34 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6506,12 +6616,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -6561,12 +6671,12 @@
+       "capability": "return-path"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -16289,12 +16399,12 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -16310,7 +16420,7 @@
+       "kernel": true
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+index 8f96b4c567..d5deea9b3c 100644
+--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+@@ -4448,10 +4448,120 @@
+ }
+ 
+ {
+-  "execute": "query-machines",
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
+   "id": "libvirt-35"
+ }
+ 
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
++{
++  "execute": "query-machines",
++  "id": "libvirt-36"
++}
++
+ {
+   "return": [
+     {
+@@ -4638,12 +4748,12 @@
+       "alias": "q35"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4978,36 +5088,36 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+     "tpm-tis"
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "return": [
+     "passthrough"
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -6286,12 +6396,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -6341,12 +6451,12 @@
+       "capability": "return-path"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -16069,7 +16179,7 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -16080,7 +16190,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -16259,7 +16369,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -16440,7 +16550,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -16683,7 +16793,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -16697,7 +16807,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -16876,7 +16986,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -17057,7 +17167,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -17300,7 +17410,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+index d91f01b55d..75ca78f75e 100644
+--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+@@ -4475,10 +4475,120 @@
+ }
+ 
+ {
+-  "execute": "query-machines",
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
+   "id": "libvirt-35"
+ }
+ 
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
++{
++  "execute": "query-machines",
++  "id": "libvirt-36"
++}
++
+ {
+   "return": [
+     {
+@@ -4665,12 +4775,12 @@
+       "cpu-max": 288
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4984,24 +5094,24 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+     "tpm-tis"
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -5009,12 +5119,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -6309,12 +6419,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -6372,12 +6482,12 @@
+       "capability": "x-multifd"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -16245,7 +16355,7 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -16256,7 +16366,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -16436,7 +16546,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -16618,7 +16728,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -16863,7 +16973,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -16877,7 +16987,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -17057,7 +17167,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -17239,7 +17349,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -17484,7 +17594,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+index 87414a9bca..b99913ed37 100644
+--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+@@ -5251,12 +5251,122 @@
+   "id": "libvirt-28"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-29"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-29"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-29"
++  "id": "libvirt-30"
+ }
+ 
+ {
+@@ -5310,7 +5420,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-29"
++  "id": "libvirt-30"
+ }
+ 
+ {
+@@ -5318,7 +5428,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -5372,7 +5482,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -5380,7 +5490,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5495,12 +5605,12 @@
+       "type": "child<irq>"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -5797,7 +5907,7 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -5805,7 +5915,7 @@
+   "arguments": {
+     "typename": "virt-2.12-machine"
+   },
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -5935,12 +6045,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -6116,35 +6226,35 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+     "emulator"
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -7309,12 +7419,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -7376,12 +7486,12 @@
+       "capability": "dirty-bitmaps"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -18749,12 +18859,12 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -18770,7 +18880,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+index b4c243096b..1e3ba0885a 100644
+--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+@@ -4641,12 +4641,122 @@
+   "id": "libvirt-34"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -4700,7 +4810,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -4708,7 +4818,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4758,7 +4868,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4766,7 +4876,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -5788,12 +5898,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -5992,12 +6102,12 @@
+       "cpu-max": 255
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -6511,12 +6621,12 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -6524,12 +6634,12 @@
+     "tpm-crb",
+     "tpm-tis"
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -6537,12 +6647,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -7829,12 +7939,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -7896,12 +8006,12 @@
+       "capability": "dirty-bitmaps"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -19269,12 +19379,12 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -19284,7 +19394,7 @@
+     "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA",
+     "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA"
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -19295,7 +19405,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -19485,7 +19595,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -19677,7 +19787,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -19932,7 +20042,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -19946,7 +20056,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -20136,7 +20246,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -20328,7 +20438,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -20583,7 +20693,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+index 8f32313b46..5cff9c485b 100644
+--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+@@ -3992,10 +3992,120 @@
+ }
+ 
+ {
+-  "execute": "query-machines",
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
+   "id": "libvirt-35"
+ }
+ 
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
++{
++  "execute": "query-machines",
++  "id": "libvirt-36"
++}
++
+ {
+   "return": [
+     {
+@@ -4172,12 +4282,12 @@
+       "cpu-max": 255
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4459,36 +4569,36 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+     "tpm-tis"
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "return": [
+     "passthrough"
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -5737,12 +5847,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -5784,12 +5894,12 @@
+       "capability": "release-ram"
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -15075,7 +15185,7 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -15086,7 +15196,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -15265,7 +15375,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -15446,7 +15556,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -15687,7 +15797,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -15701,7 +15811,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -15880,7 +15990,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -16061,7 +16171,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+@@ -16302,7 +16412,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+index f25e5deb94..c683f672f7 100644
+--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+@@ -4776,12 +4776,122 @@
+ }
+ 
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -4831,7 +4941,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -4839,7 +4949,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4889,7 +4999,7 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4897,7 +5007,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -5951,12 +6061,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -6165,12 +6275,12 @@
+       "cpu-max": 255
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -6607,12 +6717,12 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -6620,12 +6730,12 @@
+     "tpm-crb",
+     "tpm-tis"
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -6633,12 +6743,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -7937,12 +8047,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -8012,12 +8122,12 @@
+       "capability": "late-block-activate"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -19897,16 +20007,16 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-46",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV feature is not available"
+@@ -19921,7 +20031,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -20114,7 +20224,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -20309,7 +20419,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -20572,7 +20682,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -20586,7 +20696,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -20779,7 +20889,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -20974,7 +21084,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -21237,7 +21347,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+index 256fa92af9..e0e1edddf1 100644
+--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+@@ -4818,12 +4818,122 @@
+   "id": "libvirt-34"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -4884,7 +4994,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -4892,7 +5002,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4952,7 +5062,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -4960,7 +5070,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -6062,12 +6172,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -6286,12 +6396,12 @@
+       "cpu-max": 255
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -6810,12 +6920,12 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -6823,12 +6933,12 @@
+     "tpm-crb",
+     "tpm-tis"
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -6836,12 +6946,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -8115,12 +8225,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -8190,12 +8300,12 @@
+       "capability": "late-block-activate"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -20380,16 +20490,16 @@
+       "meta-type": "object"
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-46",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV feature is not available"
+@@ -20404,7 +20514,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -20606,7 +20716,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -20810,7 +20920,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -21085,7 +21195,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -21099,7 +21209,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -21301,7 +21411,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -21505,7 +21615,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -21780,7 +21890,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+index 0eca77acca..ddd77ba48a 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+@@ -5718,12 +5718,122 @@
+   "id": "libvirt-29"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-30"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -5788,7 +5898,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -5796,7 +5906,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5860,7 +5970,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5868,7 +5978,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -5983,12 +6093,12 @@
+       "type": "child<irq>"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6330,7 +6440,7 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6338,7 +6448,7 @@
+   "arguments": {
+     "typename": "virt-4.0-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -6473,12 +6583,12 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -6669,34 +6779,34 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -7844,12 +7954,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -7923,12 +8033,12 @@
+       "capability": "x-ignore-shared"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -20015,12 +20125,12 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -20036,7 +20146,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+index 84b5f06c5d..356e12aa01 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+@@ -5773,12 +5773,122 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-31"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5843,7 +5953,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5851,7 +5961,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -5915,12 +6025,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6073,7 +6183,7 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6081,7 +6191,7 @@
+   "arguments": {
+     "typename": "pseries-4.0-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -6280,12 +6390,12 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -8481,34 +8591,34 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -9651,12 +9761,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -9730,12 +9840,12 @@
+       "capability": "x-ignore-shared"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -21793,7 +21903,7 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+index 2b1d832c6b..2d63851d3a 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+@@ -3892,12 +3892,122 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-31"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -3962,7 +4072,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -3970,7 +4080,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -4034,12 +4144,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -4076,7 +4186,7 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -4084,7 +4194,7 @@
+   "arguments": {
+     "typename": "virt-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -4189,34 +4299,34 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -5488,12 +5598,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -5567,12 +5677,12 @@
+       "capability": "x-ignore-shared"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -17851,12 +17961,12 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -17893,5 +18003,5 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+index 8fd9646f53..4df475d7c0 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+@@ -3892,12 +3892,122 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-31a"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -3962,7 +4072,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -3970,7 +4080,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -4034,12 +4144,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -4076,7 +4186,7 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -4084,7 +4194,7 @@
+   "arguments": {
+     "typename": "virt-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -4189,34 +4299,34 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -5488,12 +5598,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -5567,12 +5677,12 @@
+       "capability": "x-ignore-shared"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -17851,12 +17961,12 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -17893,5 +18003,5 @@
+       "cpu-max": 1
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+index 09112a207f..8ac67e0b75 100644
+--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+@@ -5043,12 +5043,122 @@
+   "id": "libvirt-34"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -5113,7 +5223,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -5121,7 +5231,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -5185,7 +5295,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -5193,7 +5303,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -6311,12 +6421,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -6535,12 +6645,12 @@
+       "alias": "q35"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -7057,12 +7167,12 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -7070,12 +7180,12 @@
+     "tpm-crb",
+     "tpm-tis"
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -7083,12 +7193,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -8370,12 +8480,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -8449,12 +8559,12 @@
+       "capability": "x-ignore-shared"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -20919,16 +21029,16 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-46",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV feature is not available"
+@@ -20943,7 +21053,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -21147,7 +21257,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -21353,7 +21463,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -21632,7 +21742,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -21646,7 +21756,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -21850,7 +21960,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-48"
++  "id": "libvirt-49"
+ }
+ 
+ {
+@@ -22056,7 +22166,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+@@ -22335,7 +22445,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-49"
++  "id": "libvirt-50"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+index c143866dcc..5c3c706651 100644
+--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
 +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
-@@ -0,0 +1,23762 @@
+@@ -5336,12 +5336,122 @@
+   "id": "libvirt-34"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -5406,7 +5516,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -5414,7 +5524,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -5478,7 +5588,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -5486,7 +5596,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -6651,12 +6761,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -6980,12 +7090,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -8130,12 +8240,12 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -8143,12 +8253,12 @@
+     "tpm-crb",
+     "tpm-tis"
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -8156,12 +8266,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -9435,12 +9545,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -9514,12 +9624,12 @@
+       "capability": "x-ignore-shared"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -22104,16 +22214,16 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-46",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV feature is not available"
+@@ -22128,7 +22238,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -22336,7 +22446,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -22350,7 +22460,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -22558,7 +22668,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+index e5d5b53667..4d28047ebe 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+@@ -6090,12 +6090,122 @@
+   "id": "libvirt-29"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-30"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -6160,7 +6270,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -6168,7 +6278,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -6232,7 +6342,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -6240,7 +6350,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -6427,12 +6537,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6990,7 +7100,7 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6998,7 +7108,7 @@
+   "arguments": {
+     "typename": "virt-4.2-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -7151,12 +7261,12 @@
+       "type": "child<cfi.pflash01>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -7347,34 +7457,34 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -8542,12 +8652,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -8625,12 +8735,12 @@
+       "capability": "validate-uuid"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -21201,12 +21311,12 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -21222,7 +21332,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -21233,7 +21343,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -21263,7 +21373,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -21277,11 +21387,11 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+-  "id": "libvirt-43",
++  "id": "libvirt-44",
+   "error": {
+     "class": "GenericError",
+     "desc": "Parameter 'migratable' is unexpected"
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+index 2414105e25..95ec00a651 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+@@ -5895,12 +5895,122 @@
+   "id": "libvirt-30"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-31"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-31"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5965,7 +6075,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -5973,7 +6083,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -6037,12 +6147,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6304,7 +6414,7 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -6312,7 +6422,7 @@
+   "arguments": {
+     "typename": "pseries-4.2-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -6511,12 +6621,12 @@
+       "type": "string"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -8712,34 +8822,34 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -9878,12 +9988,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -9961,12 +10071,12 @@
+       "capability": "validate-uuid"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -22195,7 +22305,7 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+index b9481b6f85..c09ebb5460 100644
+--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+@@ -5576,12 +5576,122 @@
+   "id": "libvirt-34"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-35"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -5646,7 +5756,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -5654,7 +5764,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -5718,7 +5828,7 @@
+       "type": "int"
+     }
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+@@ -5726,7 +5836,7 @@
+   "arguments": {
+     "typename": "max-x86_64-cpu"
+   },
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+@@ -7280,12 +7390,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -7677,12 +7787,12 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -9065,12 +9175,12 @@
+       "migration-safe": true
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -9078,12 +9188,12 @@
+     "tpm-crb",
+     "tpm-tis"
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -9091,12 +9201,12 @@
+     "passthrough",
+     "emulator"
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -10382,12 +10492,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+@@ -10465,12 +10575,12 @@
+       "capability": "validate-uuid"
+     }
+   ],
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+@@ -23389,16 +23499,16 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-44"
++  "id": "libvirt-45"
+ }
+ 
+ {
+   "execute": "query-sev-capabilities",
+-  "id": "libvirt-45"
++  "id": "libvirt-46"
+ }
+ 
+ {
+-  "id": "libvirt-45",
++  "id": "libvirt-46",
+   "error": {
+     "class": "GenericError",
+     "desc": "SEV feature is not available"
+@@ -23413,7 +23523,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -23715,7 +23825,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-46"
++  "id": "libvirt-47"
+ }
+ 
+ {
+@@ -23729,7 +23839,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+@@ -24031,7 +24141,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-47"
++  "id": "libvirt-48"
+ }
+ 
+ {
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+index a3136a0966..067cbb7e31 100644
+--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+@@ -6476,12 +6476,122 @@
+   "id": "libvirt-29"
+ }
+ 
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-30"
++}
++
++{
++  "return": [
++    {
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "power_controller_present",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "name": "x-speed",
++      "description": "2_5/5/8/16",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "name": "slot",
++      "type": "uint16"
++    },
++    {
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "name": "mem-reserve",
++      "type": "size"
++    },
++    {
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "pref64-reserve",
++      "type": "size"
++    },
++    {
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "name": "command_serr_enable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "chassis",
++      "type": "uint8"
++    },
++    {
++      "name": "x-width",
++      "description": "1/2/4/8/12/16/32",
++      "type": "PCIELinkWidth"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "name": "pref32-reserve",
++      "type": "size"
++    },
++    {
++      "name": "bus-reserve",
++      "type": "uint32"
++    },
++    {
++      "name": "x-migrate-msix",
++      "type": "bool"
++    },
++    {
++      "name": "disable-acs",
++      "type": "bool"
++    },
++    {
++      "name": "io-reserve",
++      "type": "size"
++    }
++  ],
++  "id": "libvirt-30"
++}
++
+ {
+   "execute": "qom-list-properties",
+   "arguments": {
+     "typename": "memory-backend-file"
+   },
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -6546,7 +6656,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-30"
++  "id": "libvirt-31"
+ }
+ 
+ {
+@@ -6554,7 +6664,7 @@
+   "arguments": {
+     "typename": "memory-backend-memfd"
+   },
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -6618,7 +6728,7 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-31"
++  "id": "libvirt-32"
+ }
+ 
+ {
+@@ -6626,7 +6736,7 @@
+   "arguments": {
+     "typename": "max-arm-cpu"
+   },
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+@@ -6826,12 +6936,12 @@
+       "type": "bool"
+     }
+   ],
+-  "id": "libvirt-32"
++  "id": "libvirt-33"
+ }
+ 
+ {
+   "execute": "query-machines",
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -7411,7 +7521,7 @@
+       "deprecated": false
+     }
+   ],
+-  "id": "libvirt-33"
++  "id": "libvirt-34"
+ }
+ 
+ {
+@@ -7419,7 +7529,7 @@
+   "arguments": {
+     "typename": "virt-5.0-machine"
+   },
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+@@ -7557,12 +7667,12 @@
+       "type": "child<cfi.pflash01>"
+     }
+   ],
+-  "id": "libvirt-34"
++  "id": "libvirt-35"
+ }
+ 
+ {
+   "execute": "query-cpu-definitions",
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+@@ -7758,34 +7868,34 @@
+       "static": false
+     }
+   ],
+-  "id": "libvirt-35"
++  "id": "libvirt-36"
+ }
+ 
+ {
+   "execute": "query-tpm-models",
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-36"
++  "id": "libvirt-37"
+ }
+ 
+ {
+   "execute": "query-tpm-types",
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "return": [
+   ],
+-  "id": "libvirt-37"
++  "id": "libvirt-38"
+ }
+ 
+ {
+   "execute": "query-command-line-options",
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+@@ -8943,12 +9053,12 @@
+       "option": "drive"
+     }
+   ],
+-  "id": "libvirt-38"
++  "id": "libvirt-39"
+ }
+ 
+ {
+   "execute": "query-migrate-capabilities",
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+@@ -9026,12 +9136,12 @@
+       "capability": "validate-uuid"
+     }
+   ],
+-  "id": "libvirt-39"
++  "id": "libvirt-40"
+ }
+ 
+ {
+   "execute": "query-qmp-schema",
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+@@ -21768,12 +21878,12 @@
+       ]
+     }
+   ],
+-  "id": "libvirt-40"
++  "id": "libvirt-41"
+ }
+ 
+ {
+   "execute": "query-gic-capabilities",
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -21789,7 +21899,7 @@
+       "kernel": false
+     }
+   ],
+-  "id": "libvirt-41"
++  "id": "libvirt-42"
+ }
+ 
+ {
+@@ -21800,7 +21910,7 @@
+       "name": "host"
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -21831,7 +21941,7 @@
+       }
+     }
+   },
+-  "id": "libvirt-42"
++  "id": "libvirt-43"
+ }
+ 
+ {
+@@ -21845,11 +21955,11 @@
+       }
+     }
+   },
+-  "id": "libvirt-43"
++  "id": "libvirt-44"
+ }
+ 
+ {
+-  "id": "libvirt-43",
++  "id": "libvirt-44",
+   "error": {
+     "class": "GenericError",
+     "desc": "Parameter 'migratable' is unexpected"
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+new file mode 100644
+index 0000000000..af2299a41e
+--- /dev/null
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+@@ -0,0 +1,28673 @@
 +{
 +  "execute": "qmp_capabilities",
 +  "id": "libvirt-1"
@@ -57,11 +6332,11 @@ index 0000000000..ab0ac1e7bf
 +{
 +  "return": {
 +    "qemu": {
-+      "micro": 50,
-+      "minor": 0,
++      "micro": 91,
++      "minor": 2,
 +      "major": 4
 +    },
-+    "package": "v4.0.0-1173-g9c70209b63"
++    "package": "v5.0.0-rc1"
 +  },
 +  "id": "libvirt-2"
 +}
@@ -86,7 +6361,7 @@ index 0000000000..ab0ac1e7bf
 +{
 +  "return": [
 +    {
-+      "name": "netdev_add"
++      "name": "object-add"
 +    },
 +    {
 +      "name": "device_add"
@@ -95,12 +6370,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "query-qmp-schema"
 +    },
 +    {
-+      "name": "query-cpu-definitions"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion"
-+    },
-+    {
 +      "name": "query-sev-capabilities"
 +    },
 +    {
@@ -113,15 +6382,9 @@ index 0000000000..ab0ac1e7bf
 +      "name": "rtc-reset-reinjection"
 +    },
 +    {
-+      "name": "set-numa-node"
-+    },
-+    {
 +      "name": "query-vm-generation-id"
 +    },
 +    {
-+      "name": "query-hotpluggable-cpus"
-+    },
-+    {
 +      "name": "xen-load-devices-state"
 +    },
 +    {
@@ -131,15 +6394,9 @@ index 0000000000..ab0ac1e7bf
 +      "name": "query-memory-devices"
 +    },
 +    {
-+      "name": "query-memdev"
-+    },
-+    {
 +      "name": "query-command-line-options"
 +    },
 +    {
-+      "name": "query-target"
-+    },
-+    {
 +      "name": "query-fdsets"
 +    },
 +    {
@@ -152,60 +6409,18 @@ index 0000000000..ab0ac1e7bf
 +      "name": "query-memory-size-summary"
 +    },
 +    {
-+      "name": "query-current-machine"
-+    },
-+    {
-+      "name": "query-machines"
-+    },
-+    {
 +      "name": "closefd"
 +    },
 +    {
 +      "name": "getfd"
 +    },
 +    {
-+      "name": "object-del"
-+    },
-+    {
-+      "name": "object-add"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability"
-+    },
-+    {
-+      "name": "query-dump"
-+    },
-+    {
-+      "name": "dump-guest-memory"
-+    },
-+    {
-+      "name": "device_del"
-+    },
-+    {
 +      "name": "xen-set-global-dirty-log"
 +    },
 +    {
-+      "name": "qom-list-properties"
-+    },
-+    {
-+      "name": "device-list-properties"
-+    },
-+    {
-+      "name": "qom-list-types"
-+    },
-+    {
 +      "name": "change"
 +    },
 +    {
-+      "name": "qom-set"
-+    },
-+    {
-+      "name": "qom-get"
-+    },
-+    {
-+      "name": "qom-list"
-+    },
-+    {
 +      "name": "human-monitor-command"
 +    },
 +    {
@@ -230,9 +6445,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "memsave"
 +    },
 +    {
-+      "name": "cpu-add"
-+    },
-+    {
 +      "name": "system_powerdown"
 +    },
 +    {
@@ -242,9 +6454,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "stop"
 +    },
 +    {
-+      "name": "quit"
-+    },
-+    {
 +      "name": "query-pci"
 +    },
 +    {
@@ -254,15 +6463,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "query-iothreads"
 +    },
 +    {
-+      "name": "query-cpus-fast"
-+    },
-+    {
-+      "name": "query-cpus"
-+    },
-+    {
-+      "name": "query-events"
-+    },
-+    {
 +      "name": "query-uuid"
 +    },
 +    {
@@ -275,6 +6475,69 @@ index 0000000000..ab0ac1e7bf
 +      "name": "add_client"
 +    },
 +    {
++      "name": "query-cpu-definitions"
++    },
++    {
++      "name": "query-cpu-model-expansion"
++    },
++    {
++      "name": "set-numa-node"
++    },
++    {
++      "name": "query-hotpluggable-cpus"
++    },
++    {
++      "name": "query-memdev"
++    },
++    {
++      "name": "query-target"
++    },
++    {
++      "name": "query-current-machine"
++    },
++    {
++      "name": "query-machines"
++    },
++    {
++      "name": "cpu-add"
++    },
++    {
++      "name": "query-cpus-fast"
++    },
++    {
++      "name": "query-cpus"
++    },
++    {
++      "name": "device_del"
++    },
++    {
++      "name": "device-list-properties"
++    },
++    {
++      "name": "object-del"
++    },
++    {
++      "name": "qom-list-properties"
++    },
++    {
++      "name": "qom-list-types"
++    },
++    {
++      "name": "qom-set"
++    },
++    {
++      "name": "qom-get"
++    },
++    {
++      "name": "qom-list"
++    },
++    {
++      "name": "quit"
++    },
++    {
++      "name": "query-events"
++    },
++    {
 +      "name": "query-commands"
 +    },
 +    {
@@ -425,9 +6688,21 @@ index 0000000000..ab0ac1e7bf
 +      "name": "netdev_del"
 +    },
 +    {
++      "name": "netdev_add"
++    },
++    {
 +      "name": "set_link"
 +    },
 +    {
++      "name": "query-dump-guest-memory-capability"
++    },
++    {
++      "name": "query-dump"
++    },
++    {
++      "name": "dump-guest-memory"
++    },
++    {
 +      "name": "chardev-send-break"
 +    },
 +    {
@@ -452,6 +6727,33 @@ index 0000000000..ab0ac1e7bf
 +      "name": "query-chardev"
 +    },
 +    {
++      "name": "query-jobs"
++    },
++    {
++      "name": "job-finalize"
++    },
++    {
++      "name": "job-dismiss"
++    },
++    {
++      "name": "job-complete"
++    },
++    {
++      "name": "job-cancel"
++    },
++    {
++      "name": "job-resume"
++    },
++    {
++      "name": "job-pause"
++    },
++    {
++      "name": "blockdev-snapshot-delete-internal-sync"
++    },
++    {
++      "name": "blockdev-snapshot-internal-sync"
++    },
++    {
 +      "name": "nbd-server-stop"
 +    },
 +    {
@@ -464,18 +6766,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "nbd-server-start"
 +    },
 +    {
-+      "name": "eject"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync"
-+    },
-+    {
-+      "name": "query-pr-managers"
-+    },
-+    {
 +      "name": "x-blockdev-set-iothread"
 +    },
 +    {
@@ -485,21 +6775,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "block-set-write-threshold"
 +    },
 +    {
-+      "name": "blockdev-change-medium"
-+    },
-+    {
-+      "name": "blockdev-insert-medium"
-+    },
-+    {
-+      "name": "blockdev-remove-medium"
-+    },
-+    {
-+      "name": "blockdev-close-tray"
-+    },
-+    {
-+      "name": "blockdev-open-tray"
-+    },
-+    {
 +      "name": "blockdev-create"
 +    },
 +    {
@@ -536,9 +6811,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "block-stream"
 +    },
 +    {
-+      "name": "block_set_io_throttle"
-+    },
-+    {
 +      "name": "blockdev-mirror"
 +    },
 +    {
@@ -608,25 +6880,28 @@ index 0000000000..ab0ac1e7bf
 +      "name": "block-latency-histogram-set"
 +    },
 +    {
-+      "name": "query-jobs"
++      "name": "block_set_io_throttle"
 +    },
 +    {
-+      "name": "job-finalize"
++      "name": "blockdev-change-medium"
 +    },
 +    {
-+      "name": "job-dismiss"
++      "name": "blockdev-insert-medium"
 +    },
 +    {
-+      "name": "job-complete"
++      "name": "blockdev-remove-medium"
 +    },
 +    {
-+      "name": "job-cancel"
++      "name": "blockdev-close-tray"
 +    },
 +    {
-+      "name": "job-resume"
++      "name": "blockdev-open-tray"
 +    },
 +    {
-+      "name": "job-pause"
++      "name": "eject"
++    },
++    {
++      "name": "query-pr-managers"
 +    },
 +    {
 +      "name": "watchdog-set-action"
@@ -639,41 +6914,8 @@ index 0000000000..ab0ac1e7bf
 +}
 +
 +{
-+  "execute": "add-fd",
-+  "arguments": {
-+    "fdset-id": 0,
-+    "opaque": "/dev/null"
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "fd": 18,
-+    "fdset-id": 0
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "block-commit",
-+  "arguments": {
-+    "device": "bogus"
-+  },
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "id": "libvirt-6",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'bogus' not found"
-+  }
-+}
-+
-+{
 +  "execute": "query-kvm",
-+  "id": "libvirt-7"
++  "id": "libvirt-5"
 +}
 +
 +{
@@ -681,406 +6923,1093 @@ index 0000000000..ab0ac1e7bf
 +    "enabled": true,
 +    "present": true
 +  },
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "execute": "query-events",
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "RTC_CHANGE"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST"
-+    },
-+    {
-+      "name": "MEM_UNPLUG_ERROR"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED"
-+    },
-+    {
-+      "name": "DEVICE_DELETED"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE"
-+    },
-+    {
-+      "name": "COLO_EXIT"
-+    },
-+    {
-+      "name": "MIGRATION_PASS"
-+    },
-+    {
-+      "name": "MIGRATION"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED"
-+    },
-+    {
-+      "name": "VNC_CONNECTED"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED"
-+    },
-+    {
-+      "name": "RDMA_GID_STATUS_CHANGED"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD"
-+    },
-+    {
-+      "name": "QUORUM_FAILURE"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED"
-+    },
-+    {
-+      "name": "JOB_STATUS_CHANGE"
-+    },
-+    {
-+      "name": "GUEST_PANICKED"
-+    },
-+    {
-+      "name": "WATCHDOG"
-+    },
-+    {
-+      "name": "WAKEUP"
-+    },
-+    {
-+      "name": "SUSPEND_DISK"
-+    },
-+    {
-+      "name": "SUSPEND"
-+    },
-+    {
-+      "name": "RESUME"
-+    },
-+    {
-+      "name": "STOP"
-+    },
-+    {
-+      "name": "RESET"
-+    },
-+    {
-+      "name": "POWERDOWN"
-+    },
-+    {
-+      "name": "SHUTDOWN"
-+    }
-+  ],
-+  "id": "libvirt-8"
++  "id": "libvirt-5"
 +}
 +
 +{
 +  "execute": "qom-list-types",
-+  "id": "libvirt-9"
++  "id": "libvirt-6"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "vhost-vsock-pci",
-+      "parent": "vhost-vsock-pci-base"
-+    },
-+    {
-+      "name": "scsi-generic",
-+      "parent": "scsi-device"
-+    },
-+    {
-+      "name": "qio-channel-tls",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "scsi-hd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "usb-bot",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "chardev-null",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-parallel",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "qemu-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "lsi53c895a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "kvm-ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "cpu-cluster",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "virtio-keyboard-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "xen-sysbus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "xen-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "i440FX",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ide-hd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "Opteron_G1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvm64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-scsi-pci-non-transitional",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "virtio-net-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "kvm-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "virtio-9p-pci-non-transitional",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "chardev-pty",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "xen-apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "SUNW,fdtwo",
-+      "parent": "base-sysbus-fdc"
-+    },
-+    {
-+      "name": "isa-pcspk",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "Haswell-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-4.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "loader",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "filter-rewriter",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "pc-q35-4.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-serial-pci",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "Nehalem-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-0.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pcie-root-port",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "virtio-crypto-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "usb-host",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "Icelake-Client-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-bt-dongle",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "igd-passthrough-isa-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-mtp",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "qemu64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-input-host-pci",
-+      "parent": "virtio-input-pci"
-+    },
-+    {
-+      "name": "pc-i440fx-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "phenom-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "e1000",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "PIIX3-xen",
-+      "parent": "pci-piix3"
-+    },
-+    {
-+      "name": "sysbus-ahci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "ccid-card-emulated",
-+      "parent": "ccid-card"
-+    },
-+    {
 +      "name": "ich9-usb-uhci5",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "pc-i440fx-1.4-machine",
++      "name": "pcie-pci-bridge",
++      "parent": "base-pci-bridge"
++    },
++    {
++      "name": "pc-q35-2.11-machine",
 +      "parent": "generic-pc-machine"
 +    },
 +    {
-+      "name": "ICH9-LPC",
++      "name": "isa-applesmc",
++      "parent": "isa-device"
++    },
++    {
++      "name": "Westmere-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vhost-user-input-pci",
++      "parent": "vhost-user-input-pci-base-type"
++    },
++    {
++      "name": "floppy-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "chardev-stdio",
++      "parent": "chardev-fd"
++    },
++    {
++      "name": "chardev-testdev",
++      "parent": "chardev"
++    },
++    {
++      "name": "usb-redir",
++      "parent": "usb-device"
++    },
++    {
++      "name": "Denverton-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "filter-buffer",
++      "parent": "netfilter"
++    },
++    {
++      "name": "usb-wacom-tablet",
++      "parent": "usb-device"
++    },
++    {
++      "name": "pci-bridge",
++      "parent": "base-pci-bridge"
++    },
++    {
++      "name": "pci-ipmi-bt",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "pc-q35-2.6-machine",
-+      "parent": "generic-pc-machine"
++      "name": "Icelake-Server-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
 +    },
 +    {
 +      "name": "ich9-usb-uhci6",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
++      "name": "secondary-vga",
++      "parent": "pci-vga"
++    },
++    {
++      "name": "virtio-rng-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "Haswell-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "rtl8139",
++      "parent": "pci-device"
++    },
++    {
++      "name": "core2duo-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "kvm-pit",
++      "parent": "pit-common"
++    },
++    {
++      "name": "pc-i440fx-3.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "sev-guest",
++      "parent": "object"
++    },
++    {
++      "name": "virtio-crypto-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "pcm3680_pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "virtio-blk-pci-transitional",
++      "parent": "virtio-blk-pci-base"
++    },
++    {
++      "name": "pc-q35-2.5-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "max-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vmware-svga",
++      "parent": "pci-device"
++    },
++    {
++      "name": "tpm-crb",
++      "parent": "device"
++    },
++    {
++      "name": "kvm-ioapic",
++      "parent": "ioapic-common"
++    },
++    {
++      "name": "virtio-mmio-bus",
++      "parent": "virtio-bus"
++    },
++    {
++      "name": "serial",
++      "parent": "device"
++    },
++    {
 +      "name": "ich9-usb-uhci4",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "chardev-spicevmc",
-+      "parent": "chardev-spice"
++      "name": "gus",
++      "parent": "isa-device"
++    },
++    {
++      "name": "usb-hub",
++      "parent": "usb-device"
++    },
++    {
++      "name": "ich9-usb-ehci2",
++      "parent": "pci-ehci-usb"
++    },
++    {
++      "name": "virtio-blk-device",
++      "parent": "virtio-device"
 +    },
 +    {
 +      "name": "ich9-usb-uhci3",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
++      "name": "Icelake-Client-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "chardev-wctablet",
++      "parent": "chardev"
++    },
++    {
++      "name": "Westmere-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Opteron_G5-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
 +      "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": "qtest-accel",
++      "parent": "accel"
++    },
++    {
++      "name": "chardev-pty",
++      "parent": "chardev"
++    },
++    {
 +      "name": "ich9-usb-uhci1",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "tls-creds-psk",
-+      "parent": "tls-creds"
++      "name": "PCIE",
++      "parent": "PCI"
 +    },
 +    {
-+      "name": "tpci200",
++      "name": "pc-i440fx-5.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "scsi-generic",
++      "parent": "scsi-device"
++    },
++    {
++      "name": "Icelake-Client-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "kvmclock",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "x3130-upstream",
++      "parent": "pcie-port"
++    },
++    {
++      "name": "pxb-host",
++      "parent": "pci-host-bridge"
++    },
++    {
++      "name": "memory-backend-ram",
++      "parent": "memory-backend"
++    },
++    {
++      "name": "virtio-serial-pci-transitional",
++      "parent": "virtio-serial-pci-base"
++    },
++    {
++      "name": "e1000e",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "n270-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Cooperlake-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "scsi-disk",
++      "parent": "scsi-disk-base"
++    },
++    {
++      "name": "chardev-file",
++      "parent": "chardev-fd"
++    },
++    {
++      "name": "tpm-passthrough",
++      "parent": "tpm-backend"
++    },
++    {
++      "name": "pentium3-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "virtio-serial-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "usb-host",
++      "parent": "usb-device"
++    },
++    {
++      "name": "tulip",
++      "parent": "pci-device"
++    },
++    {
++      "name": "piix3-ide",
++      "parent": "pci-ide"
++    },
++    {
++      "name": "filter-rewriter",
++      "parent": "netfilter"
++    },
++    {
++      "name": "pc-i440fx-4.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "pc-1.2-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "vhost-scsi-pci",
++      "parent": "vhost-scsi-pci-base"
++    },
++    {
++      "name": "isa-ipmi-bt",
++      "parent": "isa-device"
++    },
++    {
++      "name": "virtio-gpu-pci",
++      "parent": "virtio-gpu-pci-base-type"
++    },
++    {
++      "name": "pci-ipmi-kcs",
++      "parent": "pci-device"
++    },
++    {
++      "name": "imx-usdhc",
++      "parent": "generic-sdhci"
++    },
++    {
++      "name": "xio3130-downstream",
++      "parent": "pcie-slot"
++    },
++    {
++      "name": "intel-iommu-iommu-memory-region",
++      "parent": "qemu:iommu-memory-region"
++    },
++    {
++      "name": "pc-i440fx-2.3-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "sdhci-bus",
++      "parent": "sd-bus"
++    },
++    {
++      "name": "PCI",
++      "parent": "bus"
++    },
++    {
++      "name": "microvm-machine",
++      "parent": "x86-machine"
++    },
++    {
++      "name": "ICH9-LPC",
++      "parent": "pci-device"
++    },
++    {
++      "name": "pci-serial-2x",
++      "parent": "pci-device"
++    },
++    {
++      "name": "igd-passthrough-isa-bridge",
++      "parent": "pci-device"
++    },
++    {
++      "name": "virtio-9p-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "virtio-scsi-pci",
++      "parent": "virtio-scsi-pci-base"
++    },
++    {
++      "name": "ipmi-bmc-extern",
++      "parent": "ipmi-bmc"
++    },
++    {
++      "name": "authz-list-file",
++      "parent": "authz"
++    },
++    {
++      "name": "pc-q35-4.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "usb-audio",
++      "parent": "usb-device"
++    },
++    {
++      "name": "usb-net",
++      "parent": "usb-device"
++    },
++    {
++      "name": "EPYC-Rome-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "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": "isa-debug-exit",
++      "parent": "isa-device"
++    },
++    {
++      "name": "KnightsMill-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vfio-pci-nohotplug",
++      "parent": "vfio-pci"
++    },
++    {
++      "name": "i2c-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "Skylake-Server-v3-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "mch",
++      "parent": "pci-device"
++    },
++    {
++      "name": "ich9-usb-ehci1",
++      "parent": "pci-ehci-usb"
++    },
++    {
++      "name": "virtio-input-host-pci",
++      "parent": "virtio-input-host-pci-base-type"
++    },
++    {
++      "name": "nvdimm",
++      "parent": "pc-dimm"
++    },
++    {
++      "name": "pc-q35-3.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "virtio-9p-pci-transitional",
++      "parent": "virtio-9p-pci-base"
++    },
++    {
++      "name": "Opteron_G1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "serial-mm",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pr-manager-helper",
++      "parent": "pr-manager"
++    },
++    {
++      "name": "pc-i440fx-2.10-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "i82557c",
++      "parent": "pci-device"
++    },
++    {
++      "name": "pxb-pcie",
++      "parent": "pci-device"
++    },
++    {
++      "name": "Haswell-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "virtio-scsi-device",
++      "parent": "virtio-scsi-common"
++    },
++    {
++      "name": "input-barrier",
++      "parent": "object"
++    },
++    {
++      "name": "cpu-cluster",
++      "parent": "device"
++    },
++    {
++      "name": "i82557b",
++      "parent": "pci-device"
++    },
++    {
++      "name": "generic-sdhci",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "migration",
++      "parent": "device"
++    },
++    {
++      "name": "i82557a",
++      "parent": "pci-device"
++    },
++    {
++      "name": "vhost-user-scsi-pci-non-transitional",
++      "parent": "vhost-user-scsi-pci-base"
++    },
++    {
++      "name": "chardev-udp",
++      "parent": "chardev"
++    },
++    {
++      "name": "pc-q35-2.8-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "vmmouse",
++      "parent": "isa-device"
++    },
++    {
++      "name": "usb-tablet",
++      "parent": "usb-hid"
++    },
++    {
++      "name": "virtio-scsi-pci-non-transitional",
++      "parent": "virtio-scsi-pci-base"
++    },
++    {
++      "name": "Haswell-v3-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "athlon-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "chardev-memory",
++      "parent": "chardev-ringbuf"
++    },
++    {
++      "name": "EPYC-Rome-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "virtio-mouse-pci",
++      "parent": "virtio-mouse-pci-base-type"
++    },
++    {
++      "name": "pc-q35-5.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "pc-i440fx-1.6-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "vhost-user-vga",
++      "parent": "vhost-user-vga-base-type"
++    },
++    {
++      "name": "Opteron_G2-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Broadwell-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "usb-braille",
++      "parent": "usb-serial-dev"
++    },
++    {
++      "name": "EPYC-IBPB-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": "Nehalem-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
 +      "name": "memory-backend-file",
 +      "parent": "memory-backend"
 +    },
 +    {
-+      "name": "pc-q35-2.5-machine",
++      "name": "isa-pcspk",
++      "parent": "isa-device"
++    },
++    {
++      "name": "vhost-vsock-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "sd-card",
++      "parent": "device"
++    },
++    {
++      "name": "isabus-bridge",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "sysbus-ahci",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vhost-scsi",
++      "parent": "vhost-scsi-common"
++    },
++    {
++      "name": "pc-q35-4.0.1-machine",
 +      "parent": "generic-pc-machine"
 +    },
 +    {
++      "name": "esp",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virtio-blk-pci-non-transitional",
++      "parent": "virtio-blk-pci-base"
++    },
++    {
++      "name": "ne2k_pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "IvyBridge-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "usb-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "ide-cd",
++      "parent": "ide-device"
++    },
++    {
++      "name": "tcg-accel",
++      "parent": "accel"
++    },
++    {
++      "name": "virtio-balloon-pci",
++      "parent": "virtio-balloon-pci-base"
++    },
++    {
++      "name": "qemu:memory-region",
++      "parent": "object"
++    },
++    {
++      "name": "virtio-gpu-device",
++      "parent": "virtio-gpu-base"
++    },
++    {
++      "name": "e1000",
++      "parent": "e1000-base"
++    },
++    {
++      "name": "Cascadelake-Server-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "athlon-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "nec-usb-xhci",
++      "parent": "base-xhci"
++    },
++    {
++      "name": "pc-i440fx-2.6-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "i82551",
++      "parent": "pci-device"
++    },
++    {
++      "name": "isa-ipmi-kcs",
++      "parent": "isa-device"
++    },
++    {
++      "name": "EPYC-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "SandyBridge-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "piix4-ide",
++      "parent": "pci-ide"
++    },
++    {
++      "name": "nvme",
++      "parent": "pci-device"
++    },
++    {
++      "name": "vmxnet3",
++      "parent": "pci-device"
++    },
++    {
++      "name": "vhost-user-backend",
++      "parent": "object"
++    },
++    {
++      "name": "mioe3680_pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "i82550",
++      "parent": "pci-device"
++    },
++    {
++      "name": "Conroe-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "ES1370",
++      "parent": "pci-device"
++    },
++    {
++      "name": "kvm-apic",
++      "parent": "apic-common"
++    },
++    {
++      "name": "Icelake-Server-noTSX-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "isa-pit",
++      "parent": "pit-common"
++    },
++    {
++      "name": "kvm64-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Broadwell-v4-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "memory-backend-memfd",
++      "parent": "memory-backend"
++    },
++    {
++      "name": "smbus-eeprom",
++      "parent": "smbus-device"
++    },
++    {
++      "name": "virtio-serial-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "Denverton-v2-x86_64-cpu",
++      "parent": "x86_64-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": "object"
++    },
++    {
++      "name": "i8042",
++      "parent": "isa-device"
++    },
++    {
++      "name": "System",
++      "parent": "bus"
++    },
++    {
++      "name": "virtio-iommu-pci-transitional",
++      "parent": "virtio-iommu-device-base"
++    },
++    {
++      "name": "pc-1.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "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": "imx.usbphy",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "core2duo-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "cirrus-vga",
++      "parent": "pci-device"
++    },
++    {
++      "name": "kvm32-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pc-i440fx-2.1-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "Skylake-Client-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "i82559er",
++      "parent": "pci-device"
++    },
++    {
++      "name": "virtio-rng-pci-non-transitional",
++      "parent": "virtio-rng-pci-base"
++    },
++    {
++      "name": "virtio-serial-pci",
++      "parent": "virtio-serial-pci-base"
++    },
++    {
++      "name": "Opteron_G3-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "am53c974",
++      "parent": "pci-device"
++    },
++    {
++      "name": "container",
++      "parent": "object"
++    },
++    {
++      "name": "EPYC-v3-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "scsi-cd",
++      "parent": "scsi-disk-base"
++    },
++    {
++      "name": "486-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vmport",
++      "parent": "isa-device"
++    },
++    {
++      "name": "vhost-user-blk-pci-non-transitional",
++      "parent": "vhost-user-blk-pci-base"
++    },
++    {
++      "name": "isa-ide",
++      "parent": "isa-device"
++    },
++    {
++      "name": "qemu64-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "e1000-82545em",
++      "parent": "e1000-base"
++    },
++    {
++      "name": "virtio-serial-pci-non-transitional",
++      "parent": "virtio-serial-pci-base"
++    },
++    {
++      "name": "ICH9 SMB",
++      "parent": "pci-device"
++    },
++    {
++      "name": "sdhci-pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "pxb-pcie-bus",
++      "parent": "PCIE"
++    },
++    {
++      "name": "vhost-user-scsi",
++      "parent": "vhost-scsi-common"
++    },
++    {
++      "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": "usb-bot",
++      "parent": "usb-storage-dev"
++    },
++    {
++      "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": "Penryn-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vhost-vsock-pci-transitional",
++      "parent": "vhost-vsock-pci-base"
++    },
++    {
++      "name": "hpet",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "Conroe-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vhost-user-fs-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "pc-i440fx-3.1-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "pci-serial-4x",
++      "parent": "pci-device"
++    },
++    {
++      "name": "Icelake-Server-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "apic",
++      "parent": "apic-common"
++    },
++    {
++      "name": "sga",
++      "parent": "isa-device"
++    },
++    {
++      "name": "Opteron_G5-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pc-q35-2.6-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "pci-ohci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "virtio-tablet-device",
++      "parent": "virtio-input-hid-device"
++    },
++    {
++      "name": "Haswell-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "ccid-card-passthru",
++      "parent": "ccid-card"
++    },
++    {
++      "name": "pc-i440fx-1.4-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "chardev-parallel",
++      "parent": "chardev"
++    },
++    {
++      "name": "chardev-vc",
++      "parent": "chardev"
++    },
++    {
++      "name": "cryptodev-backend",
++      "parent": "object"
++    },
++    {
++      "name": "isapc-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "ide-drive",
++      "parent": "ide-device"
++    },
++    {
++      "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": "sysbus-fdc",
++      "parent": "base-sysbus-fdc"
++    },
++    {
++      "name": "i82559c",
++      "parent": "pci-device"
++    },
++    {
 +      "name": "AMDVI-PCI",
 +      "parent": "pci-device"
 +    },
@@ -1089,1343 +8018,131 @@ index 0000000000..ab0ac1e7bf
 +      "parent": "netfilter"
 +    },
 +    {
-+      "name": "rtl8139",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-hci",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pc-q35-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pc-i440fx-3.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "megasas",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "base-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-balloon-pci-non-transitional",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "qxl-vga",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "scsi-block",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "Opteron_G2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "unimplemented-device",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "vhost-user-input",
-+      "parent": "virtio-input-device"
-+    },
-+    {
-+      "name": "tls-creds-anon",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "pc-i440fx-3.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "scsi-cd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "pxb-bus",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "pc-0.14-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "accel",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "floppy-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "usb-audio",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-vga",
-+      "parent": "virtio-vga-base"
-+    },
-+    {
-+      "name": "pc-i440fx-2.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vmware-svga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-0.13-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isa-serial",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "virtio-serial-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "isa-debug-exit",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vhost-scsi-pci",
-+      "parent": "vhost-scsi-pci-base"
-+    },
-+    {
-+      "name": "chardev-gdb",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "fdc37m81x-superio",
-+      "parent": "isa-superio"
-+    },
-+    {
-+      "name": "pc-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "xen-backend",
-+      "parent": "xen-sysdev"
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pr-manager-helper",
-+      "parent": "pr-manager"
-+    },
-+    {
-+      "name": "fw_cfg_mem",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "virtio-scsi-pci-transitional",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "usb-uas",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ide-cd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "pc-q35-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-1.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-balloon-pci",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "chardev-socket",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "iothread",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "sb16",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "chardev-mux",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pc-q35-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-1.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "486-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "bochs-display",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-ccid",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "isa-cirrus-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qio-channel-rdma",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "vhost-vsock-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "sdhci-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-input-host-device",
-+      "parent": "virtio-input-device"
-+    },
-+    {
-+      "name": "i82559er",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "cs4231a",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "ivshmem-doorbell",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "chardev-udp",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-rng-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "isa-parallel",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "piix4-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "adlib",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-0.15-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "authz-list-file",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "kvmvapic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "hda-micro",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "pci-bridge-seat",
-+      "parent": "pci-bridge"
-+    },
-+    {
-+      "name": "dc390",
-+      "parent": "am53c974"
-+    },
-+    {
-+      "name": "chardev-pipe",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "qemu,register",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "IDE",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "fw_cfg_io",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "tpm-crb",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "am53c974",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "memory-backend-ram",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "xen-cdrom",
-+      "parent": "xen-block"
-+    },
-+    {
-+      "name": "virtio-blk-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "pc-q35-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "nvdimm",
-+      "parent": "pc-dimm"
-+    },
-+    {
-+      "name": "mc146818rtc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qio-channel-websock",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "qio-channel-file",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "chardev-msmouse",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pc-i440fx-1.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-q35-4.0.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "cryptodev-backend-builtin",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "hda-output",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "KnightsMill-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-spiceport",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "VGA",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "vfio-pci-nohotplug",
-+      "parent": "vfio-pci"
-+    },
-+    {
-+      "name": "sga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "i8257",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qio-net-listener",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "port92",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "mptsas1068",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "edu",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Dhyana-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-mouse-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "Skylake-Client-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ICH9 SMB",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Broadwell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vfio-pci-igd-lpc-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "HDA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "n270-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-redir",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "pcm3680_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "floppy",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "qemu:memory-region",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "mioe3680_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sysbus-ohci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "chardev-ringbuf",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "max-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "can-bus",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qtest-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "qio-channel-command",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "pxb-host",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "IvyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-gpu",
-+      "parent": "virtio-gpu-base"
-+    },
-+    {
-+      "name": "xio3130-downstream",
-+      "parent": "pcie-slot"
-+    },
-+    {
-+      "name": "virtio-gpu-device",
-+      "parent": "virtio-gpu-base"
-+    },
-+    {
-+      "name": "virtio-blk-pci",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "cirrus-vga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "isa-ipmi-kcs",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "cryptodev-vhost-user",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "Opteron_G3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "lsi53c810",
-+      "parent": "lsi53c895a"
-+    },
-+    {
-+      "name": "System",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Westmere-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-serial",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "Cascadelake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vt82c686b-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "chardev-braille",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-file",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci-non-transitional",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "xen-sysdev",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "intel-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "pc-q35-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "tpm-tis",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "PCIE",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "pcie-pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "ccid-card-passthru",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "qio-dns-resolver",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "virtio-net-pci-transitional",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "virtio-serial-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "kvm-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "secondary-vga",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "vhost-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "pci-ohci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cfi.pflash01",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "usb-hub",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ccid-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "xenpv-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "EPYC-IBPB-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "input-linux",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "piix3-ide-xen",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "vmgenid",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "virtio-rng-pci-transitional",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "virtio-serial-pci-transitional",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "ati-vga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-3.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pci-serial",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmport",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "ipmi-bmc-extern",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "PIIX4_PM",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i8042",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "coreduo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82559c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82559b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82559a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-blk-pci-non-transitional",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "pc-q35-2.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SCSI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "rocker",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pcnet",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "rng-egd",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Opteron_G4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-testdev",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "PIIX3",
-+      "parent": "pci-piix3"
-+    },
-+    {
-+      "name": "filter-dump",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "migration",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "vmmouse",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "i82558b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82558a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "smbus-eeprom",
-+      "parent": "smbus-device"
-+    },
-+    {
-+      "name": "Haswell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82801",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "tls-creds-x509",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "virtio-net-pci",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "virtio-keyboard-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "i82562",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Haswell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-net",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "tpm-passthrough",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "q35-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "amd-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "i440FX-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "i82557c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82557b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82557a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-memory",
-+      "parent": "chardev-ringbuf"
-+    },
-+    {
-+      "name": "isa-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "virtio-gpu-pci",
-+      "parent": "virtio-gpu-pci-base"
-+    },
-+    {
-+      "name": "pc-i440fx-2.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SandyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "split-irq",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "usb-mouse",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "i82551",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sdhci-bus",
-+      "parent": "sd-bus"
-+    },
-+    {
-+      "name": "i82550",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-3.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "host-x86_64-cpu",
-+      "parent": "max-x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-crypto-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "ich9-usb-ehci2",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "vfio-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ich9-usb-ehci1",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "filter-mirror",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "xen-disk",
-+      "parent": "xen-block"
-+    },
-+    {
-+      "name": "isa-ide",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "irq",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "throttle-group",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "IvyBridge-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "memory-backend-memfd",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "can-host-socketcan",
-+      "parent": "can-host"
-+    },
-+    {
-+      "name": "qio-channel-socket",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "nec-usb-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "virtio-serial-pci-non-transitional",
-+      "parent": "virtio-serial-pci-base"
-+    },
-+    {
-+      "name": "virtio-rng-pci-non-transitional",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "piix3-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
 +      "name": "virtserialport",
 +      "parent": "virtio-serial-port"
 +    },
 +    {
-+      "name": "pvscsi",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sd-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Opteron_G5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ich9-ahci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-stdio",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-dimm",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "gus",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vhost-vsock-pci-non-transitional",
-+      "parent": "vhost-vsock-pci-base"
-+    },
-+    {
-+      "name": "hyperv-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "isa-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "xen-pci-passthrough",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cryptodev-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "IndustryPack",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "pc-i440fx-2.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-4.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Icelake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "or-irq",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "ipmi-bmc-sim",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-ehci",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "pentium2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-vc",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-rng-pci",
-+      "parent": "virtio-rng-pci-base"
-+    },
-+    {
-+      "name": "filter-replay",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "vhost-user-vga",
-+      "parent": "virtio-vga-base"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci-transitional",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "e1000-82545em",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "chardev-wctablet",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vhost-user-gpu-pci",
-+      "parent": "virtio-gpu-pci-base"
-+    },
-+    {
-+      "name": "hyperv-synic",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "e1000-82544gc",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "hpet",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ioh3420",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "pc-i440fx-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-9p-pci",
-+      "parent": "virtio-9p-pci-base"
-+    },
-+    {
-+      "name": "vmcoreinfo",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "filter-buffer",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "pci-serial-4x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "athlon-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ich9-intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "pc-i440fx-2.3-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-9p-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "imx-usdhc",
-+      "parent": "generic-sdhci"
-+    },
-+    {
-+      "name": "pc-i440fx-4.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci-non-transitional",
-+      "parent": "vhost-user-blk-pci-base"
-+    },
-+    {
-+      "name": "xen-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "vhost-user-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "isa-ipmi-bt",
-+      "parent": "isa-device"
-+    },
-+    {
 +      "name": "ipoctal232",
 +      "parent": "ipack-device"
 +    },
 +    {
-+      "name": "virtio-tablet-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "virtio-scsi-pci",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "piix3-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "virtio-pci-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "xen-pvdevice",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ES1370",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "x3130-upstream",
-+      "parent": "pcie-port"
-+    },
-+    {
-+      "name": "xenfv-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pci-testdev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qemu-console",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "ISA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "piix4-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "virtio-balloon-pci-transitional",
-+      "parent": "virtio-balloon-pci-base"
-+    },
-+    {
-+      "name": "pc-i440fx-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "tcg-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "virtconsole",
-+      "parent": "virtserialport"
-+    },
-+    {
-+      "name": "pci-serial-2x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pentium3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci-transitional",
-+      "parent": "vhost-user-scsi-pci-base"
-+    },
-+    {
-+      "name": "ne2k_isa",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "isa-fdc",
-+      "parent": "isa-device"
++      "name": "usb-mouse",
++      "parent": "usb-hid"
 +    },
 +    {
 +      "name": "Nehalem-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "pc-i440fx-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "xen-platform",
++      "name": "i82559b",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "chardev-serial",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "authz-pam",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "igd-passthrough-i440FX",
-+      "parent": "i440FX"
-+    },
-+    {
-+      "name": "colo-compare",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-tablet-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "e1000e",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-bus",
++      "name": "ccid-bus",
 +      "parent": "bus"
 +    },
 +    {
-+      "name": "i82801b11-bridge",
-+      "parent": "base-pci-bridge"
++      "name": "ide-hd",
++      "parent": "ide-device"
 +    },
 +    {
-+      "name": "PCI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "usb-storage",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "vhost-user-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "mch",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ib700",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "tpm-emulator",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "esp",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isabus-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "qemu32-x86_64-cpu",
++      "name": "Broadwell-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "ne2k_pci",
++      "name": "Snowridge-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "kvaser_pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "vhost-user-scsi-pci",
++      "parent": "vhost-user-scsi-pci-base"
++    },
++    {
++      "name": "i82559a",
++      "parent": "pci-device"
++    },
++    {
++      "name": "dbus-vmstate",
++      "parent": "object"
++    },
++    {
++      "name": "pc-i440fx-4.1-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "pc-1.3-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "chardev-spiceport",
++      "parent": "chardev-spice"
++    },
++    {
++      "name": "e1000-82544gc",
++      "parent": "e1000-base"
++    },
++    {
++      "name": "qio-channel-command",
++      "parent": "qio-channel"
++    },
++    {
++      "name": "Opteron_G3-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "usb-ccid",
++      "parent": "usb-device"
++    },
++    {
++      "name": "tls-creds-x509",
++      "parent": "tls-creds"
++    },
++    {
++      "name": "virtio-blk-pci",
++      "parent": "virtio-blk-pci-base"
++    },
++    {
++      "name": "pc-i440fx-2.4-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "port92",
++      "parent": "isa-device"
++    },
++    {
++      "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": "qio-net-listener",
++      "parent": "object"
++    },
++    {
++      "name": "pc-q35-4.1-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "mc146818rtc",
++      "parent": "isa-device"
++    },
++    {
++      "name": "vfio-pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "bochs-display",
 +      "parent": "pci-device"
 +    },
 +    {
@@ -2433,83 +8150,351 @@ index 0000000000..ab0ac1e7bf
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "vhost-user-blk",
-+      "parent": "virtio-device"
++      "name": "qio-channel-websock",
++      "parent": "qio-channel"
 +    },
 +    {
-+      "name": "ivshmem-plain",
-+      "parent": "ivshmem-common"
++      "name": "edu",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "usb-kbd",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "isa-applesmc",
++      "name": "pc-testdev",
 +      "parent": "isa-device"
 +    },
 +    {
-+      "name": "xen-accel",
-+      "parent": "accel"
++      "name": "SUNW,fdtwo",
++      "parent": "base-sysbus-fdc"
++    },
++    {
++      "name": "megasas",
++      "parent": "megasas-base"
++    },
++    {
++      "name": "vmcoreinfo",
++      "parent": "device"
++    },
++    {
++      "name": "virtio-iommu-pci",
++      "parent": "virtio-iommu-device-base"
++    },
++    {
++      "name": "Icelake-Client-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "tpci200",
++      "parent": "pci-device"
++    },
++    {
++      "name": "chardev-braille",
++      "parent": "chardev"
++    },
++    {
++      "name": "rocker",
++      "parent": "pci-device"
++    },
++    {
++      "name": "qio-channel-file",
++      "parent": "qio-channel"
++    },
++    {
++      "name": "gpio_i2c",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "qio-channel-socket",
++      "parent": "qio-channel"
++    },
++    {
++      "name": "filter-mirror",
++      "parent": "netfilter"
++    },
++    {
++      "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": "qemu-console",
++      "parent": "object"
++    },
++    {
++      "name": "input-linux",
++      "parent": "object"
++    },
++    {
++      "name": "Haswell-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pxb",
++      "parent": "pci-device"
++    },
++    {
++      "name": "usb-ehci",
++      "parent": "pci-ehci-usb"
++    },
++    {
++      "name": "host-x86_64-cpu",
++      "parent": "max-x86_64-cpu"
++    },
++    {
++      "name": "pc-i440fx-2.11-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "AC97",
++      "parent": "pci-device"
++    },
++    {
++      "name": "vmgenid",
++      "parent": "device"
++    },
++    {
++      "name": "serial-io",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "secret",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "hda-duplex",
-+      "parent": "hda-audio"
++      "name": "virtio-net-pci-non-transitional",
++      "parent": "virtio-net-pci-base"
 +    },
 +    {
-+      "name": "authz-simple",
-+      "parent": "authz"
++      "name": "cs4231a",
++      "parent": "isa-device"
 +    },
 +    {
-+      "name": "kvm32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
++      "name": "chardev-socket",
++      "parent": "chardev"
 +    },
 +    {
-+      "name": "virtio-9p-pci-transitional",
-+      "parent": "virtio-9p-pci-base"
++      "name": "scsi-hd",
++      "parent": "scsi-disk-base"
 +    },
 +    {
-+      "name": "pc-i440fx-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "kvm-apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "sev-guest",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-balloon-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "none-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "sysbus-fdc",
-+      "parent": "base-sysbus-fdc"
-+    },
-+    {
-+      "name": "ramfb",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "megasas-gen2",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "usb-tablet",
++      "name": "usb-kbd",
 +      "parent": "usb-hid"
 +    },
 +    {
-+      "name": "pc-1.0-machine",
++      "name": "lsi53c810",
++      "parent": "lsi53c895a"
++    },
++    {
++      "name": "isa-fdc",
++      "parent": "isa-device"
++    },
++    {
++      "name": "usb-mtp",
++      "parent": "usb-device"
++    },
++    {
++      "name": "filter-replay",
++      "parent": "netfilter"
++    },
++    {
++      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "virtio-net-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "pc-q35-2.9-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "tpm-tis",
++      "parent": "isa-device"
++    },
++    {
++      "name": "Skylake-Server-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "hyperv-testdev",
++      "parent": "isa-device"
++    },
++    {
++      "name": "s3c-sdhci",
++      "parent": "generic-sdhci"
++    },
++    {
++      "name": "fw_cfg_mem",
++      "parent": "fw_cfg"
++    },
++    {
++      "name": "virtio-iommu-pci-non-transitional",
++      "parent": "virtio-iommu-device-base"
++    },
++    {
++      "name": "ccid-card-emulated",
++      "parent": "ccid-card"
++    },
++    {
++      "name": "Westmere-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pc-i440fx-1.7-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "virtio-pmem",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "virtio-mouse-device",
++      "parent": "virtio-input-hid-device"
++    },
++    {
++      "name": "virtconsole",
++      "parent": "virtserialport"
++    },
++    {
++      "name": "ioh3420",
++      "parent": "pcie-root-port-base"
++    },
++    {
++      "name": "Skylake-Client-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "throttle-group",
++      "parent": "object"
++    },
++    {
++      "name": "piix4-usb-uhci",
++      "parent": "pci-uhci-usb"
++    },
++    {
++      "name": "pc-q35-2.10-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "virtio-rng-pci",
++      "parent": "virtio-rng-pci-base"
++    },
++    {
++      "name": "chardev-gdb",
++      "parent": "chardev"
++    },
++    {
++      "name": "virtio-scsi-pci-transitional",
++      "parent": "virtio-scsi-pci-base"
++    },
++    {
++      "name": "Skylake-Client-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Cascadelake-Server-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pci-testdev",
++      "parent": "pci-device"
++    },
++    {
++      "name": "vhost-user-input",
++      "parent": "virtio-input-device"
++    },
++    {
++      "name": "vt82c686b-usb-uhci",
++      "parent": "pci-uhci-usb"
++    },
++    {
++      "name": "ich9-intel-hda",
++      "parent": "intel-hda-generic"
++    },
++    {
++      "name": "PIIX3",
++      "parent": "pci-piix3"
++    },
++    {
++      "name": "Icelake-Client-noTSX-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pc-q35-2.4-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "virtio-9p-pci",
++      "parent": "virtio-9p-pci-base"
++    },
++    {
++      "name": "ISA",
++      "parent": "bus"
++    },
++    {
++      "name": "phenom-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vhost-vsock-pci",
++      "parent": "vhost-vsock-pci-base"
++    },
++    {
++      "name": "pc-dimm",
++      "parent": "device"
++    },
++    {
++      "name": "virtio-balloon-pci-non-transitional",
++      "parent": "virtio-balloon-pci-base"
++    },
++    {
++      "name": "virtio-net-pci-transitional",
++      "parent": "virtio-net-pci-base"
++    },
++    {
++      "name": "ipmi-bmc-sim",
++      "parent": "ipmi-bmc"
++    },
++    {
++      "name": "IvyBridge-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "irq",
++      "parent": "object"
++    },
++    {
++      "name": "tls-creds-psk",
++      "parent": "tls-creds"
++    },
++    {
++      "name": "coreduo-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
++      "parent": "x86_64-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": "pc-i440fx-2.7-machine",
 +      "parent": "generic-pc-machine"
 +    },
 +    {
@@ -2517,7 +8502,107 @@ index 0000000000..ab0ac1e7bf
 +      "parent": "vhost-scsi-pci-base"
 +    },
 +    {
-+      "name": "core2duo-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": "virtio-mmio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pxb-bus",
++      "parent": "PCI"
++    },
++    {
++      "name": "pentium2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Broadwell-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "qemu-xhci",
++      "parent": "base-xhci"
++    },
++    {
++      "name": "n270-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pvpanic",
++      "parent": "isa-device"
++    },
++    {
++      "name": "rng-random",
++      "parent": "rng-backend"
++    },
++    {
++      "name": "KnightsMill-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "kvmvapic",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "Nehalem-v1-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": "pc-1.1-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "Snowridge-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "IvyBridge-v1-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
@@ -2525,159 +8610,131 @@ index 0000000000..ab0ac1e7bf
 +      "parent": "pci-qxl"
 +    },
 +    {
-+      "name": "isa-debugcon",
-+      "parent": "isa-device"
++      "name": "cryptodev-backend-builtin",
++      "parent": "cryptodev-backend"
 +    },
 +    {
-+      "name": "pc-i440fx-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "nvme",
++      "name": "vfio-pci-igd-lpc-bridge",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "SandyBridge-IBRS-x86_64-cpu",
++      "name": "Broadwell-noTSX-IBRS-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "Skylake-Server-x86_64-cpu",
++      "name": "pc-i440fx-2.2-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "qio-dns-resolver",
++      "parent": "object"
++    },
++    {
++      "name": "virtio-balloon-pci-transitional",
++      "parent": "virtio-balloon-pci-base"
++    },
++    {
++      "name": "Haswell-v4-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": "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": "vhost-user-input-pci",
-+      "parent": "virtio-input-pci"
++      "name": "qemu32-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "usb-braille",
-+      "parent": "usb-serial-dev"
++      "name": "Haswell-noTSX-x86_64-cpu",
++      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "qio-channel-buffer",
-+      "parent": "qio-channel"
++      "name": "pci-serial",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "scsi-disk",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "intel-hda",
-+      "parent": "intel-hda-generic"
++      "name": "sysbus-ohci",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "kvm-accel",
 +      "parent": "accel"
 +    },
 +    {
-+      "name": "pxb-pcie-bus",
-+      "parent": "PCIE"
++      "name": "vhost-scsi-pci-non-transitional",
++      "parent": "vhost-scsi-pci-base"
 +    },
 +    {
-+      "name": "virtio-scsi-device",
-+      "parent": "virtio-scsi-common"
-+    },
-+    {
-+      "name": "AC97",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-wacom-tablet",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-blk-pci-transitional",
-+      "parent": "virtio-blk-pci-base"
-+    },
-+    {
-+      "name": "i2c-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "EPYC-x86_64-cpu",
++      "name": "Denverton-v1-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "virtio-mouse-device",
-+      "parent": "virtio-input-hid-device"
++      "name": "piix3-usb-uhci",
++      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "Conroe-x86_64-cpu",
++      "name": "Opteron_G4-v1-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "pxb-pcie",
-+      "parent": "pci-device"
++      "name": "ne2k_isa",
++      "parent": "isa-device"
 +    },
 +    {
-+      "name": "pc-1.3-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "authz-list",
-+      "parent": "authz"
-+    },
-+    {
-+      "name": "ide-drive",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "generic-sdhci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pvrdma",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-1.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isa-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "pxb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-net-pci-non-transitional",
-+      "parent": "virtio-net-pci-base"
-+    },
-+    {
-+      "name": "virtio-scsi-pci-non-transitional",
-+      "parent": "virtio-scsi-pci-base"
-+    },
-+    {
-+      "name": "intel-iommu-iommu-memory-region",
++      "name": "virtio-iommu-memory-region",
 +      "parent": "qemu:iommu-memory-region"
 +    },
 +    {
-+      "name": "pc-1.1-machine",
-+      "parent": "generic-pc-machine"
++      "name": "phenom-x86_64-cpu",
++      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "sd-card",
-+      "parent": "device"
++      "name": "adlib",
++      "parent": "isa-device"
 +    },
 +    {
-+      "name": "kvaser_pci",
-+      "parent": "pci-device"
++      "name": "vhost-user-gpu",
++      "parent": "virtio-gpu-base"
 +    },
 +    {
-+      "name": "vmxnet3",
-+      "parent": "pci-device"
++      "name": "hda-duplex",
++      "parent": "hda-audio"
 +    },
 +    {
-+      "name": "i6300esb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Westmere-x86_64-cpu",
++      "name": "pentium-v1-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
@@ -2685,31 +8742,363 @@ index 0000000000..ab0ac1e7bf
 +      "parent": "qemu:iommu-memory-region"
 +    },
 +    {
-+      "name": "pvpanic",
++      "name": "can-bus",
++      "parent": "object"
++    },
++    {
++      "name": "Nehalem-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Cascadelake-Server-v3-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "cfi.pflash01",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virtio-balloon-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "Skylake-Server-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Cooperlake-v1-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": "chardev-null",
++      "parent": "chardev"
++    },
++    {
++      "name": "isa-vga",
++      "parent": "isa-device"
++    },
++    {
++      "name": "EPYC-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "pc-i440fx-1.5-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "i440FX-pcihost",
++      "parent": "pci-host-bridge"
++    },
++    {
++      "name": "isa-debugcon",
++      "parent": "isa-device"
++    },
++    {
++      "name": "tls-creds-anon",
++      "parent": "tls-creds"
++    },
++    {
++      "name": "rng-egd",
++      "parent": "rng-backend"
++    },
++    {
++      "name": "ivshmem-doorbell",
++      "parent": "ivshmem-common"
++    },
++    {
++      "name": "i82558b",
++      "parent": "pci-device"
++    },
++    {
++      "name": "Cascadelake-Server-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "qxl-vga",
++      "parent": "pci-qxl"
++    },
++    {
++      "name": "virtio-iommu-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "PIIX3-xen",
++      "parent": "pci-piix3"
++    },
++    {
++      "name": "virtio-net-pci",
++      "parent": "virtio-net-pci-base"
++    },
++    {
++      "name": "i82558a",
++      "parent": "pci-device"
++    },
++    {
++      "name": "usb-serial",
++      "parent": "usb-serial-dev"
++    },
++    {
++      "name": "loader",
++      "parent": "device"
++    },
++    {
++      "name": "pvscsi",
++      "parent": "pci-device"
++    },
++    {
++      "name": "i82801",
++      "parent": "pci-device"
++    },
++    {
++      "name": "virtio-pmem-pci",
++      "parent": "virtio-pmem-pci-base"
++    },
++    {
++      "name": "accel",
++      "parent": "object"
++    },
++    {
++      "name": "virtio-tablet-pci",
++      "parent": "virtio-tablet-pci-base-type"
++    },
++    {
++      "name": "dc390",
++      "parent": "am53c974"
++    },
++    {
++      "name": "i6300esb",
++      "parent": "pci-device"
++    },
++    {
++      "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": "mptsas1068",
++      "parent": "pci-device"
++    },
++    {
++      "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": "Westmere-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vhost-user-scsi-pci-transitional",
++      "parent": "vhost-user-scsi-pci-base"
++    },
++    {
++      "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": "pci-bridge-seat",
++      "parent": "pci-bridge"
++    },
++    {
++      "name": "lsi53c895a",
++      "parent": "pci-device"
++    },
++    {
++      "name": "kvm32-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "SandyBridge-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "intel-hda",
++      "parent": "intel-hda-generic"
++    },
++    {
++      "name": "scsi-block",
++      "parent": "scsi-disk-base"
++    },
++    {
++      "name": "hyperv-synic",
++      "parent": "device"
++    },
++    {
++      "name": "chardev-mux",
++      "parent": "chardev"
++    },
++    {
++      "name": "Opteron_G1-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": "base-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "kvm64-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "Snowridge-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "chardev-spicevmc",
++      "parent": "chardev-spice"
++    },
++    {
++      "name": "q35-pcihost",
++      "parent": "pcie-host-bridge"
++    },
++    {
++      "name": "pc-i440fx-2.0-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "pc-i440fx-2.12-machine",
++      "parent": "generic-pc-machine"
++    },
++    {
++      "name": "SCSI",
++      "parent": "bus"
++    },
++    {
++      "name": "hda-micro",
++      "parent": "hda-audio"
++    },
++    {
 +      "name": "Penryn-x86_64-cpu",
 +      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "vhost-vsock-pci-transitional",
-+      "parent": "vhost-vsock-pci-base"
++      "name": "Dhyana-x86_64-cpu",
++      "parent": "x86_64-cpu"
 +    },
 +    {
-+      "name": "apic",
-+      "parent": "apic-common"
++      "name": "piix3-ide-xen",
++      "parent": "pci-ide"
 +    },
 +    {
-+      "name": "isapc-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "rng-random",
++      "name": "rng-builtin",
 +      "parent": "rng-backend"
++    },
++    {
++      "name": "sd-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "filter-dump",
++      "parent": "netfilter"
++    },
++    {
++      "name": "virtio-pci-bus",
++      "parent": "virtio-bus"
++    },
++    {
++      "name": "smbus-ipmi",
++      "parent": "smbus-device"
++    },
++    {
++      "name": "chardev-ringbuf",
++      "parent": "chardev"
++    },
++    {
++      "name": "Skylake-Server-v1-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "vhost-user-blk",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "Haswell-noTSX-IBRS-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "SandyBridge-v2-x86_64-cpu",
++      "parent": "x86_64-cpu"
++    },
++    {
++      "name": "qio-channel-tls",
++      "parent": "qio-channel"
++    },
++    {
++      "name": "virtio-vga",
++      "parent": "virtio-vga-base-type"
++    },
++    {
++      "name": "authz-pam",
++      "parent": "authz"
 +    }
 +  ],
-+  "id": "libvirt-9"
++  "id": "libvirt-6"
 +}
 +
 +{
@@ -2717,82 +9106,202 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-blk-pci"
 +  },
-+  "id": "libvirt-10"
++  "id": "libvirt-7"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
++      "name": "romfile",
 +      "type": "str"
 +    },
 +    {
-+      "name": "heads",
-+      "type": "uint32"
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
 +    },
 +    {
-+      "name": "ioeventfd",
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "write-zeroes",
++      "default-value": true,
++      "name": "migrate-extra",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "scsi",
++      "default-value": false,
++      "name": "ats",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "cyls",
-+      "type": "uint32"
++      "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": 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": 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"
 +    },
 +    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
++      "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": true,
++      "name": "notify_on_empty",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "share-rw",
++      "type": "bool"
++    },
++    {
++      "default-value": 256,
++      "name": "queue-size",
++      "type": "uint16"
++    },
++    {
++      "default-value": 0,
++      "name": "lcyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "lsecs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "heads",
++      "type": "uint32"
++    },
++    {
++      "name": "iothread",
++      "type": "link<iothread>"
++    },
++    {
++      "default-value": 0,
++      "name": "lheads",
++      "type": "uint32"
++    },
++    {
++      "default-value": 1,
++      "name": "num-queues",
++      "type": "uint16"
++    },
++    {
++      "default-value": 0,
++      "name": "cyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "secs",
++      "type": "uint32"
++    },
++    {
++      "name": "virtio-backend",
++      "type": "child<virtio-blk-device>"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
 +      "type": "uint16"
 +    },
 +    {
@@ -2800,20 +9309,14 @@ index 0000000000..ab0ac1e7bf
 +      "type": "int32"
 +    },
 +    {
-+      "name": "indirect_desc",
++      "default-value": true,
++      "name": "config-wce",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "max-write-zeroes-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "disable-modern",
++      "default-value": true,
++      "name": "seg-max-adjust",
 +      "type": "bool"
 +    },
 +    {
@@ -2822,152 +9325,130 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": "auto",
 +      "name": "werror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": "auto",
 +      "name": "rerror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max-discard-sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "discard",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": "auto",
 +      "name": "write-cache",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
-+      "name": "num-queues",
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "iommu_platform",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "physical_block_size",
++      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": false,
++      "name": "scsi",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "any_layout",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
 +      "name": "opt_io_size",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "ats",
++      "default-value": 0,
++      "name": "logical_block_size",
++      "description": "A power of two between 512 and 32768",
++      "type": "uint16"
++    },
++    {
++      "default-value": 4194303,
++      "name": "max-discard-sectors",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "discard",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "romfile",
++      "default-value": 4294967295,
++      "name": "discard_granularity",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "request-merging",
++      "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": true,
++      "name": "event_idx",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-enable-wce-if-config-wce",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "indirect_desc",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "serial",
 +      "type": "str"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-10"
++  "id": "libvirt-7"
 +}
 +
 +{
@@ -2975,251 +9456,133 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-net-pci"
 +  },
-+  "id": "libvirt-11"
++  "id": "libvirt-8"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "ctrl_mac_addr",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "romfile",
 +      "type": "str"
 +    },
 +    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rsc_interval",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "speed",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
++      "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"
 +    },
 +    {
-+      "name": "host_ufo",
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-pm-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "duplex",
-+      "type": "str"
-+    },
-+    {
-+      "name": "guest_tso6",
++      "default-value": true,
++      "name": "x-pcie-flr-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "ctrl_guest_offloads",
++      "default-value": true,
++      "name": "x-pcie-lnkctl-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "csum",
++      "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": true,
 +      "name": "ioeventfd",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "mq",
-+      "description": "on/off",
-+      "type": "bool"
++      "default-value": "auto",
++      "name": "disable-legacy",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
 +    },
 +    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
++      "default-value": false,
++      "name": "disable-modern",
 +      "type": "bool"
 +    },
 +    {
@@ -3228,29 +9591,168 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "tx_queue_size",
-+      "type": "uint16"
++      "default-value": true,
++      "name": "notify_on_empty",
++      "description": "on/off",
++      "type": "bool"
 +    },
 +    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
++      "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": 256,
++      "name": "x-txburst",
++      "type": "int32"
++    },
++    {
++      "default-value": 0,
++      "name": "host_mtu",
++      "type": "uint16"
 +    },
 +    {
 +      "name": "tx",
 +      "type": "str"
 +    },
 +    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": true,
++      "name": "status",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-mtu-bypass-backend",
++      "default-value": false,
++      "name": "failover",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-pcie-deverr-init",
++      "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": 256,
++      "name": "tx_queue_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": true,
++      "name": "guest_tso4",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "host_tso6",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_guest_offloads",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "guest_ufo",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "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": false,
++      "name": "iommu_platform",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "host_ufo",
++      "description": "on/off",
++      "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": 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"
 +    },
@@ -3260,21 +9762,80 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "migrate-extra",
++      "default-value": true,
++      "name": "host_tso4",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "guest_rsc_ext",
++      "default-value": true,
++      "name": "x-mtu-bypass-backend",
++      "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"
++    },
++    {
++      "name": "bootindex",
++      "type": "int32"
++    },
++    {
++      "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"
++  "id": "libvirt-8"
 +}
 +
 +{
@@ -3282,172 +9843,228 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-scsi-pci"
 +  },
-+  "id": "libvirt-12"
++  "id": "libvirt-9"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
++      "name": "romfile",
++      "type": "str"
 +    },
 +    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
 +    },
 +    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
++      "name": "failover_pair_id",
++      "type": "str"
 +    },
 +    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "max_sectors",
++      "default-value": 1,
++      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "param_change",
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
++      "name": "multifunction",
++      "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": 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": 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": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "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": true,
++      "name": "notify_on_empty",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
 +      "name": "iothread",
 +      "type": "link<iothread>"
 +    },
 +    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
++      "default-value": true,
++      "name": "param_change",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "modern-pio-notify",
++      "default-value": false,
++      "name": "packed",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "vectors",
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": 256,
++      "name": "virtqueue_size",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
++      "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>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-12"
++  "id": "libvirt-9"
 +}
 +
 +{
@@ -3455,11 +10072,11 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-net-ccw"
 +  },
-+  "id": "libvirt-13"
++  "id": "libvirt-10"
 +}
 +
 +{
-+  "id": "libvirt-13",
++  "id": "libvirt-10",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-net-ccw' not found"
@@ -3471,11 +10088,11 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-scsi-ccw"
 +  },
-+  "id": "libvirt-14"
++  "id": "libvirt-11"
 +}
 +
 +{
-+  "id": "libvirt-14",
++  "id": "libvirt-11",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-scsi-ccw' not found"
@@ -3487,11 +10104,11 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-net-s390"
 +  },
-+  "id": "libvirt-15"
++  "id": "libvirt-12"
 +}
 +
 +{
-+  "id": "libvirt-15",
++  "id": "libvirt-12",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-net-s390' not found"
@@ -3501,95 +10118,85 @@ index 0000000000..ab0ac1e7bf
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "pci-assign"
-+  },
-+  "id": "libvirt-16"
-+}
-+
-+{
-+  "id": "libvirt-16",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "kvm-pci-assign"
-+  },
-+  "id": "libvirt-17"
-+}
-+
-+{
-+  "id": "libvirt-17",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'kvm-pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
 +    "typename": "vfio-pci"
 +  },
-+  "id": "libvirt-18"
++  "id": "libvirt-13"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "x-igd-opregion",
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-pci-vendor-id",
++      "default-value": 1,
++      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pci-sub-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-kvm-ioeventfd",
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-kvm-msi",
++      "default-value": false,
++      "name": "x-no-kvm-msix",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-req",
++      "default-value": false,
++      "name": "x-no-mmap",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "yres",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "x-vga",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "xres",
-+      "type": "uint32"
++      "default-value": "off",
++      "name": "x-msix-relocation",
++      "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
++      "type": "OffAutoPCIBAR"
 +    },
 +    {
++      "default-value": false,
 +      "name": "x-no-vfio-ioeventfd",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-no-kvm-intx",
-+      "type": "bool"
++      "name": "sysfsdev",
++      "type": "str"
 +    },
 +    {
 +      "name": "host",
@@ -3597,271 +10204,309 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "x-no-kvm-msix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-balloon-allowed",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pci-sub-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": 4294967295,
 +      "name": "x-pci-device-id",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": false,
++      "name": "x-no-kvm-msi",
++      "type": "bool"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "x-pci-sub-vendor-id",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
 +      "name": "x-no-geforce-quirks",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-req",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "x-igd-gms",
++      "type": "uint32"
++    },
++    {
++      "default-value": 1100,
++      "name": "x-intx-mmap-timeout-ms",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "x-no-kvm-intx",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-no-kvm-ioeventfd",
++      "type": "bool"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "x-pci-sub-device-id",
++      "type": "uint32"
++    },
++    {
++      "default-value": "off",
 +      "name": "display",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
++      "default-value": false,
++      "name": "x-igd-opregion",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
 +      "name": "x-nv-gpudirect-clique",
 +      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
 +      "type": "uint4"
 +    },
 +    {
-+      "name": "x-igd-gms",
++      "default-value": 0,
++      "name": "xres",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "x-msix-relocation",
-+      "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
-+      "type": "OffAutoPCIBAR"
-+    },
-+    {
-+      "name": "x-intx-mmap-timeout-ms",
++      "default-value": 4294967295,
++      "name": "x-pci-vendor-id",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-no-mmap",
++      "default-value": false,
++      "name": "x-balloon-allowed",
 +      "type": "bool"
 +    },
 +    {
 +      "name": "bootindex",
 +      "type": "int32"
-+    },
-+    {
-+      "name": "sysfsdev",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-vga",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
 +    }
 +  ],
-+  "id": "libvirt-18"
++  "id": "libvirt-13"
 +}
 +
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "scsi-disk"
++    "typename": "scsi-hd"
 +  },
-+  "id": "libvirt-19"
++  "id": "libvirt-14"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "dpofua",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
++      "default-value": 4294967295,
 +      "name": "scsi-id",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "cyls",
++      "default-value": 4294967295,
++      "name": "lun",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "rotation_rate",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "scsi_version",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "discard_granularity",
++      "default-value": 0,
++      "name": "channel",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "port_wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "max_unmap_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "max_io_size",
-+      "type": "uint64"
++      "default-value": 0,
++      "name": "lsecs",
++      "type": "uint32"
 +    },
 +    {
 +      "name": "device_id",
 +      "type": "str"
 +    },
 +    {
-+      "name": "wwn",
++      "default-value": 0,
++      "name": "logical_block_size",
++      "description": "A power of two between 512 and 32768",
++      "type": "uint16"
++    },
++    {
++      "default-value": 2147483647,
++      "name": "max_io_size",
 +      "type": "uint64"
 +    },
 +    {
++      "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": 0,
++      "name": "lheads",
++      "type": "uint32"
++    },
++    {
++      "name": "serial",
++      "type": "str"
++    },
++    {
++      "name": "ver",
++      "type": "str"
++    },
++    {
++      "default-value": "auto",
++      "name": "write-cache",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": false,
 +      "name": "share-rw",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "product",
-+      "type": "str"
++      "default-value": 5,
++      "name": "scsi_version",
++      "type": "int32"
++    },
++    {
++      "default-value": false,
++      "name": "removable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "wwn",
++      "type": "uint64"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "discard_granularity",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "heads",
++      "type": "uint32"
 +    },
 +    {
 +      "name": "vendor",
 +      "type": "str"
 +    },
 +    {
++      "default-value": 1073741824,
++      "name": "max_unmap_size",
++      "type": "uint64"
++    },
++    {
++      "default-value": 0,
++      "name": "cyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "lcyls",
++      "type": "uint32"
++    },
++    {
++      "name": "product",
++      "type": "str"
++    },
++    {
++      "default-value": 0,
++      "name": "opt_io_size",
++      "type": "uint32"
++    },
++    {
++      "default-value": "auto",
++      "name": "rerror",
++      "description": "Error handling policy, report/ignore/enospc/stop/auto",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": 0,
++      "name": "secs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "rotation_rate",
++      "type": "uint16"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": 0,
 +      "name": "physical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": 0,
++      "name": "port_wwn",
++      "type": "uint64"
++    },
++    {
++      "default-value": 0,
 +      "name": "port_index",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": "auto",
++      "name": "werror",
++      "description": "Error handling policy, report/ignore/enospc/stop/auto",
++      "type": "BlockdevOnError"
++    },
++    {
 +      "name": "bootindex",
 +      "type": "int32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-19"
++  "id": "libvirt-14"
 +}
 +
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "ide-drive"
++    "typename": "ide-hd"
 +  },
-+  "id": "libvirt-20"
++  "id": "libvirt-15"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "secs",
++      "default-value": 4294967295,
++      "name": "unit",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": 0,
 +      "name": "logical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
-+      "name": "discard_granularity",
++      "default-value": 0,
++      "name": "lsecs",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
++      "default-value": 0,
 +      "name": "rotation_rate",
 +      "type": "uint16"
 +    },
@@ -3871,68 +10516,103 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "heads",
++      "default-value": 0,
++      "name": "lheads",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "bios-chs-trans",
-+      "description": "Logical CHS translation algorithm, auto/none/lba/large/rechs",
-+      "type": "BiosAtaTranslation"
-+    },
-+    {
-+      "name": "unit",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "model",
++      "name": "serial",
 +      "type": "str"
 +    },
 +    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
 +      "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": "wwn",
++      "type": "uint64"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "discard_granularity",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "heads",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "cyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "lcyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "opt_io_size",
++      "type": "uint32"
++    },
++    {
++      "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"
++    },
++    {
++      "name": "model",
++      "type": "str"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": 0,
 +      "name": "physical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
-+      "name": "cyls",
++      "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-20"
++  "id": "libvirt-15"
 +}
 +
 +{
@@ -3940,70 +10620,80 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "PIIX4_PM"
 +  },
-+  "id": "libvirt-21"
++  "id": "libvirt-16"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
++      "name": "romfile",
++      "type": "str"
 +    },
 +    {
-+      "name": "rombar",
-+      "type": "uint32"
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "acpi-pci-hotplug-with-bridge-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
 +      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "command_serr_enable",
++      "default-value": false,
++      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "s4_val",
-+      "type": "uint8"
++      "default-value": true,
++      "name": "acpi-pci-hotplug-with-bridge-support",
++      "type": "bool"
 +    },
 +    {
++      "default-value": 0,
 +      "name": "smb_io_base",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
++      "default-value": 2,
++      "name": "s4_val",
++      "type": "uint8"
++    },
++    {
++      "default-value": 0,
++      "name": "disable_s3",
++      "type": "uint8"
++    },
++    {
++      "default-value": true,
++      "name": "memory-hotplug-support",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "disable_s4",
++      "type": "uint8"
 +    }
 +  ],
-+  "id": "libvirt-21"
++  "id": "libvirt-16"
 +}
 +
 +{
@@ -4011,16 +10701,23 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "usb-redir"
 +  },
-+  "id": "libvirt-22"
++  "id": "libvirt-17"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "filter",
++      "default-value": true,
++      "name": "full-path",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
 +      "type": "str"
 +    },
 +    {
++      "default-value": true,
 +      "name": "msos-desc",
 +      "description": "on/off",
 +      "type": "bool"
@@ -4030,18 +10727,11 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "port",
++      "name": "filter",
 +      "type": "str"
 +    },
 +    {
-+      "name": "debug",
-+      "type": "uint8"
-+    },
-+    {
++      "default-value": true,
 +      "name": "streams",
 +      "type": "bool"
 +    },
@@ -4051,136 +10741,25 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "full-path",
-+      "description": "on/off",
++      "default-value": 2,
++      "name": "debug",
++      "type": "uint8"
++    },
++    {
++      "default-value": true,
++      "name": "suppress-remote-wake",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-host"
-+  },
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "isobufs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostaddr",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "productid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
 +      "name": "bootindex",
 +      "type": "int32"
 +    },
 +    {
-+      "name": "guest-reset",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "isobsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vendorid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pipeline",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "attached",
 +      "type": "bool"
-+    },
-+    {
-+      "name": "hostport",
-+      "type": "str"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "loglevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostbus",
-+      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-generic"
-+  },
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-24"
++  "id": "libvirt-17"
 +}
 +
 +{
@@ -4188,49 +10767,52 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "i440FX-pcihost"
 +  },
-+  "id": "libvirt-25"
++  "id": "libvirt-18"
 +}
 +
 +{
 +  "return": [
 +    {
++      "default-value": 2147483648,
++      "name": "pci-hole64-size",
++      "type": "size"
++    },
++    {
++      "default-value": 0,
 +      "name": "short_root_bus",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "pci-conf-idx[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-end",
-+      "type": "uint64"
++      "default-value": true,
++      "name": "x-pci-hole64-fix",
++      "type": "bool"
 +    },
 +    {
 +      "name": "pci-hole-end",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "pci-hole-start",
-+      "type": "uint32"
-+    },
-+    {
 +      "name": "pci-hole64-start",
 +      "type": "uint64"
 +    },
 +    {
-+      "name": "pci-hole64-size",
-+      "type": "size"
++      "name": "pci-hole64-end",
++      "type": "uint64"
++    },
++    {
++      "name": "pci-conf-idx[0]",
++      "type": "child<qemu:memory-region>"
 +    },
 +    {
 +      "name": "pci-conf-data[0]",
 +      "type": "child<qemu:memory-region>"
 +    },
 +    {
-+      "name": "x-pci-hole64-fix",
-+      "type": "bool"
++      "name": "pci-hole-start",
++      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-25"
++  "id": "libvirt-18"
 +}
 +
 +{
@@ -4238,70 +10820,48 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "q35-pcihost"
 +  },
-+  "id": "libvirt-26"
++  "id": "libvirt-19"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "short_root_bus",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "system-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-conf-idx[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pcie-mmcfg-mmio[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-start",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "io-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-end",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole-end",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "above-4g-mem-size",
++      "default-value": 34359738368,
++      "name": "pci-hole64-size",
 +      "type": "size"
 +    },
 +    {
++      "default-value": 0,
 +      "name": "below-4g-mem-size",
 +      "type": "size"
 +    },
 +    {
-+      "name": "ram-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole-start",
++      "default-value": 0,
++      "name": "short_root_bus",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-pci-hole64-fix",
++      "type": "bool"
++    },
++    {
++      "default-value": 2952790016,
 +      "name": "MCFG",
 +      "type": "uint64"
 +    },
 +    {
-+      "name": "mch",
-+      "type": "child<mch>"
++      "default-value": 0,
++      "name": "above-4g-mem-size",
++      "type": "size"
 +    },
 +    {
-+      "name": "pci-hole64-size",
-+      "type": "size"
++      "name": "mcfg_size",
++      "type": "uint64"
++    },
++    {
++      "name": "pci-hole64-end",
++      "type": "uint64"
 +    },
 +    {
 +      "name": "pci-mem",
@@ -4312,15 +10872,43 @@ index 0000000000..ab0ac1e7bf
 +      "type": "child<qemu:memory-region>"
 +    },
 +    {
-+      "name": "x-pci-hole64-fix",
-+      "type": "bool"
++      "name": "pci-hole-start",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "mcfg_size",
++      "name": "system-mem",
++      "type": "link<qemu:memory-region>"
++    },
++    {
++      "name": "io-mem",
++      "type": "link<qemu:memory-region>"
++    },
++    {
++      "name": "mch",
++      "type": "child<mch>"
++    },
++    {
++      "name": "pci-hole-end",
++      "type": "uint32"
++    },
++    {
++      "name": "pci-conf-idx[0]",
++      "type": "child<qemu:memory-region>"
++    },
++    {
++      "name": "pci-hole64-start",
 +      "type": "uint64"
++    },
++    {
++      "name": "ram-mem",
++      "type": "link<qemu:memory-region>"
++    },
++    {
++      "name": "pcie-mmcfg-mmio[0]",
++      "type": "child<qemu:memory-region>"
 +    }
 +  ],
-+  "id": "libvirt-26"
++  "id": "libvirt-19"
 +}
 +
 +{
@@ -4328,27 +10916,68 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "usb-storage"
 +  },
-+  "id": "libvirt-27"
++  "id": "libvirt-20"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "serial",
++      "default-value": true,
++      "name": "full-path",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "port",
 +      "type": "str"
 +    },
 +    {
++      "default-value": true,
 +      "name": "msos-desc",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "serial",
++      "type": "str"
++    },
++    {
++      "default-value": "auto",
++      "name": "rerror",
++      "description": "Error handling policy, report/ignore/enospc/stop/auto",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": false,
++      "name": "removable",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "share-rw",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
 +      "name": "logical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
-+      "name": "discard_granularity",
++      "default-value": "auto",
++      "name": "write-cache",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": 0,
++      "name": "opt_io_size",
 +      "type": "uint32"
 +    },
 +    {
@@ -4357,58 +10986,777 @@ index 0000000000..ab0ac1e7bf
 +      "type": "str"
 +    },
 +    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
++      "default-value": 4294967295,
++      "name": "discard_granularity",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
++      "default-value": 0,
++      "name": "physical_block_size",
++      "description": "A power of two between 512 and 32768",
++      "type": "uint16"
 +    },
 +    {
++      "default-value": "auto",
 +      "name": "werror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
-+      "name": "full-path",
++      "name": "bootindex",
++      "type": "int32"
++    },
++    {
++      "name": "attached",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-20"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "kvm-pit"
++  },
++  "id": "libvirt-21"
++}
++
++{
++  "return": [
++    {
++      "default-value": "delay",
++      "name": "lost_tick_policy",
++      "type": "LostTickPolicy"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "iobase",
++      "type": "uint32"
++    }
++  ],
++  "id": "libvirt-21"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "VGA"
++  },
++  "id": "libvirt-22"
++}
++
++{
++  "return": [
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "removable",
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
++      "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": 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"
++    },
++    {
++      "name": "big-endian-framebuffer",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-22"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "vmware-svga"
++  },
++  "id": "libvirt-23"
++}
++
++{
++  "return": [
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "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-23"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "qxl"
++  },
++  "id": "libvirt-24"
++}
++
++{
++  "return": [
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "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-24"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "virtio-gpu-pci"
++  },
++  "id": "libvirt-25"
++}
++
++{
++  "return": [
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
++      "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": 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": 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": 768,
++      "name": "yres",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "iommu_platform",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "stats",
++      "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": true,
++      "name": "any_layout",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 268435456,
++      "name": "max_hostmem",
++      "type": "size"
++    },
++    {
++      "default-value": true,
++      "name": "notify_on_empty",
++      "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": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "max_outputs",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "virgl",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1024,
++      "name": "xres",
++      "type": "uint32"
++    },
++    {
++      "name": "virtio-backend",
++      "type": "child<virtio-gpu-device>"
++    }
++  ],
++  "id": "libvirt-25"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "virtio-gpu-device"
++  },
++  "id": "libvirt-26"
++}
++
++{
++  "return": [
++    {
++      "default-value": false,
++      "name": "packed",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "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": 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": 1024,
++      "name": "xres",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "stats",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "edid",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 768,
++      "name": "yres",
++      "type": "uint32"
++    },
++    {
++      "default-value": 1,
++      "name": "max_outputs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 268435456,
++      "name": "max_hostmem",
++      "type": "size"
++    },
++    {
++      "default-value": true,
++      "name": "virgl",
++      "description": "on/off",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-26"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "ICH9-LPC"
++  },
++  "id": "libvirt-27"
++}
++
++{
++  "return": [
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "noreboot",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-smi-broadcast",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "enable_tco",
++      "type": "bool"
++    },
++    {
++      "name": "cpu-hotplug-legacy",
++      "type": "bool"
++    },
++    {
++      "name": "acpi_enable_cmd",
++      "type": "uint8"
++    },
++    {
++      "name": "disable_s3",
++      "type": "uint8"
++    },
++    {
++      "name": "disable_s4",
++      "type": "uint8"
++    },
++    {
++      "name": "acpi_disable_cmd",
++      "type": "uint8"
++    },
++    {
++      "name": "memory-hotplug-support",
++      "type": "bool"
++    },
++    {
++      "name": "gpe0_blk_len",
++      "type": "uint32"
++    },
++    {
++      "name": "sci_int",
++      "type": "uint8"
++    },
++    {
++      "name": "gpe0_blk",
++      "type": "uint32"
++    },
++    {
++      "name": "s4_val",
++      "type": "uint8"
++    },
++    {
++      "name": "pm_io_base",
++      "type": "uint32"
 +    }
 +  ],
 +  "id": "libvirt-27"
@@ -4417,7 +11765,7 @@ index 0000000000..ab0ac1e7bf
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "kvm-pit"
++    "typename": "virtio-balloon-pci"
 +  },
 +  "id": "libvirt-28"
 +}
@@ -4425,669 +11773,121 @@ index 0000000000..ab0ac1e7bf
 +{
 +  "return": [
 +    {
-+      "name": "iobase",
-+      "type": "uint32"
++      "name": "romfile",
++      "type": "str"
 +    },
 +    {
-+      "name": "lost_tick_policy",
-+      "type": "LostTickPolicy"
-+    }
-+  ],
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "VGA"
-+  },
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "mmio",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "qemu-extended-regs",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "big-endian-framebuffer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vgamem_mb",
++      "default-value": 1,
++      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
 +      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vmware-svga"
-+  },
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "qxl"
-+  },
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "debug",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ram_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram64_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guestdebug",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "surfaces",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cmdlog",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-pci"
-+  },
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": true,
 +      "name": "migrate-extra",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-gpu-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virgl",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": false,
 +      "name": "ats",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "romfile",
-+      "type": "str"
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
 +    },
 +    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-device"
-+  },
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "notify_on_empty",
++      "default-value": true,
++      "name": "x-pcie-pm-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "stats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virgl",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "edid",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ICH9-LPC"
-+  },
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "sci_int",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gpe0_blk_len",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pm_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "noreboot",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cpu-hotplug-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi_disable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-smi-broadcast",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "acpi_enable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "enable_tco",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gpe0_blk",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-pci"
-+  },
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
++      "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"
 +    },
 +    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "free-page-hint",
++      "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": 0,
++      "name": "class",
++      "type": "uint32"
++    },
++    {
++      "default-value": "auto",
 +      "name": "disable-legacy",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
++      "default-value": false,
++      "name": "disable-modern",
 +      "type": "bool"
 +    },
 +    {
@@ -5095,32 +11895,23 @@ index 0000000000..ab0ac1e7bf
 +      "type": "guest statistics"
 +    },
 +    {
-+      "name": "deflate-on-oom",
++      "name": "guest-stats-polling-interval",
++      "type": "int"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "iommu_platform",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
++      "default-value": false,
++      "name": "packed",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -5129,26 +11920,8 @@ index 0000000000..ab0ac1e7bf
 +      "type": "link<iothread>"
 +    },
 +    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": true,
++      "name": "any_layout",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -5157,35 +11930,47 @@ index 0000000000..ab0ac1e7bf
 +      "type": "child<virtio-balloon-device>"
 +    },
 +    {
-+      "name": "x-ignore-backend-features",
++      "default-value": true,
++      "name": "event_idx",
++      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
++      "name": "free-page-hint",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
 +      "name": "notify_on_empty",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "iommu_platform",
++      "default-value": false,
++      "name": "qemu-4-0-config-size",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "deflate-on-oom",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "ats",
++      "default-value": true,
++      "name": "indirect_desc",
 +      "description": "on/off",
 +      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
 +    }
 +  ],
-+  "id": "libvirt-35"
++  "id": "libvirt-28"
 +}
 +
 +{
@@ -5193,11 +11978,11 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-balloon-ccw"
 +  },
-+  "id": "libvirt-36"
++  "id": "libvirt-29"
 +}
 +
 +{
-+  "id": "libvirt-36",
++  "id": "libvirt-29",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5209,60 +11994,88 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "virtio-balloon-device"
 +  },
-+  "id": "libvirt-37"
++  "id": "libvirt-30"
 +}
 +
 +{
 +  "return": [
 +    {
++      "default-value": false,
++      "name": "packed",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "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": true,
 +      "name": "notify_on_empty",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
 +      "name": "any_layout",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
++      "default-value": true,
++      "name": "use-started",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
++      "default-value": true,
++      "name": "indirect_desc",
++      "description": "on/off",
++      "type": "bool"
 +    },
 +    {
 +      "name": "iothread",
 +      "type": "link<iothread>"
 +    },
 +    {
-+      "name": "event_idx",
++      "default-value": false,
++      "name": "deflate-on-oom",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
 +      "name": "free-page-hint",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
++      "default-value": false,
++      "name": "qemu-4-0-config-size",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
++      "name": "guest-stats-polling-interval",
++      "type": "int"
++    },
++    {
++      "name": "guest-stats",
++      "type": "guest statistics"
 +    }
 +  ],
-+  "id": "libvirt-37"
++  "id": "libvirt-30"
 +}
 +
 +{
@@ -5270,87 +12083,100 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "nec-usb-xhci"
 +  },
-+  "id": "libvirt-38"
++  "id": "libvirt-31"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "intrs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msix",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msi",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "superspeed-ports-first",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "streams",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "romfile",
 +      "type": "str"
 +    },
 +    {
-+      "name": "force-pcie-endcap",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 4,
 +      "name": "p3",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
++      "name": "streams",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 4,
 +      "name": "p2",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": "auto",
++      "name": "msi",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": "auto",
++      "name": "msix",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": false,
++      "name": "force-pcie-endcap",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "superspeed-ports-first",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 16,
++      "name": "intrs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 64,
 +      "name": "slots",
 +      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-38"
++  "id": "libvirt-31"
 +}
 +
 +{
@@ -5358,55 +12184,65 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "intel-iommu"
 +  },
-+  "id": "libvirt-39"
++  "id": "libvirt-32"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "eim",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "caching-mode",
++      "default-value": true,
++      "name": "pt",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-buggy-eim",
++      "default-value": false,
++      "name": "device-iotlb",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": "auto",
 +      "name": "intremap",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
-+      "name": "version",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-scalable-mode",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": true,
 +      "name": "dma-drain",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "pt",
++      "default-value": false,
++      "name": "caching-mode",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "device-iotlb",
++      "default-value": false,
++      "name": "x-buggy-eim",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
++      "name": "x-scalable-mode",
++      "type": "bool"
++    },
++    {
++      "default-value": 39,
 +      "name": "aw-bits",
 +      "type": "uint8"
++    },
++    {
++      "default-value": "auto",
++      "name": "eim",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": 0,
++      "name": "version",
++      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-39"
++  "id": "libvirt-32"
 +}
 +
 +{
@@ -5414,50 +12250,239 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "mch"
 +  },
-+  "id": "libvirt-40"
++  "id": "libvirt-33"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "rombar",
-+      "type": "uint32"
++      "name": "romfile",
++      "type": "str"
 +    },
 +    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "extended-tseg-mbytes",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
 +      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "command_serr_enable",
++      "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-33"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "nvdimm"
++  },
++  "id": "libvirt-34"
++}
++
++{
++  "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-34"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "pcie-root-port"
++  },
++  "id": "libvirt-35"
++}
++
++{
++  "return": [
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "port",
++      "type": "uint8"
++    },
++    {
++      "default-value": 8,
++      "name": "aer_log_max",
++      "type": "uint16"
++    },
++    {
++      "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",
++      "type": "PCIELinkSpeed"
++    },
++    {
++      "default-value": 18446744073709551615,
++      "name": "pref32-reserve",
++      "type": "size"
 +    }
 +  ],
-+  "id": "libvirt-40"
++  "id": "libvirt-35"
 +}
 +
 +{
@@ -5465,7 +12490,7 @@ index 0000000000..ab0ac1e7bf
 +  "arguments": {
 +    "typename": "memory-backend-file"
 +  },
-+  "id": "libvirt-41"
++  "id": "libvirt-36"
 +}
 +
 +{
@@ -5475,9 +12500,9 @@ index 0000000000..ab0ac1e7bf
 +      "type": "string"
 +    },
 +    {
-+      "name": "policy",
-+      "description": "Set the NUMA policy",
-+      "type": "HostMemPolicy"
++      "name": "share",
++      "description": "Mark the memory as private to QEMU or shared",
++      "type": "bool"
 +    },
 +    {
 +      "name": "dump",
@@ -5485,14 +12510,18 @@ index 0000000000..ab0ac1e7bf
 +      "type": "bool"
 +    },
 +    {
-+      "name": "share",
-+      "description": "Mark the memory as private to QEMU or shared",
++      "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": "prealloc",
-+      "description": "Preallocate memory",
-+      "type": "bool"
++      "name": "policy",
++      "description": "Set the NUMA policy",
++      "type": "HostMemPolicy"
 +    },
 +    {
 +      "name": "size",
@@ -5500,7 +12529,8 @@ index 0000000000..ab0ac1e7bf
 +      "type": "int"
 +    },
 +    {
-+      "name": "x-use-canonical-path-for-ramblock-id",
++      "name": "prealloc",
++      "description": "Preallocate memory",
 +      "type": "bool"
 +    },
 +    {
@@ -5514,14 +12544,14 @@ index 0000000000..ab0ac1e7bf
 +      "type": "bool"
 +    },
 +    {
-+      "name": "pmem",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "align",
 +      "type": "int"
 +    },
 +    {
++      "name": "pmem",
++      "type": "bool"
++    },
++    {
 +      "name": "mem-path",
 +      "type": "string"
 +    },
@@ -5530,277 +12560,2044 @@ index 0000000000..ab0ac1e7bf
 +      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-41"
++  "id": "libvirt-36"
 +}
 +
 +{
 +  "execute": "qom-list-properties",
 +  "arguments": {
-+    "typename": "spapr-machine"
++    "typename": "memory-backend-memfd"
 +  },
-+  "id": "libvirt-42"
++  "id": "libvirt-37"
 +}
 +
 +{
-+  "id": "libvirt-42",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Class 'spapr-machine' not found"
-+  }
++  "return": [
++    {
++      "name": "type",
++      "type": "string"
++    },
++    {
++      "name": "share",
++      "description": "Mark the memory as private to QEMU or shared",
++      "type": "bool"
++    },
++    {
++      "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": "size",
++      "description": "Size of the memory region (ex: 500M)",
++      "type": "int"
++    },
++    {
++      "name": "prealloc",
++      "description": "Preallocate memory",
++      "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<qemu:memory-region>"
++    },
++    {
++      "name": "legacy-memory",
++      "type": "str"
++    },
++    {
++      "name": "fill-mtrr-mask",
++      "type": "bool"
++    },
++    {
++      "name": "host-phys-bits-limit",
++      "type": "uint8"
++    },
++    {
++      "name": "x-force-features",
++      "type": "bool"
++    },
++    {
++      "name": "hv-vpindex",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "kvm",
++      "type": "bool"
++    },
++    {
++      "name": "apic-id",
++      "type": "uint32"
++    },
++    {
++      "name": "min-xlevel",
++      "type": "uint32"
++    },
++    {
++      "name": "enforce",
++      "type": "bool"
++    },
++    {
++      "name": "hv-runtime",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "level",
++      "type": "uint32"
++    },
++    {
++      "name": "hv-tlbflush",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "core-id",
++      "type": "int32"
++    },
++    {
++      "name": "hv-crash",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "hv-reset",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "hv-no-nonarch-coresharing",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "name": "hv-spinlocks",
++      "type": "uint32"
++    },
++    {
++      "name": "pmu",
++      "type": "bool"
++    },
++    {
++      "name": "socket-id",
++      "type": "int32"
++    },
++    {
++      "name": "hv-relaxed",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "thread-id",
++      "type": "int32"
++    },
++    {
++      "name": "tcg-cpuid",
++      "type": "bool"
++    },
++    {
++      "name": "die-id",
++      "type": "int32"
++    },
++    {
++      "name": "node-id",
++      "type": "int32"
++    },
++    {
++      "name": "vmware-cpuid-freq",
++      "type": "bool"
++    },
++    {
++      "name": "min-xlevel2",
++      "type": "uint32"
++    },
++    {
++      "name": "hv-stimer",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "x-hv-max-vps",
++      "type": "int32"
++    },
++    {
++      "name": "legacy-cache",
++      "type": "bool"
++    },
++    {
++      "name": "x-migrate-smi-count",
++      "type": "bool"
++    },
++    {
++      "name": "hv-reenlightenment",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "hv-vendor-id",
++      "type": "str"
++    },
++    {
++      "name": "x-hv-synic-kvm-only",
++      "type": "bool"
++    },
++    {
++      "name": "min-level",
++      "type": "uint32"
++    },
++    {
++      "name": "phys-bits",
++      "type": "uint32"
++    },
++    {
++      "name": "l3-cache",
++      "type": "bool"
++    },
++    {
++      "name": "level-func7",
++      "type": "uint32"
++    },
++    {
++      "name": "lmce",
++      "type": "bool"
++    },
++    {
++      "name": "hv-passthrough",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-no-smi-migration",
++      "type": "bool"
++    },
++    {
++      "name": "xlevel2",
++      "type": "uint32"
++    },
++    {
++      "name": "hv-stimer-direct",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "ucode-rev",
++      "type": "uint64"
++    },
++    {
++      "name": "xlevel",
++      "type": "uint32"
++    },
++    {
++      "name": "host-phys-bits",
++      "type": "bool"
++    },
++    {
++      "name": "check",
++      "type": "bool"
++    },
++    {
++      "name": "hv-time",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "full-cpuid-auto-level",
++      "type": "bool"
++    },
++    {
++      "name": "hv-synic",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "hv-evmcs",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "hv-ipi",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "hv-vapic",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "cpuid-0xb",
++      "type": "bool"
++    },
++    {
++      "name": "hv-frequencies",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "x-intel-pt-auto-level",
++      "type": "bool"
++    },
++    {
++      "name": "host-cache-info",
++      "type": "bool"
++    },
++    {
++      "name": "migratable",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invept-single-context",
++      "type": "bool"
++    },
++    {
++      "name": "core-capability",
++      "type": "bool"
++    },
++    {
++      "name": "popcnt",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_mmu",
++      "type": "bool"
++    },
++    {
++      "name": "dtes64",
++      "type": "bool"
++    },
++    {
++      "name": "sse4_1",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invvpid-single-addr",
++      "type": "bool"
++    },
++    {
++      "name": "xstore",
++      "type": "bool"
++    },
++    {
++      "name": "stepping",
++      "type": "int"
++    },
++    {
++      "name": "vmx-vmfunc",
++      "type": "bool"
++    },
++    {
++      "name": "pse36",
++      "type": "bool"
++    },
++    {
++      "name": "avx512-4vnniw",
++      "type": "bool"
++    },
++    {
++      "name": "fma4",
++      "type": "bool"
++    },
++    {
++      "name": "avx2",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-poll-control",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_nopiodelay",
++      "type": "bool"
++    },
++    {
++      "name": "amd-stibp",
++      "type": "bool"
++    },
++    {
++      "name": "family",
++      "type": "int"
++    },
++    {
++      "name": "pclmuldq",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-store-lma",
++      "type": "bool"
++    },
++    {
++      "name": "erms",
++      "type": "bool"
++    },
++    {
++      "name": "vaes",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-activity-wait-sipi",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-flexpriority",
++      "type": "bool"
++    },
++    {
++      "name": "rdrand",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ept-advanced-exitinfo",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-pause-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-shadow-vmcs",
++      "type": "bool"
++    },
++    {
++      "name": "model",
++      "type": "int"
++    },
++    {
++      "name": "avx512-vpopcntdq",
++      "type": "bool"
++    },
++    {
++      "name": "tbm",
++      "type": "bool"
++    },
++    {
++      "name": "xcrypt",
++      "type": "bool"
++    },
++    {
++      "name": "lm",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-pv-eoi",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-monitor-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-eptad",
++      "type": "bool"
++    },
++    {
++      "name": "pae",
++      "type": "bool"
++    },
++    {
++      "name": "ssse3",
++      "type": "bool"
++    },
++    {
++      "name": "phe",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-unrestricted-guest",
++      "type": "bool"
++    },
++    {
++      "name": "movdiri",
++      "type": "bool"
++    },
++    {
++      "name": "taa-no",
++      "type": "bool"
++    },
++    {
++      "name": "perfctr_nb",
++      "type": "bool"
++    },
++    {
++      "name": "arat",
++      "type": "bool"
++    },
++    {
++      "name": "avx512vbmi2",
++      "type": "bool"
++    },
++    {
++      "name": "perfctr_core",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_asyncpf",
++      "type": "bool"
++    },
++    {
++      "name": "x2apic",
++      "type": "bool"
++    },
++    {
++      "name": "npt",
++      "type": "bool"
++    },
++    {
++      "name": "avx512ifma",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_poll_control",
++      "type": "bool"
++    },
++    {
++      "name": "model-id",
++      "type": "string"
++    },
++    {
++      "name": "vmx-vnmi-pending",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invpcid-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-io-exit",
++      "type": "bool"
++    },
++    {
++      "name": "pmm-en",
++      "type": "bool"
++    },
++    {
++      "name": "tsc",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ins-outs",
++      "type": "bool"
++    },
++    {
++      "name": "dca",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-apicv-x2apic",
++      "type": "bool"
++    },
++    {
++      "name": "ia64",
++      "type": "bool"
++    },
++    {
++      "name": "perfctr-core",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-cr3-load-noexit",
++      "type": "bool"
++    },
++    {
++      "name": "kvmclock",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-entry-noload-debugctl",
++      "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": "kvm-pv-ipi",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-apicv-register",
++      "type": "bool"
++    },
++    {
++      "name": "fxsr-opt",
++      "type": "bool"
++    },
++    {
++      "name": "skip-l1dfl-vmentry",
++      "type": "bool"
++    },
++    {
++      "name": "pcid",
++      "type": "bool"
++    },
++    {
++      "name": "rdpid",
++      "type": "bool"
++    },
++    {
++      "name": "wbnoinvd",
++      "type": "bool"
++    },
++    {
++      "name": "filtered-features",
++      "type": "X86CPUFeatureWordInfo"
++    },
++    {
++      "name": "syscall",
++      "type": "bool"
++    },
++    {
++      "name": "pse",
++      "type": "bool"
++    },
++    {
++      "name": "tsc_scale",
++      "type": "bool"
++    },
++    {
++      "name": "mce",
++      "type": "bool"
++    },
++    {
++      "name": "xsaves",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-entry-load-pat",
++      "type": "bool"
++    },
++    {
++      "name": "ibpb",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-apicv-xapic",
++      "type": "bool"
++    },
++    {
++      "name": "cldemote",
++      "type": "bool"
++    },
++    {
++      "name": "rtm",
++      "type": "bool"
++    },
++    {
++      "name": "lwp",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-steal-time",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-hlt-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-entry-load-efer",
++      "type": "bool"
++    },
++    {
++      "name": "nrip_save",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invlpg-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-save-efer",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-eptp-switching",
++      "type": "bool"
++    },
++    {
++      "name": "vme",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-pv-unhalt",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-desc-exit",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_pv_unhalt",
++      "type": "bool"
++    },
++    {
++      "name": "svm",
++      "type": "bool"
++    },
++    {
++      "name": "lahf-lm",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invvpid",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-hint-dedicated",
++      "type": "bool"
++    },
++    {
++      "name": "mca",
++      "type": "bool"
++    },
++    {
++      "name": "mtrr",
++      "type": "bool"
++    },
++    {
++      "name": "cid",
++      "type": "bool"
++    },
++    {
++      "name": "vmcb_clean",
++      "type": "bool"
++    },
++    {
++      "name": "pfthreshold",
++      "type": "bool"
++    },
++    {
++      "name": "pmm",
++      "type": "bool"
++    },
++    {
++      "name": "tm",
++      "type": "bool"
++    },
++    {
++      "name": "pbe",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-entry-ia32e-mode",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-rdpmc-exit",
++      "type": "bool"
++    },
++    {
++      "name": "split-lock-detect",
++      "type": "bool"
++    },
++    {
++      "name": "fpu",
++      "type": "bool"
++    },
++    {
++      "name": "skinit",
++      "type": "bool"
++    },
++    {
++      "name": "sep",
++      "type": "bool"
++    },
++    {
++      "name": "avx512-bf16",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-rdtscp-exit",
++      "type": "bool"
++    },
++    {
++      "name": "nx",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invvpid-all-context",
++      "type": "bool"
++    },
++    {
++      "name": "ds-cpl",
++      "type": "bool"
++    },
++    {
++      "name": "pause-filter",
++      "type": "bool"
++    },
++    {
++      "name": "pause_filter",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-vmwrite-vmexit-fields",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ept",
++      "type": "bool"
++    },
++    {
++      "name": "nodeid-msr",
++      "type": "bool"
++    },
++    {
++      "name": "smap",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-io-bitmap",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-intr-exit",
++      "type": "bool"
++    },
++    {
++      "name": "fxsr_opt",
++      "type": "bool"
++    },
++    {
++      "name": "cr8legacy",
++      "type": "bool"
++    },
++    {
++      "name": "cmp_legacy",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-zero-len-inject",
++      "type": "bool"
++    },
++    {
++      "name": "virt-ssbd",
++      "type": "bool"
++    },
++    {
++      "name": "pschange-mc-no",
++      "type": "bool"
++    },
++    {
++      "name": "umip",
++      "type": "bool"
++    },
++    {
++      "name": "avx512er",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-vpid",
++      "type": "bool"
++    },
++    {
++      "name": "xstore-en",
++      "type": "bool"
++    },
++    {
++      "name": "avx512vl",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invept-single-context-noglobals",
++      "type": "bool"
++    },
++    {
++      "name": "cmov",
++      "type": "bool"
++    },
++    {
++      "name": "rsba",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-posted-intr",
++      "type": "bool"
++    },
++    {
++      "name": "xcrypt-en",
++      "type": "bool"
++    },
++    {
++      "name": "tm2",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-clear-bndcfgs",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ept-execonly",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-load-efer",
++      "type": "bool"
++    },
++    {
++      "name": "xsaveerptr",
++      "type": "bool"
++    },
++    {
++      "name": "fsgsbase",
++      "type": "bool"
++    },
++    {
++      "name": "avx512bw",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-vintr-pending",
++      "type": "bool"
++    },
++    {
++      "name": "smx",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-secondary-ctls",
++      "type": "bool"
++    },
++    {
++      "name": "lbrv",
++      "type": "bool"
++    },
++    {
++      "name": "tsc-frequency",
++      "type": "int"
++    },
++    {
++      "name": "hle",
++      "type": "bool"
++    },
++    {
++      "name": "monitor",
++      "type": "bool"
++    },
++    {
++      "name": "tce",
++      "type": "bool"
++    },
++    {
++      "name": "sse4a",
++      "type": "bool"
++    },
++    {
++      "name": "vpclmulqdq",
++      "type": "bool"
++    },
++    {
++      "name": "tsc-scale",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-pv-tlb-flush",
++      "type": "bool"
++    },
++    {
++      "name": "mds-no",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-cr8-load-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-activity-hlt",
++      "type": "bool"
++    },
++    {
++      "name": "i64",
++      "type": "bool"
++    },
++    {
++      "name": "adx",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invept-all-context",
++      "type": "bool"
++    },
++    {
++      "name": "ffxsr",
++      "type": "bool"
++    },
++    {
++      "name": "amd-no-ssb",
++      "type": "bool"
++    },
++    {
++      "name": "crash-information",
++      "type": "GuestPanicInformation"
++    },
++    {
++      "name": "vmx-entry-load-bndcfgs",
++      "type": "bool"
++    },
++    {
++      "name": "svm_lock",
++      "type": "bool"
++    },
++    {
++      "name": "msr",
++      "type": "bool"
++    },
++    {
++      "name": "pclmulqdq",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-preemption-timer",
++      "type": "bool"
++    },
++    {
++      "name": "clflush",
++      "type": "bool"
++    },
++    {
++      "name": "ssb-no",
++      "type": "bool"
++    },
++    {
++      "name": "mpx",
++      "type": "bool"
++    },
++    {
++      "name": "extapic",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-vnmi",
++      "type": "bool"
++    },
++    {
++      "name": "xop",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-rdseed-exit",
++      "type": "bool"
++    },
++    {
++      "name": "smep",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-mwait-exit",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-rdtsc-exit",
++      "type": "bool"
++    },
++    {
++      "name": "cx8",
++      "type": "bool"
++    },
++    {
++      "name": "xsavec",
++      "type": "bool"
++    },
++    {
++      "name": "pku",
++      "type": "bool"
++    },
++    {
++      "name": "sse4-2",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-mtf",
++      "type": "bool"
++    },
++    {
++      "name": "vmcb-clean",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-load-pat",
++      "type": "bool"
++    },
++    {
++      "name": "stibp",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-cr3-store-noexit",
++      "type": "bool"
++    },
++    {
++      "name": "tsx-ctrl",
++      "type": "bool"
++    },
++    {
++      "name": "svm-lock",
++      "type": "bool"
++    },
++    {
++      "name": "sse4-1",
++      "type": "bool"
++    },
++    {
++      "name": "lahf_lm",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_pv_eoi",
++      "type": "bool"
++    },
++    {
++      "name": "sse",
++      "type": "bool"
++    },
++    {
++      "name": "clzero",
++      "type": "bool"
++    },
++    {
++      "name": "ds",
++      "type": "bool"
++    },
++    {
++      "name": "osvw",
++      "type": "bool"
++    },
++    {
++      "name": "kvm_steal_time",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-true-ctls",
++      "type": "bool"
++    },
++    {
++      "name": "movdir64b",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-invept",
++      "type": "bool"
++    },
++    {
++      "name": "acpi",
++      "type": "bool"
++    },
++    {
++      "name": "xd",
++      "type": "bool"
++    },
++    {
++      "name": "nodeid_msr",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ept-1gb",
++      "type": "bool"
++    },
++    {
++      "name": "nrip-save",
++      "type": "bool"
++    },
++    {
++      "name": "gfni",
++      "type": "bool"
++    },
++    {
++      "name": "ds_cpl",
++      "type": "bool"
++    },
++    {
++      "name": "sse3",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-mmu",
++      "type": "bool"
++    },
++    {
++      "name": "avx512bitalg",
++      "type": "bool"
++    },
++    {
++      "name": "rdseed",
++      "type": "bool"
++    },
++    {
++      "name": "sha-ni",
++      "type": "bool"
++    },
++    {
++      "name": "ace2",
++      "type": "bool"
++    },
++    {
++      "name": "waitpkg",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-rdrand-exit",
++      "type": "bool"
++    },
++    {
++      "name": "f16c",
++      "type": "bool"
++    },
++    {
++      "name": "3dnowprefetch",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-encls-exit",
++      "type": "bool"
++    },
++    {
++      "name": "avx",
++      "type": "bool"
++    },
++    {
++      "name": "topoext",
++      "type": "bool"
++    },
++    {
++      "name": "sse2",
++      "type": "bool"
++    },
++    {
++      "name": "rdctl-no",
++      "type": "bool"
++    },
++    {
++      "name": "mmx",
++      "type": "bool"
++    },
++    {
++      "name": "avx512-4fmaps",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-cr8-store-exit",
++      "type": "bool"
++    },
++    {
++      "name": "avx512vnni",
++      "type": "bool"
++    },
++    {
++      "name": "pni",
++      "type": "bool"
++    },
++    {
++      "name": "movbe",
++      "type": "bool"
++    },
++    {
++      "name": "mmxext",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ple",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-apicv-vid",
++      "type": "bool"
++    },
++    {
++      "name": "flushbyasid",
++      "type": "bool"
++    },
++    {
++      "name": "rdtscp",
++      "type": "bool"
++    },
++    {
++      "name": "clwb",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-asyncpf",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-pv-sched-yield",
++      "type": "bool"
++    },
++    {
++      "name": "decodeassists",
++      "type": "bool"
++    },
++    {
++      "name": "pat",
++      "type": "bool"
++    },
++    {
++      "name": "invpcid",
++      "type": "bool"
++    },
++    {
++      "name": "pdpe1gb",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-save-pat",
++      "type": "bool"
++    },
++    {
++      "name": "tsc-adjust",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-entry-load-rtit-ctl",
++      "type": "bool"
++    },
++    {
++      "name": "ht",
++      "type": "bool"
++    },
++    {
++      "name": "clflushopt",
++      "type": "bool"
++    },
++    {
++      "name": "tsc_adjust",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-tsc-offset",
++      "type": "bool"
++    },
++    {
++      "name": "ssbd",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-clear-rtit-ctl",
++      "type": "bool"
++    },
++    {
++      "name": "3dnowext",
++      "type": "bool"
++    },
++    {
++      "name": "xtpr",
++      "type": "bool"
++    },
++    {
++      "name": "pdcm",
++      "type": "bool"
++    },
++    {
++      "name": "xsave",
++      "type": "bool"
++    },
++    {
++      "name": "unavailable-features",
++      "type": "strList"
++    },
++    {
++      "name": "est",
++      "type": "bool"
++    },
++    {
++      "name": "pge",
++      "type": "bool"
++    },
++    {
++      "name": "vendor",
++      "type": "string"
++    },
++    {
++      "name": "pcommit",
++      "type": "bool"
++    },
++    {
++      "name": "ibs",
++      "type": "bool"
++    },
++    {
++      "name": "tsc-deadline",
++      "type": "bool"
++    },
++    {
++      "name": "kvmclock-stable-bit",
++      "type": "bool"
++    },
++    {
++      "name": "misalignsse",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-msr-bitmap",
++      "type": "bool"
++    },
++    {
++      "name": "perfctr-nb",
++      "type": "bool"
++    },
++    {
++      "name": "feature-words",
++      "type": "X86CPUFeatureWordInfo"
++    },
++    {
++      "name": "apic",
++      "type": "bool"
++    },
++    {
++      "name": "avx512vbmi",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-nosave-debugctl",
++      "type": "bool"
++    },
++    {
++      "name": "avx512f",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-save-preemption-timer",
++      "type": "bool"
++    },
++    {
++      "name": "arch-capabilities",
++      "type": "bool"
++    },
++    {
++      "name": "bmi2",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-pml",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-nmi-exit",
++      "type": "bool"
++    },
++    {
++      "name": "intel-pt",
++      "type": "bool"
++    },
++    {
++      "name": "wdt",
++      "type": "bool"
++    },
++    {
++      "name": "ace2-en",
++      "type": "bool"
++    },
++    {
++      "name": "avx512pf",
++      "type": "bool"
++    },
++    {
++      "name": "bmi1",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-page-walk-5",
++      "type": "bool"
++    },
++    {
++      "name": "kvm-nopiodelay",
++      "type": "bool"
++    },
++    {
++      "name": "sse4.2",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-ept-2mb",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-load-perf-global-ctrl",
++      "type": "bool"
++    },
++    {
++      "name": "3dnow",
++      "type": "bool"
++    },
++    {
++      "name": "vmx",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-wbinvd-exit",
++      "type": "bool"
++    },
++    {
++      "name": "la57",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-page-walk-4",
++      "type": "bool"
++    },
++    {
++      "name": "sse4.1",
++      "type": "bool"
++    },
++    {
++      "name": "ibrs-all",
++      "type": "bool"
++    },
++    {
++      "name": "xgetbv1",
++      "type": "bool"
++    },
++    {
++      "name": "xsaveopt",
++      "type": "bool"
++    },
++    {
++      "name": "spec-ctrl",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-entry-load-perf-global-ctrl",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-exit-ack-intr",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-xsaves",
++      "type": "bool"
++    },
++    {
++      "name": "phe-en",
++      "type": "bool"
++    },
++    {
++      "name": "fxsr",
++      "type": "bool"
++    },
++    {
++      "name": "hypervisor",
++      "type": "bool"
++    },
++    {
++      "name": "aes",
++      "type": "bool"
++    },
++    {
++      "name": "amd-ssbd",
++      "type": "bool"
++    },
++    {
++      "name": "sse4_2",
++      "type": "bool"
++    },
++    {
++      "name": "de",
++      "type": "bool"
++    },
++    {
++      "name": "ss",
++      "type": "bool"
++    },
++    {
++      "name": "vmx-movdr-exit",
++      "type": "bool"
++    },
++    {
++      "name": "fma",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-38"
 +}
 +
 +{
 +  "execute": "query-machines",
-+  "id": "libvirt-43"
++  "id": "libvirt-39"
 +}
 +
 +{
 +  "return": [
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "isapc",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.1",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.2",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.3",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.8",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.9",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "xenfv",
-+      "cpu-max": 128
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.1",
-+      "is-default": true,
++      "name": "pc-i440fx-2.12",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
 +      "cpu-max": 255,
-+      "alias": "pc"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.3",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-4.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.1",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.2",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.1",
-+      "cpu-max": 288
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
 +      "name": "pc-i440fx-2.0",
-+      "cpu-max": 255
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.11",
-+      "cpu-max": 288
++      "name": "pc-q35-4.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.12",
-+      "cpu-max": 288
++      "name": "pc-i440fx-2.5",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.0",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "xenpv",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.10",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.0.1",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.9",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.15",
-+      "cpu-max": 255
++      "name": "pc-i440fx-4.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
 +      "name": "pc-i440fx-1.5",
-+      "cpu-max": 255
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
 +      "name": "pc-q35-2.7",
-+      "cpu-max": 255
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.6",
-+      "cpu-max": 255
++      "name": "pc-i440fx-2.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.11",
-+      "cpu-max": 255
++      "name": "pc-1.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "none",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.8",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.13",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.12",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.14",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.1",
-+      "cpu-max": 255
++      "name": "pc-i440fx-2.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
 +      "name": "pc-q35-2.4",
-+      "cpu-max": 255
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.5",
-+      "cpu-max": 255
++      "name": "pc-q35-2.10",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.6",
-+      "cpu-max": 255
++      "name": "pc-i440fx-1.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.4",
-+      "cpu-max": 255
++      "name": "pc-q35-2.9",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.10",
-+      "cpu-max": 255
++      "name": "pc-i440fx-2.11",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
-+      "name": "pc-0.12",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-4.0",
-+      "cpu-max": 288
++      "name": "pc-q35-3.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
 +    },
 +    {
 +      "hotpluggable-cpus": true,
 +      "name": "pc-q35-4.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
 +      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.4",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.3",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-4.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.9",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "isapc",
++      "numa-mem-supported": true,
++      "default-cpu-type": "486-x86_64-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-1.4",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-3.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.12",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-4.0.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-1.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-5.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false,
 +      "alias": "q35"
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.8",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.10",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-3.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-4.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "microvm",
++      "numa-mem-supported": false,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.3",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-4.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-5.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "is-default": true,
++      "cpu-max": 255,
++      "deprecated": false,
++      "alias": "pc"
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.8",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.5",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-3.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.11",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
 +    }
 +  ],
-+  "id": "libvirt-43"
++  "id": "libvirt-39"
 +}
 +
 +{
 +  "execute": "query-cpu-definitions",
-+  "id": "libvirt-44"
++  "id": "libvirt-40"
 +}
 +
 +{
@@ -5830,10 +14627,27 @@ index 0000000000..ab0ac1e7bf
 +      "migration-safe": true
 +    },
 +    {
++      "name": "qemu64-v1",
++      "typename": "qemu64-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "qemu64",
 +      "typename": "qemu64-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "qemu64-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32-v1",
++      "typename": "qemu32-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5842,6 +14656,21 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "qemu32-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "qemu32-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom-v1",
++      "typename": "phenom-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "sse4a",
++        "npt"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5856,6 +14685,15 @@ index 0000000000..ab0ac1e7bf
 +        "sse4a",
 +        "npt"
 +      ],
++      "alias-of": "phenom-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3-v1",
++      "typename": "pentium3-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5864,6 +14702,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "pentium3-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "pentium3-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2-v1",
++      "typename": "pentium2-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5872,6 +14719,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "pentium2-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "pentium2-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium-v1",
++      "typename": "pentium-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5880,6 +14736,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "pentium-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "pentium-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270-v1",
++      "typename": "n270-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5888,6 +14753,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "n270-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "n270-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64-v1",
++      "typename": "kvm64-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5896,6 +14770,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "kvm64-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "kvm64-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32-v1",
++      "typename": "kvm32-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5904,6 +14787,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "kvm32-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "kvm32-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo-v1",
++      "typename": "coreduo-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5912,6 +14804,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "coreduo-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "coreduo-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo-v1",
++      "typename": "core2duo-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5920,6 +14821,18 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "core2duo-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "core2duo-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon-v1",
++      "typename": "athlon-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5931,6 +14844,23 @@ index 0000000000..ab0ac1e7bf
 +        "3dnowext",
 +        "3dnow"
 +      ],
++      "alias-of": "athlon-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v2",
++      "typename": "Westmere-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v1",
++      "typename": "Westmere-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5938,8 +14868,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Westmere-IBRS",
 +      "typename": "Westmere-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Westmere-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5948,6 +14878,133 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Westmere-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Westmere-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v2",
++      "typename": "Snowridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v1",
++      "typename": "Snowridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge",
++      "typename": "Snowridge-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "alias-of": "Snowridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v3",
++      "typename": "Skylake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v2",
++      "typename": "Skylake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v1",
++      "typename": "Skylake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-noTSX-IBRS",
++      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "alias-of": "Skylake-Server-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5962,12 +15019,12 @@ index 0000000000..ab0ac1e7bf
 +        "avx512bw",
 +        "avx512vl",
 +        "pku",
-+        "spec-ctrl",
 +        "avx512f",
 +        "avx512f",
 +        "avx512f",
 +        "pku"
 +      ],
++      "alias-of": "Skylake-Server-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5987,6 +15044,40 @@ index 0000000000..ab0ac1e7bf
 +        "avx512f",
 +        "pku"
 +      ],
++      "alias-of": "Skylake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v3",
++      "typename": "Skylake-Client-v3-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v2",
++      "typename": "Skylake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v1",
++      "typename": "Skylake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-noTSX-IBRS",
++      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "alias-of": "Skylake-Client-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -5994,8 +15085,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Skylake-Client-IBRS",
 +      "typename": "Skylake-Client-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Skylake-Client-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6004,6 +15095,23 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Skylake-Client-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Skylake-Client-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v2",
++      "typename": "SandyBridge-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v1",
++      "typename": "SandyBridge-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6011,8 +15119,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "SandyBridge-IBRS",
 +      "typename": "SandyBridge-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "SandyBridge-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6021,6 +15129,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "SandyBridge-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "SandyBridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Penryn-v1",
++      "typename": "Penryn-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6029,6 +15146,22 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Penryn-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Penryn-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G5-v1",
++      "typename": "Opteron_G5-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "tbm",
++        "npt",
++        "nrip-save"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6044,6 +15177,21 @@ index 0000000000..ab0ac1e7bf
 +        "npt",
 +        "nrip-save"
 +      ],
++      "alias-of": "Opteron_G5-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G4-v1",
++      "typename": "Opteron_G4-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse",
++        "xop",
++        "fma4",
++        "npt",
++        "nrip-save"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6058,6 +15206,17 @@ index 0000000000..ab0ac1e7bf
 +        "npt",
 +        "nrip-save"
 +      ],
++      "alias-of": "Opteron_G4-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G3-v1",
++      "typename": "Opteron_G3-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a",
++        "misalignsse"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6068,6 +15227,15 @@ index 0000000000..ab0ac1e7bf
 +        "sse4a",
 +        "misalignsse"
 +      ],
++      "alias-of": "Opteron_G3-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G2-v1",
++      "typename": "Opteron_G2-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6076,6 +15244,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Opteron_G2-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Opteron_G2-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G1-v1",
++      "typename": "Opteron_G1-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6084,6 +15261,23 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Opteron_G1-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Opteron_G1-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v2",
++      "typename": "Nehalem-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v1",
++      "typename": "Nehalem-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6091,8 +15285,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Nehalem-IBRS",
 +      "typename": "Nehalem-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Nehalem-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6101,6 +15295,25 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Nehalem-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Nehalem-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "KnightsMill-v1",
++      "typename": "KnightsMill-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512pf",
++        "avx512er",
++        "avx512cd",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps",
++        "avx512f",
++        "avx512f",
++        "avx512f"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6119,6 +15332,23 @@ index 0000000000..ab0ac1e7bf
 +        "avx512f",
 +        "avx512f"
 +      ],
++      "alias-of": "KnightsMill-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v2",
++      "typename": "IvyBridge-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v1",
++      "typename": "IvyBridge-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6126,8 +15356,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "IvyBridge-IBRS",
 +      "typename": "IvyBridge-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "IvyBridge-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6136,6 +15366,95 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "IvyBridge-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "IvyBridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v2",
++      "typename": "Icelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v1",
++      "typename": "Icelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-noTSX",
++      "typename": "Icelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "la57",
++        "wbnoinvd",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "alias-of": "Icelake-Server-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6159,14 +15478,71 @@ index 0000000000..ab0ac1e7bf
 +        "avx512bitalg",
 +        "avx512-vpopcntdq",
 +        "la57",
-+        "spec-ctrl",
-+        "ssbd",
 +        "wbnoinvd",
 +        "avx512f",
 +        "avx512f",
 +        "avx512f",
 +        "pku"
 +      ],
++      "alias-of": "Icelake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v2",
++      "typename": "Icelake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v1",
++      "typename": "Icelake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-noTSX",
++      "typename": "Icelake-Client-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512vbmi",
++        "pku",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "wbnoinvd",
++        "pku"
++      ],
++      "alias-of": "Icelake-Client-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6183,11 +15559,42 @@ index 0000000000..ab0ac1e7bf
 +        "avx512vnni",
 +        "avx512bitalg",
 +        "avx512-vpopcntdq",
-+        "spec-ctrl",
-+        "ssbd",
 +        "wbnoinvd",
 +        "pku"
 +      ],
++      "alias-of": "Icelake-Client-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v4",
++      "typename": "Haswell-v4-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v3",
++      "typename": "Haswell-v3-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v2",
++      "typename": "Haswell-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v1",
++      "typename": "Haswell-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6195,8 +15602,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Haswell-noTSX-IBRS",
 +      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Haswell-v4",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6205,6 +15612,7 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Haswell-noTSX-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Haswell-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6212,8 +15620,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Haswell-IBRS",
 +      "typename": "Haswell-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Haswell-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6222,6 +15630,114 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Haswell-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Haswell-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v3",
++      "typename": "EPYC-v3-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v2",
++      "typename": "EPYC-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v1",
++      "typename": "EPYC-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-Rome-v1",
++      "typename": "EPYC-Rome-v1-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "rdpid",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "wbnoinvd",
++        "ibpb",
++        "amd-stibp",
++        "npt",
++        "nrip-save"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-Rome",
++      "typename": "EPYC-Rome-x86_64-cpu",
++      "unavailable-features": [
++        "clwb",
++        "sha-ni",
++        "rdpid",
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "wbnoinvd",
++        "ibpb",
++        "amd-stibp",
++        "npt",
++        "nrip-save"
++      ],
++      "alias-of": "EPYC-Rome-v1",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6240,6 +15756,7 @@ index 0000000000..ab0ac1e7bf
 +        "npt",
 +        "nrip-save"
 +      ],
++      "alias-of": "EPYC-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6257,6 +15774,24 @@ index 0000000000..ab0ac1e7bf
 +        "npt",
 +        "nrip-save"
 +      ],
++      "alias-of": "EPYC-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana-v1",
++      "typename": "Dhyana-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "cr8legacy",
++        "sse4a",
++        "misalignsse",
++        "osvw",
++        "ibpb",
++        "npt",
++        "nrip-save"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6274,6 +15809,97 @@ index 0000000000..ab0ac1e7bf
 +        "npt",
 +        "nrip-save"
 +      ],
++      "alias-of": "Dhyana-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v2",
++      "typename": "Denverton-v2-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdctl-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v1",
++      "typename": "Denverton-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdctl-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton",
++      "typename": "Denverton-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "rdctl-no"
++      ],
++      "alias-of": "Denverton-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake-v1",
++      "typename": "Cooperlake-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512-bf16",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no",
++        "taa-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake",
++      "typename": "Cooperlake-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512-bf16",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no",
++        "taa-no"
++      ],
++      "alias-of": "Cooperlake-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe-v1",
++      "typename": "Conroe-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6282,6 +15908,97 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Conroe-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Conroe-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v3",
++      "typename": "Cascadelake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v2",
++      "typename": "Cascadelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v1",
++      "typename": "Cascadelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-noTSX",
++      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "avx512f",
++        "avx512dq",
++        "clwb",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "pku",
++        "avx512vnni",
++        "avx512f",
++        "avx512f",
++        "avx512f",
++        "pku",
++        "rdctl-no",
++        "ibrs-all",
++        "mds-no"
++      ],
++      "alias-of": "Cascadelake-Server-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6297,13 +16014,44 @@ index 0000000000..ab0ac1e7bf
 +        "avx512vl",
 +        "pku",
 +        "avx512vnni",
-+        "spec-ctrl",
-+        "ssbd",
 +        "avx512f",
 +        "avx512f",
 +        "avx512f",
 +        "pku"
 +      ],
++      "alias-of": "Cascadelake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v4",
++      "typename": "Broadwell-v4-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v3",
++      "typename": "Broadwell-v3-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v2",
++      "typename": "Broadwell-v2-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v1",
++      "typename": "Broadwell-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6311,8 +16059,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Broadwell-noTSX-IBRS",
 +      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Broadwell-v4",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6321,6 +16069,7 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Broadwell-noTSX-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Broadwell-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6328,8 +16077,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "Broadwell-IBRS",
 +      "typename": "Broadwell-IBRS-x86_64-cpu",
 +      "unavailable-features": [
-+        "spec-ctrl"
 +      ],
++      "alias-of": "Broadwell-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6338,6 +16087,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Broadwell-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Broadwell-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "486-v1",
++      "typename": "486-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -6346,16 +16104,17 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "486-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "486-v1",
 +      "static": false,
 +      "migration-safe": true
 +    }
 +  ],
-+  "id": "libvirt-44"
++  "id": "libvirt-40"
 +}
 +
 +{
 +  "execute": "query-tpm-models",
-+  "id": "libvirt-45"
++  "id": "libvirt-41"
 +}
 +
 +{
@@ -6363,12 +16122,12 @@ index 0000000000..ab0ac1e7bf
 +    "tpm-crb",
 +    "tpm-tis"
 +  ],
-+  "id": "libvirt-45"
++  "id": "libvirt-41"
 +}
 +
 +{
 +  "execute": "query-tpm-types",
-+  "id": "libvirt-46"
++  "id": "libvirt-42"
 +}
 +
 +{
@@ -6376,12 +16135,12 @@ index 0000000000..ab0ac1e7bf
 +    "passthrough",
 +    "emulator"
 +  ],
-+  "id": "libvirt-46"
++  "id": "libvirt-42"
 +}
 +
 +{
 +  "execute": "query-command-line-options",
-+  "id": "libvirt-47"
++  "id": "libvirt-43"
 +}
 +
 +{
@@ -6424,6 +16183,10 @@ index 0000000000..ab0ac1e7bf
 +    {
 +      "parameters": [
 +        {
++          "name": "audiodev",
++          "type": "string"
++        },
++        {
 +          "name": "non-adaptive",
 +          "type": "boolean"
 +        },
@@ -6664,6 +16427,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "string"
 +        },
 +        {
++          "name": "multidevs",
++          "type": "string"
++        },
++        {
 +          "name": "readonly",
 +          "type": "boolean"
 +        },
@@ -6804,6 +16571,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "string"
 +        },
 +        {
++          "name": "multidevs",
++          "type": "string"
++        },
++        {
 +          "name": "readonly",
 +          "type": "boolean"
 +        },
@@ -7039,6 +16810,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "number"
 +        },
 +        {
++          "name": "dies",
++          "type": "number"
++        },
++        {
 +          "name": "sockets",
 +          "type": "number"
 +        },
@@ -7068,16 +16843,6 @@ index 0000000000..ab0ac1e7bf
 +    },
 +    {
 +      "parameters": [
-+        {
-+          "name": "thread",
-+          "help": "Enable/disable multi-threaded TCG",
-+          "type": "string"
-+        },
-+        {
-+          "name": "accel",
-+          "help": "Select the type of accelerator",
-+          "type": "string"
-+        }
 +      ],
 +      "option": "accel"
 +    },
@@ -7604,7 +17369,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "aio",
-+          "help": "host AIO implementation (threads, native)",
++          "help": "host AIO implementation (threads, native, io_uring)",
 +          "type": "string"
 +        },
 +        {
@@ -7651,12 +17416,12 @@ index 0000000000..ab0ac1e7bf
 +      "option": "drive"
 +    }
 +  ],
-+  "id": "libvirt-47"
++  "id": "libvirt-43"
 +}
 +
 +{
 +  "execute": "query-migrate-capabilities",
-+  "id": "libvirt-48"
++  "id": "libvirt-44"
 +}
 +
 +{
@@ -7728,14 +17493,18 @@ index 0000000000..ab0ac1e7bf
 +    {
 +      "state": false,
 +      "capability": "x-ignore-shared"
++    },
++    {
++      "state": false,
++      "capability": "validate-uuid"
 +    }
 +  ],
-+  "id": "libvirt-48"
++  "id": "libvirt-44"
 +}
 +
 +{
 +  "execute": "query-qmp-schema",
-+  "id": "libvirt-49"
++  "id": "libvirt-45"
 +}
 +
 +{
@@ -7803,73 +17572,89 @@ index 0000000000..ab0ac1e7bf
 +      "arg-type": "6"
 +    },
 +    {
-+      "name": "JOB_STATUS_CHANGE",
++      "name": "GUEST_CRASHLOADED",
 +      "meta-type": "event",
 +      "arg-type": "7"
 +    },
 +    {
-+      "name": "job-pause",
-+      "ret-type": "0",
++      "name": "query-pr-managers",
++      "ret-type": "[8]",
 +      "meta-type": "command",
-+      "arg-type": "8"
++      "arg-type": "0"
 +    },
 +    {
-+      "name": "job-resume",
++      "name": "eject",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "9"
 +    },
 +    {
-+      "name": "job-cancel",
++      "name": "blockdev-open-tray",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "10"
 +    },
 +    {
-+      "name": "job-complete",
++      "name": "blockdev-close-tray",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "11"
 +    },
 +    {
-+      "name": "job-dismiss",
++      "name": "blockdev-remove-medium",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "12"
 +    },
 +    {
-+      "name": "job-finalize",
++      "name": "blockdev-insert-medium",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "13"
 +    },
 +    {
-+      "name": "query-jobs",
-+      "ret-type": "[14]",
++      "name": "blockdev-change-medium",
++      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "14"
++    },
++    {
++      "name": "DEVICE_TRAY_MOVED",
++      "meta-type": "event",
++      "arg-type": "15"
++    },
++    {
++      "name": "PR_MANAGER_STATUS_CHANGED",
++      "meta-type": "event",
++      "arg-type": "16"
++    },
++    {
++      "name": "block_set_io_throttle",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "17"
 +    },
 +    {
 +      "name": "block-latency-histogram-set",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "15"
++      "arg-type": "18"
 +    },
 +    {
 +      "name": "query-block",
-+      "ret-type": "[16]",
++      "ret-type": "[19]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-blockstats",
-+      "ret-type": "[18]",
++      "ret-type": "[21]",
 +      "meta-type": "command",
-+      "arg-type": "17"
++      "arg-type": "20"
 +    },
 +    {
 +      "name": "query-block-jobs",
-+      "ret-type": "[19]",
++      "ret-type": "[22]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -7877,59 +17662,62 @@ index 0000000000..ab0ac1e7bf
 +      "name": "block_passwd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "20"
++      "arg-type": "23"
 +    },
 +    {
 +      "name": "block_resize",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "21"
++      "arg-type": "24"
 +    },
 +    {
 +      "name": "blockdev-snapshot-sync",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "22"
++      "arg-type": "25"
 +    },
 +    {
 +      "name": "blockdev-snapshot",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "23"
++      "arg-type": "26",
++      "features": [
++        "allow-write-only-overlay"
++      ]
 +    },
 +    {
 +      "name": "change-backing-file",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "24"
++      "arg-type": "27"
 +    },
 +    {
 +      "name": "block-commit",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "25"
++      "arg-type": "28"
 +    },
 +    {
 +      "name": "drive-backup",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "26"
++      "arg-type": "29"
 +    },
 +    {
 +      "name": "blockdev-backup",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "27"
++      "arg-type": "30"
 +    },
 +    {
 +      "name": "query-named-block-nodes",
-+      "ret-type": "[28]",
++      "ret-type": "[32]",
 +      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "31"
 +    },
 +    {
 +      "name": "x-debug-query-block-graph",
-+      "ret-type": "29",
++      "ret-type": "33",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -7937,263 +17725,203 @@ index 0000000000..ab0ac1e7bf
 +      "name": "drive-mirror",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "30"
++      "arg-type": "34"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-add",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "31"
++      "arg-type": "35"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-remove",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "32"
++      "arg-type": "36"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-clear",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "32"
++      "arg-type": "36"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-enable",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "32"
++      "arg-type": "36"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-disable",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "32"
++      "arg-type": "36"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-merge",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "33"
++      "arg-type": "37"
 +    },
 +    {
 +      "name": "x-debug-block-dirty-bitmap-sha256",
-+      "ret-type": "34",
++      "ret-type": "38",
 +      "meta-type": "command",
-+      "arg-type": "32"
++      "arg-type": "36"
 +    },
 +    {
 +      "name": "blockdev-mirror",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "35"
-+    },
-+    {
-+      "name": "block_set_io_throttle",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "36"
++      "arg-type": "39"
 +    },
 +    {
 +      "name": "block-stream",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "37"
++      "arg-type": "40"
 +    },
 +    {
 +      "name": "block-job-set-speed",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "38"
++      "arg-type": "41"
 +    },
 +    {
 +      "name": "block-job-cancel",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "39"
++      "arg-type": "42"
 +    },
 +    {
 +      "name": "block-job-pause",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "40"
++      "arg-type": "43"
 +    },
 +    {
 +      "name": "block-job-resume",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "41"
++      "arg-type": "44"
 +    },
 +    {
 +      "name": "block-job-complete",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "42"
++      "arg-type": "45"
 +    },
 +    {
 +      "name": "block-job-dismiss",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "43"
++      "arg-type": "46"
 +    },
 +    {
 +      "name": "block-job-finalize",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "44"
++      "arg-type": "47"
 +    },
 +    {
 +      "name": "blockdev-add",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "45"
++      "arg-type": "48"
 +    },
 +    {
 +      "name": "x-blockdev-reopen",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "45"
++      "arg-type": "48"
 +    },
 +    {
 +      "name": "blockdev-del",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "46"
++      "arg-type": "49"
 +    },
 +    {
 +      "name": "blockdev-create",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "47"
-+    },
-+    {
-+      "name": "blockdev-open-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "48"
-+    },
-+    {
-+      "name": "blockdev-close-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "49"
-+    },
-+    {
-+      "name": "blockdev-remove-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
 +      "arg-type": "50"
 +    },
 +    {
-+      "name": "blockdev-insert-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "51"
-+    },
-+    {
-+      "name": "blockdev-change-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "52"
-+    },
-+    {
 +      "name": "BLOCK_IMAGE_CORRUPTED",
 +      "meta-type": "event",
-+      "arg-type": "53"
++      "arg-type": "51"
 +    },
 +    {
 +      "name": "BLOCK_IO_ERROR",
 +      "meta-type": "event",
-+      "arg-type": "54"
++      "arg-type": "52"
 +    },
 +    {
 +      "name": "BLOCK_JOB_COMPLETED",
 +      "meta-type": "event",
-+      "arg-type": "55"
++      "arg-type": "53"
 +    },
 +    {
 +      "name": "BLOCK_JOB_CANCELLED",
 +      "meta-type": "event",
-+      "arg-type": "56"
++      "arg-type": "54"
 +    },
 +    {
 +      "name": "BLOCK_JOB_ERROR",
 +      "meta-type": "event",
-+      "arg-type": "57"
++      "arg-type": "55"
 +    },
 +    {
 +      "name": "BLOCK_JOB_READY",
 +      "meta-type": "event",
-+      "arg-type": "58"
++      "arg-type": "56"
 +    },
 +    {
 +      "name": "BLOCK_JOB_PENDING",
 +      "meta-type": "event",
-+      "arg-type": "59"
++      "arg-type": "57"
 +    },
 +    {
 +      "name": "BLOCK_WRITE_THRESHOLD",
 +      "meta-type": "event",
-+      "arg-type": "60"
++      "arg-type": "58"
 +    },
 +    {
 +      "name": "block-set-write-threshold",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "61"
++      "arg-type": "59"
 +    },
 +    {
 +      "name": "x-blockdev-change",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "62"
++      "arg-type": "60"
 +    },
 +    {
 +      "name": "x-blockdev-set-iothread",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "63"
-+    },
-+    {
-+      "name": "query-pr-managers",
-+      "ret-type": "[64]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "65"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync",
-+      "ret-type": "67",
-+      "meta-type": "command",
-+      "arg-type": "66"
-+    },
-+    {
-+      "name": "eject",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "68"
++      "arg-type": "61"
 +    },
 +    {
 +      "name": "nbd-server-start",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "69"
++      "arg-type": "62"
 +    },
 +    {
 +      "name": "nbd-server-add",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "70"
++      "arg-type": "63"
 +    },
 +    {
 +      "name": "nbd-server-remove",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "71"
++      "arg-type": "64"
 +    },
 +    {
 +      "name": "nbd-server-stop",
@@ -8202,34 +17930,83 @@ index 0000000000..ab0ac1e7bf
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "DEVICE_TRAY_MOVED",
-+      "meta-type": "event",
-+      "arg-type": "72"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "73"
-+    },
-+    {
 +      "name": "QUORUM_FAILURE",
 +      "meta-type": "event",
-+      "arg-type": "74"
++      "arg-type": "65"
 +    },
 +    {
 +      "name": "QUORUM_REPORT_BAD",
 +      "meta-type": "event",
++      "arg-type": "66"
++    },
++    {
++      "name": "blockdev-snapshot-internal-sync",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "67"
++    },
++    {
++      "name": "blockdev-snapshot-delete-internal-sync",
++      "ret-type": "69",
++      "meta-type": "command",
++      "arg-type": "68"
++    },
++    {
++      "name": "JOB_STATUS_CHANGE",
++      "meta-type": "event",
++      "arg-type": "70"
++    },
++    {
++      "name": "job-pause",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "71"
++    },
++    {
++      "name": "job-resume",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "72"
++    },
++    {
++      "name": "job-cancel",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "73"
++    },
++    {
++      "name": "job-complete",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "74"
++    },
++    {
++      "name": "job-dismiss",
++      "ret-type": "0",
++      "meta-type": "command",
 +      "arg-type": "75"
 +    },
 +    {
++      "name": "job-finalize",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "76"
++    },
++    {
++      "name": "query-jobs",
++      "ret-type": "[77]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
 +      "name": "query-chardev",
-+      "ret-type": "[76]",
++      "ret-type": "[78]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-chardev-backends",
-+      "ret-type": "[77]",
++      "ret-type": "[79]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8237,122 +18014,150 @@ index 0000000000..ab0ac1e7bf
 +      "name": "ringbuf-write",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "78"
++      "arg-type": "80"
 +    },
 +    {
 +      "name": "ringbuf-read",
 +      "ret-type": "str",
 +      "meta-type": "command",
-+      "arg-type": "79"
++      "arg-type": "81"
 +    },
 +    {
 +      "name": "chardev-add",
-+      "ret-type": "81",
++      "ret-type": "83",
 +      "meta-type": "command",
-+      "arg-type": "80"
++      "arg-type": "82"
 +    },
 +    {
 +      "name": "chardev-change",
-+      "ret-type": "81",
++      "ret-type": "83",
 +      "meta-type": "command",
-+      "arg-type": "82"
++      "arg-type": "84"
 +    },
 +    {
 +      "name": "chardev-remove",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "83"
++      "arg-type": "85"
 +    },
 +    {
 +      "name": "chardev-send-break",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "84"
++      "arg-type": "86"
 +    },
 +    {
 +      "name": "VSERPORT_CHANGE",
 +      "meta-type": "event",
-+      "arg-type": "85"
-+    },
-+    {
-+      "name": "set_link",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "86"
-+    },
-+    {
-+      "name": "netdev_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
 +      "arg-type": "87"
 +    },
 +    {
-+      "name": "netdev_del",
++      "name": "dump-guest-memory",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "88"
 +    },
 +    {
-+      "name": "query-rx-filter",
-+      "ret-type": "[90]",
++      "name": "query-dump",
++      "ret-type": "89",
 +      "meta-type": "command",
-+      "arg-type": "89"
++      "arg-type": "0"
 +    },
 +    {
-+      "name": "NIC_RX_FILTER_CHANGED",
++      "name": "DUMP_COMPLETED",
 +      "meta-type": "event",
-+      "arg-type": "91"
++      "arg-type": "90"
 +    },
 +    {
-+      "name": "announce-self",
++      "name": "query-dump-guest-memory-capability",
++      "ret-type": "91",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "set_link",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "92"
 +    },
 +    {
-+      "name": "RDMA_GID_STATUS_CHANGED",
-+      "meta-type": "event",
++      "name": "netdev_add",
++      "ret-type": "0",
++      "meta-type": "command",
 +      "arg-type": "93"
 +    },
 +    {
-+      "name": "query-rocker",
-+      "ret-type": "95",
++      "name": "netdev_del",
++      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "94"
 +    },
 +    {
-+      "name": "query-rocker-ports",
-+      "ret-type": "[97]",
++      "name": "query-rx-filter",
++      "ret-type": "[96]",
 +      "meta-type": "command",
-+      "arg-type": "96"
++      "arg-type": "95"
 +    },
 +    {
-+      "name": "query-rocker-of-dpa-flows",
-+      "ret-type": "[99]",
++      "name": "NIC_RX_FILTER_CHANGED",
++      "meta-type": "event",
++      "arg-type": "97"
++    },
++    {
++      "name": "announce-self",
++      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "98"
 +    },
 +    {
-+      "name": "query-rocker-of-dpa-groups",
-+      "ret-type": "[101]",
-+      "meta-type": "command",
++      "name": "FAILOVER_NEGOTIATED",
++      "meta-type": "event",
++      "arg-type": "99"
++    },
++    {
++      "name": "RDMA_GID_STATUS_CHANGED",
++      "meta-type": "event",
 +      "arg-type": "100"
 +    },
 +    {
++      "name": "query-rocker",
++      "ret-type": "102",
++      "meta-type": "command",
++      "arg-type": "101"
++    },
++    {
++      "name": "query-rocker-ports",
++      "ret-type": "[104]",
++      "meta-type": "command",
++      "arg-type": "103"
++    },
++    {
++      "name": "query-rocker-of-dpa-flows",
++      "ret-type": "[106]",
++      "meta-type": "command",
++      "arg-type": "105"
++    },
++    {
++      "name": "query-rocker-of-dpa-groups",
++      "ret-type": "[108]",
++      "meta-type": "command",
++      "arg-type": "107"
++    },
++    {
 +      "name": "query-tpm-models",
-+      "ret-type": "[102]",
++      "ret-type": "[109]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-tpm-types",
-+      "ret-type": "[103]",
++      "ret-type": "[110]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-tpm",
-+      "ret-type": "[104]",
++      "ret-type": "[111]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8360,40 +18165,40 @@ index 0000000000..ab0ac1e7bf
 +      "name": "set_password",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "105"
++      "arg-type": "112"
 +    },
 +    {
 +      "name": "expire_password",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "106"
++      "arg-type": "113"
 +    },
 +    {
 +      "name": "screendump",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "107"
++      "arg-type": "114"
 +    },
 +    {
 +      "name": "query-spice",
-+      "ret-type": "108",
++      "ret-type": "115",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "SPICE_CONNECTED",
 +      "meta-type": "event",
-+      "arg-type": "109"
++      "arg-type": "116"
 +    },
 +    {
 +      "name": "SPICE_INITIALIZED",
 +      "meta-type": "event",
-+      "arg-type": "110"
++      "arg-type": "117"
 +    },
 +    {
 +      "name": "SPICE_DISCONNECTED",
 +      "meta-type": "event",
-+      "arg-type": "111"
++      "arg-type": "118"
 +    },
 +    {
 +      "name": "SPICE_MIGRATE_COMPLETED",
@@ -8402,13 +18207,13 @@ index 0000000000..ab0ac1e7bf
 +    },
 +    {
 +      "name": "query-vnc",
-+      "ret-type": "112",
++      "ret-type": "119",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-vnc-servers",
-+      "ret-type": "[113]",
++      "ret-type": "[120]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8416,26 +18221,26 @@ index 0000000000..ab0ac1e7bf
 +      "name": "change-vnc-password",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "114"
++      "arg-type": "121"
 +    },
 +    {
 +      "name": "VNC_CONNECTED",
 +      "meta-type": "event",
-+      "arg-type": "115"
++      "arg-type": "122"
 +    },
 +    {
 +      "name": "VNC_INITIALIZED",
 +      "meta-type": "event",
-+      "arg-type": "116"
++      "arg-type": "123"
 +    },
 +    {
 +      "name": "VNC_DISCONNECTED",
 +      "meta-type": "event",
-+      "arg-type": "117"
++      "arg-type": "124"
 +    },
 +    {
 +      "name": "query-mice",
-+      "ret-type": "[118]",
++      "ret-type": "[125]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8443,23 +18248,23 @@ index 0000000000..ab0ac1e7bf
 +      "name": "send-key",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "119"
++      "arg-type": "126"
 +    },
 +    {
 +      "name": "input-send-event",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "120"
++      "arg-type": "127"
 +    },
 +    {
 +      "name": "query-display-options",
-+      "ret-type": "121",
++      "ret-type": "128",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-migrate",
-+      "ret-type": "122",
++      "ret-type": "129",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8467,11 +18272,11 @@ index 0000000000..ab0ac1e7bf
 +      "name": "migrate-set-capabilities",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "123"
++      "arg-type": "130"
 +    },
 +    {
 +      "name": "query-migrate-capabilities",
-+      "ret-type": "[124]",
++      "ret-type": "[131]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8479,11 +18284,11 @@ index 0000000000..ab0ac1e7bf
 +      "name": "migrate-set-parameters",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "125"
++      "arg-type": "132"
 +    },
 +    {
 +      "name": "query-migrate-parameters",
-+      "ret-type": "126",
++      "ret-type": "133",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8491,7 +18296,7 @@ index 0000000000..ab0ac1e7bf
 +      "name": "client_migrate_info",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "127"
++      "arg-type": "134"
 +    },
 +    {
 +      "name": "migrate-start-postcopy",
@@ -8502,17 +18307,17 @@ index 0000000000..ab0ac1e7bf
 +    {
 +      "name": "MIGRATION",
 +      "meta-type": "event",
-+      "arg-type": "128"
++      "arg-type": "135"
 +    },
 +    {
 +      "name": "MIGRATION_PASS",
 +      "meta-type": "event",
-+      "arg-type": "129"
++      "arg-type": "136"
 +    },
 +    {
 +      "name": "COLO_EXIT",
 +      "meta-type": "event",
-+      "arg-type": "130"
++      "arg-type": "137"
 +    },
 +    {
 +      "name": "x-colo-lost-heartbeat",
@@ -8530,59 +18335,71 @@ index 0000000000..ab0ac1e7bf
 +      "name": "migrate-continue",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "131"
++      "arg-type": "138"
 +    },
 +    {
 +      "name": "migrate_set_downtime",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "132"
++      "arg-type": "139",
++      "features": [
++        "deprecated"
++      ]
 +    },
 +    {
 +      "name": "migrate_set_speed",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "133"
++      "arg-type": "140",
++      "features": [
++        "deprecated"
++      ]
 +    },
 +    {
 +      "name": "migrate-set-cache-size",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "134"
++      "arg-type": "141",
++      "features": [
++        "deprecated"
++      ]
 +    },
 +    {
 +      "name": "query-migrate-cache-size",
 +      "ret-type": "int",
 +      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "0",
++      "features": [
++        "deprecated"
++      ]
 +    },
 +    {
 +      "name": "migrate",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "135"
++      "arg-type": "142"
 +    },
 +    {
 +      "name": "migrate-incoming",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "136"
++      "arg-type": "143"
 +    },
 +    {
 +      "name": "xen-save-devices-state",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "137"
++      "arg-type": "144"
 +    },
 +    {
 +      "name": "xen-set-replication",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "138"
++      "arg-type": "145"
 +    },
 +    {
 +      "name": "query-xen-replication-status",
-+      "ret-type": "139",
++      "ret-type": "146",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8594,7 +18411,7 @@ index 0000000000..ab0ac1e7bf
 +    },
 +    {
 +      "name": "query-colo-status",
-+      "ret-type": "140",
++      "ret-type": "147",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8603,7 +18420,7 @@ index 0000000000..ab0ac1e7bf
 +      "ret-type": "0",
 +      "allow-oob": true,
 +      "meta-type": "command",
-+      "arg-type": "141"
++      "arg-type": "148"
 +    },
 +    {
 +      "name": "migrate-pause",
@@ -8613,44 +18430,201 @@ index 0000000000..ab0ac1e7bf
 +      "arg-type": "0"
 +    },
 +    {
++      "name": "UNPLUG_PRIMARY",
++      "meta-type": "event",
++      "arg-type": "149"
++    },
++    {
 +      "name": "transaction",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "142"
++      "arg-type": "150"
 +    },
 +    {
 +      "name": "trace-event-get-state",
-+      "ret-type": "[144]",
++      "ret-type": "[152]",
 +      "meta-type": "command",
-+      "arg-type": "143"
++      "arg-type": "151"
 +    },
 +    {
 +      "name": "trace-event-set-state",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "145"
-+    },
-+    {
-+      "name": "query-qmp-schema",
-+      "ret-type": "[146]",
-+      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "153"
 +    },
 +    {
 +      "name": "qmp_capabilities",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "147"
++      "arg-type": "154"
 +    },
 +    {
 +      "name": "query-version",
-+      "ret-type": "148",
++      "ret-type": "155",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-commands",
-+      "ret-type": "[149]",
++      "ret-type": "[156]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-events",
++      "ret-type": "[157]",
++      "meta-type": "command",
++      "arg-type": "0",
++      "features": [
++        "deprecated"
++      ]
++    },
++    {
++      "name": "quit",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-qmp-schema",
++      "ret-type": "[158]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "qom-list",
++      "ret-type": "[160]",
++      "meta-type": "command",
++      "arg-type": "159"
++    },
++    {
++      "name": "qom-get",
++      "ret-type": "any",
++      "meta-type": "command",
++      "arg-type": "161"
++    },
++    {
++      "name": "qom-set",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "162"
++    },
++    {
++      "name": "qom-list-types",
++      "ret-type": "[164]",
++      "meta-type": "command",
++      "arg-type": "163"
++    },
++    {
++      "name": "qom-list-properties",
++      "ret-type": "[160]",
++      "meta-type": "command",
++      "arg-type": "165"
++    },
++    {
++      "name": "object-add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "166"
++    },
++    {
++      "name": "object-del",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "167"
++    },
++    {
++      "name": "device-list-properties",
++      "ret-type": "[160]",
++      "meta-type": "command",
++      "arg-type": "168"
++    },
++    {
++      "name": "device_add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "169"
++    },
++    {
++      "name": "device_del",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "170"
++    },
++    {
++      "name": "DEVICE_DELETED",
++      "meta-type": "event",
++      "arg-type": "171"
++    },
++    {
++      "name": "query-cpus",
++      "ret-type": "[172]",
++      "meta-type": "command",
++      "arg-type": "0",
++      "features": [
++        "deprecated"
++      ]
++    },
++    {
++      "name": "query-cpus-fast",
++      "ret-type": "[173]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "cpu-add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "174",
++      "features": [
++        "deprecated"
++      ]
++    },
++    {
++      "name": "query-machines",
++      "ret-type": "[175]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-current-machine",
++      "ret-type": "176",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-target",
++      "ret-type": "177",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-memdev",
++      "ret-type": "[178]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-hotpluggable-cpus",
++      "ret-type": "[179]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "set-numa-node",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "180"
++    },
++    {
++      "name": "query-cpu-model-expansion",
++      "ret-type": "186",
++      "meta-type": "command",
++      "arg-type": "185"
++    },
++    {
++      "name": "query-cpu-definitions",
++      "ret-type": "[187]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8658,70 +18632,46 @@ index 0000000000..ab0ac1e7bf
 +      "name": "add_client",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "150"
++      "arg-type": "188"
 +    },
 +    {
 +      "name": "query-name",
-+      "ret-type": "151",
++      "ret-type": "189",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-kvm",
-+      "ret-type": "152",
++      "ret-type": "190",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-uuid",
-+      "ret-type": "153",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-events",
-+      "ret-type": "[154]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpus",
-+      "ret-type": "[155]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpus-fast",
-+      "ret-type": "[156]",
++      "ret-type": "191",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-iothreads",
-+      "ret-type": "[157]",
++      "ret-type": "[192]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-balloon",
-+      "ret-type": "158",
++      "ret-type": "193",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "BALLOON_CHANGE",
 +      "meta-type": "event",
-+      "arg-type": "159"
++      "arg-type": "194"
 +    },
 +    {
 +      "name": "query-pci",
-+      "ret-type": "[160]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "quit",
-+      "ret-type": "0",
++      "ret-type": "[195]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -8744,22 +18694,16 @@ index 0000000000..ab0ac1e7bf
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "cpu-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "161"
-+    },
-+    {
 +      "name": "memsave",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "162"
++      "arg-type": "196"
 +    },
 +    {
 +      "name": "pmemsave",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "163"
++      "arg-type": "197"
 +    },
 +    {
 +      "name": "cont",
@@ -8789,230 +18733,112 @@ index 0000000000..ab0ac1e7bf
 +      "name": "balloon",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "164"
++      "arg-type": "198"
 +    },
 +    {
 +      "name": "human-monitor-command",
 +      "ret-type": "str",
 +      "meta-type": "command",
-+      "arg-type": "165"
-+    },
-+    {
-+      "name": "qom-list",
-+      "ret-type": "[167]",
-+      "meta-type": "command",
-+      "arg-type": "166"
-+    },
-+    {
-+      "name": "qom-get",
-+      "ret-type": "any",
-+      "meta-type": "command",
-+      "arg-type": "168"
-+    },
-+    {
-+      "name": "qom-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "169"
++      "arg-type": "199",
++      "features": [
++        "savevm-monitor-nodes"
++      ]
 +    },
 +    {
 +      "name": "change",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "170"
-+    },
-+    {
-+      "name": "qom-list-types",
-+      "ret-type": "[172]",
-+      "meta-type": "command",
-+      "arg-type": "171"
-+    },
-+    {
-+      "name": "device-list-properties",
-+      "ret-type": "[167]",
-+      "meta-type": "command",
-+      "arg-type": "173"
-+    },
-+    {
-+      "name": "qom-list-properties",
-+      "ret-type": "[167]",
-+      "meta-type": "command",
-+      "arg-type": "174"
++      "arg-type": "200",
++      "features": [
++        "deprecated"
++      ]
 +    },
 +    {
 +      "name": "xen-set-global-dirty-log",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "175"
-+    },
-+    {
-+      "name": "device_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "176"
-+    },
-+    {
-+      "name": "device_del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "177"
-+    },
-+    {
-+      "name": "DEVICE_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "178"
-+    },
-+    {
-+      "name": "dump-guest-memory",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "179"
-+    },
-+    {
-+      "name": "query-dump",
-+      "ret-type": "180",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "181"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability",
-+      "ret-type": "182",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "object-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "183"
-+    },
-+    {
-+      "name": "object-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "184"
++      "arg-type": "201"
 +    },
 +    {
 +      "name": "getfd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "185"
++      "arg-type": "202"
 +    },
 +    {
 +      "name": "closefd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "186"
-+    },
-+    {
-+      "name": "query-machines",
-+      "ret-type": "[187]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-current-machine",
-+      "ret-type": "188",
-+      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "203"
 +    },
 +    {
 +      "name": "query-memory-size-summary",
-+      "ret-type": "189",
++      "ret-type": "204",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "add-fd",
-+      "ret-type": "191",
++      "ret-type": "206",
 +      "meta-type": "command",
-+      "arg-type": "190"
++      "arg-type": "205"
 +    },
 +    {
 +      "name": "remove-fd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "192"
++      "arg-type": "207"
 +    },
 +    {
 +      "name": "query-fdsets",
-+      "ret-type": "[193]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-target",
-+      "ret-type": "194",
++      "ret-type": "[208]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-command-line-options",
-+      "ret-type": "[196]",
++      "ret-type": "[210]",
 +      "meta-type": "command",
-+      "arg-type": "195"
-+    },
-+    {
-+      "name": "query-memdev",
-+      "ret-type": "[197]",
-+      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "209"
 +    },
 +    {
 +      "name": "query-memory-devices",
-+      "ret-type": "[198]",
++      "ret-type": "[211]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "MEM_UNPLUG_ERROR",
 +      "meta-type": "event",
-+      "arg-type": "199"
++      "arg-type": "212"
 +    },
 +    {
 +      "name": "query-acpi-ospm-status",
-+      "ret-type": "[200]",
++      "ret-type": "[213]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "ACPI_DEVICE_OST",
 +      "meta-type": "event",
-+      "arg-type": "201"
++      "arg-type": "214"
 +    },
 +    {
 +      "name": "xen-load-devices-state",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "202"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus",
-+      "ret-type": "[203]",
-+      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "215"
 +    },
 +    {
 +      "name": "query-vm-generation-id",
-+      "ret-type": "204",
++      "ret-type": "216",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "set-numa-node",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "205"
-+    },
-+    {
 +      "name": "RTC_CHANGE",
 +      "meta-type": "event",
-+      "arg-type": "206"
++      "arg-type": "217"
 +    },
 +    {
 +      "name": "rtc-reset-reinjection",
@@ -9022,31 +18848,19 @@ index 0000000000..ab0ac1e7bf
 +    },
 +    {
 +      "name": "query-sev",
-+      "ret-type": "207",
++      "ret-type": "218",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-sev-launch-measure",
-+      "ret-type": "208",
++      "ret-type": "219",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-sev-capabilities",
-+      "ret-type": "209",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion",
-+      "ret-type": "217",
-+      "meta-type": "command",
-+      "arg-type": "216"
-+    },
-+    {
-+      "name": "query-cpu-definitions",
-+      "ret-type": "[218]",
++      "ret-type": "220",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -9069,7 +18883,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "status",
-+          "type": "219"
++          "type": "223"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9083,7 +18897,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "reason",
-+          "type": "220"
++          "type": "224"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9097,7 +18911,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "reason",
-+          "type": "220"
++          "type": "224"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9107,7 +18921,7 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "action",
-+          "type": "221"
++          "type": "225"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9117,7 +18931,7 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "action",
-+          "type": "221"
++          "type": "225"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9127,12 +18941,12 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "action",
-+          "type": "222"
++          "type": "226"
 +        },
 +        {
 +          "name": "info",
 +          "default": null,
-+          "type": "223"
++          "type": "227"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9141,22 +18955,32 @@ index 0000000000..ab0ac1e7bf
 +      "name": "7",
 +      "members": [
 +        {
-+          "name": "id",
-+          "type": "str"
++          "name": "action",
++          "type": "226"
 +        },
 +        {
-+          "name": "status",
-+          "type": "224"
++          "name": "info",
++          "default": null,
++          "type": "227"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
++      "name": "[8]",
++      "element-type": "8",
++      "meta-type": "array"
++    },
++    {
 +      "name": "8",
 +      "members": [
 +        {
 +          "name": "id",
 +          "type": "str"
++        },
++        {
++          "name": "connected",
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9165,8 +18989,22 @@ index 0000000000..ab0ac1e7bf
 +      "name": "9",
 +      "members": [
 +        {
++          "name": "device",
++          "default": null,
++          "type": "str",
++          "features": [
++            "deprecated"
++          ]
++        },
++        {
 +          "name": "id",
++          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "force",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9175,8 +19013,22 @@ index 0000000000..ab0ac1e7bf
 +      "name": "10",
 +      "members": [
 +        {
++          "name": "device",
++          "default": null,
++          "type": "str",
++          "features": [
++            "deprecated"
++          ]
++        },
++        {
 +          "name": "id",
++          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "force",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -9185,7 +19037,16 @@ index 0000000000..ab0ac1e7bf
 +      "name": "11",
 +      "members": [
 +        {
++          "name": "device",
++          "default": null,
++          "type": "str",
++          "features": [
++            "deprecated"
++          ]
++        },
++        {
 +          "name": "id",
++          "default": null,
 +          "type": "str"
 +        }
 +      ],
@@ -9207,40 +19068,186 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "id",
 +          "type": "str"
++        },
++        {
++          "name": "node-name",
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[14]",
-+      "element-type": "14",
-+      "meta-type": "array"
++      "name": "14",
++      "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": "read-only-mode",
++          "default": null,
++          "type": "228"
++        }
++      ],
++      "meta-type": "object"
 +    },
 +    {
-+      "name": "14",
++      "name": "15",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "tray-open",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "16",
 +      "members": [
 +        {
 +          "name": "id",
 +          "type": "str"
 +        },
 +        {
-+          "name": "type",
-+          "type": "225"
++          "name": "connected",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "17",
++      "members": [
++        {
++          "name": "device",
++          "default": null,
++          "type": "str",
++          "features": [
++            "deprecated"
++          ]
 +        },
 +        {
-+          "name": "status",
-+          "type": "224"
++          "name": "id",
++          "default": null,
++          "type": "str"
 +        },
 +        {
-+          "name": "current-progress",
++          "name": "bps",
 +          "type": "int"
 +        },
 +        {
-+          "name": "total-progress",
++          "name": "bps_rd",
 +          "type": "int"
 +        },
 +        {
-+          "name": "error",
++          "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"
 +        }
@@ -9248,7 +19255,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "15",
++      "name": "18",
 +      "members": [
 +        {
 +          "name": "id",
@@ -9278,12 +19285,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[16]",
-+      "element-type": "16",
++      "name": "[19]",
++      "element-type": "19",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "16",
++      "name": "19",
 +      "members": [
 +        {
 +          "name": "device",
@@ -9309,7 +19316,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "inserted",
 +          "default": null,
-+          "type": "28"
++          "type": "32"
 +        },
 +        {
 +          "name": "tray_open",
@@ -9319,18 +19326,21 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "io-status",
 +          "default": null,
-+          "type": "226"
++          "type": "229"
 +        },
 +        {
 +          "name": "dirty-bitmaps",
 +          "default": null,
-+          "type": "[227]"
++          "type": "[230]",
++          "features": [
++            "deprecated"
++          ]
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "17",
++      "name": "20",
 +      "members": [
 +        {
 +          "name": "query-nodes",
@@ -9341,12 +19351,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[18]",
-+      "element-type": "18",
++      "name": "[21]",
++      "element-type": "21",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "18",
++      "name": "21",
 +      "members": [
 +        {
 +          "name": "device",
@@ -9365,28 +19375,33 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "stats",
-+          "type": "228"
++          "type": "231"
++        },
++        {
++          "name": "driver-specific",
++          "default": null,
++          "type": "232"
 +        },
 +        {
 +          "name": "parent",
 +          "default": null,
-+          "type": "18"
++          "type": "21"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "18"
++          "type": "21"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[19]",
-+      "element-type": "19",
++      "name": "[22]",
++      "element-type": "22",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "19",
++      "name": "22",
 +      "members": [
 +        {
 +          "name": "type",
@@ -9418,7 +19433,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "io-status",
-+          "type": "226"
++          "type": "229"
 +        },
 +        {
 +          "name": "ready",
@@ -9426,7 +19441,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "status",
-+          "type": "224"
++          "type": "233"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -9445,7 +19460,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "20",
++      "name": "23",
 +      "members": [
 +        {
 +          "name": "device",
@@ -9465,7 +19480,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "21",
++      "name": "24",
 +      "members": [
 +        {
 +          "name": "device",
@@ -9485,7 +19500,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "22",
++      "name": "25",
 +      "members": [
 +        {
 +          "name": "device",
@@ -9514,13 +19529,13 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "mode",
 +          "default": null,
-+          "type": "229"
++          "type": "234"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "23",
++      "name": "26",
 +      "members": [
 +        {
 +          "name": "node",
@@ -9534,7 +19549,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "24",
++      "name": "27",
 +      "members": [
 +        {
 +          "name": "device",
@@ -9552,7 +19567,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "25",
++      "name": "28",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -9571,7 +19586,10 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "base",
 +          "default": null,
-+          "type": "str"
++          "type": "str",
++          "features": [
++            "deprecated"
++          ]
 +        },
 +        {
 +          "name": "top-node",
@@ -9581,7 +19599,10 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "top",
 +          "default": null,
-+          "type": "str"
++          "type": "str",
++          "features": [
++            "deprecated"
++          ]
 +        },
 +        {
 +          "name": "backing-file",
@@ -9594,6 +19615,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "on-error",
++          "default": null,
++          "type": "235"
++        },
++        {
 +          "name": "filter-node-name",
 +          "default": null,
 +          "type": "str"
@@ -9612,7 +19638,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "26",
++      "name": "29",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -9624,6 +19650,55 @@ index 0000000000..ab0ac1e7bf
 +          "type": "str"
 +        },
 +        {
++          "name": "sync",
++          "type": "236"
++        },
++        {
++          "name": "speed",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "bitmap",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "bitmap-mode",
++          "default": null,
++          "type": "237"
++        },
++        {
++          "name": "compress",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "on-source-error",
++          "default": null,
++          "type": "235"
++        },
++        {
++          "name": "on-target-error",
++          "default": null,
++          "type": "235"
++        },
++        {
++          "name": "auto-finalize",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "auto-dismiss",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "filter-node-name",
++          "default": null,
++          "type": "str"
++        },
++        {
 +          "name": "target",
 +          "type": "str"
 +        },
@@ -9633,54 +19708,15 @@ index 0000000000..ab0ac1e7bf
 +          "type": "str"
 +        },
 +        {
-+          "name": "sync",
-+          "type": "230"
-+        },
-+        {
 +          "name": "mode",
 +          "default": null,
-+          "type": "229"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "231"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "231"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
++          "type": "234"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "27",
++      "name": "30",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -9692,12 +19728,8 @@ index 0000000000..ab0ac1e7bf
 +          "type": "str"
 +        },
 +        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
 +          "name": "sync",
-+          "type": "230"
++          "type": "236"
 +        },
 +        {
 +          "name": "speed",
@@ -9710,6 +19742,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "str"
 +        },
 +        {
++          "name": "bitmap-mode",
++          "default": null,
++          "type": "237"
++        },
++        {
 +          "name": "compress",
 +          "default": null,
 +          "type": "bool"
@@ -9717,12 +19754,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "on-source-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "on-target-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -9733,17 +19770,37 @@ index 0000000000..ab0ac1e7bf
 +          "name": "auto-dismiss",
 +          "default": null,
 +          "type": "bool"
++        },
++        {
++          "name": "filter-node-name",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "target",
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[28]",
-+      "element-type": "28",
++      "name": "31",
++      "members": [
++        {
++          "name": "flat",
++          "default": null,
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[32]",
++      "element-type": "32",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "28",
++      "name": "32",
 +      "members": [
 +        {
 +          "name": "file",
@@ -9777,11 +19834,14 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "encryption_key_missing",
-+          "type": "bool"
++          "type": "bool",
++          "features": [
++            "deprecated"
++          ]
 +        },
 +        {
 +          "name": "detect_zeroes",
-+          "type": "232"
++          "type": "238"
 +        },
 +        {
 +          "name": "bps",
@@ -9809,7 +19869,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "image",
-+          "type": "233"
++          "type": "239"
 +        },
 +        {
 +          "name": "bps_max",
@@ -9883,31 +19943,36 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "cache",
-+          "type": "234"
++          "type": "240"
 +        },
 +        {
 +          "name": "write_threshold",
 +          "type": "int"
++        },
++        {
++          "name": "dirty-bitmaps",
++          "default": null,
++          "type": "[230]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "29",
++      "name": "33",
 +      "members": [
 +        {
 +          "name": "nodes",
-+          "type": "[235]"
++          "type": "[241]"
 +        },
 +        {
 +          "name": "edges",
-+          "type": "[236]"
++          "type": "[242]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "30",
++      "name": "34",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -9939,12 +20004,12 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "sync",
-+          "type": "230"
++          "type": "236"
 +        },
 +        {
 +          "name": "mode",
 +          "default": null,
-+          "type": "229"
++          "type": "234"
 +        },
 +        {
 +          "name": "speed",
@@ -9964,12 +20029,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "on-source-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "on-target-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "unmap",
@@ -9979,7 +20044,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "copy-mode",
 +          "default": null,
-+          "type": "237"
++          "type": "243"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -9995,7 +20060,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "31",
++      "name": "35",
 +      "members": [
 +        {
 +          "name": "node",
@@ -10016,11 +20081,6 @@ index 0000000000..ab0ac1e7bf
 +          "type": "bool"
 +        },
 +        {
-+          "name": "autoload",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
 +          "name": "disabled",
 +          "default": null,
 +          "type": "bool"
@@ -10029,7 +20089,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "32",
++      "name": "36",
 +      "members": [
 +        {
 +          "name": "node",
@@ -10043,7 +20103,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "33",
++      "name": "37",
 +      "members": [
 +        {
 +          "name": "node",
@@ -10055,13 +20115,13 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "bitmaps",
-+          "type": "[238]"
++          "type": "[244]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "34",
++      "name": "38",
 +      "members": [
 +        {
 +          "name": "sha256",
@@ -10071,7 +20131,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "35",
++      "name": "39",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -10093,7 +20153,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "sync",
-+          "type": "230"
++          "type": "236"
 +        },
 +        {
 +          "name": "speed",
@@ -10113,12 +20173,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "on-source-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "on-target-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "filter-node-name",
@@ -10128,7 +20188,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "copy-mode",
 +          "default": null,
-+          "type": "237"
++          "type": "243"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -10144,117 +20204,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "36",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "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": "37",
++      "name": "40",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -10288,7 +20238,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "on-error",
 +          "default": null,
-+          "type": "231"
++          "type": "235"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -10304,7 +20254,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "38",
++      "name": "41",
 +      "members": [
 +        {
 +          "name": "device",
@@ -10318,7 +20268,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "39",
++      "name": "42",
 +      "members": [
 +        {
 +          "name": "device",
@@ -10333,40 +20283,10 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "40",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "41",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "42",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "43",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "device",
 +          "type": "str"
 +        }
 +      ],
@@ -10376,7 +20296,7 @@ index 0000000000..ab0ac1e7bf
 +      "name": "44",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "device",
 +          "type": "str"
 +        }
 +      ],
@@ -10384,169 +20304,207 @@ index 0000000000..ab0ac1e7bf
 +    },
 +    {
 +      "name": "45",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "46",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "47",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "48",
 +      "tag": "driver",
 +      "variants": [
 +        {
 +          "case": "blkdebug",
-+          "type": "242"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "243"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "244"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "245"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "245"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "245"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "245"
-+        },
-+        {
-+          "case": "file",
-+          "type": "246"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "247"
-+        },
-+        {
-+          "case": "ftps",
 +          "type": "248"
 +        },
 +        {
-+          "case": "gluster",
++          "case": "blklogwrites",
 +          "type": "249"
 +        },
 +        {
-+          "case": "host_cdrom",
-+          "type": "246"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "246"
-+        },
-+        {
-+          "case": "http",
++          "case": "blkverify",
 +          "type": "250"
 +        },
 +        {
-+          "case": "https",
++          "case": "blkreplay",
 +          "type": "251"
 +        },
 +        {
-+          "case": "iscsi",
++          "case": "bochs",
 +          "type": "252"
 +        },
 +        {
-+          "case": "luks",
++          "case": "cloop",
++          "type": "252"
++        },
++        {
++          "case": "compress",
++          "type": "252"
++        },
++        {
++          "case": "copy-on-read",
++          "type": "252"
++        },
++        {
++          "case": "dmg",
++          "type": "252"
++        },
++        {
++          "case": "file",
 +          "type": "253"
 +        },
 +        {
-+          "case": "nbd",
++          "case": "ftp",
 +          "type": "254"
 +        },
 +        {
-+          "case": "nfs",
++          "case": "ftps",
 +          "type": "255"
 +        },
 +        {
-+          "case": "null-aio",
++          "case": "gluster",
 +          "type": "256"
 +        },
 +        {
-+          "case": "null-co",
-+          "type": "256"
++          "case": "host_cdrom",
++          "type": "253"
 +        },
 +        {
-+          "case": "nvme",
++          "case": "host_device",
++          "type": "253"
++        },
++        {
++          "case": "http",
 +          "type": "257"
 +        },
 +        {
-+          "case": "parallels",
-+          "type": "245"
-+        },
-+        {
-+          "case": "qcow2",
++          "case": "https",
 +          "type": "258"
 +        },
 +        {
-+          "case": "qcow",
++          "case": "iscsi",
 +          "type": "259"
 +        },
 +        {
-+          "case": "qed",
++          "case": "luks",
 +          "type": "260"
 +        },
 +        {
-+          "case": "quorum",
++          "case": "nbd",
 +          "type": "261"
 +        },
 +        {
-+          "case": "raw",
++          "case": "nfs",
 +          "type": "262"
 +        },
 +        {
-+          "case": "rbd",
++          "case": "null-aio",
 +          "type": "263"
 +        },
 +        {
-+          "case": "replication",
++          "case": "null-co",
++          "type": "263"
++        },
++        {
++          "case": "nvme",
 +          "type": "264"
 +        },
 +        {
-+          "case": "sheepdog",
++          "case": "parallels",
++          "type": "252"
++        },
++        {
++          "case": "qcow2",
 +          "type": "265"
 +        },
 +        {
-+          "case": "ssh",
++          "case": "qcow",
 +          "type": "266"
 +        },
 +        {
-+          "case": "throttle",
++          "case": "qed",
 +          "type": "267"
 +        },
 +        {
-+          "case": "vdi",
-+          "type": "245"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "245"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "260"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "245"
-+        },
-+        {
-+          "case": "vvfat",
++          "case": "quorum",
 +          "type": "268"
 +        },
 +        {
-+          "case": "vxhs",
++          "case": "raw",
 +          "type": "269"
++        },
++        {
++          "case": "rbd",
++          "type": "270"
++        },
++        {
++          "case": "replication",
++          "type": "271"
++        },
++        {
++          "case": "sheepdog",
++          "type": "272"
++        },
++        {
++          "case": "ssh",
++          "type": "273"
++        },
++        {
++          "case": "throttle",
++          "type": "274"
++        },
++        {
++          "case": "vdi",
++          "type": "252"
++        },
++        {
++          "case": "vhdx",
++          "type": "252"
++        },
++        {
++          "case": "vmdk",
++          "type": "267"
++        },
++        {
++          "case": "vpc",
++          "type": "252"
++        },
++        {
++          "case": "vvfat",
++          "type": "275"
++        },
++        {
++          "case": "vxhs",
++          "type": "276"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "driver",
-+          "type": "239"
++          "type": "245"
 +        },
 +        {
 +          "name": "node-name",
@@ -10556,12 +20514,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "discard",
 +          "default": null,
-+          "type": "240"
++          "type": "246"
 +        },
 +        {
 +          "name": "cache",
 +          "default": null,
-+          "type": "241"
++          "type": "247"
 +        },
 +        {
 +          "name": "read-only",
@@ -10581,52 +20539,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "detect-zeroes",
 +          "default": null,
-+          "type": "232"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "46",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "47",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "options",
-+          "type": "270"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "48",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
++          "type": "238"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10635,13 +20548,7 @@ index 0000000000..ab0ac1e7bf
 +      "name": "49",
 +      "members": [
 +        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
++          "name": "node-name",
 +          "type": "str"
 +        }
 +      ],
@@ -10651,8 +20558,12 @@ index 0000000000..ab0ac1e7bf
 +      "name": "50",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "job-id",
 +          "type": "str"
++        },
++        {
++          "name": "options",
++          "type": "277"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10661,50 +20572,6 @@ index 0000000000..ab0ac1e7bf
 +      "name": "51",
 +      "members": [
 +        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "52",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "read-only-mode",
-+          "default": null,
-+          "type": "271"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "53",
-+      "members": [
-+        {
 +          "name": "device",
 +          "type": "str"
 +        },
@@ -10735,7 +20602,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "54",
++      "name": "52",
 +      "members": [
 +        {
 +          "name": "device",
@@ -10748,11 +20615,11 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "operation",
-+          "type": "272"
++          "type": "278"
 +        },
 +        {
 +          "name": "action",
-+          "type": "273"
++          "type": "279"
 +        },
 +        {
 +          "name": "nospace",
@@ -10767,11 +20634,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "55",
++      "name": "53",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "225"
++          "type": "280"
 +        },
 +        {
 +          "name": "device",
@@ -10798,11 +20665,55 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
++      "name": "54",
++      "members": [
++        {
++          "name": "type",
++          "type": "280"
++        },
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "len",
++          "type": "int"
++        },
++        {
++          "name": "offset",
++          "type": "int"
++        },
++        {
++          "name": "speed",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "55",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "operation",
++          "type": "278"
++        },
++        {
++          "name": "action",
++          "type": "279"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
 +      "name": "56",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "225"
++          "type": "280"
 +        },
 +        {
 +          "name": "device",
@@ -10827,52 +20738,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "57",
 +      "members": [
 +        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "272"
-+        },
-+        {
-+          "name": "action",
-+          "type": "273"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "58",
-+      "members": [
-+        {
 +          "name": "type",
-+          "type": "225"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "59",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "225"
++          "type": "280"
 +        },
 +        {
 +          "name": "id",
@@ -10882,7 +20749,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "60",
++      "name": "58",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -10900,7 +20767,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "61",
++      "name": "59",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -10914,7 +20781,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "62",
++      "name": "60",
 +      "members": [
 +        {
 +          "name": "parent",
@@ -10934,7 +20801,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "63",
++      "name": "61",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -10942,7 +20809,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "iothread",
-+          "type": "274"
++          "type": "281"
 +        },
 +        {
 +          "name": "force",
@@ -10953,20 +20820,66 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[64]",
-+      "element-type": "64",
-+      "meta-type": "array"
++      "name": "62",
++      "members": [
++        {
++          "name": "addr",
++          "type": "282"
++        },
++        {
++          "name": "tls-creds",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "tls-authz",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "63",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "name",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "description",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "writable",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "bitmap",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
 +    },
 +    {
 +      "name": "64",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "name",
 +          "type": "str"
 +        },
 +        {
-+          "name": "connected",
-+          "type": "bool"
++          "name": "mode",
++          "default": null,
++          "type": "283"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10975,6 +20888,51 @@ index 0000000000..ab0ac1e7bf
 +      "name": "65",
 +      "members": [
 +        {
++          "name": "reference",
++          "type": "str"
++        },
++        {
++          "name": "sector-num",
++          "type": "int"
++        },
++        {
++          "name": "sectors-count",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "66",
++      "members": [
++        {
++          "name": "type",
++          "type": "284"
++        },
++        {
++          "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": "67",
++      "members": [
++        {
 +          "name": "device",
 +          "type": "str"
 +        },
@@ -10986,7 +20944,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "66",
++      "name": "68",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11006,7 +20964,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "67",
++      "name": "69",
 +      "members": [
 +        {
 +          "name": "id",
@@ -11040,67 +20998,15 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "68",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "69",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "275"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-authz",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "70",
 +      "members": [
 +        {
-+          "name": "device",
++          "name": "id",
 +          "type": "str"
 +        },
 +        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
++          "name": "status",
++          "type": "233"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11109,13 +21015,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "71",
 +      "members": [
 +        {
-+          "name": "name",
++          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "276"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11124,16 +21025,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "72",
 +      "members": [
 +        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
 +          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "tray-open",
-+          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11144,10 +21037,6 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11156,16 +21045,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "74",
 +      "members": [
 +        {
-+          "name": "reference",
++          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11174,36 +21055,65 @@ index 0000000000..ab0ac1e7bf
 +      "name": "75",
 +      "members": [
 +        {
-+          "name": "type",
-+          "type": "277"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
++          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[76]",
-+      "element-type": "76",
++      "name": "76",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[77]",
++      "element-type": "77",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "76",
++      "name": "77",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "type",
++          "type": "280"
++        },
++        {
++          "name": "status",
++          "type": "233"
++        },
++        {
++          "name": "current-progress",
++          "type": "int"
++        },
++        {
++          "name": "total-progress",
++          "type": "int"
++        },
++        {
++          "name": "error",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[78]",
++      "element-type": "78",
++      "meta-type": "array"
++    },
++    {
++      "name": "78",
 +      "members": [
 +        {
 +          "name": "label",
@@ -11221,12 +21131,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[77]",
-+      "element-type": "77",
++      "name": "[79]",
++      "element-type": "79",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "77",
++      "name": "79",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11236,7 +21146,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "78",
++      "name": "80",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11249,13 +21159,13 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "format",
 +          "default": null,
-+          "type": "278"
++          "type": "285"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "79",
++      "name": "81",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11268,7 +21178,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "format",
 +          "default": null,
-+          "type": "278"
++          "type": "285"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11279,31 +21189,6 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "80",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "279"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "81",
-+      "members": [
-+        {
-+          "name": "pty",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "82",
 +      "members": [
 +        {
@@ -11312,7 +21197,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "backend",
-+          "type": "279"
++          "type": "286"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11321,7 +21206,8 @@ index 0000000000..ab0ac1e7bf
 +      "name": "83",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "pty",
++          "default": null,
 +          "type": "str"
 +        }
 +      ],
@@ -11333,6 +21219,10 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "id",
 +          "type": "str"
++        },
++        {
++          "name": "backend",
++          "type": "286"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11343,6 +21233,26 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "id",
 +          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "86",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "87",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
 +        },
 +        {
 +          "name": "open",
@@ -11352,7 +21262,84 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "86",
++      "name": "88",
++      "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": "287"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "89",
++      "members": [
++        {
++          "name": "status",
++          "type": "288"
++        },
++        {
++          "name": "completed",
++          "type": "int"
++        },
++        {
++          "name": "total",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "90",
++      "members": [
++        {
++          "name": "result",
++          "type": "89"
++        },
++        {
++          "name": "error",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "91",
++      "members": [
++        {
++          "name": "formats",
++          "type": "[287]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "92",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11366,21 +21353,68 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "87",
++      "name": "93",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "nic",
++          "type": "290"
++        },
++        {
++          "case": "user",
++          "type": "291"
++        },
++        {
++          "case": "tap",
++          "type": "292"
++        },
++        {
++          "case": "l2tpv3",
++          "type": "293"
++        },
++        {
++          "case": "socket",
++          "type": "294"
++        },
++        {
++          "case": "vde",
++          "type": "295"
++        },
++        {
++          "case": "bridge",
++          "type": "296"
++        },
++        {
++          "case": "hubport",
++          "type": "297"
++        },
++        {
++          "case": "netmap",
++          "type": "298"
++        },
++        {
++          "case": "vhost-user",
++          "type": "299"
++        },
++        {
++          "case": "none",
++          "type": "0"
++        }
++      ],
 +      "members": [
 +        {
-+          "name": "type",
++          "name": "id",
 +          "type": "str"
 +        },
 +        {
-+          "name": "id",
-+          "type": "str"
++          "name": "type",
++          "type": "289"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "88",
++      "name": "94",
 +      "members": [
 +        {
 +          "name": "id",
@@ -11390,7 +21424,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "89",
++      "name": "95",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11401,12 +21435,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[90]",
-+      "element-type": "90",
++      "name": "[96]",
++      "element-type": "96",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "90",
++      "name": "96",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11418,15 +21452,15 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "multicast",
-+          "type": "280"
++          "type": "300"
 +        },
 +        {
 +          "name": "unicast",
-+          "type": "280"
++          "type": "300"
 +        },
 +        {
 +          "name": "vlan",
-+          "type": "280"
++          "type": "300"
 +        },
 +        {
 +          "name": "broadcast-allowed",
@@ -11460,7 +21494,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "91",
++      "name": "97",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11475,7 +21509,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "92",
++      "name": "98",
 +      "members": [
 +        {
 +          "name": "initial",
@@ -11492,12 +21526,32 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "step",
 +          "type": "int"
++        },
++        {
++          "name": "interfaces",
++          "default": null,
++          "type": "[str]"
++        },
++        {
++          "name": "id",
++          "default": null,
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "93",
++      "name": "99",
++      "members": [
++        {
++          "name": "device-id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "100",
 +      "members": [
 +        {
 +          "name": "netdev",
@@ -11519,7 +21573,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "94",
++      "name": "101",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11529,7 +21583,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "95",
++      "name": "102",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11547,7 +21601,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "96",
++      "name": "103",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11557,12 +21611,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[97]",
-+      "element-type": "97",
++      "name": "[104]",
++      "element-type": "104",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "97",
++      "name": "104",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11582,17 +21636,17 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "duplex",
-+          "type": "281"
++          "type": "301"
 +        },
 +        {
 +          "name": "autoneg",
-+          "type": "282"
++          "type": "302"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "98",
++      "name": "105",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11607,12 +21661,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[99]",
-+      "element-type": "99",
++      "name": "[106]",
++      "element-type": "106",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "99",
++      "name": "106",
 +      "members": [
 +        {
 +          "name": "cookie",
@@ -11624,21 +21678,21 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "key",
-+          "type": "283"
++          "type": "303"
 +        },
 +        {
 +          "name": "mask",
-+          "type": "284"
++          "type": "304"
 +        },
 +        {
 +          "name": "action",
-+          "type": "285"
++          "type": "305"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "100",
++      "name": "107",
 +      "members": [
 +        {
 +          "name": "name",
@@ -11653,12 +21707,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[101]",
-+      "element-type": "101",
++      "name": "[108]",
++      "element-type": "108",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "101",
++      "name": "108",
 +      "members": [
 +        {
 +          "name": "id",
@@ -11727,25 +21781,26 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[102]",
-+      "element-type": "102",
++      "name": "[109]",
++      "element-type": "109",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "102",
++      "name": "109",
 +      "meta-type": "enum",
 +      "values": [
 +        "tpm-tis",
-+        "tpm-crb"
++        "tpm-crb",
++        "tpm-spapr"
 +      ]
 +    },
 +    {
-+      "name": "[103]",
-+      "element-type": "103",
++      "name": "[110]",
++      "element-type": "110",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "103",
++      "name": "110",
 +      "meta-type": "enum",
 +      "values": [
 +        "passthrough",
@@ -11753,12 +21808,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[104]",
-+      "element-type": "104",
++      "name": "[111]",
++      "element-type": "111",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "104",
++      "name": "111",
 +      "members": [
 +        {
 +          "name": "id",
@@ -11766,17 +21821,17 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "model",
-+          "type": "102"
++          "type": "109"
 +        },
 +        {
 +          "name": "options",
-+          "type": "286"
++          "type": "306"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "105",
++      "name": "112",
 +      "members": [
 +        {
 +          "name": "protocol",
@@ -11795,7 +21850,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "106",
++      "name": "113",
 +      "members": [
 +        {
 +          "name": "protocol",
@@ -11809,7 +21864,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "107",
++      "name": "114",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -11829,7 +21884,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "108",
++      "name": "115",
 +      "members": [
 +        {
 +          "name": "enabled",
@@ -11866,60 +21921,60 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "mouse-mode",
-+          "type": "287"
++          "type": "307"
 +        },
 +        {
 +          "name": "channels",
 +          "default": null,
-+          "type": "[288]"
++          "type": "[308]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "109",
++      "name": "116",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "289"
++          "type": "309"
 +        },
 +        {
 +          "name": "client",
-+          "type": "289"
++          "type": "309"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "110",
++      "name": "117",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "290"
++          "type": "310"
 +        },
 +        {
 +          "name": "client",
-+          "type": "288"
++          "type": "308"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "111",
++      "name": "118",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "289"
++          "type": "309"
 +        },
 +        {
 +          "name": "client",
-+          "type": "289"
++          "type": "309"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "112",
++      "name": "119",
 +      "members": [
 +        {
 +          "name": "enabled",
@@ -11933,7 +21988,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "family",
 +          "default": null,
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "service",
@@ -11948,18 +22003,18 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "clients",
 +          "default": null,
-+          "type": "[292]"
++          "type": "[312]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[113]",
-+      "element-type": "113",
++      "name": "[120]",
++      "element-type": "120",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "113",
++      "name": "120",
 +      "members": [
 +        {
 +          "name": "id",
@@ -11967,20 +22022,20 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "server",
-+          "type": "[293]"
++          "type": "[313]"
 +        },
 +        {
 +          "name": "clients",
-+          "type": "[292]"
++          "type": "[312]"
 +        },
 +        {
 +          "name": "auth",
-+          "type": "294"
++          "type": "314"
 +        },
 +        {
 +          "name": "vencrypt",
 +          "default": null,
-+          "type": "295"
++          "type": "315"
 +        },
 +        {
 +          "name": "display",
@@ -11991,7 +22046,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "114",
++      "name": "121",
 +      "members": [
 +        {
 +          "name": "password",
@@ -12001,54 +22056,54 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "115",
++      "name": "122",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "296"
++          "type": "316"
 +        },
 +        {
 +          "name": "client",
-+          "type": "297"
++          "type": "317"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "116",
++      "name": "123",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "296"
++          "type": "316"
 +        },
 +        {
 +          "name": "client",
-+          "type": "292"
++          "type": "312"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "117",
++      "name": "124",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "296"
++          "type": "316"
 +        },
 +        {
 +          "name": "client",
-+          "type": "292"
++          "type": "312"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[118]",
-+      "element-type": "118",
++      "name": "[125]",
++      "element-type": "125",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "118",
++      "name": "125",
 +      "members": [
 +        {
 +          "name": "name",
@@ -12070,11 +22125,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "119",
++      "name": "126",
 +      "members": [
 +        {
 +          "name": "keys",
-+          "type": "[298]"
++          "type": "[318]"
 +        },
 +        {
 +          "name": "hold-time",
@@ -12085,7 +22140,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "120",
++      "name": "127",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12099,26 +22154,26 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "events",
-+          "type": "[299]"
++          "type": "[319]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "121",
++      "name": "128",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "gtk",
-+          "type": "302"
++          "type": "322"
 +        },
 +        {
 +          "case": "curses",
-+          "type": "303"
++          "type": "323"
 +        },
 +        {
 +          "case": "egl-headless",
-+          "type": "304"
++          "type": "324"
 +        },
 +        {
 +          "case": "default",
@@ -12144,7 +22199,7 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "300"
++          "type": "320"
 +        },
 +        {
 +          "name": "full-screen",
@@ -12157,35 +22212,40 @@ index 0000000000..ab0ac1e7bf
 +          "type": "bool"
 +        },
 +        {
++          "name": "show-cursor",
++          "default": null,
++          "type": "bool"
++        },
++        {
 +          "name": "gl",
 +          "default": null,
-+          "type": "301"
++          "type": "321"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "122",
++      "name": "129",
 +      "members": [
 +        {
 +          "name": "status",
 +          "default": null,
-+          "type": "305"
++          "type": "325"
 +        },
 +        {
 +          "name": "ram",
 +          "default": null,
-+          "type": "306"
++          "type": "326"
 +        },
 +        {
 +          "name": "disk",
 +          "default": null,
-+          "type": "306"
++          "type": "326"
 +        },
 +        {
 +          "name": "xbzrle-cache",
 +          "default": null,
-+          "type": "307"
++          "type": "327"
 +        },
 +        {
 +          "name": "total-time",
@@ -12230,37 +22290,37 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "compression",
 +          "default": null,
-+          "type": "308"
++          "type": "328"
 +        },
 +        {
 +          "name": "socket-address",
 +          "default": null,
-+          "type": "[309]"
++          "type": "[329]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "123",
++      "name": "130",
 +      "members": [
 +        {
 +          "name": "capabilities",
-+          "type": "[124]"
++          "type": "[131]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[124]",
-+      "element-type": "124",
++      "name": "[131]",
++      "element-type": "131",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "124",
++      "name": "131",
 +      "members": [
 +        {
 +          "name": "capability",
-+          "type": "310"
++          "type": "330"
 +        },
 +        {
 +          "name": "state",
@@ -12270,7 +22330,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "125",
++      "name": "132",
 +      "members": [
 +        {
 +          "name": "announce-initial",
@@ -12313,6 +22373,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "throttle-trigger-threshold",
++          "default": null,
++          "type": "int"
++        },
++        {
 +          "name": "cpu-throttle-initial",
 +          "default": null,
 +          "type": "int"
@@ -12325,17 +22390,17 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "tls-creds",
 +          "default": null,
-+          "type": "274"
++          "type": "281"
 +        },
 +        {
 +          "name": "tls-hostname",
 +          "default": null,
-+          "type": "274"
++          "type": "281"
 +        },
 +        {
 +          "name": "tls-authz",
 +          "default": null,
-+          "type": "274"
++          "type": "281"
 +        },
 +        {
 +          "name": "max-bandwidth",
@@ -12376,12 +22441,27 @@ index 0000000000..ab0ac1e7bf
 +          "name": "max-cpu-throttle",
 +          "default": null,
 +          "type": "int"
++        },
++        {
++          "name": "multifd-compression",
++          "default": null,
++          "type": "331"
++        },
++        {
++          "name": "multifd-zlib-level",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "multifd-zstd-level",
++          "default": null,
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "126",
++      "name": "133",
 +      "members": [
 +        {
 +          "name": "announce-initial",
@@ -12424,6 +22504,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "throttle-trigger-threshold",
++          "default": null,
++          "type": "int"
++        },
++        {
 +          "name": "cpu-throttle-initial",
 +          "default": null,
 +          "type": "int"
@@ -12487,12 +22572,27 @@ index 0000000000..ab0ac1e7bf
 +          "name": "max-cpu-throttle",
 +          "default": null,
 +          "type": "int"
++        },
++        {
++          "name": "multifd-compression",
++          "default": null,
++          "type": "331"
++        },
++        {
++          "name": "multifd-zlib-level",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "multifd-zstd-level",
++          "default": null,
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "127",
++      "name": "134",
 +      "members": [
 +        {
 +          "name": "protocol",
@@ -12521,17 +22621,17 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "128",
++      "name": "135",
 +      "members": [
 +        {
 +          "name": "status",
-+          "type": "305"
++          "type": "325"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "129",
++      "name": "136",
 +      "members": [
 +        {
 +          "name": "pass",
@@ -12541,31 +22641,31 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "130",
++      "name": "137",
 +      "members": [
 +        {
 +          "name": "mode",
-+          "type": "311"
++          "type": "332"
 +        },
 +        {
 +          "name": "reason",
-+          "type": "312"
++          "type": "333"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "131",
++      "name": "138",
 +      "members": [
 +        {
 +          "name": "state",
-+          "type": "305"
++          "type": "325"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "132",
++      "name": "139",
 +      "members": [
 +        {
 +          "name": "value",
@@ -12575,7 +22675,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "133",
++      "name": "140",
 +      "members": [
 +        {
 +          "name": "value",
@@ -12585,7 +22685,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "134",
++      "name": "141",
 +      "members": [
 +        {
 +          "name": "value",
@@ -12600,7 +22700,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "135",
++      "name": "142",
 +      "members": [
 +        {
 +          "name": "uri",
@@ -12630,7 +22730,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "136",
++      "name": "143",
 +      "members": [
 +        {
 +          "name": "uri",
@@ -12640,7 +22740,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "137",
++      "name": "144",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -12655,7 +22755,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "138",
++      "name": "145",
 +      "members": [
 +        {
 +          "name": "enable",
@@ -12674,7 +22774,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "139",
++      "name": "146",
 +      "members": [
 +        {
 +          "name": "error",
@@ -12689,25 +22789,25 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "140",
++      "name": "147",
 +      "members": [
 +        {
 +          "name": "mode",
-+          "type": "311"
++          "type": "332"
 +        },
 +        {
 +          "name": "last-mode",
-+          "type": "311"
++          "type": "332"
 +        },
 +        {
 +          "name": "reason",
-+          "type": "312"
++          "type": "333"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "141",
++      "name": "148",
 +      "members": [
 +        {
 +          "name": "uri",
@@ -12717,22 +22817,32 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "142",
++      "name": "149",
 +      "members": [
 +        {
-+          "name": "actions",
-+          "type": "[313]"
-+        },
-+        {
-+          "name": "properties",
-+          "default": null,
-+          "type": "314"
++          "name": "device-id",
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "143",
++      "name": "150",
++      "members": [
++        {
++          "name": "actions",
++          "type": "[334]"
++        },
++        {
++          "name": "properties",
++          "default": null,
++          "type": "335"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "151",
 +      "members": [
 +        {
 +          "name": "name",
@@ -12747,12 +22857,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[144]",
-+      "element-type": "144",
++      "name": "[152]",
++      "element-type": "152",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "144",
++      "name": "152",
 +      "members": [
 +        {
 +          "name": "name",
@@ -12760,7 +22870,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "state",
-+          "type": "315"
++          "type": "336"
 +        },
 +        {
 +          "name": "vcpu",
@@ -12770,7 +22880,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "145",
++      "name": "153",
 +      "members": [
 +        {
 +          "name": "name",
@@ -12794,72 +22904,22 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[146]",
-+      "element-type": "146",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "146",
-+      "tag": "meta-type",
-+      "variants": [
-+        {
-+          "case": "builtin",
-+          "type": "317"
-+        },
-+        {
-+          "case": "enum",
-+          "type": "318"
-+        },
-+        {
-+          "case": "array",
-+          "type": "319"
-+        },
-+        {
-+          "case": "object",
-+          "type": "320"
-+        },
-+        {
-+          "case": "alternate",
-+          "type": "321"
-+        },
-+        {
-+          "case": "command",
-+          "type": "322"
-+        },
-+        {
-+          "case": "event",
-+          "type": "323"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "meta-type",
-+          "type": "316"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "147",
++      "name": "154",
 +      "members": [
 +        {
 +          "name": "enable",
 +          "default": null,
-+          "type": "[324]"
++          "type": "[337]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "148",
++      "name": "155",
 +      "members": [
 +        {
 +          "name": "qemu",
-+          "type": "325"
++          "type": "338"
 +        },
 +        {
 +          "name": "package",
@@ -12869,12 +22929,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[149]",
-+      "element-type": "149",
++      "name": "[156]",
++      "element-type": "156",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "149",
++      "name": "156",
 +      "members": [
 +        {
 +          "name": "name",
@@ -12884,71 +22944,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "150",
-+      "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": "151",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "152",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "present",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "153",
-+      "members": [
-+        {
-+          "name": "UUID",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[154]",
-+      "element-type": "154",
++      "name": "[157]",
++      "element-type": "157",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "154",
++      "name": "157",
 +      "members": [
 +        {
 +          "name": "name",
@@ -12958,41 +22959,307 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[155]",
-+      "element-type": "155",
++      "name": "[158]",
++      "element-type": "158",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "155",
++      "name": "158",
++      "tag": "meta-type",
++      "variants": [
++        {
++          "case": "builtin",
++          "type": "340"
++        },
++        {
++          "case": "enum",
++          "type": "341"
++        },
++        {
++          "case": "array",
++          "type": "342"
++        },
++        {
++          "case": "object",
++          "type": "343"
++        },
++        {
++          "case": "alternate",
++          "type": "344"
++        },
++        {
++          "case": "command",
++          "type": "345"
++        },
++        {
++          "case": "event",
++          "type": "346"
++        }
++      ],
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "meta-type",
++          "type": "339"
++        },
++        {
++          "name": "features",
++          "default": null,
++          "type": "[str]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "159",
++      "members": [
++        {
++          "name": "path",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[160]",
++      "element-type": "160",
++      "meta-type": "array"
++    },
++    {
++      "name": "160",
++      "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": "161",
++      "members": [
++        {
++          "name": "path",
++          "type": "str"
++        },
++        {
++          "name": "property",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "any",
++      "json-type": "value",
++      "meta-type": "builtin"
++    },
++    {
++      "name": "162",
++      "members": [
++        {
++          "name": "path",
++          "type": "str"
++        },
++        {
++          "name": "property",
++          "type": "str"
++        },
++        {
++          "name": "value",
++          "type": "any"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "163",
++      "members": [
++        {
++          "name": "implements",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "abstract",
++          "default": null,
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[164]",
++      "element-type": "164",
++      "meta-type": "array"
++    },
++    {
++      "name": "164",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "abstract",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "parent",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "165",
++      "members": [
++        {
++          "name": "typename",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "166",
++      "members": [
++        {
++          "name": "qom-type",
++          "type": "str"
++        },
++        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "props",
++          "default": null,
++          "type": "any"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "167",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "168",
++      "members": [
++        {
++          "name": "typename",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "169",
++      "members": [
++        {
++          "name": "driver",
++          "type": "str"
++        },
++        {
++          "name": "bus",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "id",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "170",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "171",
++      "members": [
++        {
++          "name": "device",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "path",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[172]",
++      "element-type": "172",
++      "meta-type": "array"
++    },
++    {
++      "name": "172",
 +      "tag": "arch",
 +      "variants": [
 +        {
 +          "case": "x86",
-+          "type": "328"
++          "type": "349"
 +        },
 +        {
 +          "case": "sparc",
-+          "type": "329"
++          "type": "350"
 +        },
 +        {
 +          "case": "ppc",
-+          "type": "330"
++          "type": "351"
 +        },
 +        {
 +          "case": "mips",
-+          "type": "331"
++          "type": "352"
 +        },
 +        {
 +          "case": "tricore",
-+          "type": "332"
++          "type": "353"
 +        },
 +        {
 +          "case": "s390",
-+          "type": "333"
++          "type": "354"
 +        },
 +        {
 +          "case": "riscv",
-+          "type": "334"
++          "type": "355"
 +        },
 +        {
 +          "case": "other",
@@ -13023,27 +23290,27 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "props",
 +          "default": null,
-+          "type": "326"
++          "type": "347"
 +        },
 +        {
 +          "name": "arch",
-+          "type": "327"
++          "type": "348"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[156]",
-+      "element-type": "156",
++      "name": "[173]",
++      "element-type": "173",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "156",
++      "name": "173",
 +      "tag": "target",
 +      "variants": [
 +        {
 +          "case": "s390x",
-+          "type": "333"
++          "type": "354"
 +        },
 +        {
 +          "case": "aarch64",
@@ -13130,6 +23397,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "0"
 +        },
 +        {
++          "case": "rx",
++          "type": "0"
++        },
++        {
 +          "case": "sh4",
 +          "type": "0"
 +        },
@@ -13182,302 +23453,18 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "props",
 +          "default": null,
-+          "type": "326"
++          "type": "347"
 +        },
 +        {
 +          "name": "arch",
-+          "type": "327"
++          "type": "348",
++          "features": [
++            "deprecated"
++          ]
 +        },
 +        {
 +          "name": "target",
-+          "type": "335"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[157]",
-+      "element-type": "157",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "157",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "158",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "159",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[160]",
-+      "element-type": "160",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "160",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[336]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "161",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "162",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "163",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "164",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "165",
-+      "members": [
-+        {
-+          "name": "command-line",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "166",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[167]",
-+      "element-type": "167",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "167",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "168",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "any",
-+      "json-type": "value",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "169",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "170",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "arg",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "171",
-+      "members": [
-+        {
-+          "name": "implements",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[172]",
-+      "element-type": "172",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "172",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "173",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
++          "type": "356"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -13486,200 +23473,19 @@ index 0000000000..ab0ac1e7bf
 +      "name": "174",
 +      "members": [
 +        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "175",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "176",
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bus",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
 +          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "177",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "178",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "179",
-+      "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": "337"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "180",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "338"
-+        },
-+        {
-+          "name": "completed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
 +          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "181",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "180"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "182",
-+      "members": [
-+        {
-+          "name": "formats",
-+          "type": "[337]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "183",
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "184",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "185",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "186",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[187]",
-+      "element-type": "187",
++      "name": "[175]",
++      "element-type": "175",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "187",
++      "name": "175",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13702,12 +23508,25 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "hotpluggable-cpus",
 +          "type": "bool"
++        },
++        {
++          "name": "numa-mem-supported",
++          "type": "bool"
++        },
++        {
++          "name": "deprecated",
++          "type": "bool"
++        },
++        {
++          "name": "default-cpu-type",
++          "default": null,
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "188",
++      "name": "176",
 +      "members": [
 +        {
 +          "name": "wakeup-suspend-support",
@@ -13717,131 +23536,22 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "189",
-+      "members": [
-+        {
-+          "name": "base-memory",
-+          "type": "int"
-+        },
-+        {
-+          "name": "plugged-memory",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "190",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "191",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "192",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[193]",
-+      "element-type": "193",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "193",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fds",
-+          "type": "[339]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "194",
++      "name": "177",
 +      "members": [
 +        {
 +          "name": "arch",
-+          "type": "335"
++          "type": "356"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "195",
-+      "members": [
-+        {
-+          "name": "option",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[196]",
-+      "element-type": "196",
++      "name": "[178]",
++      "element-type": "178",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "196",
-+      "members": [
-+        {
-+          "name": "option",
-+          "type": "str"
-+        },
-+        {
-+          "name": "parameters",
-+          "type": "[340]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[197]",
-+      "element-type": "197",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "197",
++      "name": "178",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13870,33 +23580,310 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "policy",
-+          "type": "341"
++          "type": "357"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[198]",
-+      "element-type": "198",
++      "name": "[179]",
++      "element-type": "179",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "198",
++      "name": "179",
++      "members": [
++        {
++          "name": "type",
++          "type": "str"
++        },
++        {
++          "name": "vcpus-count",
++          "type": "int"
++        },
++        {
++          "name": "props",
++          "type": "347"
++        },
++        {
++          "name": "qom-path",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "180",
 +      "tag": "type",
 +      "variants": [
 +        {
-+          "case": "dimm",
-+          "type": "343"
++          "case": "node",
++          "type": "359"
 +        },
 +        {
-+          "case": "nvdimm",
-+          "type": "343"
++          "case": "dist",
++          "type": "360"
++        },
++        {
++          "case": "cpu",
++          "type": "361"
++        },
++        {
++          "case": "hmat-lb",
++          "type": "362"
++        },
++        {
++          "case": "hmat-cache",
++          "type": "363"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "342"
++          "type": "358"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "185",
++      "members": [
++        {
++          "name": "type",
++          "type": "366"
++        },
++        {
++          "name": "model",
++          "type": "364"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "186",
++      "members": [
++        {
++          "name": "model",
++          "type": "364"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[187]",
++      "element-type": "187",
++      "meta-type": "array"
++    },
++    {
++      "name": "187",
++      "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"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "188",
++      "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": "189",
++      "members": [
++        {
++          "name": "name",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "190",
++      "members": [
++        {
++          "name": "enabled",
++          "type": "bool"
++        },
++        {
++          "name": "present",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "191",
++      "members": [
++        {
++          "name": "UUID",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[192]",
++      "element-type": "192",
++      "meta-type": "array"
++    },
++    {
++      "name": "192",
++      "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"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "193",
++      "members": [
++        {
++          "name": "actual",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "194",
++      "members": [
++        {
++          "name": "actual",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[195]",
++      "element-type": "195",
++      "meta-type": "array"
++    },
++    {
++      "name": "195",
++      "members": [
++        {
++          "name": "bus",
++          "type": "int"
++        },
++        {
++          "name": "devices",
++          "type": "[367]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "196",
++      "members": [
++        {
++          "name": "val",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "filename",
++          "type": "str"
++        },
++        {
++          "name": "cpu-index",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "197",
++      "members": [
++        {
++          "name": "val",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "filename",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "198",
++      "members": [
++        {
++          "name": "value",
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -13905,6 +23892,209 @@ index 0000000000..ab0ac1e7bf
 +      "name": "199",
 +      "members": [
 +        {
++          "name": "command-line",
++          "type": "str"
++        },
++        {
++          "name": "cpu-index",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "200",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "target",
++          "type": "str"
++        },
++        {
++          "name": "arg",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "201",
++      "members": [
++        {
++          "name": "enable",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "202",
++      "members": [
++        {
++          "name": "fdname",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "203",
++      "members": [
++        {
++          "name": "fdname",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "204",
++      "members": [
++        {
++          "name": "base-memory",
++          "type": "int"
++        },
++        {
++          "name": "plugged-memory",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "205",
++      "members": [
++        {
++          "name": "fdset-id",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "opaque",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "206",
++      "members": [
++        {
++          "name": "fdset-id",
++          "type": "int"
++        },
++        {
++          "name": "fd",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "207",
++      "members": [
++        {
++          "name": "fdset-id",
++          "type": "int"
++        },
++        {
++          "name": "fd",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[208]",
++      "element-type": "208",
++      "meta-type": "array"
++    },
++    {
++      "name": "208",
++      "members": [
++        {
++          "name": "fdset-id",
++          "type": "int"
++        },
++        {
++          "name": "fds",
++          "type": "[368]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "209",
++      "members": [
++        {
++          "name": "option",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[210]",
++      "element-type": "210",
++      "meta-type": "array"
++    },
++    {
++      "name": "210",
++      "members": [
++        {
++          "name": "option",
++          "type": "str"
++        },
++        {
++          "name": "parameters",
++          "type": "[369]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[211]",
++      "element-type": "211",
++      "meta-type": "array"
++    },
++    {
++      "name": "211",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "dimm",
++          "type": "371"
++        },
++        {
++          "case": "nvdimm",
++          "type": "371"
++        },
++        {
++          "case": "virtio-pmem",
++          "type": "372"
++        }
++      ],
++      "members": [
++        {
++          "name": "type",
++          "type": "370"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "212",
++      "members": [
++        {
 +          "name": "device",
 +          "type": "str"
 +        },
@@ -13916,12 +24106,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[200]",
-+      "element-type": "200",
++      "name": "[213]",
++      "element-type": "213",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "200",
++      "name": "213",
 +      "members": [
 +        {
 +          "name": "device",
@@ -13934,7 +24124,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "slot-type",
-+          "type": "344"
++          "type": "373"
 +        },
 +        {
 +          "name": "source",
@@ -13948,17 +24138,17 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "201",
++      "name": "214",
 +      "members": [
 +        {
 +          "name": "info",
-+          "type": "200"
++          "type": "213"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "202",
++      "name": "215",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -13968,35 +24158,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[203]",
-+      "element-type": "203",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "203",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpus-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "type": "326"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "204",
++      "name": "216",
 +      "members": [
 +        {
 +          "name": "guid",
@@ -14006,32 +24168,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "205",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "node",
-+          "type": "346"
-+        },
-+        {
-+          "case": "dist",
-+          "type": "347"
-+        },
-+        {
-+          "case": "cpu",
-+          "type": "348"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "345"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "206",
++      "name": "217",
 +      "members": [
 +        {
 +          "name": "offset",
@@ -14041,7 +24178,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "207",
++      "name": "218",
 +      "members": [
 +        {
 +          "name": "enabled",
@@ -14065,7 +24202,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "state",
-+          "type": "349"
++          "type": "374"
 +        },
 +        {
 +          "name": "handle",
@@ -14075,7 +24212,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "208",
++      "name": "219",
 +      "members": [
 +        {
 +          "name": "data",
@@ -14085,7 +24222,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "209",
++      "name": "220",
 +      "members": [
 +        {
 +          "name": "pdh",
@@ -14107,69 +24244,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "216",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "352"
-+        },
-+        {
-+          "name": "model",
-+          "type": "350"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "217",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "350"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[218]",
-+      "element-type": "218",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "218",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "bool",
 +      "json-type": "boolean",
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "219",
++      "name": "223",
 +      "meta-type": "enum",
 +      "values": [
 +        "debug",
@@ -14192,7 +24272,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "220",
++      "name": "224",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -14208,7 +24288,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "221",
++      "name": "225",
 +      "meta-type": "enum",
 +      "values": [
 +        "reset",
@@ -14221,60 +24301,42 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "222",
++      "name": "226",
 +      "meta-type": "enum",
 +      "values": [
 +        "pause",
-+        "poweroff"
++        "poweroff",
++        "run"
 +      ]
 +    },
 +    {
-+      "name": "223",
++      "name": "227",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "hyper-v",
-+          "type": "354"
++          "type": "376"
 +        },
 +        {
 +          "case": "s390",
-+          "type": "355"
++          "type": "377"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "353"
++          "type": "375"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "224",
++      "name": "228",
 +      "meta-type": "enum",
 +      "values": [
-+        "undefined",
-+        "created",
-+        "running",
-+        "paused",
-+        "ready",
-+        "standby",
-+        "waiting",
-+        "pending",
-+        "aborting",
-+        "concluded",
-+        "null"
-+      ]
-+    },
-+    {
-+      "name": "225",
-+      "meta-type": "enum",
-+      "values": [
-+        "commit",
-+        "stream",
-+        "mirror",
-+        "backup",
-+        "create"
++        "retain",
++        "read-only",
++        "read-write"
 +      ]
 +    },
 +    {
@@ -14283,7 +24345,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "226",
++      "name": "229",
 +      "meta-type": "enum",
 +      "values": [
 +        "ok",
@@ -14292,12 +24354,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[227]",
-+      "element-type": "227",
++      "name": "[230]",
++      "element-type": "230",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "227",
++      "name": "230",
 +      "members": [
 +        {
 +          "name": "name",
@@ -14322,7 +24384,10 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "status",
-+          "type": "356"
++          "type": "378",
++          "features": [
++            "deprecated"
++          ]
 +        },
 +        {
 +          "name": "persistent",
@@ -14337,7 +24402,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "228",
++      "name": "231",
 +      "members": [
 +        {
 +          "name": "rd_bytes",
@@ -14348,6 +24413,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "unmap_bytes",
++          "type": "int"
++        },
++        {
 +          "name": "rd_operations",
 +          "type": "int"
 +        },
@@ -14360,7 +24429,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
-+          "name": "flush_total_time_ns",
++          "name": "unmap_operations",
++          "type": "int"
++        },
++        {
++          "name": "rd_total_time_ns",
 +          "type": "int"
 +        },
 +        {
@@ -14368,7 +24441,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
-+          "name": "rd_total_time_ns",
++          "name": "flush_total_time_ns",
++          "type": "int"
++        },
++        {
++          "name": "unmap_total_time_ns",
 +          "type": "int"
 +        },
 +        {
@@ -14384,6 +24461,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "unmap_merged",
++          "type": "int"
++        },
++        {
 +          "name": "idle_time_ns",
 +          "default": null,
 +          "type": "int"
@@ -14401,6 +24482,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "failed_unmap_operations",
++          "type": "int"
++        },
++        {
 +          "name": "invalid_rd_operations",
 +          "type": "int"
 +        },
@@ -14413,6 +24498,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "invalid_unmap_operations",
++          "type": "int"
++        },
++        {
 +          "name": "account_invalid",
 +          "type": "bool"
 +        },
@@ -14422,28 +24511,222 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "timed_stats",
-+          "type": "[357]"
++          "type": "[379]"
 +        },
 +        {
 +          "name": "rd_latency_histogram",
 +          "default": null,
-+          "type": "358"
++          "type": "380"
 +        },
 +        {
 +          "name": "wr_latency_histogram",
 +          "default": null,
-+          "type": "358"
++          "type": "380"
 +        },
 +        {
 +          "name": "flush_latency_histogram",
 +          "default": null,
-+          "type": "358"
++          "type": "380"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "229",
++      "name": "232",
++      "tag": "driver",
++      "variants": [
++        {
++          "case": "file",
++          "type": "381"
++        },
++        {
++          "case": "host_device",
++          "type": "381"
++        },
++        {
++          "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-on-read",
++          "type": "0"
++        },
++        {
++          "case": "dmg",
++          "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": "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",
++          "type": "0"
++        },
++        {
++          "case": "parallels",
++          "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": "sheepdog",
++          "type": "0"
++        },
++        {
++          "case": "ssh",
++          "type": "0"
++        },
++        {
++          "case": "throttle",
++          "type": "0"
++        },
++        {
++          "case": "vdi",
++          "type": "0"
++        },
++        {
++          "case": "vhdx",
++          "type": "0"
++        },
++        {
++          "case": "vmdk",
++          "type": "0"
++        },
++        {
++          "case": "vpc",
++          "type": "0"
++        },
++        {
++          "case": "vvfat",
++          "type": "0"
++        },
++        {
++          "case": "vxhs",
++          "type": "0"
++        }
++      ],
++      "members": [
++        {
++          "name": "driver",
++          "type": "245"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "233",
++      "meta-type": "enum",
++      "values": [
++        "undefined",
++        "created",
++        "running",
++        "paused",
++        "ready",
++        "standby",
++        "waiting",
++        "pending",
++        "aborting",
++        "concluded",
++        "null"
++      ]
++    },
++    {
++      "name": "234",
 +      "meta-type": "enum",
 +      "values": [
 +        "existing",
@@ -14451,17 +24734,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "230",
-+      "meta-type": "enum",
-+      "values": [
-+        "top",
-+        "full",
-+        "none",
-+        "incremental"
-+      ]
-+    },
-+    {
-+      "name": "231",
++      "name": "235",
 +      "meta-type": "enum",
 +      "values": [
 +        "report",
@@ -14472,7 +24745,27 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "232",
++      "name": "236",
++      "meta-type": "enum",
++      "values": [
++        "top",
++        "full",
++        "none",
++        "incremental",
++        "bitmap"
++      ]
++    },
++    {
++      "name": "237",
++      "meta-type": "enum",
++      "values": [
++        "on-success",
++        "never",
++        "always"
++      ]
++    },
++    {
++      "name": "238",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -14481,7 +24774,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "233",
++      "name": "239",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -14538,23 +24831,23 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "snapshots",
 +          "default": null,
-+          "type": "[67]"
++          "type": "[69]"
 +        },
 +        {
 +          "name": "backing-image",
 +          "default": null,
-+          "type": "233"
++          "type": "239"
 +        },
 +        {
 +          "name": "format-specific",
 +          "default": null,
-+          "type": "359"
++          "type": "382"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "234",
++      "name": "240",
 +      "members": [
 +        {
 +          "name": "writeback",
@@ -14572,12 +24865,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[235]",
-+      "element-type": "235",
++      "name": "[241]",
++      "element-type": "241",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "235",
++      "name": "241",
 +      "members": [
 +        {
 +          "name": "id",
@@ -14585,7 +24878,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "type",
-+          "type": "360"
++          "type": "383"
 +        },
 +        {
 +          "name": "name",
@@ -14595,12 +24888,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[236]",
-+      "element-type": "236",
++      "name": "[242]",
++      "element-type": "242",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "236",
++      "name": "242",
 +      "members": [
 +        {
 +          "name": "parent",
@@ -14616,17 +24909,17 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "perm",
-+          "type": "[361]"
++          "type": "[384]"
 +        },
 +        {
 +          "name": "shared-perm",
-+          "type": "[361]"
++          "type": "[384]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "237",
++      "name": "243",
 +      "meta-type": "enum",
 +      "values": [
 +        "background",
@@ -14634,31 +24927,33 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[238]",
-+      "element-type": "238",
++      "name": "[244]",
++      "element-type": "244",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "238",
++      "name": "244",
 +      "members": [
 +        {
 +          "type": "str"
 +        },
 +        {
-+          "type": "32"
++          "type": "36"
 +        }
 +      ],
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "239",
++      "name": "245",
 +      "meta-type": "enum",
 +      "values": [
 +        "blkdebug",
 +        "blklogwrites",
++        "blkreplay",
 +        "blkverify",
 +        "bochs",
 +        "cloop",
++        "compress",
 +        "copy-on-read",
 +        "dmg",
 +        "file",
@@ -14696,7 +24991,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "240",
++      "name": "246",
 +      "meta-type": "enum",
 +      "values": [
 +        "ignore",
@@ -14704,7 +24999,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "241",
++      "name": "247",
 +      "members": [
 +        {
 +          "name": "direct",
@@ -14720,11 +25015,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "242",
++      "name": "248",
 +      "members": [
 +        {
 +          "name": "image",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "config",
@@ -14764,26 +25059,36 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "inject-error",
 +          "default": null,
-+          "type": "[363]"
++          "type": "[386]"
 +        },
 +        {
 +          "name": "set-state",
 +          "default": null,
-+          "type": "[364]"
++          "type": "[387]"
++        },
++        {
++          "name": "take-child-perms",
++          "default": null,
++          "type": "[384]"
++        },
++        {
++          "name": "unshare-child-perms",
++          "default": null,
++          "type": "[384]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "243",
++      "name": "249",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "log",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "log-sector-size",
@@ -14804,31 +25109,41 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "244",
++      "name": "250",
 +      "members": [
 +        {
 +          "name": "test",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "raw",
-+          "type": "362"
++          "type": "385"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "245",
++      "name": "251",
++      "members": [
++        {
++          "name": "image",
++          "type": "385"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "252",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "246",
++      "name": "253",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -14842,12 +25157,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "locking",
 +          "default": null,
-+          "type": "365"
++          "type": "388"
 +        },
 +        {
 +          "name": "aio",
 +          "default": null,
-+          "type": "366"
++          "type": "389"
 +        },
 +        {
 +          "name": "drop-cache",
@@ -14860,10 +25175,13 @@ index 0000000000..ab0ac1e7bf
 +          "type": "bool"
 +        }
 +      ],
-+      "meta-type": "object"
++      "meta-type": "object",
++      "features": [
++        "dynamic-auto-read-only"
++      ]
 +    },
 +    {
-+      "name": "247",
++      "name": "254",
 +      "members": [
 +        {
 +          "name": "url",
@@ -14903,7 +25221,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "248",
++      "name": "255",
 +      "members": [
 +        {
 +          "name": "url",
@@ -14948,7 +25266,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "249",
++      "name": "256",
 +      "members": [
 +        {
 +          "name": "volume",
@@ -14960,7 +25278,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "server",
-+          "type": "[309]"
++          "type": "[329]"
 +        },
 +        {
 +          "name": "debug",
@@ -14976,7 +25294,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "250",
++      "name": "257",
 +      "members": [
 +        {
 +          "name": "url",
@@ -15026,7 +25344,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "251",
++      "name": "258",
 +      "members": [
 +        {
 +          "name": "url",
@@ -15081,11 +25399,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "252",
++      "name": "259",
 +      "members": [
 +        {
 +          "name": "transport",
-+          "type": "367"
++          "type": "390"
 +        },
 +        {
 +          "name": "portal",
@@ -15118,7 +25436,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "header-digest",
 +          "default": null,
-+          "type": "368"
++          "type": "391"
 +        },
 +        {
 +          "name": "timeout",
@@ -15129,11 +25447,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "253",
++      "name": "260",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "key-secret",
@@ -15144,11 +25462,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "254",
++      "name": "261",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "309"
++          "type": "329"
 +        },
 +        {
 +          "name": "export",
@@ -15164,16 +25482,21 @@ index 0000000000..ab0ac1e7bf
 +          "name": "x-dirty-bitmap",
 +          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "reconnect-delay",
++          "default": null,
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "255",
++      "name": "262",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "369"
++          "type": "392"
 +        },
 +        {
 +          "name": "path",
@@ -15213,7 +25536,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "256",
++      "name": "263",
 +      "members": [
 +        {
 +          "name": "size",
@@ -15224,12 +25547,17 @@ index 0000000000..ab0ac1e7bf
 +          "name": "latency-ns",
 +          "default": null,
 +          "type": "int"
++        },
++        {
++          "name": "read-zeroes",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "257",
++      "name": "264",
 +      "members": [
 +        {
 +          "name": "device",
@@ -15243,16 +25571,16 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "258",
++      "name": "265",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "370"
++          "type": "393"
 +        },
 +        {
 +          "name": "lazy-refcounts",
@@ -15277,7 +25605,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "overlap-check",
 +          "default": null,
-+          "type": "371"
++          "type": "394"
 +        },
 +        {
 +          "name": "cache-size",
@@ -15307,53 +25635,53 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "372"
++          "type": "395"
 +        },
 +        {
 +          "name": "data-file",
 +          "default": null,
-+          "type": "362"
++          "type": "385"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "259",
++      "name": "266",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "370"
++          "type": "393"
 +        },
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "373"
++          "type": "396"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "260",
++      "name": "267",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "370"
++          "type": "393"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "261",
++      "name": "268",
 +      "members": [
 +        {
 +          "name": "blkverify",
@@ -15362,7 +25690,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "children",
-+          "type": "[362]"
++          "type": "[385]"
 +        },
 +        {
 +          "name": "vote-threshold",
@@ -15376,17 +25704,17 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "read-pattern",
 +          "default": null,
-+          "type": "374"
++          "type": "397"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "262",
++      "name": "269",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "offset",
@@ -15402,13 +25730,18 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "263",
++      "name": "270",
 +      "members": [
 +        {
 +          "name": "pool",
 +          "type": "str"
 +        },
 +        {
++          "name": "namespace",
++          "default": null,
++          "type": "str"
++        },
++        {
 +          "name": "image",
 +          "type": "str"
 +        },
@@ -15430,7 +25763,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "auth-client-required",
 +          "default": null,
-+          "type": "[375]"
++          "type": "[398]"
 +        },
 +        {
 +          "name": "key-secret",
@@ -15440,21 +25773,21 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "server",
 +          "default": null,
-+          "type": "[376]"
++          "type": "[399]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "264",
++      "name": "271",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "mode",
-+          "type": "377"
++          "type": "400"
 +        },
 +        {
 +          "name": "top-id",
@@ -15465,11 +25798,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "265",
++      "name": "272",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "309"
++          "type": "329"
 +        },
 +        {
 +          "name": "vdi",
@@ -15489,11 +25822,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "266",
++      "name": "273",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "378"
++          "type": "401"
 +        },
 +        {
 +          "name": "path",
@@ -15507,13 +25840,13 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "host-key-check",
 +          "default": null,
-+          "type": "379"
++          "type": "402"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "267",
++      "name": "274",
 +      "members": [
 +        {
 +          "name": "throttle-group",
@@ -15521,13 +25854,13 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "268",
++      "name": "275",
 +      "members": [
 +        {
 +          "name": "dir",
@@ -15557,7 +25890,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "269",
++      "name": "276",
 +      "members": [
 +        {
 +          "name": "vdisk-id",
@@ -15565,7 +25898,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "server",
-+          "type": "376"
++          "type": "399"
 +        },
 +        {
 +          "name": "tls-creds",
@@ -15576,68 +25909,68 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "270",
++      "name": "277",
 +      "tag": "driver",
 +      "variants": [
 +        {
 +          "case": "file",
-+          "type": "380"
++          "type": "403"
 +        },
 +        {
 +          "case": "gluster",
-+          "type": "381"
++          "type": "404"
 +        },
 +        {
 +          "case": "luks",
-+          "type": "382"
++          "type": "405"
 +        },
 +        {
 +          "case": "nfs",
-+          "type": "383"
++          "type": "406"
 +        },
 +        {
 +          "case": "parallels",
-+          "type": "384"
++          "type": "407"
 +        },
 +        {
 +          "case": "qcow",
-+          "type": "385"
++          "type": "408"
 +        },
 +        {
 +          "case": "qcow2",
-+          "type": "386"
++          "type": "409"
 +        },
 +        {
 +          "case": "qed",
-+          "type": "387"
++          "type": "410"
 +        },
 +        {
 +          "case": "rbd",
-+          "type": "388"
++          "type": "411"
 +        },
 +        {
 +          "case": "sheepdog",
-+          "type": "389"
++          "type": "412"
 +        },
 +        {
 +          "case": "ssh",
-+          "type": "390"
++          "type": "413"
 +        },
 +        {
 +          "case": "vdi",
-+          "type": "391"
++          "type": "414"
 +        },
 +        {
 +          "case": "vhdx",
-+          "type": "392"
++          "type": "415"
 +        },
 +        {
 +          "case": "vmdk",
-+          "type": "393"
++          "type": "416"
 +        },
 +        {
 +          "case": "vpc",
-+          "type": "394"
++          "type": "417"
 +        },
 +        {
 +          "case": "blkdebug",
@@ -15648,6 +25981,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "0"
 +        },
 +        {
++          "case": "blkreplay",
++          "type": "0"
++        },
++        {
 +          "case": "blkverify",
 +          "type": "0"
 +        },
@@ -15660,6 +25997,10 @@ index 0000000000..ab0ac1e7bf
 +          "type": "0"
 +        },
 +        {
++          "case": "compress",
++          "type": "0"
++        },
++        {
 +          "case": "copy-on-read",
 +          "type": "0"
 +        },
@@ -15739,22 +26080,13 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "driver",
-+          "type": "239"
++          "type": "245"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "271",
-+      "meta-type": "enum",
-+      "values": [
-+        "retain",
-+        "read-only",
-+        "read-write"
-+      ]
-+    },
-+    {
-+      "name": "272",
++      "name": "278",
 +      "meta-type": "enum",
 +      "values": [
 +        "read",
@@ -15762,7 +26094,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "273",
++      "name": "279",
 +      "meta-type": "enum",
 +      "values": [
 +        "ignore",
@@ -15771,7 +26103,18 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "274",
++      "name": "280",
++      "meta-type": "enum",
++      "values": [
++        "commit",
++        "stream",
++        "mirror",
++        "backup",
++        "create"
++      ]
++    },
++    {
++      "name": "281",
 +      "members": [
 +        {
 +          "type": "str"
@@ -15783,36 +26126,36 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "275",
++      "name": "282",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "inet",
-+          "type": "396"
++          "type": "419"
 +        },
 +        {
 +          "case": "unix",
-+          "type": "397"
++          "type": "420"
 +        },
 +        {
 +          "case": "vsock",
-+          "type": "398"
++          "type": "421"
 +        },
 +        {
 +          "case": "fd",
-+          "type": "399"
++          "type": "422"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "395"
++          "type": "418"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "276",
++      "name": "283",
 +      "meta-type": "enum",
 +      "values": [
 +        "safe",
@@ -15820,7 +26163,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "277",
++      "name": "284",
 +      "meta-type": "enum",
 +      "values": [
 +        "read",
@@ -15829,7 +26172,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "278",
++      "name": "285",
 +      "meta-type": "enum",
 +      "values": [
 +        "utf8",
@@ -15837,100 +26180,572 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "279",
++      "name": "286",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "file",
-+          "type": "401"
++          "type": "424"
 +        },
 +        {
 +          "case": "serial",
-+          "type": "402"
++          "type": "425"
 +        },
 +        {
 +          "case": "parallel",
-+          "type": "402"
++          "type": "425"
 +        },
 +        {
 +          "case": "pipe",
-+          "type": "402"
++          "type": "425"
 +        },
 +        {
 +          "case": "socket",
-+          "type": "403"
++          "type": "426"
 +        },
 +        {
 +          "case": "udp",
-+          "type": "404"
++          "type": "427"
 +        },
 +        {
 +          "case": "pty",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "null",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "mux",
-+          "type": "406"
++          "type": "429"
 +        },
 +        {
 +          "case": "msmouse",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "wctablet",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "braille",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "testdev",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "stdio",
-+          "type": "407"
++          "type": "430"
 +        },
 +        {
 +          "case": "console",
-+          "type": "405"
++          "type": "428"
 +        },
 +        {
 +          "case": "spicevmc",
-+          "type": "408"
++          "type": "431"
 +        },
 +        {
 +          "case": "spiceport",
-+          "type": "409"
++          "type": "432"
 +        },
 +        {
 +          "case": "vc",
-+          "type": "410"
++          "type": "433"
 +        },
 +        {
 +          "case": "ringbuf",
-+          "type": "411"
++          "type": "434"
 +        },
 +        {
 +          "case": "memory",
-+          "type": "411"
++          "type": "434"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "400"
++          "type": "423"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "280",
++      "name": "287",
++      "meta-type": "enum",
++      "values": [
++        "elf",
++        "kdump-zlib",
++        "kdump-lzo",
++        "kdump-snappy",
++        "win-dmp"
++      ]
++    },
++    {
++      "name": "288",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "active",
++        "completed",
++        "failed"
++      ]
++    },
++    {
++      "name": "[287]",
++      "element-type": "287",
++      "meta-type": "array"
++    },
++    {
++      "name": "289",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "nic",
++        "user",
++        "tap",
++        "l2tpv3",
++        "socket",
++        "vde",
++        "bridge",
++        "hubport",
++        "netmap",
++        "vhost-user"
++      ]
++    },
++    {
++      "name": "290",
++      "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": "291",
++      "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": "[435]"
++        },
++        {
++          "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": "[435]"
++        },
++        {
++          "name": "guestfwd",
++          "default": null,
++          "type": "[435]"
++        },
++        {
++          "name": "tftp-server-name",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "292",
++      "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": "293",
++      "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": "294",
++      "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": "295",
++      "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": "296",
++      "members": [
++        {
++          "name": "br",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "helper",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "297",
++      "members": [
++        {
++          "name": "hubid",
++          "type": "int"
++        },
++        {
++          "name": "netdev",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "298",
++      "members": [
++        {
++          "name": "ifname",
++          "type": "str"
++        },
++        {
++          "name": "devname",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "299",
++      "members": [
++        {
++          "name": "chardev",
++          "type": "str"
++        },
++        {
++          "name": "vhostforce",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "queues",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "300",
 +      "meta-type": "enum",
 +      "values": [
 +        "normal",
@@ -15944,7 +26759,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "281",
++      "name": "301",
 +      "meta-type": "enum",
 +      "values": [
 +        "half",
@@ -15952,7 +26767,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "282",
++      "name": "302",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -15960,7 +26775,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "283",
++      "name": "303",
 +      "members": [
 +        {
 +          "name": "priority",
@@ -16019,7 +26834,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "284",
++      "name": "304",
 +      "members": [
 +        {
 +          "name": "in-pport",
@@ -16060,7 +26875,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "285",
++      "name": "305",
 +      "members": [
 +        {
 +          "name": "goto-tbl",
@@ -16096,28 +26911,28 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "286",
++      "name": "306",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "passthrough",
-+          "type": "413"
++          "type": "437"
 +        },
 +        {
 +          "case": "emulator",
-+          "type": "414"
++          "type": "438"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "412"
++          "type": "436"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "287",
++      "name": "307",
 +      "meta-type": "enum",
 +      "values": [
 +        "client",
@@ -16126,12 +26941,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[288]",
-+      "element-type": "288",
++      "name": "[308]",
++      "element-type": "308",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "288",
++      "name": "308",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16143,7 +26958,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "connection-id",
@@ -16165,7 +26980,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "289",
++      "name": "309",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16177,13 +26992,13 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "290",
++      "name": "310",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16195,7 +27010,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "auth",
@@ -16206,7 +27021,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "291",
++      "name": "311",
 +      "meta-type": "enum",
 +      "values": [
 +        "ipv4",
@@ -16217,12 +27032,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[292]",
-+      "element-type": "292",
++      "name": "[312]",
++      "element-type": "312",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "292",
++      "name": "312",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16234,7 +27049,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "websocket",
@@ -16254,12 +27069,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[293]",
-+      "element-type": "293",
++      "name": "[313]",
++      "element-type": "313",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "293",
++      "name": "313",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16271,7 +27086,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "websocket",
@@ -16279,18 +27094,18 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "auth",
-+          "type": "294"
++          "type": "314"
 +        },
 +        {
 +          "name": "vencrypt",
 +          "default": null,
-+          "type": "295"
++          "type": "315"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "294",
++      "name": "314",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -16305,7 +27120,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "295",
++      "name": "315",
 +      "meta-type": "enum",
 +      "values": [
 +        "plain",
@@ -16320,7 +27135,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "296",
++      "name": "316",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16332,7 +27147,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "websocket",
@@ -16347,7 +27162,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "297",
++      "name": "317",
 +      "members": [
 +        {
 +          "name": "host",
@@ -16359,7 +27174,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "family",
-+          "type": "291"
++          "type": "311"
 +        },
 +        {
 +          "name": "websocket",
@@ -16369,67 +27184,67 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[298]",
-+      "element-type": "298",
++      "name": "[318]",
++      "element-type": "318",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "298",
++      "name": "318",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "number",
-+          "type": "416"
++          "type": "440"
 +        },
 +        {
 +          "case": "qcode",
-+          "type": "417"
++          "type": "441"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "415"
++          "type": "439"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[299]",
-+      "element-type": "299",
++      "name": "[319]",
++      "element-type": "319",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "299",
++      "name": "319",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "key",
-+          "type": "419"
++          "type": "443"
 +        },
 +        {
 +          "case": "btn",
-+          "type": "420"
++          "type": "444"
 +        },
 +        {
 +          "case": "rel",
-+          "type": "421"
++          "type": "445"
 +        },
 +        {
 +          "case": "abs",
-+          "type": "421"
++          "type": "445"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "418"
++          "type": "442"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "300",
++      "name": "320",
 +      "meta-type": "enum",
 +      "values": [
 +        "default",
@@ -16443,7 +27258,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "301",
++      "name": "321",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -16453,7 +27268,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "302",
++      "name": "322",
 +      "members": [
 +        {
 +          "name": "grab-on-hover",
@@ -16469,7 +27284,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "303",
++      "name": "323",
 +      "members": [
 +        {
 +          "name": "charset",
@@ -16480,7 +27295,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "304",
++      "name": "324",
 +      "members": [
 +        {
 +          "name": "rendernode",
@@ -16491,7 +27306,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "305",
++      "name": "325",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -16506,11 +27321,12 @@ index 0000000000..ab0ac1e7bf
 +        "failed",
 +        "colo",
 +        "pre-switchover",
-+        "device"
++        "device",
++        "wait-unplug"
 +      ]
 +    },
 +    {
-+      "name": "306",
++      "name": "326",
 +      "members": [
 +        {
 +          "name": "transferred",
@@ -16572,7 +27388,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "307",
++      "name": "327",
 +      "members": [
 +        {
 +          "name": "cache-size",
@@ -16602,7 +27418,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "308",
++      "name": "328",
 +      "members": [
 +        {
 +          "name": "pages",
@@ -16628,41 +27444,41 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[309]",
-+      "element-type": "309",
++      "name": "[329]",
++      "element-type": "329",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "309",
++      "name": "329",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "inet",
-+          "type": "378"
++          "type": "401"
 +        },
 +        {
 +          "case": "unix",
-+          "type": "423"
++          "type": "447"
 +        },
 +        {
 +          "case": "vsock",
-+          "type": "424"
++          "type": "448"
 +        },
 +        {
 +          "case": "fd",
-+          "type": "425"
++          "type": "435"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "422"
++          "type": "446"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "310",
++      "name": "330",
 +      "meta-type": "enum",
 +      "values": [
 +        "xbzrle",
@@ -16681,11 +27497,20 @@ index 0000000000..ab0ac1e7bf
 +        "dirty-bitmaps",
 +        "postcopy-blocktime",
 +        "late-block-activate",
-+        "x-ignore-shared"
++        "x-ignore-shared",
++        "validate-uuid"
 +      ]
 +    },
 +    {
-+      "name": "311",
++      "name": "331",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "zlib"
++      ]
++    },
++    {
++      "name": "332",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -16694,7 +27519,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "312",
++      "name": "333",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -16709,80 +27534,84 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "[313]",
-+      "element-type": "313",
++      "name": "[334]",
++      "element-type": "334",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "313",
++      "name": "334",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "abort",
-+          "type": "427"
++          "type": "450"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-add",
-+          "type": "428"
++          "type": "451"
++        },
++        {
++          "case": "block-dirty-bitmap-remove",
++          "type": "452"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-clear",
-+          "type": "429"
++          "type": "452"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-enable",
-+          "type": "429"
++          "type": "452"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-disable",
-+          "type": "429"
++          "type": "452"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-merge",
-+          "type": "430"
++          "type": "453"
 +        },
 +        {
 +          "case": "blockdev-backup",
-+          "type": "431"
++          "type": "454"
 +        },
 +        {
 +          "case": "blockdev-snapshot",
-+          "type": "432"
++          "type": "455"
 +        },
 +        {
 +          "case": "blockdev-snapshot-internal-sync",
-+          "type": "433"
++          "type": "456"
 +        },
 +        {
 +          "case": "blockdev-snapshot-sync",
-+          "type": "434"
++          "type": "457"
 +        },
 +        {
 +          "case": "drive-backup",
-+          "type": "435"
++          "type": "458"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "426"
++          "type": "449"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "314",
++      "name": "335",
 +      "members": [
 +        {
 +          "name": "completion-mode",
 +          "default": null,
-+          "type": "436"
++          "type": "459"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "315",
++      "name": "336",
 +      "meta-type": "enum",
 +      "values": [
 +        "unavailable",
@@ -16791,7 +27620,37 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "316",
++      "name": "[337]",
++      "element-type": "337",
++      "meta-type": "array"
++    },
++    {
++      "name": "337",
++      "meta-type": "enum",
++      "values": [
++        "oob"
++      ]
++    },
++    {
++      "name": "338",
++      "members": [
++        {
++          "name": "major",
++          "type": "int"
++        },
++        {
++          "name": "minor",
++          "type": "int"
++        },
++        {
++          "name": "micro",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "339",
 +      "meta-type": "enum",
 +      "values": [
 +        "builtin",
@@ -16804,17 +27663,17 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "317",
++      "name": "340",
 +      "members": [
 +        {
 +          "name": "json-type",
-+          "type": "437"
++          "type": "460"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "318",
++      "name": "341",
 +      "members": [
 +        {
 +          "name": "values",
@@ -16824,7 +27683,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "319",
++      "name": "342",
 +      "members": [
 +        {
 +          "name": "element-type",
@@ -16834,11 +27693,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "320",
++      "name": "343",
 +      "members": [
 +        {
 +          "name": "members",
-+          "type": "[438]"
++          "type": "[461]"
 +        },
 +        {
 +          "name": "tag",
@@ -16848,23 +27707,23 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "variants",
 +          "default": null,
-+          "type": "[439]"
++          "type": "[462]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "321",
++      "name": "344",
 +      "members": [
 +        {
 +          "name": "members",
-+          "type": "[440]"
++          "type": "[463]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "322",
++      "name": "345",
 +      "members": [
 +        {
 +          "name": "arg-type",
@@ -16883,7 +27742,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "323",
++      "name": "346",
 +      "members": [
 +        {
 +          "name": "arg-type",
@@ -16893,37 +27752,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[324]",
-+      "element-type": "324",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "324",
-+      "meta-type": "enum",
-+      "values": [
-+        "oob"
-+      ]
-+    },
-+    {
-+      "name": "325",
-+      "members": [
-+        {
-+          "name": "major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "micro",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "326",
++      "name": "347",
 +      "members": [
 +        {
 +          "name": "node-id",
@@ -16936,6 +27765,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "die-id",
++          "default": null,
++          "type": "int"
++        },
++        {
 +          "name": "core-id",
 +          "default": null,
 +          "type": "int"
@@ -16949,7 +27783,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "327",
++      "name": "348",
 +      "meta-type": "enum",
 +      "values": [
 +        "x86",
@@ -16963,7 +27797,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "328",
++      "name": "349",
 +      "members": [
 +        {
 +          "name": "pc",
@@ -16973,7 +27807,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "329",
++      "name": "350",
 +      "members": [
 +        {
 +          "name": "pc",
@@ -16987,7 +27821,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "330",
++      "name": "351",
 +      "members": [
 +        {
 +          "name": "nip",
@@ -16997,7 +27831,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "331",
++      "name": "352",
 +      "members": [
 +        {
 +          "name": "PC",
@@ -17007,7 +27841,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "332",
++      "name": "353",
 +      "members": [
 +        {
 +          "name": "PC",
@@ -17017,17 +27851,17 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "333",
++      "name": "354",
 +      "members": [
 +        {
 +          "name": "cpu-state",
-+          "type": "441"
++          "type": "464"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "334",
++      "name": "355",
 +      "members": [
 +        {
 +          "name": "pc",
@@ -17037,7 +27871,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "335",
++      "name": "356",
 +      "meta-type": "enum",
 +      "values": [
 +        "aarch64",
@@ -17061,6 +27895,7 @@ index 0000000000..ab0ac1e7bf
 +        "ppc64",
 +        "riscv32",
 +        "riscv64",
++        "rx",
 +        "s390x",
 +        "sh4",
 +        "sh4eb",
@@ -17074,131 +27909,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[336]",
-+      "element-type": "336",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "336",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "function",
-+          "type": "int"
-+        },
-+        {
-+          "name": "class_info",
-+          "type": "442"
-+        },
-+        {
-+          "name": "id",
-+          "type": "443"
-+        },
-+        {
-+          "name": "irq",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "qdev_id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pci_bridge",
-+          "default": null,
-+          "type": "444"
-+        },
-+        {
-+          "name": "regions",
-+          "type": "[445]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "337",
-+      "meta-type": "enum",
-+      "values": [
-+        "elf",
-+        "kdump-zlib",
-+        "kdump-lzo",
-+        "kdump-snappy",
-+        "win-dmp"
-+      ]
-+    },
-+    {
-+      "name": "338",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "active",
-+        "completed",
-+        "failed"
-+      ]
-+    },
-+    {
-+      "name": "[337]",
-+      "element-type": "337",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "[339]",
-+      "element-type": "339",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "339",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[340]",
-+      "element-type": "340",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "340",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "446"
-+        },
-+        {
-+          "name": "help",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "341",
++      "name": "357",
 +      "meta-type": "enum",
 +      "values": [
 +        "default",
@@ -17208,42 +27919,18 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "342",
-+      "meta-type": "enum",
-+      "values": [
-+        "dimm",
-+        "nvdimm"
-+      ]
-+    },
-+    {
-+      "name": "343",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "447"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "344",
-+      "meta-type": "enum",
-+      "values": [
-+        "DIMM",
-+        "CPU"
-+      ]
-+    },
-+    {
-+      "name": "345",
++      "name": "358",
 +      "meta-type": "enum",
 +      "values": [
 +        "node",
 +        "dist",
-+        "cpu"
++        "cpu",
++        "hmat-lb",
++        "hmat-cache"
 +      ]
 +    },
 +    {
-+      "name": "346",
++      "name": "359",
 +      "members": [
 +        {
 +          "name": "nodeid",
@@ -17264,12 +27951,17 @@ index 0000000000..ab0ac1e7bf
 +          "name": "memdev",
 +          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "initiator",
++          "default": null,
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "347",
++      "name": "360",
 +      "members": [
 +        {
 +          "name": "src",
@@ -17287,7 +27979,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "348",
++      "name": "361",
 +      "members": [
 +        {
 +          "name": "node-id",
@@ -17300,6 +27992,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "die-id",
++          "default": null,
++          "type": "int"
++        },
++        {
 +          "name": "core-id",
 +          "default": null,
 +          "type": "int"
@@ -17313,19 +28010,69 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "349",
-+      "meta-type": "enum",
-+      "values": [
-+        "uninit",
-+        "launch-update",
-+        "launch-secret",
-+        "running",
-+        "send-update",
-+        "receive-update"
-+      ]
++      "name": "362",
++      "members": [
++        {
++          "name": "initiator",
++          "type": "int"
++        },
++        {
++          "name": "target",
++          "type": "int"
++        },
++        {
++          "name": "hierarchy",
++          "type": "465"
++        },
++        {
++          "name": "data-type",
++          "type": "466"
++        },
++        {
++          "name": "latency",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "bandwidth",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
 +    },
 +    {
-+      "name": "350",
++      "name": "363",
++      "members": [
++        {
++          "name": "node-id",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "level",
++          "type": "int"
++        },
++        {
++          "name": "associativity",
++          "type": "467"
++        },
++        {
++          "name": "policy",
++          "type": "468"
++        },
++        {
++          "name": "line",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "364",
 +      "members": [
 +        {
 +          "name": "name",
@@ -17340,7 +28087,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "351",
++      "name": "365",
 +      "meta-type": "enum",
 +      "values": [
 +        "incompatible",
@@ -17350,7 +28097,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "352",
++      "name": "366",
 +      "meta-type": "enum",
 +      "values": [
 +        "static",
@@ -17358,7 +28105,154 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "353",
++      "name": "[367]",
++      "element-type": "367",
++      "meta-type": "array"
++    },
++    {
++      "name": "367",
++      "members": [
++        {
++          "name": "bus",
++          "type": "int"
++        },
++        {
++          "name": "slot",
++          "type": "int"
++        },
++        {
++          "name": "function",
++          "type": "int"
++        },
++        {
++          "name": "class_info",
++          "type": "469"
++        },
++        {
++          "name": "id",
++          "type": "470"
++        },
++        {
++          "name": "irq",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "qdev_id",
++          "type": "str"
++        },
++        {
++          "name": "pci_bridge",
++          "default": null,
++          "type": "471"
++        },
++        {
++          "name": "regions",
++          "type": "[472]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[368]",
++      "element-type": "368",
++      "meta-type": "array"
++    },
++    {
++      "name": "368",
++      "members": [
++        {
++          "name": "fd",
++          "type": "int"
++        },
++        {
++          "name": "opaque",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[369]",
++      "element-type": "369",
++      "meta-type": "array"
++    },
++    {
++      "name": "369",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "type",
++          "type": "473"
++        },
++        {
++          "name": "help",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "default",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "370",
++      "meta-type": "enum",
++      "values": [
++        "dimm",
++        "nvdimm",
++        "virtio-pmem"
++      ]
++    },
++    {
++      "name": "371",
++      "members": [
++        {
++          "name": "data",
++          "type": "474"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "372",
++      "members": [
++        {
++          "name": "data",
++          "type": "475"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "373",
++      "meta-type": "enum",
++      "values": [
++        "DIMM",
++        "CPU"
++      ]
++    },
++    {
++      "name": "374",
++      "meta-type": "enum",
++      "values": [
++        "uninit",
++        "launch-update",
++        "launch-secret",
++        "running",
++        "send-update",
++        "receive-update"
++      ]
++    },
++    {
++      "name": "375",
 +      "meta-type": "enum",
 +      "values": [
 +        "hyper-v",
@@ -17366,7 +28260,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "354",
++      "name": "376",
 +      "members": [
 +        {
 +          "name": "arg1",
@@ -17392,7 +28286,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "355",
++      "name": "377",
 +      "members": [
 +        {
 +          "name": "core",
@@ -17408,13 +28302,13 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "reason",
-+          "type": "448"
++          "type": "476"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "356",
++      "name": "378",
 +      "meta-type": "enum",
 +      "values": [
 +        "active",
@@ -17425,12 +28319,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[357]",
-+      "element-type": "357",
++      "name": "[379]",
++      "element-type": "379",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "357",
++      "name": "379",
 +      "members": [
 +        {
 +          "name": "interval_length",
@@ -17484,7 +28378,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "358",
++      "name": "380",
 +      "members": [
 +        {
 +          "name": "boundaries",
@@ -17498,37 +28392,55 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[67]",
-+      "element-type": "67",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "359",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "qcow2",
-+          "type": "450"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "451"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "452"
-+        }
-+      ],
++      "name": "381",
 +      "members": [
 +        {
-+          "name": "type",
-+          "type": "449"
++          "name": "discard-nb-ok",
++          "type": "int"
++        },
++        {
++          "name": "discard-nb-failed",
++          "type": "int"
++        },
++        {
++          "name": "discard-bytes-ok",
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "360",
++      "name": "[69]",
++      "element-type": "69",
++      "meta-type": "array"
++    },
++    {
++      "name": "382",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "qcow2",
++          "type": "478"
++        },
++        {
++          "case": "vmdk",
++          "type": "479"
++        },
++        {
++          "case": "luks",
++          "type": "480"
++        }
++      ],
++      "members": [
++        {
++          "name": "type",
++          "type": "477"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "383",
 +      "meta-type": "enum",
 +      "values": [
 +        "block-backend",
@@ -17537,12 +28449,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[361]",
-+      "element-type": "361",
++      "name": "[384]",
++      "element-type": "384",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "361",
++      "name": "384",
 +      "meta-type": "enum",
 +      "values": [
 +        "consistent-read",
@@ -17553,10 +28465,10 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "362",
++      "name": "385",
 +      "members": [
 +        {
-+          "type": "45"
++          "type": "48"
 +        },
 +        {
 +          "type": "str"
@@ -17565,16 +28477,16 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "[363]",
-+      "element-type": "363",
++      "name": "[386]",
++      "element-type": "386",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "363",
++      "name": "386",
 +      "members": [
 +        {
 +          "name": "event",
-+          "type": "453"
++          "type": "481"
 +        },
 +        {
 +          "name": "state",
@@ -17582,6 +28494,11 @@ index 0000000000..ab0ac1e7bf
 +          "type": "int"
 +        },
 +        {
++          "name": "iotype",
++          "default": null,
++          "type": "482"
++        },
++        {
 +          "name": "errno",
 +          "default": null,
 +          "type": "int"
@@ -17605,16 +28522,16 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[364]",
-+      "element-type": "364",
++      "name": "[387]",
++      "element-type": "387",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "364",
++      "name": "387",
 +      "members": [
 +        {
 +          "name": "event",
-+          "type": "453"
++          "type": "481"
 +        },
 +        {
 +          "name": "state",
@@ -17629,7 +28546,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "365",
++      "name": "388",
 +      "meta-type": "enum",
 +      "values": [
 +        "auto",
@@ -17638,7 +28555,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "366",
++      "name": "389",
 +      "meta-type": "enum",
 +      "values": [
 +        "threads",
@@ -17646,7 +28563,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "367",
++      "name": "390",
 +      "meta-type": "enum",
 +      "values": [
 +        "tcp",
@@ -17654,7 +28571,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "368",
++      "name": "391",
 +      "meta-type": "enum",
 +      "values": [
 +        "crc32c",
@@ -17664,11 +28581,11 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "369",
++      "name": "392",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "454"
++          "type": "483"
 +        },
 +        {
 +          "name": "host",
@@ -17678,10 +28595,10 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "370",
++      "name": "393",
 +      "members": [
 +        {
-+          "type": "45"
++          "type": "48"
 +        },
 +        {
 +          "type": "str"
@@ -17693,62 +28610,62 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "371",
++      "name": "394",
 +      "members": [
 +        {
-+          "type": "455"
++          "type": "484"
 +        },
 +        {
-+          "type": "456"
++          "type": "485"
 +        }
 +      ],
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "372",
++      "name": "395",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "aes",
-+          "type": "458"
++          "type": "487"
 +        },
 +        {
 +          "case": "luks",
-+          "type": "459"
++          "type": "488"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "457"
++          "type": "486"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "373",
++      "name": "396",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "aes",
-+          "type": "458"
++          "type": "487"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "460"
++          "type": "489"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[362]",
-+      "element-type": "362",
++      "name": "[385]",
++      "element-type": "385",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "374",
++      "name": "397",
 +      "meta-type": "enum",
 +      "values": [
 +        "quorum",
@@ -17756,12 +28673,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[375]",
-+      "element-type": "375",
++      "name": "[398]",
++      "element-type": "398",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "375",
++      "name": "398",
 +      "meta-type": "enum",
 +      "values": [
 +        "cephx",
@@ -17769,12 +28686,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[376]",
-+      "element-type": "376",
++      "name": "[399]",
++      "element-type": "399",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "376",
++      "name": "399",
 +      "members": [
 +        {
 +          "name": "host",
@@ -17788,7 +28705,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "377",
++      "name": "400",
 +      "meta-type": "enum",
 +      "values": [
 +        "primary",
@@ -17796,7 +28713,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "378",
++      "name": "401",
 +      "members": [
 +        {
 +          "name": "host",
@@ -17825,17 +28742,22 @@ index 0000000000..ab0ac1e7bf
 +          "name": "ipv6",
 +          "default": null,
 +          "type": "bool"
++        },
++        {
++          "name": "keep-alive",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "379",
++      "name": "402",
 +      "tag": "mode",
 +      "variants": [
 +        {
 +          "case": "hash",
-+          "type": "462"
++          "type": "491"
 +        },
 +        {
 +          "case": "none",
@@ -17849,13 +28771,13 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "mode",
-+          "type": "461"
++          "type": "490"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "380",
++      "name": "403",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -17868,7 +28790,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "463"
++          "type": "492"
 +        },
 +        {
 +          "name": "nocow",
@@ -17879,11 +28801,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "381",
++      "name": "404",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "249"
++          "type": "256"
 +        },
 +        {
 +          "name": "size",
@@ -17892,13 +28814,13 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "463"
++          "type": "492"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "382",
++      "name": "405",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -17908,27 +28830,27 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "cipher-alg",
 +          "default": null,
-+          "type": "464"
++          "type": "493"
 +        },
 +        {
 +          "name": "cipher-mode",
 +          "default": null,
-+          "type": "465"
++          "type": "494"
 +        },
 +        {
 +          "name": "ivgen-alg",
 +          "default": null,
-+          "type": "466"
++          "type": "495"
 +        },
 +        {
 +          "name": "ivgen-hash-alg",
 +          "default": null,
-+          "type": "467"
++          "type": "496"
 +        },
 +        {
 +          "name": "hash-alg",
 +          "default": null,
-+          "type": "467"
++          "type": "496"
 +        },
 +        {
 +          "name": "iter-time",
@@ -17937,21 +28859,26 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
 +          "type": "int"
++        },
++        {
++          "name": "preallocation",
++          "default": null,
++          "type": "492"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "383",
++      "name": "406",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "255"
++          "type": "262"
 +        },
 +        {
 +          "name": "size",
@@ -17961,11 +28888,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "384",
++      "name": "407",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -17980,11 +28907,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "385",
++      "name": "408",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -17998,22 +28925,22 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "468"
++          "type": "497"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "386",
++      "name": "409",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "data-file",
 +          "default": null,
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "data-file-raw",
@@ -18027,7 +28954,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "version",
 +          "default": null,
-+          "type": "469"
++          "type": "498"
 +        },
 +        {
 +          "name": "backing-file",
@@ -18037,12 +28964,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "backing-fmt",
 +          "default": null,
-+          "type": "239"
++          "type": "245"
 +        },
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "468"
++          "type": "497"
 +        },
 +        {
 +          "name": "cluster-size",
@@ -18052,7 +28979,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "463"
++          "type": "492"
 +        },
 +        {
 +          "name": "lazy-refcounts",
@@ -18068,11 +28995,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "387",
++      "name": "410",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -18086,7 +29013,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "backing-fmt",
 +          "default": null,
-+          "type": "239"
++          "type": "245"
 +        },
 +        {
 +          "name": "cluster-size",
@@ -18102,11 +29029,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "388",
++      "name": "411",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "263"
++          "type": "270"
 +        },
 +        {
 +          "name": "size",
@@ -18121,11 +29048,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "389",
++      "name": "412",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "265"
++          "type": "272"
 +        },
 +        {
 +          "name": "size",
@@ -18139,12 +29066,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "463"
++          "type": "492"
 +        },
 +        {
 +          "name": "redundancy",
 +          "default": null,
-+          "type": "470"
++          "type": "499"
 +        },
 +        {
 +          "name": "object-size",
@@ -18155,11 +29082,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "390",
++      "name": "413",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "266"
++          "type": "273"
 +        },
 +        {
 +          "name": "size",
@@ -18169,11 +29096,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "391",
++      "name": "414",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -18182,17 +29109,17 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "463"
++          "type": "492"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "392",
++      "name": "415",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -18211,7 +29138,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "subformat",
 +          "default": null,
-+          "type": "471"
++          "type": "500"
 +        },
 +        {
 +          "name": "block-state-zero",
@@ -18222,11 +29149,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "393",
++      "name": "416",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -18235,12 +29162,12 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "extents",
 +          "default": null,
-+          "type": "[362]"
++          "type": "[385]"
 +        },
 +        {
 +          "name": "subformat",
 +          "default": null,
-+          "type": "472"
++          "type": "501"
 +        },
 +        {
 +          "name": "backing-file",
@@ -18250,7 +29177,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "adapter-type",
 +          "default": null,
-+          "type": "473"
++          "type": "502"
 +        },
 +        {
 +          "name": "hwversion",
@@ -18266,11 +29193,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "394",
++      "name": "417",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "362"
++          "type": "385"
 +        },
 +        {
 +          "name": "size",
@@ -18279,7 +29206,7 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "subformat",
 +          "default": null,
-+          "type": "474"
++          "type": "503"
 +        },
 +        {
 +          "name": "force-size",
@@ -18295,7 +29222,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "395",
++      "name": "418",
 +      "meta-type": "enum",
 +      "values": [
 +        "inet",
@@ -18305,47 +29232,47 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "396",
++      "name": "419",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "378"
++          "type": "401"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "397",
++      "name": "420",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "423"
++          "type": "447"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "398",
++      "name": "421",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "424"
++          "type": "448"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "399",
++      "name": "422",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "425"
++          "type": "435"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "400",
++      "name": "423",
 +      "meta-type": "enum",
 +      "values": [
 +        "file",
@@ -18371,117 +29298,132 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "401",
++      "name": "424",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "475"
++          "type": "504"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "402",
++      "name": "425",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "476"
++          "type": "505"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "403",
++      "name": "426",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "477"
++          "type": "506"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "404",
++      "name": "427",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "478"
++          "type": "507"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "405",
++      "name": "428",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "479"
++          "type": "508"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "406",
++      "name": "429",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "480"
++          "type": "509"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "407",
++      "name": "430",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "481"
++          "type": "510"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "408",
++      "name": "431",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "482"
++          "type": "511"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "409",
++      "name": "432",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "483"
++          "type": "512"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "410",
++      "name": "433",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "484"
++          "type": "513"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "411",
++      "name": "434",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "485"
++          "type": "514"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "412",
++      "name": "[435]",
++      "element-type": "435",
++      "meta-type": "array"
++    },
++    {
++      "name": "435",
++      "members": [
++        {
++          "name": "str",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "436",
 +      "meta-type": "enum",
 +      "values": [
 +        "passthrough",
@@ -18489,27 +29431,27 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "413",
++      "name": "437",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "486"
++          "type": "515"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "414",
++      "name": "438",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "487"
++          "type": "516"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "415",
++      "name": "439",
 +      "meta-type": "enum",
 +      "values": [
 +        "number",
@@ -18517,7 +29459,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "416",
++      "name": "440",
 +      "members": [
 +        {
 +          "name": "data",
@@ -18527,17 +29469,17 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "417",
++      "name": "441",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "488"
++          "type": "517"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "418",
++      "name": "442",
 +      "meta-type": "enum",
 +      "values": [
 +        "key",
@@ -18547,37 +29489,37 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "419",
++      "name": "443",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "489"
++          "type": "518"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "420",
++      "name": "444",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "490"
++          "type": "519"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "421",
++      "name": "445",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "491"
++          "type": "520"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "422",
++      "name": "446",
 +      "meta-type": "enum",
 +      "values": [
 +        "inet",
@@ -18587,7 +29529,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "423",
++      "name": "447",
 +      "members": [
 +        {
 +          "name": "path",
@@ -18597,7 +29539,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "424",
++      "name": "448",
 +      "members": [
 +        {
 +          "name": "cid",
@@ -18611,21 +29553,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "425",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "426",
++      "name": "449",
 +      "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",
@@ -18638,87 +29571,57 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "427",
++      "name": "450",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "492"
++          "type": "521"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "428",
++      "name": "451",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "31"
++          "type": "35"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "429",
++      "name": "452",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "32"
++          "type": "36"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "430",
++      "name": "453",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "33"
++          "type": "37"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "431",
++      "name": "454",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "27"
++          "type": "30"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "432",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "23"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "433",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "65"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "434",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "22"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "435",
++      "name": "455",
 +      "members": [
 +        {
 +          "name": "data",
@@ -18728,7 +29631,37 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "436",
++      "name": "456",
++      "members": [
++        {
++          "name": "data",
++          "type": "67"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "457",
++      "members": [
++        {
++          "name": "data",
++          "type": "25"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "458",
++      "members": [
++        {
++          "name": "data",
++          "type": "29"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "459",
 +      "meta-type": "enum",
 +      "values": [
 +        "individual",
@@ -18736,7 +29669,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "437",
++      "name": "460",
 +      "meta-type": "enum",
 +      "values": [
 +        "string",
@@ -18750,12 +29683,12 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "[438]",
-+      "element-type": "438",
++      "name": "[461]",
++      "element-type": "461",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "438",
++      "name": "461",
 +      "members": [
 +        {
 +          "name": "name",
@@ -18769,17 +29702,22 @@ index 0000000000..ab0ac1e7bf
 +          "name": "default",
 +          "default": null,
 +          "type": "any"
++        },
++        {
++          "name": "features",
++          "default": null,
++          "type": "[str]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[439]",
-+      "element-type": "439",
++      "name": "[462]",
++      "element-type": "462",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "439",
++      "name": "462",
 +      "members": [
 +        {
 +          "name": "case",
@@ -18793,12 +29731,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[440]",
-+      "element-type": "440",
++      "name": "[463]",
++      "element-type": "463",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "440",
++      "name": "463",
 +      "members": [
 +        {
 +          "name": "type",
@@ -18808,7 +29746,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "441",
++      "name": "464",
 +      "meta-type": "enum",
 +      "values": [
 +        "uninitialized",
@@ -18819,7 +29757,47 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "442",
++      "name": "465",
++      "meta-type": "enum",
++      "values": [
++        "memory",
++        "first-level",
++        "second-level",
++        "third-level"
++      ]
++    },
++    {
++      "name": "466",
++      "meta-type": "enum",
++      "values": [
++        "access-latency",
++        "read-latency",
++        "write-latency",
++        "access-bandwidth",
++        "read-bandwidth",
++        "write-bandwidth"
++      ]
++    },
++    {
++      "name": "467",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "direct",
++        "complex"
++      ]
++    },
++    {
++      "name": "468",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "write-back",
++        "write-through"
++      ]
++    },
++    {
++      "name": "469",
 +      "members": [
 +        {
 +          "name": "desc",
@@ -18834,7 +29812,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "443",
++      "name": "470",
 +      "members": [
 +        {
 +          "name": "device",
@@ -18858,27 +29836,27 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "444",
++      "name": "471",
 +      "members": [
 +        {
 +          "name": "bus",
-+          "type": "493"
++          "type": "522"
 +        },
 +        {
 +          "name": "devices",
 +          "default": null,
-+          "type": "[336]"
++          "type": "[367]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[445]",
-+      "element-type": "445",
++      "name": "[472]",
++      "element-type": "472",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "445",
++      "name": "472",
 +      "members": [
 +        {
 +          "name": "bar",
@@ -18910,7 +29888,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "446",
++      "name": "473",
 +      "meta-type": "enum",
 +      "values": [
 +        "string",
@@ -18920,7 +29898,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "447",
++      "name": "474",
 +      "members": [
 +        {
 +          "name": "id",
@@ -18959,7 +29937,30 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "448",
++      "name": "475",
++      "members": [
++        {
++          "name": "id",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "memaddr",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "memdev",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "476",
 +      "meta-type": "enum",
 +      "values": [
 +        "unknown",
@@ -18970,7 +29971,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "449",
++      "name": "477",
 +      "meta-type": "enum",
 +      "values": [
 +        "qcow2",
@@ -18979,37 +29980,37 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "450",
++      "name": "478",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "494"
++          "type": "523"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "451",
++      "name": "479",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "495"
++          "type": "524"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "452",
++      "name": "480",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "496"
++          "type": "525"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "453",
++      "name": "481",
 +      "meta-type": "enum",
 +      "values": [
 +        "l1_update",
@@ -19058,23 +30059,36 @@ index 0000000000..ab0ac1e7bf
 +        "l1_shrink_write_table",
 +        "l1_shrink_free_l2_clusters",
 +        "cor_write",
-+        "cluster_alloc_space"
++        "cluster_alloc_space",
++        "none"
 +      ]
 +    },
 +    {
-+      "name": "454",
++      "name": "482",
++      "meta-type": "enum",
++      "values": [
++        "read",
++        "write",
++        "write-zeroes",
++        "discard",
++        "flush",
++        "block-status"
++      ]
++    },
++    {
++      "name": "483",
 +      "meta-type": "enum",
 +      "values": [
 +        "inet"
 +      ]
 +    },
 +    {
-+      "name": "455",
++      "name": "484",
 +      "members": [
 +        {
 +          "name": "template",
 +          "default": null,
-+          "type": "456"
++          "type": "485"
 +        },
 +        {
 +          "name": "main-header",
@@ -19125,7 +30139,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "456",
++      "name": "485",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -19135,7 +30149,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "457",
++      "name": "486",
 +      "meta-type": "enum",
 +      "values": [
 +        "aes",
@@ -19143,7 +30157,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "458",
++      "name": "487",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -19154,7 +30168,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "459",
++      "name": "488",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -19165,14 +30179,14 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "460",
++      "name": "489",
 +      "meta-type": "enum",
 +      "values": [
 +        "aes"
 +      ]
 +    },
 +    {
-+      "name": "461",
++      "name": "490",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -19181,11 +30195,11 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "462",
++      "name": "491",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "497"
++          "type": "526"
 +        },
 +        {
 +          "name": "hash",
@@ -19195,7 +30209,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "463",
++      "name": "492",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -19205,7 +30219,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "464",
++      "name": "493",
 +      "meta-type": "enum",
 +      "values": [
 +        "aes-128",
@@ -19223,7 +30237,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "465",
++      "name": "494",
 +      "meta-type": "enum",
 +      "values": [
 +        "ecb",
@@ -19233,7 +30247,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "466",
++      "name": "495",
 +      "meta-type": "enum",
 +      "values": [
 +        "plain",
@@ -19242,7 +30256,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "467",
++      "name": "496",
 +      "meta-type": "enum",
 +      "values": [
 +        "md5",
@@ -19255,28 +30269,28 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "468",
++      "name": "497",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "qcow",
-+          "type": "458"
++          "type": "487"
 +        },
 +        {
 +          "case": "luks",
-+          "type": "499"
++          "type": "528"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "498"
++          "type": "527"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "469",
++      "name": "498",
 +      "meta-type": "enum",
 +      "values": [
 +        "v2",
@@ -19284,28 +30298,28 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "470",
++      "name": "499",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "full",
-+          "type": "501"
++          "type": "530"
 +        },
 +        {
 +          "case": "erasure-coded",
-+          "type": "502"
++          "type": "531"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "500"
++          "type": "529"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "471",
++      "name": "500",
 +      "meta-type": "enum",
 +      "values": [
 +        "dynamic",
@@ -19313,7 +30327,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "472",
++      "name": "501",
 +      "meta-type": "enum",
 +      "values": [
 +        "monolithicSparse",
@@ -19324,7 +30338,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "473",
++      "name": "502",
 +      "meta-type": "enum",
 +      "values": [
 +        "ide",
@@ -19334,7 +30348,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "474",
++      "name": "503",
 +      "meta-type": "enum",
 +      "values": [
 +        "dynamic",
@@ -19342,7 +30356,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "475",
++      "name": "504",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19372,7 +30386,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "476",
++      "name": "505",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19392,7 +30406,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "477",
++      "name": "506",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19406,7 +30420,7 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "addr",
-+          "type": "275"
++          "type": "282"
 +        },
 +        {
 +          "name": "tls-creds",
@@ -19457,7 +30471,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "478",
++      "name": "507",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19471,18 +30485,18 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "remote",
-+          "type": "275"
++          "type": "282"
 +        },
 +        {
 +          "name": "local",
 +          "default": null,
-+          "type": "275"
++          "type": "282"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "479",
++      "name": "508",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19498,7 +30512,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "480",
++      "name": "509",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19518,7 +30532,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "481",
++      "name": "510",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19539,7 +30553,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "482",
++      "name": "511",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19559,7 +30573,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "483",
++      "name": "512",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19579,7 +30593,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "484",
++      "name": "513",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19615,7 +30629,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "485",
++      "name": "514",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -19636,7 +30650,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "486",
++      "name": "515",
 +      "members": [
 +        {
 +          "name": "path",
@@ -19652,7 +30666,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "487",
++      "name": "516",
 +      "members": [
 +        {
 +          "name": "chardev",
@@ -19662,7 +30676,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "488",
++      "name": "517",
 +      "meta-type": "enum",
 +      "values": [
 +        "unmapped",
@@ -19816,11 +30830,11 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "489",
++      "name": "518",
 +      "members": [
 +        {
 +          "name": "key",
-+          "type": "298"
++          "type": "318"
 +        },
 +        {
 +          "name": "down",
@@ -19830,11 +30844,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "490",
++      "name": "519",
 +      "members": [
 +        {
 +          "name": "button",
-+          "type": "503"
++          "type": "532"
 +        },
 +        {
 +          "name": "down",
@@ -19844,11 +30858,11 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "491",
++      "name": "520",
 +      "members": [
 +        {
 +          "name": "axis",
-+          "type": "504"
++          "type": "533"
 +        },
 +        {
 +          "name": "value",
@@ -19858,13 +30872,13 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "492",
++      "name": "521",
 +      "members": [
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "493",
++      "name": "522",
 +      "members": [
 +        {
 +          "name": "number",
@@ -19880,21 +30894,21 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "io_range",
-+          "type": "505"
++          "type": "534"
 +        },
 +        {
 +          "name": "memory_range",
-+          "type": "505"
++          "type": "534"
 +        },
 +        {
 +          "name": "prefetchable_range",
-+          "type": "505"
++          "type": "534"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "494",
++      "name": "523",
 +      "members": [
 +        {
 +          "name": "compat",
@@ -19927,18 +30941,18 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "506"
++          "type": "535"
 +        },
 +        {
 +          "name": "bitmaps",
 +          "default": null,
-+          "type": "[507]"
++          "type": "[536]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "495",
++      "name": "524",
 +      "members": [
 +        {
 +          "name": "create-type",
@@ -19954,34 +30968,34 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "extents",
-+          "type": "[233]"
++          "type": "[239]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "496",
++      "name": "525",
 +      "members": [
 +        {
 +          "name": "cipher-alg",
-+          "type": "464"
++          "type": "493"
 +        },
 +        {
 +          "name": "cipher-mode",
-+          "type": "465"
++          "type": "494"
 +        },
 +        {
 +          "name": "ivgen-alg",
-+          "type": "466"
++          "type": "495"
 +        },
 +        {
 +          "name": "ivgen-hash-alg",
 +          "default": null,
-+          "type": "467"
++          "type": "496"
 +        },
 +        {
 +          "name": "hash-alg",
-+          "type": "467"
++          "type": "496"
 +        },
 +        {
 +          "name": "payload-offset",
@@ -19997,13 +31011,13 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "slots",
-+          "type": "[508]"
++          "type": "[537]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "497",
++      "name": "526",
 +      "meta-type": "enum",
 +      "values": [
 +        "md5",
@@ -20011,7 +31025,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "498",
++      "name": "527",
 +      "meta-type": "enum",
 +      "values": [
 +        "qcow",
@@ -20019,7 +31033,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "499",
++      "name": "528",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -20029,27 +31043,27 @@ index 0000000000..ab0ac1e7bf
 +        {
 +          "name": "cipher-alg",
 +          "default": null,
-+          "type": "464"
++          "type": "493"
 +        },
 +        {
 +          "name": "cipher-mode",
 +          "default": null,
-+          "type": "465"
++          "type": "494"
 +        },
 +        {
 +          "name": "ivgen-alg",
 +          "default": null,
-+          "type": "466"
++          "type": "495"
 +        },
 +        {
 +          "name": "ivgen-hash-alg",
 +          "default": null,
-+          "type": "467"
++          "type": "496"
 +        },
 +        {
 +          "name": "hash-alg",
 +          "default": null,
-+          "type": "467"
++          "type": "496"
 +        },
 +        {
 +          "name": "iter-time",
@@ -20060,7 +31074,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "500",
++      "name": "529",
 +      "meta-type": "enum",
 +      "values": [
 +        "full",
@@ -20068,7 +31082,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "501",
++      "name": "530",
 +      "members": [
 +        {
 +          "name": "copies",
@@ -20078,7 +31092,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "502",
++      "name": "531",
 +      "members": [
 +        {
 +          "name": "data-strips",
@@ -20092,7 +31106,7 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "503",
++      "name": "532",
 +      "meta-type": "enum",
 +      "values": [
 +        "left",
@@ -20105,7 +31119,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "504",
++      "name": "533",
 +      "meta-type": "enum",
 +      "values": [
 +        "x",
@@ -20113,7 +31127,7 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    },
 +    {
-+      "name": "505",
++      "name": "534",
 +      "members": [
 +        {
 +          "name": "base",
@@ -20127,12 +31141,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "506",
++      "name": "535",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "luks",
-+          "type": "496"
++          "type": "525"
 +        },
 +        {
 +          "case": "aes",
@@ -20142,18 +31156,18 @@ index 0000000000..ab0ac1e7bf
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "457"
++          "type": "486"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[507]",
-+      "element-type": "507",
++      "name": "[536]",
++      "element-type": "536",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "507",
++      "name": "536",
 +      "members": [
 +        {
 +          "name": "name",
@@ -20165,23 +31179,23 @@ index 0000000000..ab0ac1e7bf
 +        },
 +        {
 +          "name": "flags",
-+          "type": "[509]"
++          "type": "[538]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[233]",
-+      "element-type": "233",
++      "name": "[239]",
++      "element-type": "239",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "[508]",
-+      "element-type": "508",
++      "name": "[537]",
++      "element-type": "537",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "508",
++      "name": "537",
 +      "members": [
 +        {
 +          "name": "active",
@@ -20205,12 +31219,12 @@ index 0000000000..ab0ac1e7bf
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[509]",
-+      "element-type": "509",
++      "name": "[538]",
++      "element-type": "538",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "509",
++      "name": "538",
 +      "meta-type": "enum",
 +      "values": [
 +        "in-use",
@@ -20218,7 +31232,20 @@ index 0000000000..ab0ac1e7bf
 +      ]
 +    }
 +  ],
-+  "id": "libvirt-49"
++  "id": "libvirt-45"
++}
++
++{
++  "execute": "query-sev-capabilities",
++  "id": "libvirt-46"
++}
++
++{
++  "id": "libvirt-46",
++  "error": {
++    "class": "GenericError",
++    "desc": "SEV feature is not available"
++  }
 +}
 +
 +{
@@ -20229,7 +31256,7 @@ index 0000000000..ab0ac1e7bf
 +      "name": "host"
 +    }
 +  },
-+  "id": "libvirt-50"
++  "id": "libvirt-47"
 +}
 +
 +{
@@ -20237,52 +31264,87 @@ index 0000000000..ab0ac1e7bf
 +    "model": {
 +      "name": "base",
 +      "props": {
++        "vmx-entry-load-rtit-ctl": false,
 +        "cmov": true,
 +        "ia64": false,
 +        "ssb-no": false,
 +        "aes": true,
++        "vmx-apicv-xapic": true,
 +        "mmx": true,
 +        "rdpid": false,
 +        "arat": true,
++        "vmx-page-walk-4": true,
++        "vmx-page-walk-5": false,
 +        "gfni": false,
 +        "ibrs-all": false,
++        "vmx-desc-exit": true,
 +        "pause-filter": false,
 +        "xsavec": true,
 +        "intel-pt": false,
++        "vmx-cr8-store-exit": true,
++        "vmx-rdseed-exit": true,
++        "vmx-eptp-switching": true,
 +        "kvm-asyncpf": true,
 +        "perfctr-core": false,
 +        "mpx": true,
 +        "pbe": false,
 +        "avx512cd": false,
 +        "decodeassists": false,
++        "vmx-exit-load-efer": true,
++        "vmx-exit-clear-bndcfgs": false,
 +        "sse4.1": true,
 +        "family": 6,
++        "vmx-vmwrite-vmexit-fields": true,
++        "vmx-vnmi": true,
++        "vmx-true-ctls": true,
++        "vmx-ept-execonly": true,
++        "vmx-exit-save-efer": true,
++        "vmx-invept-all-context": true,
 +        "wbnoinvd": false,
 +        "avx512f": false,
 +        "msr": true,
 +        "mce": true,
 +        "mca": true,
 +        "xcrypt": false,
-+        "min-level": 13,
++        "vmx-exit-load-pat": true,
++        "vmx-intr-exit": true,
++        "min-level": 22,
++        "vmx-flexpriority": true,
 +        "xgetbv1": true,
 +        "cid": false,
 +        "ds": false,
 +        "fxsr": true,
++        "avx512-bf16": false,
++        "vmx-cr8-load-exit": true,
 +        "xsaveopt": true,
++        "vmx-apicv-vid": false,
++        "vmx-exit-save-pat": true,
 +        "xtpr": false,
++        "tsx-ctrl": false,
++        "vmx-ple": false,
 +        "avx512vl": false,
 +        "avx512-vpopcntdq": false,
 +        "phe": false,
 +        "extapic": false,
 +        "3dnowprefetch": true,
++        "vmx-vmfunc": true,
++        "vmx-activity-shutdown": false,
 +        "avx512vbmi2": false,
 +        "cr8legacy": false,
-+        "stibp": false,
++        "vmx-encls-exit": false,
++        "stibp": true,
++        "vmx-msr-bitmap": true,
 +        "xcrypt-en": false,
++        "vmx-mwait-exit": true,
++        "vmx-pml": true,
++        "vmx-nmi-exit": true,
++        "vmx-invept-single-context-noglobals": true,
 +        "pn": false,
 +        "rsba": false,
 +        "dca": false,
 +        "vendor": "GenuineIntel",
++        "vmx-unrestricted-guest": true,
++        "vmx-cr3-store-noexit": true,
 +        "pku": false,
 +        "smx": false,
 +        "cmp-legacy": false,
@@ -20293,6 +31355,7 @@ index 0000000000..ab0ac1e7bf
 +        "amd-no-ssb": false,
 +        "npt": false,
 +        "rdctl-no": false,
++        "vmx-invvpid": true,
 +        "clwb": false,
 +        "lbrv": false,
 +        "adx": true,
@@ -20302,49 +31365,70 @@ index 0000000000..ab0ac1e7bf
 +        "smep": true,
 +        "smap": true,
 +        "pfthreshold": false,
++        "vmx-invpcid-exit": true,
 +        "x2apic": true,
 +        "avx512vbmi": false,
 +        "avx512vnni": false,
++        "vmx-apicv-x2apic": true,
++        "kvm-pv-sched-yield": true,
++        "vmx-invlpg-exit": true,
++        "vmx-invvpid-all-context": true,
++        "vmx-activity-hlt": true,
 +        "flushbyasid": false,
 +        "f16c": true,
++        "vmx-exit-ack-intr": true,
 +        "ace2-en": false,
 +        "pae": true,
 +        "pat": true,
 +        "sse": true,
 +        "phe-en": false,
++        "vmx-tsc-offset": true,
 +        "kvm-nopiodelay": true,
 +        "tm": false,
 +        "kvmclock-stable-bit": true,
++        "vmx-rdtsc-exit": true,
 +        "hypervisor": true,
++        "vmx-rdtscp-exit": true,
 +        "mds-no": false,
 +        "pcommit": false,
++        "vmx-vpid": true,
 +        "syscall": true,
 +        "avx512dq": false,
 +        "svm": false,
 +        "invtsc": false,
++        "vmx-monitor-exit": true,
 +        "sse2": true,
-+        "ssbd": false,
++        "ssbd": true,
++        "vmx-wbinvd-exit": true,
 +        "est": false,
++        "kvm-poll-control": true,
 +        "avx512ifma": false,
 +        "tm2": false,
 +        "kvm-pv-eoi": true,
 +        "kvm-pv-ipi": true,
 +        "cx8": true,
++        "vmx-invvpid-single-addr": true,
++        "waitpkg": false,
 +        "cldemote": false,
++        "vmx-ept": true,
 +        "kvm-mmu": false,
 +        "sse4.2": true,
 +        "pge": true,
 +        "avx512bitalg": false,
 +        "pdcm": false,
++        "vmx-entry-load-bndcfgs": false,
++        "vmx-exit-clear-rtit-ctl": false,
 +        "model": 94,
 +        "movbe": true,
 +        "nrip-save": false,
 +        "ssse3": true,
 +        "sse4a": false,
++        "vmx-pause-exit": true,
 +        "invpcid": true,
 +        "pdpe1gb": true,
 +        "tsc-deadline": true,
 +        "skip-l1dfl-vmentry": true,
++        "vmx-exit-load-perf-global-ctrl": false,
 +        "fma": true,
 +        "cx16": true,
 +        "de": true,
@@ -20358,25 +31442,39 @@ index 0000000000..ab0ac1e7bf
 +        "ds-cpl": false,
 +        "ibs": false,
 +        "fma4": false,
++        "vmx-exit-nosave-debugctl": true,
 +        "la57": false,
++        "vmx-invept": true,
 +        "osvw": false,
 +        "apic": true,
 +        "pmm": false,
-+        "spec-ctrl": false,
++        "vmx-entry-noload-debugctl": true,
++        "vmx-eptad": true,
++        "spec-ctrl": true,
++        "vmx-posted-intr": false,
++        "vmx-apicv-register": false,
 +        "tsc-adjust": true,
 +        "kvm-steal-time": true,
 +        "kvmclock": true,
++        "vmx-zero-len-inject": false,
++        "pschange-mc-no": true,
++        "vmx-rdrand-exit": true,
 +        "lwp": false,
 +        "amd-ssbd": false,
 +        "xop": false,
 +        "ibpb": false,
 +        "avx": true,
++        "core-capability": false,
++        "vmx-invept-single-context": true,
 +        "movdiri": false,
 +        "acpi": false,
 +        "avx512bw": false,
 +        "ace2": false,
 +        "fsgsbase": true,
++        "vmx-ept-2mb": true,
++        "vmx-ept-1gb": true,
 +        "ht": false,
++        "vmx-io-exit": true,
 +        "nx": true,
 +        "pclmulqdq": true,
 +        "mmxext": false,
@@ -20384,31 +31482,50 @@ index 0000000000..ab0ac1e7bf
 +        "vaes": false,
 +        "movdir64b": false,
 +        "xsaves": true,
++        "vmx-shadow-vmcs": true,
 +        "lm": true,
++        "vmx-exit-save-preemption-timer": true,
++        "vmx-entry-load-pat": true,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": true,
 +        "umip": true,
++        "vmx-store-lma": true,
++        "vmx-movdr-exit": true,
 +        "pse": true,
 +        "avx2": true,
 +        "sep": true,
 +        "virt-ssbd": false,
++        "vmx-cr3-load-noexit": true,
 +        "nodeid-msr": false,
-+        "md-clear": false,
++        "md-clear": true,
 +        "misalignsse": false,
++        "split-lock-detect": false,
 +        "min-xlevel": 2147483656,
 +        "bmi1": true,
 +        "bmi2": true,
 +        "kvm-pv-unhalt": true,
 +        "tsc-scale": false,
 +        "topoext": false,
++        "amd-stibp": false,
++        "vmx-preemption-timer": true,
 +        "clflushopt": true,
++        "vmx-vnmi-pending": true,
 +        "monitor": false,
++        "vmx-vintr-pending": true,
 +        "avx512er": false,
 +        "pmm-en": false,
 +        "pcid": true,
++        "taa-no": false,
 +        "arch-capabilities": true,
++        "vmx-secondary-ctls": true,
++        "vmx-xsaves": true,
++        "clzero": false,
 +        "3dnow": false,
 +        "erms": true,
++        "vmx-entry-ia32e-mode": true,
 +        "lahf-lm": true,
 +        "vpclmulqdq": false,
++        "vmx-ins-outs": true,
 +        "fxsr-opt": false,
 +        "xstore": false,
 +        "rtm": true,
@@ -20423,508 +31540,26 @@ index 0000000000..ab0ac1e7bf
 +        "dtes64": false,
 +        "mtrr": true,
 +        "rdtscp": true,
++        "xsaveerptr": false,
 +        "pse36": true,
 +        "kvm-pv-tlb-flush": true,
++        "vmx-activity-wait-sipi": false,
 +        "tbm": false,
 +        "wdt": false,
++        "vmx-rdpmc-exit": true,
++        "vmx-mtf": true,
++        "vmx-entry-load-efer": true,
 +        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
 +        "sha-ni": false,
 +        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
 +        "avx512pf": false,
++        "vmx-hlt-exit": true,
 +        "xstore-en": false
 +      }
 +    }
 +  },
-+  "id": "libvirt-50"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": false,
-+        "rdctl-no": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "mds-no": false,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "kvm-pv-ipi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "movdiri": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "vaes": false,
-+        "movdir64b": false,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "arch-capabilities": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "kvm-hint-dedicated": false,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "x-intel-pt-auto-level": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "host-phys-bits-limit": 0,
-+        "vmware-cpuid-freq": true,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "hv-evmcs": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "rsba": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "hv-ipi": false,
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "hle": true,
-+        "npt": false,
-+        "rdctl-no": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "x-hv-synic-kvm-only": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "mds-no": false,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "x-migrate-smi-count": true,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-ipi": true,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmm": false,
-+        "pmu": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "movdiri": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "movdir64b": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "arch-capabilities": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": true,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
++  "id": "libvirt-47"
 +}
 +
 +{
@@ -20938,7 +31573,7 @@ index 0000000000..ab0ac1e7bf
 +      }
 +    }
 +  },
-+  "id": "libvirt-52"
++  "id": "libvirt-48"
 +}
 +
 +{
@@ -20946,52 +31581,87 @@ index 0000000000..ab0ac1e7bf
 +    "model": {
 +      "name": "base",
 +      "props": {
++        "vmx-entry-load-rtit-ctl": false,
 +        "cmov": true,
 +        "ia64": false,
 +        "ssb-no": false,
 +        "aes": true,
++        "vmx-apicv-xapic": true,
 +        "mmx": true,
 +        "rdpid": false,
 +        "arat": true,
++        "vmx-page-walk-4": true,
++        "vmx-page-walk-5": false,
 +        "gfni": false,
 +        "ibrs-all": false,
++        "vmx-desc-exit": true,
 +        "pause-filter": false,
 +        "xsavec": true,
 +        "intel-pt": false,
++        "vmx-cr8-store-exit": true,
++        "vmx-rdseed-exit": true,
++        "vmx-eptp-switching": true,
 +        "kvm-asyncpf": true,
 +        "perfctr-core": false,
 +        "mpx": true,
 +        "pbe": false,
 +        "avx512cd": false,
 +        "decodeassists": false,
++        "vmx-exit-load-efer": true,
++        "vmx-exit-clear-bndcfgs": false,
 +        "sse4.1": true,
 +        "family": 6,
++        "vmx-vmwrite-vmexit-fields": true,
++        "vmx-vnmi": true,
++        "vmx-true-ctls": true,
++        "vmx-ept-execonly": true,
++        "vmx-exit-save-efer": true,
++        "vmx-invept-all-context": true,
 +        "wbnoinvd": false,
 +        "avx512f": false,
 +        "msr": true,
 +        "mce": true,
 +        "mca": true,
 +        "xcrypt": false,
-+        "min-level": 13,
++        "vmx-exit-load-pat": true,
++        "vmx-intr-exit": true,
++        "min-level": 22,
++        "vmx-flexpriority": true,
 +        "xgetbv1": true,
 +        "cid": false,
 +        "ds": false,
 +        "fxsr": true,
++        "avx512-bf16": false,
++        "vmx-cr8-load-exit": true,
 +        "xsaveopt": true,
++        "vmx-apicv-vid": false,
++        "vmx-exit-save-pat": true,
 +        "xtpr": false,
++        "tsx-ctrl": false,
++        "vmx-ple": false,
 +        "avx512vl": false,
 +        "avx512-vpopcntdq": false,
 +        "phe": false,
 +        "extapic": false,
 +        "3dnowprefetch": true,
++        "vmx-vmfunc": true,
++        "vmx-activity-shutdown": false,
 +        "avx512vbmi2": false,
 +        "cr8legacy": false,
-+        "stibp": false,
++        "vmx-encls-exit": false,
++        "stibp": true,
++        "vmx-msr-bitmap": true,
 +        "xcrypt-en": false,
++        "vmx-mwait-exit": true,
++        "vmx-pml": true,
++        "vmx-nmi-exit": true,
++        "vmx-invept-single-context-noglobals": true,
 +        "pn": false,
 +        "rsba": false,
 +        "dca": false,
 +        "vendor": "GenuineIntel",
++        "vmx-unrestricted-guest": true,
++        "vmx-cr3-store-noexit": true,
 +        "pku": false,
 +        "smx": false,
 +        "cmp-legacy": false,
@@ -21002,6 +31672,7 @@ index 0000000000..ab0ac1e7bf
 +        "amd-no-ssb": false,
 +        "npt": false,
 +        "rdctl-no": false,
++        "vmx-invvpid": true,
 +        "clwb": false,
 +        "lbrv": false,
 +        "adx": true,
@@ -21011,49 +31682,70 @@ index 0000000000..ab0ac1e7bf
 +        "smep": true,
 +        "smap": true,
 +        "pfthreshold": false,
++        "vmx-invpcid-exit": true,
 +        "x2apic": true,
 +        "avx512vbmi": false,
 +        "avx512vnni": false,
++        "vmx-apicv-x2apic": true,
++        "kvm-pv-sched-yield": true,
++        "vmx-invlpg-exit": true,
++        "vmx-invvpid-all-context": true,
++        "vmx-activity-hlt": true,
 +        "flushbyasid": false,
 +        "f16c": true,
++        "vmx-exit-ack-intr": true,
 +        "ace2-en": false,
 +        "pae": true,
 +        "pat": true,
 +        "sse": true,
 +        "phe-en": false,
++        "vmx-tsc-offset": true,
 +        "kvm-nopiodelay": true,
 +        "tm": false,
 +        "kvmclock-stable-bit": true,
++        "vmx-rdtsc-exit": true,
 +        "hypervisor": true,
++        "vmx-rdtscp-exit": true,
 +        "mds-no": false,
 +        "pcommit": false,
++        "vmx-vpid": true,
 +        "syscall": true,
 +        "avx512dq": false,
 +        "svm": false,
-+        "invtsc": false,
++        "invtsc": true,
++        "vmx-monitor-exit": true,
 +        "sse2": true,
-+        "ssbd": false,
++        "ssbd": true,
++        "vmx-wbinvd-exit": true,
 +        "est": false,
++        "kvm-poll-control": true,
 +        "avx512ifma": false,
 +        "tm2": false,
 +        "kvm-pv-eoi": true,
 +        "kvm-pv-ipi": true,
 +        "cx8": true,
++        "vmx-invvpid-single-addr": true,
++        "waitpkg": false,
 +        "cldemote": false,
++        "vmx-ept": true,
 +        "kvm-mmu": false,
 +        "sse4.2": true,
 +        "pge": true,
 +        "avx512bitalg": false,
 +        "pdcm": false,
++        "vmx-entry-load-bndcfgs": false,
++        "vmx-exit-clear-rtit-ctl": false,
 +        "model": 94,
 +        "movbe": true,
 +        "nrip-save": false,
 +        "ssse3": true,
 +        "sse4a": false,
++        "vmx-pause-exit": true,
 +        "invpcid": true,
 +        "pdpe1gb": true,
 +        "tsc-deadline": true,
 +        "skip-l1dfl-vmentry": true,
++        "vmx-exit-load-perf-global-ctrl": false,
 +        "fma": true,
 +        "cx16": true,
 +        "de": true,
@@ -21067,25 +31759,39 @@ index 0000000000..ab0ac1e7bf
 +        "ds-cpl": false,
 +        "ibs": false,
 +        "fma4": false,
++        "vmx-exit-nosave-debugctl": true,
 +        "la57": false,
++        "vmx-invept": true,
 +        "osvw": false,
 +        "apic": true,
 +        "pmm": false,
-+        "spec-ctrl": false,
++        "vmx-entry-noload-debugctl": true,
++        "vmx-eptad": true,
++        "spec-ctrl": true,
++        "vmx-posted-intr": false,
++        "vmx-apicv-register": false,
 +        "tsc-adjust": true,
 +        "kvm-steal-time": true,
 +        "kvmclock": true,
++        "vmx-zero-len-inject": false,
++        "pschange-mc-no": true,
++        "vmx-rdrand-exit": true,
 +        "lwp": false,
 +        "amd-ssbd": false,
 +        "xop": false,
 +        "ibpb": false,
 +        "avx": true,
++        "core-capability": false,
++        "vmx-invept-single-context": true,
 +        "movdiri": false,
 +        "acpi": false,
 +        "avx512bw": false,
 +        "ace2": false,
 +        "fsgsbase": true,
++        "vmx-ept-2mb": true,
++        "vmx-ept-1gb": true,
 +        "ht": false,
++        "vmx-io-exit": true,
 +        "nx": true,
 +        "pclmulqdq": true,
 +        "mmxext": false,
@@ -21093,31 +31799,50 @@ index 0000000000..ab0ac1e7bf
 +        "vaes": false,
 +        "movdir64b": false,
 +        "xsaves": true,
++        "vmx-shadow-vmcs": true,
 +        "lm": true,
++        "vmx-exit-save-preemption-timer": true,
++        "vmx-entry-load-pat": true,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": true,
 +        "umip": true,
++        "vmx-store-lma": true,
++        "vmx-movdr-exit": true,
 +        "pse": true,
 +        "avx2": true,
 +        "sep": true,
 +        "virt-ssbd": false,
++        "vmx-cr3-load-noexit": true,
 +        "nodeid-msr": false,
-+        "md-clear": false,
++        "md-clear": true,
 +        "misalignsse": false,
++        "split-lock-detect": false,
 +        "min-xlevel": 2147483656,
 +        "bmi1": true,
 +        "bmi2": true,
 +        "kvm-pv-unhalt": true,
 +        "tsc-scale": false,
 +        "topoext": false,
++        "amd-stibp": false,
++        "vmx-preemption-timer": true,
 +        "clflushopt": true,
++        "vmx-vnmi-pending": true,
 +        "monitor": false,
++        "vmx-vintr-pending": true,
 +        "avx512er": false,
 +        "pmm-en": false,
 +        "pcid": true,
++        "taa-no": false,
 +        "arch-capabilities": true,
++        "vmx-secondary-ctls": true,
++        "vmx-xsaves": true,
++        "clzero": false,
 +        "3dnow": false,
 +        "erms": true,
++        "vmx-entry-ia32e-mode": true,
 +        "lahf-lm": true,
 +        "vpclmulqdq": false,
++        "vmx-ins-outs": true,
 +        "fxsr-opt": false,
 +        "xstore": false,
 +        "rtm": true,
@@ -21132,521 +31857,26 @@ index 0000000000..ab0ac1e7bf
 +        "dtes64": false,
 +        "mtrr": true,
 +        "rdtscp": true,
++        "xsaveerptr": false,
 +        "pse36": true,
 +        "kvm-pv-tlb-flush": true,
++        "vmx-activity-wait-sipi": false,
 +        "tbm": false,
 +        "wdt": false,
++        "vmx-rdpmc-exit": true,
++        "vmx-mtf": true,
++        "vmx-entry-load-efer": true,
 +        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
 +        "sha-ni": false,
 +        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
 +        "avx512pf": false,
++        "vmx-hlt-exit": true,
 +        "xstore-en": false
 +      }
 +    }
 +  },
-+  "id": "libvirt-52"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": false,
-+        "rdctl-no": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "mds-no": false,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "kvm-pv-ipi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "movdiri": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "vaes": false,
-+        "movdir64b": false,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "arch-capabilities": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "kvm-hint-dedicated": false,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-53"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "x-intel-pt-auto-level": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "host-phys-bits-limit": 0,
-+        "vmware-cpuid-freq": true,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "hv-evmcs": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "rsba": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "hv-ipi": false,
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "hle": true,
-+        "npt": false,
-+        "rdctl-no": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "x-hv-synic-kvm-only": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "mds-no": false,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "x-migrate-smi-count": true,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-ipi": true,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "skip-l1dfl-vmentry": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmm": false,
-+        "pmu": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "movdiri": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "movdir64b": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "arch-capabilities": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": true,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-53"
-+}
-+
-+{
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-54"
-+}
-+
-+{
-+  "id": "libvirt-54",
-+  "error": {
-+    "class": "GenericError",
-+    "desc": "SEV feature is not available"
-+  }
++  "id": "libvirt-48"
 +}
 +
 +{
@@ -21693,10 +31923,27 @@ index 0000000000..ab0ac1e7bf
 +      "migration-safe": true
 +    },
 +    {
++      "name": "qemu64-v1",
++      "typename": "qemu64-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
 +      "name": "qemu64",
 +      "typename": "qemu64-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "qemu64-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32-v1",
++      "typename": "qemu32-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21705,6 +31952,16 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "qemu32-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "qemu32-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom-v1",
++      "typename": "phenom-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fxsr-opt"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21714,6 +31971,15 @@ index 0000000000..ab0ac1e7bf
 +      "unavailable-features": [
 +        "fxsr-opt"
 +      ],
++      "alias-of": "phenom-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3-v1",
++      "typename": "pentium3-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21722,6 +31988,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "pentium3-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "pentium3-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2-v1",
++      "typename": "pentium2-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21730,6 +32005,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "pentium2-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "pentium2-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium-v1",
++      "typename": "pentium-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21738,6 +32022,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "pentium-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "pentium-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270-v1",
++      "typename": "n270-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21746,6 +32039,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "n270-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "n270-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64-v1",
++      "typename": "kvm64-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21754,6 +32056,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "kvm64-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "kvm64-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32-v1",
++      "typename": "kvm32-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21762,6 +32073,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "kvm32-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "kvm32-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo-v1",
++      "typename": "coreduo-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21770,6 +32090,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "coreduo-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "coreduo-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo-v1",
++      "typename": "core2duo-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21778,6 +32107,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "core2duo-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "core2duo-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon-v1",
++      "typename": "athlon-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21786,6 +32124,24 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "athlon-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "athlon-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v2",
++      "typename": "Westmere-v2-x86_64-cpu",
++      "unavailable-features": [
++        "spec-ctrl"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v1",
++      "typename": "Westmere-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21795,6 +32151,7 @@ index 0000000000..ab0ac1e7bf
 +      "unavailable-features": [
 +        "spec-ctrl"
 +      ],
++      "alias-of": "Westmere-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21803,6 +32160,184 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Westmere-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Westmere-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v2",
++      "typename": "Snowridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "rdseed",
++        "sha-ni",
++        "umip",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "spec-ctrl",
++        "arch-capabilities",
++        "core-capability",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v1",
++      "typename": "Snowridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "rdseed",
++        "sha-ni",
++        "umip",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "spec-ctrl",
++        "arch-capabilities",
++        "core-capability",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge",
++      "typename": "Snowridge-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "rdseed",
++        "sha-ni",
++        "umip",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "spec-ctrl",
++        "arch-capabilities",
++        "core-capability",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "split-lock-detect"
++      ],
++      "alias-of": "Snowridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v3",
++      "typename": "Skylake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "spec-ctrl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v2",
++      "typename": "Skylake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "spec-ctrl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-v1",
++      "typename": "Skylake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Server-noTSX-IBRS",
++      "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "spec-ctrl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "alias-of": "Skylake-Server-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21830,6 +32365,7 @@ index 0000000000..ab0ac1e7bf
 +        "3dnowprefetch",
 +        "xsavec"
 +      ],
++      "alias-of": "Skylake-Server-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21856,6 +32392,91 @@ index 0000000000..ab0ac1e7bf
 +        "3dnowprefetch",
 +        "xsavec"
 +      ],
++      "alias-of": "Skylake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v3",
++      "typename": "Skylake-Client-v3-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "rdseed",
++        "spec-ctrl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v2",
++      "typename": "Skylake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "rdseed",
++        "spec-ctrl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-v1",
++      "typename": "Skylake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "rdseed",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Skylake-Client-noTSX-IBRS",
++      "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "rdseed",
++        "spec-ctrl",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "alias-of": "Skylake-Client-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21878,6 +32499,7 @@ index 0000000000..ab0ac1e7bf
 +        "3dnowprefetch",
 +        "xsavec"
 +      ],
++      "alias-of": "Skylake-Client-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21899,6 +32521,30 @@ index 0000000000..ab0ac1e7bf
 +        "3dnowprefetch",
 +        "xsavec"
 +      ],
++      "alias-of": "Skylake-Client-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v2",
++      "typename": "SandyBridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "spec-ctrl"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "SandyBridge-v1",
++      "typename": "SandyBridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "avx"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21911,6 +32557,7 @@ index 0000000000..ab0ac1e7bf
 +        "avx",
 +        "spec-ctrl"
 +      ],
++      "alias-of": "SandyBridge-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21922,6 +32569,15 @@ index 0000000000..ab0ac1e7bf
 +        "tsc-deadline",
 +        "avx"
 +      ],
++      "alias-of": "SandyBridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Penryn-v1",
++      "typename": "Penryn-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21930,6 +32586,24 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Penryn-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Penryn-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G5-v1",
++      "typename": "Opteron_G5-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "misalignsse",
++        "3dnowprefetch",
++        "xop",
++        "fma4",
++        "tbm",
++        "nrip-save"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21947,6 +32621,21 @@ index 0000000000..ab0ac1e7bf
 +        "tbm",
 +        "nrip-save"
 +      ],
++      "alias-of": "Opteron_G5-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G4-v1",
++      "typename": "Opteron_G4-v1-x86_64-cpu",
++      "unavailable-features": [
++        "avx",
++        "misalignsse",
++        "3dnowprefetch",
++        "xop",
++        "fma4",
++        "nrip-save"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21961,6 +32650,16 @@ index 0000000000..ab0ac1e7bf
 +        "fma4",
 +        "nrip-save"
 +      ],
++      "alias-of": "Opteron_G4-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G3-v1",
++      "typename": "Opteron_G3-v1-x86_64-cpu",
++      "unavailable-features": [
++        "misalignsse"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21970,6 +32669,15 @@ index 0000000000..ab0ac1e7bf
 +      "unavailable-features": [
 +        "misalignsse"
 +      ],
++      "alias-of": "Opteron_G3-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G2-v1",
++      "typename": "Opteron_G2-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21978,6 +32686,15 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Opteron_G2-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Opteron_G2-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Opteron_G1-v1",
++      "typename": "Opteron_G1-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21986,6 +32703,24 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Opteron_G1-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Opteron_G1-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v2",
++      "typename": "Nehalem-v2-x86_64-cpu",
++      "unavailable-features": [
++        "spec-ctrl"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Nehalem-v1",
++      "typename": "Nehalem-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -21995,6 +32730,7 @@ index 0000000000..ab0ac1e7bf
 +      "unavailable-features": [
 +        "spec-ctrl"
 +      ],
++      "alias-of": "Nehalem-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22003,6 +32739,30 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Nehalem-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Nehalem-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "KnightsMill-v1",
++      "typename": "KnightsMill-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "avx512f",
++        "rdseed",
++        "avx512pf",
++        "avx512er",
++        "avx512cd",
++        "avx512-vpopcntdq",
++        "avx512-4vnniw",
++        "avx512-4fmaps",
++        "3dnowprefetch"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22026,6 +32786,32 @@ index 0000000000..ab0ac1e7bf
 +        "avx512-4fmaps",
 +        "3dnowprefetch"
 +      ],
++      "alias-of": "KnightsMill-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v2",
++      "typename": "IvyBridge-v2-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "spec-ctrl"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "IvyBridge-v1",
++      "typename": "IvyBridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22039,6 +32825,7 @@ index 0000000000..ab0ac1e7bf
 +        "f16c",
 +        "spec-ctrl"
 +      ],
++      "alias-of": "IvyBridge-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22051,6 +32838,118 @@ index 0000000000..ab0ac1e7bf
 +        "avx",
 +        "f16c"
 +      ],
++      "alias-of": "IvyBridge-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v2",
++      "typename": "Icelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "umip",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "wbnoinvd",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-v1",
++      "typename": "Icelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "umip",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "wbnoinvd",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Server-noTSX",
++      "typename": "Icelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vbmi",
++        "umip",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "wbnoinvd",
++        "xsavec"
++      ],
++      "alias-of": "Icelake-Server-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22089,6 +32988,103 @@ index 0000000000..ab0ac1e7bf
 +        "wbnoinvd",
 +        "xsavec"
 +      ],
++      "alias-of": "Icelake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v2",
++      "typename": "Icelake-Client-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "rdseed",
++        "avx512vbmi",
++        "umip",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "wbnoinvd",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-v1",
++      "typename": "Icelake-Client-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "rdseed",
++        "avx512vbmi",
++        "umip",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "wbnoinvd",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Icelake-Client-noTSX",
++      "typename": "Icelake-Client-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "rdseed",
++        "avx512vbmi",
++        "umip",
++        "avx512vbmi2",
++        "gfni",
++        "vaes",
++        "vpclmulqdq",
++        "avx512vnni",
++        "avx512bitalg",
++        "avx512-vpopcntdq",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "wbnoinvd",
++        "xsavec"
++      ],
++      "alias-of": "Icelake-Client-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22122,6 +33118,77 @@ index 0000000000..ab0ac1e7bf
 +        "wbnoinvd",
 +        "xsavec"
 +      ],
++      "alias-of": "Icelake-Client-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v4",
++      "typename": "Haswell-v4-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "spec-ctrl"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v3",
++      "typename": "Haswell-v3-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "spec-ctrl"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v2",
++      "typename": "Haswell-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Haswell-v1",
++      "typename": "Haswell-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22139,6 +33206,7 @@ index 0000000000..ab0ac1e7bf
 +        "invpcid",
 +        "spec-ctrl"
 +      ],
++      "alias-of": "Haswell-v4",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22155,6 +33223,7 @@ index 0000000000..ab0ac1e7bf
 +        "avx2",
 +        "invpcid"
 +      ],
++      "alias-of": "Haswell-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22174,6 +33243,7 @@ index 0000000000..ab0ac1e7bf
 +        "rtm",
 +        "spec-ctrl"
 +      ],
++      "alias-of": "Haswell-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22192,6 +33262,137 @@ index 0000000000..ab0ac1e7bf
 +        "invpcid",
 +        "rtm"
 +      ],
++      "alias-of": "Haswell-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v3",
++      "typename": "EPYC-v3-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "avx2",
++        "rdseed",
++        "sha-ni",
++        "fxsr-opt",
++        "misalignsse",
++        "3dnowprefetch",
++        "osvw",
++        "topoext",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "ibpb",
++        "nrip-save",
++        "xsavec",
++        "xsaves"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v2",
++      "typename": "EPYC-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "avx2",
++        "rdseed",
++        "sha-ni",
++        "fxsr-opt",
++        "misalignsse",
++        "3dnowprefetch",
++        "osvw",
++        "topoext",
++        "ibpb",
++        "nrip-save",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-v1",
++      "typename": "EPYC-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "avx2",
++        "rdseed",
++        "sha-ni",
++        "fxsr-opt",
++        "misalignsse",
++        "3dnowprefetch",
++        "osvw",
++        "topoext",
++        "nrip-save",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-Rome-v1",
++      "typename": "EPYC-Rome-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "avx2",
++        "rdseed",
++        "sha-ni",
++        "umip",
++        "rdpid",
++        "fxsr-opt",
++        "misalignsse",
++        "3dnowprefetch",
++        "osvw",
++        "topoext",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "wbnoinvd",
++        "ibpb",
++        "amd-stibp",
++        "nrip-save",
++        "xsavec",
++        "xsaves"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "EPYC-Rome",
++      "typename": "EPYC-Rome-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "avx2",
++        "rdseed",
++        "sha-ni",
++        "umip",
++        "rdpid",
++        "fxsr-opt",
++        "misalignsse",
++        "3dnowprefetch",
++        "osvw",
++        "topoext",
++        "perfctr-core",
++        "clzero",
++        "xsaveerptr",
++        "wbnoinvd",
++        "ibpb",
++        "amd-stibp",
++        "nrip-save",
++        "xsavec",
++        "xsaves"
++      ],
++      "alias-of": "EPYC-Rome-v1",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22214,6 +33415,7 @@ index 0000000000..ab0ac1e7bf
 +        "nrip-save",
 +        "xsavec"
 +      ],
++      "alias-of": "EPYC-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22235,6 +33437,28 @@ index 0000000000..ab0ac1e7bf
 +        "nrip-save",
 +        "xsavec"
 +      ],
++      "alias-of": "EPYC-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Dhyana-v1",
++      "typename": "Dhyana-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "avx",
++        "f16c",
++        "avx2",
++        "rdseed",
++        "fxsr-opt",
++        "misalignsse",
++        "3dnowprefetch",
++        "osvw",
++        "topoext",
++        "ibpb",
++        "nrip-save",
++        "xsavec"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22256,6 +33480,150 @@ index 0000000000..ab0ac1e7bf
 +        "nrip-save",
 +        "xsavec"
 +      ],
++      "alias-of": "Dhyana-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v2",
++      "typename": "Denverton-v2-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "rdseed",
++        "sha-ni",
++        "spec-ctrl",
++        "arch-capabilities",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "skip-l1dfl-vmentry"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton-v1",
++      "typename": "Denverton-v1-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "rdseed",
++        "sha-ni",
++        "spec-ctrl",
++        "arch-capabilities",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "skip-l1dfl-vmentry"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Denverton",
++      "typename": "Denverton-x86_64-cpu",
++      "unavailable-features": [
++        "x2apic",
++        "tsc-deadline",
++        "rdseed",
++        "sha-ni",
++        "spec-ctrl",
++        "arch-capabilities",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "skip-l1dfl-vmentry"
++      ],
++      "alias-of": "Denverton-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake-v1",
++      "typename": "Cooperlake-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vnni",
++        "spec-ctrl",
++        "stibp",
++        "arch-capabilities",
++        "ssbd",
++        "avx512-bf16",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "ibrs-all",
++        "skip-l1dfl-vmentry",
++        "mds-no",
++        "pschange-mc-no",
++        "taa-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cooperlake",
++      "typename": "Cooperlake-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vnni",
++        "spec-ctrl",
++        "stibp",
++        "arch-capabilities",
++        "ssbd",
++        "avx512-bf16",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "ibrs-all",
++        "skip-l1dfl-vmentry",
++        "mds-no",
++        "pschange-mc-no",
++        "taa-no"
++      ],
++      "alias-of": "Cooperlake-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Conroe-v1",
++      "typename": "Conroe-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22264,6 +33632,135 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "Conroe-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "Conroe-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v3",
++      "typename": "Cascadelake-Server-v3-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vnni",
++        "spec-ctrl",
++        "arch-capabilities",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "ibrs-all",
++        "skip-l1dfl-vmentry",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v2",
++      "typename": "Cascadelake-Server-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vnni",
++        "spec-ctrl",
++        "arch-capabilities",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "ibrs-all",
++        "skip-l1dfl-vmentry",
++        "mds-no"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-v1",
++      "typename": "Cascadelake-Server-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vnni",
++        "spec-ctrl",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Cascadelake-Server-noTSX",
++      "typename": "Cascadelake-Server-noTSX-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "avx512f",
++        "avx512dq",
++        "rdseed",
++        "avx512cd",
++        "avx512bw",
++        "avx512vl",
++        "avx512vnni",
++        "spec-ctrl",
++        "arch-capabilities",
++        "ssbd",
++        "3dnowprefetch",
++        "xsavec",
++        "rdctl-no",
++        "ibrs-all",
++        "skip-l1dfl-vmentry",
++        "mds-no"
++      ],
++      "alias-of": "Cascadelake-Server-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22293,6 +33790,85 @@ index 0000000000..ab0ac1e7bf
 +        "3dnowprefetch",
 +        "xsavec"
 +      ],
++      "alias-of": "Cascadelake-Server-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v4",
++      "typename": "Broadwell-v4-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "rdseed",
++        "spec-ctrl",
++        "3dnowprefetch"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v3",
++      "typename": "Broadwell-v3-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "rdseed",
++        "spec-ctrl",
++        "3dnowprefetch"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v2",
++      "typename": "Broadwell-v2-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "avx2",
++        "invpcid",
++        "rdseed",
++        "3dnowprefetch"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Broadwell-v1",
++      "typename": "Broadwell-v1-x86_64-cpu",
++      "unavailable-features": [
++        "fma",
++        "pcid",
++        "x2apic",
++        "tsc-deadline",
++        "avx",
++        "f16c",
++        "hle",
++        "avx2",
++        "invpcid",
++        "rtm",
++        "rdseed",
++        "3dnowprefetch"
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22312,6 +33888,7 @@ index 0000000000..ab0ac1e7bf
 +        "spec-ctrl",
 +        "3dnowprefetch"
 +      ],
++      "alias-of": "Broadwell-v4",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22330,6 +33907,7 @@ index 0000000000..ab0ac1e7bf
 +        "rdseed",
 +        "3dnowprefetch"
 +      ],
++      "alias-of": "Broadwell-v2",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22351,6 +33929,7 @@ index 0000000000..ab0ac1e7bf
 +        "spec-ctrl",
 +        "3dnowprefetch"
 +      ],
++      "alias-of": "Broadwell-v3",
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22371,6 +33950,15 @@ index 0000000000..ab0ac1e7bf
 +        "rdseed",
 +        "3dnowprefetch"
 +      ],
++      "alias-of": "Broadwell-v1",
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "486-v1",
++      "typename": "486-v1-x86_64-cpu",
++      "unavailable-features": [
++      ],
 +      "static": false,
 +      "migration-safe": true
 +    },
@@ -22379,6 +33967,7 @@ index 0000000000..ab0ac1e7bf
 +      "typename": "486-x86_64-cpu",
 +      "unavailable-features": [
 +      ],
++      "alias-of": "486-v1",
 +      "static": false,
 +      "migration-safe": true
 +    }
@@ -22402,52 +33991,87 @@ index 0000000000..ab0ac1e7bf
 +    "model": {
 +      "name": "base",
 +      "props": {
++        "vmx-entry-load-rtit-ctl": false,
 +        "cmov": true,
 +        "ia64": false,
 +        "ssb-no": false,
 +        "aes": true,
++        "vmx-apicv-xapic": false,
 +        "mmx": true,
 +        "rdpid": false,
 +        "arat": true,
++        "vmx-page-walk-4": false,
++        "vmx-page-walk-5": false,
 +        "gfni": false,
 +        "ibrs-all": false,
++        "vmx-desc-exit": false,
 +        "pause-filter": false,
 +        "xsavec": false,
 +        "intel-pt": false,
++        "vmx-cr8-store-exit": false,
++        "vmx-rdseed-exit": false,
++        "vmx-eptp-switching": false,
 +        "kvm-asyncpf": false,
 +        "perfctr-core": false,
 +        "mpx": true,
 +        "pbe": false,
 +        "avx512cd": false,
 +        "decodeassists": false,
++        "vmx-exit-load-efer": false,
++        "vmx-exit-clear-bndcfgs": false,
 +        "sse4.1": true,
 +        "family": 6,
++        "vmx-vmwrite-vmexit-fields": false,
++        "vmx-vnmi": false,
++        "vmx-true-ctls": false,
++        "vmx-ept-execonly": false,
++        "vmx-exit-save-efer": false,
++        "vmx-invept-all-context": false,
 +        "wbnoinvd": false,
 +        "avx512f": false,
 +        "msr": true,
 +        "mce": true,
 +        "mca": true,
 +        "xcrypt": false,
++        "vmx-exit-load-pat": false,
++        "vmx-intr-exit": false,
 +        "min-level": 13,
++        "vmx-flexpriority": false,
 +        "xgetbv1": true,
 +        "cid": false,
 +        "ds": false,
 +        "fxsr": true,
++        "avx512-bf16": false,
++        "vmx-cr8-load-exit": false,
 +        "xsaveopt": true,
++        "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": false,
++        "vmx-vmfunc": false,
++        "vmx-activity-shutdown": false,
 +        "avx512vbmi2": false,
 +        "cr8legacy": true,
++        "vmx-encls-exit": false,
 +        "stibp": false,
++        "vmx-msr-bitmap": false,
 +        "xcrypt-en": false,
++        "vmx-mwait-exit": false,
++        "vmx-pml": false,
++        "vmx-nmi-exit": 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,
 +        "smx": false,
 +        "cmp-legacy": false,
@@ -22458,6 +34082,7 @@ index 0000000000..ab0ac1e7bf
 +        "amd-no-ssb": false,
 +        "npt": true,
 +        "rdctl-no": false,
++        "vmx-invvpid": false,
 +        "clwb": true,
 +        "lbrv": false,
 +        "adx": true,
@@ -22467,49 +34092,70 @@ index 0000000000..ab0ac1e7bf
 +        "smep": true,
 +        "smap": true,
 +        "pfthreshold": false,
++        "vmx-invpcid-exit": false,
 +        "x2apic": false,
 +        "avx512vbmi": false,
 +        "avx512vnni": false,
++        "vmx-apicv-x2apic": false,
++        "kvm-pv-sched-yield": false,
++        "vmx-invlpg-exit": false,
++        "vmx-invvpid-all-context": false,
++        "vmx-activity-hlt": false,
 +        "flushbyasid": false,
 +        "f16c": 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,
 +        "kvmclock-stable-bit": false,
++        "vmx-rdtsc-exit": false,
 +        "hypervisor": true,
++        "vmx-rdtscp-exit": false,
 +        "mds-no": false,
 +        "pcommit": true,
++        "vmx-vpid": false,
 +        "syscall": true,
 +        "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,
 +        "kvm-pv-eoi": false,
 +        "kvm-pv-ipi": false,
 +        "cx8": true,
++        "vmx-invvpid-single-addr": false,
++        "waitpkg": false,
 +        "cldemote": false,
++        "vmx-ept": false,
 +        "kvm-mmu": false,
 +        "sse4.2": true,
 +        "pge": true,
 +        "avx512bitalg": false,
 +        "pdcm": false,
++        "vmx-entry-load-bndcfgs": false,
++        "vmx-exit-clear-rtit-ctl": false,
 +        "model": 6,
 +        "movbe": true,
 +        "nrip-save": false,
 +        "ssse3": true,
 +        "sse4a": true,
++        "vmx-pause-exit": false,
 +        "invpcid": false,
 +        "pdpe1gb": true,
 +        "tsc-deadline": false,
 +        "skip-l1dfl-vmentry": false,
++        "vmx-exit-load-perf-global-ctrl": false,
 +        "fma": false,
 +        "cx16": true,
 +        "de": true,
@@ -22523,25 +34169,39 @@ index 0000000000..ab0ac1e7bf
 +        "ds-cpl": false,
 +        "ibs": false,
 +        "fma4": false,
++        "vmx-exit-nosave-debugctl": false,
 +        "la57": true,
++        "vmx-invept": false,
 +        "osvw": 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,
 +        "kvm-steal-time": false,
 +        "kvmclock": false,
++        "vmx-zero-len-inject": false,
++        "pschange-mc-no": false,
++        "vmx-rdrand-exit": false,
 +        "lwp": false,
 +        "amd-ssbd": false,
 +        "xop": false,
 +        "ibpb": false,
 +        "avx": false,
++        "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,
@@ -22549,31 +34209,50 @@ index 0000000000..ab0ac1e7bf
 +        "vaes": false,
 +        "movdir64b": false,
 +        "xsaves": false,
++        "vmx-shadow-vmcs": false,
 +        "lm": true,
++        "vmx-exit-save-preemption-timer": false,
++        "vmx-entry-load-pat": false,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": false,
 +        "umip": false,
++        "vmx-store-lma": false,
++        "vmx-movdr-exit": false,
 +        "pse": true,
 +        "avx2": false,
 +        "sep": true,
 +        "virt-ssbd": false,
++        "vmx-cr3-load-noexit": false,
 +        "nodeid-msr": false,
 +        "md-clear": 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-vnmi-pending": false,
 +        "monitor": true,
++        "vmx-vintr-pending": false,
 +        "avx512er": false,
 +        "pmm-en": false,
 +        "pcid": false,
++        "taa-no": false,
 +        "arch-capabilities": false,
++        "vmx-secondary-ctls": false,
++        "vmx-xsaves": false,
++        "clzero": false,
 +        "3dnow": true,
 +        "erms": true,
++        "vmx-entry-ia32e-mode": false,
 +        "lahf-lm": true,
 +        "vpclmulqdq": false,
++        "vmx-ins-outs": false,
 +        "fxsr-opt": false,
 +        "xstore": false,
 +        "rtm": false,
@@ -22588,14 +34267,21 @@ index 0000000000..ab0ac1e7bf
 +        "dtes64": false,
 +        "mtrr": true,
 +        "rdtscp": true,
++        "xsaveerptr": false,
 +        "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,
 +        "model-id": "QEMU TCG CPU version 2.5+",
 +        "sha-ni": false,
 +        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
 +        "avx512pf": false,
++        "vmx-hlt-exit": false,
 +        "xstore-en": false
 +      }
 +    }
@@ -22606,495 +34292,6 @@ index 0000000000..ab0ac1e7bf
 +{
 +  "execute": "query-cpu-model-expansion",
 +  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "stibp": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "rdctl-no": false,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "mds-no": false,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "kvm-pv-ipi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "skip-l1dfl-vmentry": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": false,
-+        "movdiri": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "movdir64b": false,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "arch-capabilities": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483658,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "x-intel-pt-auto-level": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": false,
-+        "kvm_asyncpf": false,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "host-phys-bits-limit": 0,
-+        "vmware-cpuid-freq": true,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "hv-evmcs": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "stibp": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": false,
-+        "apic-id": 4294967295,
-+        "rsba": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "hv-ipi": false,
-+        "pku": true,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "hle": false,
-+        "npt": true,
-+        "rdctl-no": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "x-hv-synic-kvm-only": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "mds-no": false,
-+        "pcommit": true,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "x-migrate-smi-count": true,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-ipi": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 6,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "skip-l1dfl-vmentry": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmm": false,
-+        "pmu": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": false,
-+        "tsc_adjust": false,
-+        "kvm-steal-time": false,
-+        "kvm_steal_time": false,
-+        "kvmclock": false,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": false,
-+        "movdiri": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": true,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "movdir64b": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "kvm-pv-unhalt": false,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "arch-capabilities": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
 +    "type": "static",
 +    "model": {
 +      "name": "max",
@@ -23103,7 +34300,7 @@ index 0000000000..ab0ac1e7bf
 +      }
 +    }
 +  },
-+  "id": "libvirt-5"
++  "id": "libvirt-4"
 +}
 +
 +{
@@ -23111,52 +34308,87 @@ index 0000000000..ab0ac1e7bf
 +    "model": {
 +      "name": "base",
 +      "props": {
++        "vmx-entry-load-rtit-ctl": false,
 +        "cmov": true,
 +        "ia64": false,
 +        "ssb-no": false,
 +        "aes": true,
++        "vmx-apicv-xapic": false,
 +        "mmx": true,
 +        "rdpid": false,
 +        "arat": true,
++        "vmx-page-walk-4": false,
++        "vmx-page-walk-5": false,
 +        "gfni": false,
 +        "ibrs-all": false,
++        "vmx-desc-exit": false,
 +        "pause-filter": false,
 +        "xsavec": false,
 +        "intel-pt": false,
++        "vmx-cr8-store-exit": false,
++        "vmx-rdseed-exit": false,
++        "vmx-eptp-switching": false,
 +        "kvm-asyncpf": false,
 +        "perfctr-core": false,
 +        "mpx": true,
 +        "pbe": false,
 +        "avx512cd": false,
 +        "decodeassists": false,
++        "vmx-exit-load-efer": false,
++        "vmx-exit-clear-bndcfgs": false,
 +        "sse4.1": true,
 +        "family": 6,
++        "vmx-vmwrite-vmexit-fields": false,
++        "vmx-vnmi": false,
++        "vmx-true-ctls": false,
++        "vmx-ept-execonly": false,
++        "vmx-exit-save-efer": false,
++        "vmx-invept-all-context": false,
 +        "wbnoinvd": false,
 +        "avx512f": false,
 +        "msr": true,
 +        "mce": true,
 +        "mca": true,
 +        "xcrypt": false,
++        "vmx-exit-load-pat": false,
++        "vmx-intr-exit": false,
 +        "min-level": 13,
++        "vmx-flexpriority": false,
 +        "xgetbv1": true,
 +        "cid": false,
 +        "ds": false,
 +        "fxsr": true,
++        "avx512-bf16": false,
++        "vmx-cr8-load-exit": false,
 +        "xsaveopt": true,
++        "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": false,
++        "vmx-vmfunc": false,
++        "vmx-activity-shutdown": false,
 +        "avx512vbmi2": false,
 +        "cr8legacy": true,
++        "vmx-encls-exit": false,
 +        "stibp": false,
++        "vmx-msr-bitmap": false,
 +        "xcrypt-en": false,
++        "vmx-mwait-exit": false,
++        "vmx-pml": false,
++        "vmx-nmi-exit": 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,
 +        "smx": false,
 +        "cmp-legacy": false,
@@ -23167,6 +34399,7 @@ index 0000000000..ab0ac1e7bf
 +        "amd-no-ssb": false,
 +        "npt": true,
 +        "rdctl-no": false,
++        "vmx-invvpid": false,
 +        "clwb": true,
 +        "lbrv": false,
 +        "adx": true,
@@ -23176,49 +34409,70 @@ index 0000000000..ab0ac1e7bf
 +        "smep": true,
 +        "smap": true,
 +        "pfthreshold": false,
++        "vmx-invpcid-exit": false,
 +        "x2apic": false,
 +        "avx512vbmi": false,
 +        "avx512vnni": false,
++        "vmx-apicv-x2apic": false,
++        "kvm-pv-sched-yield": false,
++        "vmx-invlpg-exit": false,
++        "vmx-invvpid-all-context": false,
++        "vmx-activity-hlt": false,
 +        "flushbyasid": false,
 +        "f16c": 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,
 +        "kvmclock-stable-bit": false,
++        "vmx-rdtsc-exit": false,
 +        "hypervisor": true,
++        "vmx-rdtscp-exit": false,
 +        "mds-no": false,
 +        "pcommit": true,
++        "vmx-vpid": false,
 +        "syscall": true,
 +        "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,
 +        "kvm-pv-eoi": false,
 +        "kvm-pv-ipi": false,
 +        "cx8": true,
++        "vmx-invvpid-single-addr": false,
++        "waitpkg": false,
 +        "cldemote": false,
++        "vmx-ept": false,
 +        "kvm-mmu": false,
 +        "sse4.2": true,
 +        "pge": true,
 +        "avx512bitalg": false,
 +        "pdcm": false,
++        "vmx-entry-load-bndcfgs": false,
++        "vmx-exit-clear-rtit-ctl": false,
 +        "model": 6,
 +        "movbe": true,
 +        "nrip-save": false,
 +        "ssse3": true,
 +        "sse4a": true,
++        "vmx-pause-exit": false,
 +        "invpcid": false,
 +        "pdpe1gb": true,
 +        "tsc-deadline": false,
 +        "skip-l1dfl-vmentry": false,
++        "vmx-exit-load-perf-global-ctrl": false,
 +        "fma": false,
 +        "cx16": true,
 +        "de": true,
@@ -23232,25 +34486,39 @@ index 0000000000..ab0ac1e7bf
 +        "ds-cpl": false,
 +        "ibs": false,
 +        "fma4": false,
++        "vmx-exit-nosave-debugctl": false,
 +        "la57": true,
++        "vmx-invept": false,
 +        "osvw": 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,
 +        "kvm-steal-time": false,
 +        "kvmclock": false,
++        "vmx-zero-len-inject": false,
++        "pschange-mc-no": false,
++        "vmx-rdrand-exit": false,
 +        "lwp": false,
 +        "amd-ssbd": false,
 +        "xop": false,
 +        "ibpb": false,
 +        "avx": false,
++        "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,
@@ -23258,31 +34526,50 @@ index 0000000000..ab0ac1e7bf
 +        "vaes": false,
 +        "movdir64b": false,
 +        "xsaves": false,
++        "vmx-shadow-vmcs": false,
 +        "lm": true,
++        "vmx-exit-save-preemption-timer": false,
++        "vmx-entry-load-pat": false,
++        "vmx-entry-load-perf-global-ctrl": false,
++        "vmx-io-bitmap": false,
 +        "umip": false,
++        "vmx-store-lma": false,
++        "vmx-movdr-exit": false,
 +        "pse": true,
 +        "avx2": false,
 +        "sep": true,
 +        "virt-ssbd": false,
++        "vmx-cr3-load-noexit": false,
 +        "nodeid-msr": false,
 +        "md-clear": 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-vnmi-pending": false,
 +        "monitor": true,
++        "vmx-vintr-pending": false,
 +        "avx512er": false,
 +        "pmm-en": false,
 +        "pcid": false,
++        "taa-no": false,
 +        "arch-capabilities": false,
++        "vmx-secondary-ctls": false,
++        "vmx-xsaves": false,
++        "clzero": false,
 +        "3dnow": true,
 +        "erms": true,
++        "vmx-entry-ia32e-mode": false,
 +        "lahf-lm": true,
 +        "vpclmulqdq": false,
++        "vmx-ins-outs": false,
 +        "fxsr-opt": false,
 +        "xstore": false,
 +        "rtm": false,
@@ -23297,524 +34584,422 @@ index 0000000000..ab0ac1e7bf
 +        "dtes64": false,
 +        "mtrr": true,
 +        "rdtscp": true,
++        "xsaveerptr": false,
 +        "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,
 +        "model-id": "QEMU TCG CPU version 2.5+",
 +        "sha-ni": false,
 +        "abm": true,
++        "vmx-ept-advanced-exitinfo": false,
 +        "avx512pf": false,
++        "vmx-hlt-exit": false,
 +        "xstore-en": false
 +      }
 +    }
 +  },
++  "id": "libvirt-4"
++}
++
++{
++  "execute": "query-machines",
 +  "id": "libvirt-5"
 +}
 +
 +{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "stibp": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "rsba": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "rdctl-no": false,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "mds-no": false,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "kvm-pv-ipi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "skip-l1dfl-vmentry": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": false,
-+        "movdiri": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "movdir64b": false,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "arch-capabilities": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
++  "return": [
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.12",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-4.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.5",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-4.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-1.5",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "none",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.4",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.10",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-1.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.9",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.11",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-3.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-4.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.4",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.3",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-4.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.9",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "isapc",
++      "numa-mem-supported": true,
++      "default-cpu-type": "486-x86_64-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-1.4",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-3.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.12",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-4.0.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-1.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-5.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false,
++      "alias": "q35"
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.8",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.10",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-3.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-4.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "microvm",
++      "numa-mem-supported": false,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.3",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-1.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": true
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-4.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-5.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "is-default": true,
++      "cpu-max": 255,
++      "deprecated": false,
++      "alias": "pc"
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-2.8",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.5",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-i440fx-3.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": true,
++      "name": "pc-q35-2.11",
++      "numa-mem-supported": true,
++      "default-cpu-type": "qemu64-x86_64-cpu",
++      "cpu-max": 288,
++      "deprecated": false
 +    }
-+  },
-+  "id": "libvirt-6"
++  ],
++  "id": "libvirt-5"
 +}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483658,
-+        "cmov": true,
-+        "ia64": false,
-+        "ssb-no": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "ibrs-all": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "x-intel-pt-auto-level": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": false,
-+        "kvm_asyncpf": false,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "host-phys-bits-limit": 0,
-+        "vmware-cpuid-freq": true,
-+        "wbnoinvd": false,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "hv-evmcs": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "stibp": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": false,
-+        "apic-id": 4294967295,
-+        "rsba": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "hv-ipi": false,
-+        "pku": true,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "hle": false,
-+        "npt": true,
-+        "rdctl-no": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "x-hv-synic-kvm-only": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "mds-no": false,
-+        "pcommit": true,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "x-migrate-smi-count": true,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-ipi": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 6,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "skip-l1dfl-vmentry": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmm": false,
-+        "pmu": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": false,
-+        "tsc_adjust": false,
-+        "kvm-steal-time": false,
-+        "kvm_steal_time": false,
-+        "kvmclock": false,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": false,
-+        "movdiri": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": true,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "movdir64b": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "kvm-pv-unhalt": false,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "arch-capabilities": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-6"
-+}
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
 new file mode 100644
-index 0000000000..93c5da537a
+index 0000000000..d0b5f18c02
 --- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -0,0 +1,1424 @@
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+@@ -0,0 +1,2842 @@
 +<qemuCaps>
++  <emulator>/usr/bin/qemu-system-x86_64</emulator>
 +  <qemuctime>0</qemuctime>
 +  <selfctime>0</selfctime>
 +  <selfvers>0</selfvers>
-+  <usedQMP/>
 +  <flag name='kvm'/>
 +  <flag name='no-hpet'/>
 +  <flag name='spice'/>
-+  <flag name='boot-index'/>
 +  <flag name='hda-duplex'/>
 +  <flag name='ccid-emulated'/>
 +  <flag name='ccid-passthru'/>
@@ -23836,14 +35021,9 @@ index 0000000000..93c5da537a
 +  <flag name='virtio-blk-pci.scsi'/>
 +  <flag name='scsi-disk.channel'/>
 +  <flag name='scsi-block'/>
-+  <flag name='transaction'/>
-+  <flag name='block-job-async'/>
-+  <flag name='scsi-cd'/>
-+  <flag name='ide-cd'/>
 +  <flag name='hda-micro'/>
 +  <flag name='dump-guest-memory'/>
 +  <flag name='nec-usb-xhci'/>
-+  <flag name='balloon-event'/>
 +  <flag name='lsi'/>
 +  <flag name='virtio-scsi-pci'/>
 +  <flag name='blockio'/>
@@ -23854,21 +35034,13 @@ index 0000000000..93c5da537a
 +  <flag name='scsi-disk.wwn'/>
 +  <flag name='seccomp-sandbox'/>
 +  <flag name='reboot-timeout'/>
-+  <flag name='seamless-migration'/>
-+  <flag name='block-commit'/>
 +  <flag name='vnc'/>
-+  <flag name='drive-mirror'/>
-+  <flag name='usb-redir.bootindex'/>
-+  <flag name='usb-host.bootindex'/>
-+  <flag name='blockdev-snapshot-sync'/>
 +  <flag name='qxl'/>
 +  <flag name='VGA'/>
 +  <flag name='cirrus-vga'/>
 +  <flag name='vmware-svga'/>
 +  <flag name='device-video-primary'/>
 +  <flag name='usb-serial'/>
-+  <flag name='usb-net'/>
-+  <flag name='add-fd'/>
 +  <flag name='nbd-server'/>
 +  <flag name='virtio-rng'/>
 +  <flag name='rng-random'/>
@@ -23878,25 +35050,19 @@ index 0000000000..93c5da537a
 +  <flag name='tpm-tis'/>
 +  <flag name='pci-bridge'/>
 +  <flag name='vfio-pci'/>
-+  <flag name='vfio-pci.bootindex'/>
-+  <flag name='scsi-generic'/>
-+  <flag name='scsi-generic.bootindex'/>
 +  <flag name='mem-merge'/>
-+  <flag name='vnc-websocket'/>
 +  <flag name='drive-discard'/>
-+  <flag name='mlock'/>
-+  <flag name='device-del-event'/>
 +  <flag name='dmi-to-pci-bridge'/>
 +  <flag name='i440fx-pci-hole64-size'/>
 +  <flag name='q35-pci-hole64-size'/>
 +  <flag name='usb-storage'/>
 +  <flag name='usb-storage.removable'/>
++  <flag name='virtio-mmio'/>
 +  <flag name='ich9-intel-hda'/>
 +  <flag name='kvm-pit-lost-tick-policy'/>
 +  <flag name='boot-strict'/>
 +  <flag name='pvpanic'/>
 +  <flag name='spice-file-xfer-disable'/>
-+  <flag name='spiceport'/>
 +  <flag name='usb-kbd'/>
 +  <flag name='msg-timestamp'/>
 +  <flag name='active-commit'/>
@@ -23947,7 +35113,6 @@ index 0000000000..93c5da537a
 +  <flag name='secret'/>
 +  <flag name='pxb'/>
 +  <flag name='pxb-pcie'/>
-+  <flag name='device-tray-moved-event'/>
 +  <flag name='nec-usb-xhci-ports'/>
 +  <flag name='virtio-scsi-pci.iothread'/>
 +  <flag name='name-guest'/>
@@ -24022,171 +35187,212 @@ index 0000000000..93c5da537a
 +  <flag name='usb-storage.werror'/>
 +  <flag name='egl-headless'/>
 +  <flag name='vfio-pci.display'/>
-+  <version>4000050</version>
++  <flag name='blockdev'/>
++  <flag name='memory-backend-memfd'/>
++  <flag name='memory-backend-memfd.hugetlb'/>
++  <flag name='iothread.poll-max-ns'/>
++  <flag name='egl-headless.rendernode'/>
++  <flag name='memory-backend-file.align'/>
++  <flag name='memory-backend-file.pmem'/>
++  <flag name='nvdimm.unarmed'/>
++  <flag name='scsi-disk.device_id'/>
++  <flag name='virtio-pci-non-transitional'/>
++  <flag name='overcommit'/>
++  <flag name='query-current-machine'/>
++  <flag name='bitmap-merge'/>
++  <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='ramfb'/>
++  <flag name='blockdev-file-dynamic-auto-read-only'/>
++  <flag name='savevm-monitor-nodes'/>
++  <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
++  <flag name='virtio-net.failover'/>
++  <flag name='vhost-user-fs'/>
++  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
++  <flag name='storage.werror'/>
++  <flag name='pcie-root-port.hotplug'/>
++  <version>4002091</version>
 +  <kvmVersion>0</kvmVersion>
-+  <microcodeVersion>456805</microcodeVersion>
-+  <package>v4.0.0-1173-g9c70209b63</package>
++  <microcodeVersion>43100241</microcodeVersion>
++  <package>v5.0.0-rc1</package>
 +  <arch>x86_64</arch>
 +  <hostCPU type='kvm' model='base' migratability='yes'>
-+    <property name='phys-bits' type='number' value='0'/>
-+    <property name='core-id' type='number' value='-1'/>
-+    <property name='xlevel' type='number' value='2147483656'/>
++    <property name='vmx-entry-load-rtit-ctl' 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='true' migratable='yes'/>
 +    <property name='mmx' type='boolean' value='true' migratable='yes'/>
 +    <property name='rdpid' type='boolean' value='false'/>
 +    <property name='arat' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-page-walk-4' type='boolean' value='true' migratable='yes'/>
++    <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='true' migratable='yes'/>
 +    <property name='pause-filter' type='boolean' value='false'/>
 +    <property name='xsavec' type='boolean' value='true' migratable='yes'/>
 +    <property name='intel-pt' type='boolean' value='false'/>
-+    <property name='hv-frequencies' type='boolean' value='false'/>
-+    <property name='tsc-frequency' type='number' value='0'/>
-+    <property name='xd' type='boolean' value='true' migratable='yes'/>
-+    <property name='x-intel-pt-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vendor-id' type='string' value=''/>
++    <property name='vmx-cr8-store-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-rdseed-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-eptp-switching' type='boolean' value='true' migratable='yes'/>
 +    <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='perfctr_core' type='boolean' value='false'/>
 +    <property name='perfctr-core' type='boolean' value='false'/>
 +    <property name='mpx' type='boolean' value='true' migratable='yes'/>
 +    <property name='pbe' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
 +    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
++    <property name='decodeassists' type='boolean' value='false'/>
++    <property name='vmx-exit-load-efer' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-exit-clear-bndcfgs' type='boolean' value='false'/>
 +    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
 +    <property name='family' type='number' value='6'/>
-+    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='host-phys-bits-limit' type='number' value='0'/>
-+    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-vmwrite-vmexit-fields' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-vnmi' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-true-ctls' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-ept-execonly' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-exit-save-efer' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-invept-all-context' type='boolean' value='true' migratable='yes'/>
 +    <property name='wbnoinvd' type='boolean' value='false'/>
 +    <property name='avx512f' type='boolean' value='false'/>
 +    <property name='msr' type='boolean' value='true' migratable='yes'/>
 +    <property name='mce' type='boolean' value='true' migratable='yes'/>
 +    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-runtime' type='boolean' value='false'/>
 +    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='thread-id' type='number' value='-1'/>
-+    <property name='min-level' type='number' value='13'/>
++    <property name='vmx-exit-load-pat' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-intr-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='min-level' type='number' value='22'/>
++    <property name='vmx-flexpriority' type='boolean' value='true' migratable='yes'/>
 +    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
 +    <property name='cid' type='boolean' value='false'/>
-+    <property name='hv-relaxed' type='boolean' value='false'/>
-+    <property name='hv-crash' type='boolean' value='false'/>
 +    <property name='ds' type='boolean' value='false'/>
 +    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
++    <property name='avx512-bf16' type='boolean' value='false'/>
++    <property name='vmx-cr8-load-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-apicv-vid' type='boolean' value='false'/>
++    <property name='vmx-exit-save-pat' type='boolean' value='true' migratable='yes'/>
 +    <property name='xtpr' type='boolean' value='false'/>
-+    <property name='hv-evmcs' 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='true' migratable='yes'/>
++    <property name='vmx-activity-shutdown' type='boolean' value='false'/>
 +    <property name='avx512vbmi2' type='boolean' value='false'/>
 +    <property name='cr8legacy' type='boolean' value='false'/>
-+    <property name='stibp' type='boolean' value='false'/>
-+    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-encls-exit' type='boolean' value='false'/>
++    <property name='stibp' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-msr-bitmap' type='boolean' value='true' migratable='yes'/>
 +    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-+    <property name='apic-id' type='number' value='4294967295'/>
-+    <property name='rsba' type='boolean' value='false'/>
++    <property name='vmx-mwait-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-pml' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-nmi-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-invept-single-context-noglobals' type='boolean' value='true' migratable='yes'/>
 +    <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='GenuineIntel'/>
-+    <property name='hv-ipi' type='boolean' value='false'/>
++    <property name='vmx-unrestricted-guest' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-cr3-store-noexit' type='boolean' value='true' migratable='yes'/>
 +    <property name='pku' type='boolean' value='false'/>
 +    <property name='smx' type='boolean' value='false'/>
-+    <property name='cmp_legacy' type='boolean' value='false'/>
 +    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='node-id' type='number' value='-1'/>
 +    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb_clean' type='boolean' value='false'/>
 +    <property name='vmcb-clean' type='boolean' value='false'/>
++    <property name='hle' type='boolean' value='true' migratable='yes'/>
 +    <property name='3dnowext' type='boolean' value='false'/>
 +    <property name='amd-no-ssb' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='true' migratable='yes'/>
 +    <property name='npt' type='boolean' value='false'/>
 +    <property name='rdctl-no' type='boolean' value='false'/>
-+    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
++    <property name='vmx-invvpid' type='boolean' value='true' migratable='yes'/>
 +    <property name='clwb' 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='svm_lock' type='boolean' value='false'/>
 +    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='pfthreshold' 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='true' migratable='yes'/>
 +    <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='hv-stimer' type='boolean' value='false'/>
-+    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
-+    <property name='i64' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-apicv-x2apic' type='boolean' value='true' migratable='yes'/>
++    <property name='kvm-pv-sched-yield' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-invlpg-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-invvpid-all-context' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-activity-hlt' type='boolean' value='true' migratable='yes'/>
 +    <property name='flushbyasid' type='boolean' value='false'/>
 +    <property name='f16c' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-exit-ack-intr' type='boolean' value='true' migratable='yes'/>
 +    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
 +    <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='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-tsc-offset' type='boolean' value='true' migratable='yes'/>
 +    <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
 +    <property name='tm' type='boolean' value='false'/>
 +    <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-rdtsc-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-+    <property name='socket-id' type='number' value='-1'/>
++    <property name='vmx-rdtscp-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='mds-no' type='boolean' value='false'/>
 +    <property name='pcommit' type='boolean' value='false'/>
++    <property name='vmx-vpid' type='boolean' value='true' migratable='yes'/>
 +    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='level' type='number' value='13'/>
 +    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
 +    <property name='svm' type='boolean' value='false'/>
-+    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-reset' type='boolean' value='false'/>
-+    <property name='invtsc' type='boolean' value='false'/>
-+    <property name='sse3' type='boolean' value='true' migratable='yes'/>
++    <property name='invtsc' type='boolean' value='true' migratable='no'/>
++    <property name='vmx-monitor-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssbd' type='boolean' value='false'/>
++    <property name='ssbd' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-wbinvd-exit' type='boolean' value='true' migratable='yes'/>
 +    <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='kvm-pv-ipi' type='boolean' value='true' migratable='yes'/>
 +    <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='true' migratable='yes'/>
++    <property name='waitpkg' type='boolean' value='false'/>
 +    <property name='cldemote' type='boolean' value='false'/>
-+    <property name='hv-reenlightenment' type='boolean' value='false'/>
-+    <property name='kvm_mmu' type='boolean' value='false'/>
++    <property name='vmx-ept' type='boolean' value='true' migratable='yes'/>
 +    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
 +    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
 +    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
 +    <property name='avx512bitalg' type='boolean' value='false'/>
-+    <property name='nodeid_msr' type='boolean' value='false'/>
 +    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-entry-load-bndcfgs' type='boolean' value='false'/>
++    <property name='vmx-exit-clear-rtit-ctl' type='boolean' value='false'/>
 +    <property name='model' type='number' value='94'/>
-+    <property name='nrip_save' type='boolean' value='false'/>
++    <property name='movbe' type='boolean' value='true' migratable='yes'/>
 +    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
 +    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
 +    <property name='sse4a' type='boolean' value='false'/>
++    <property name='vmx-pause-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='invpcid' type='boolean' value='true' migratable='yes'/>
 +    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
 +    <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='cx16' type='boolean' value='true' migratable='yes'/>
 +    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='enforce' type='boolean' value='false'/>
 +    <property name='stepping' type='number' value='3'/>
 +    <property name='xsave' type='boolean' value='true' migratable='yes'/>
 +    <property name='clflush' type='boolean' value='true' migratable='yes'/>
@@ -24194,389 +35400,132 @@ index 0000000000..93c5da537a
 +    <property name='tsc' type='boolean' value='true' migratable='yes'/>
 +    <property name='tce' type='boolean' value='false'/>
 +    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='ds_cpl' type='boolean' value='false'/>
 +    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='host-phys-bits' 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='true' migratable='yes'/>
 +    <property name='la57' type='boolean' value='false'/>
++    <property name='vmx-invept' type='boolean' value='true' migratable='yes'/>
 +    <property name='osvw' type='boolean' value='false'/>
-+    <property name='check' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-spinlocks' type='number' value='-1'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='pmu' type='boolean' value='false'/>
 +    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='min-xlevel2' type='number' value='0'/>
++    <property name='pmm' type='boolean' value='false'/>
++    <property name='vmx-entry-noload-debugctl' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-eptad' type='boolean' value='true' migratable='yes'/>
++    <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
++    <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='tsc_adjust' type='boolean' value='true' migratable='yes'/>
 +    <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
 +    <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-+    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-zero-len-inject' type='boolean' value='false'/>
++    <property name='pschange-mc-no' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-rdrand-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='lwp' type='boolean' value='false'/>
 +    <property name='amd-ssbd' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
 +    <property name='xop' type='boolean' value='false'/>
++    <property name='ibpb' 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='true' migratable='yes'/>
 +    <property name='movdiri' type='boolean' value='false'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
 +    <property name='acpi' type='boolean' value='false'/>
-+    <property name='hv-vapic' 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='true' migratable='yes'/>
++    <property name='vmx-ept-1gb' type='boolean' value='true' migratable='yes'/>
 +    <property name='ht' type='boolean' value='false'/>
++    <property name='vmx-io-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='nx' type='boolean' value='true' migratable='yes'/>
 +    <property name='pclmulqdq' type='boolean' value='true' migratable='yes'/>
 +    <property name='mmxext' type='boolean' value='false'/>
-+    <property name='vaes' type='boolean' value='false'/>
 +    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
++    <property name='vaes' type='boolean' value='false'/>
 +    <property name='movdir64b' type='boolean' value='false'/>
-+    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
++    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-shadow-vmcs' type='boolean' value='true' migratable='yes'/>
 +    <property name='lm' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-exit-save-preemption-timer' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-entry-load-pat' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-entry-load-perf-global-ctrl' type='boolean' value='false'/>
++    <property name='vmx-io-bitmap' type='boolean' value='true' migratable='yes'/>
 +    <property name='umip' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-store-lma' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-movdr-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='pse' type='boolean' value='true' migratable='yes'/>
 +    <property name='avx2' type='boolean' value='true' migratable='yes'/>
 +    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
 +    <property name='virt-ssbd' type='boolean' value='false'/>
-+    <property name='x-hv-max-vps' type='number' value='-1'/>
++    <property name='vmx-cr3-load-noexit' type='boolean' value='true' migratable='yes'/>
 +    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='md-clear' type='boolean' value='false'/>
-+    <property name='kvm' type='boolean' value='true' migratable='yes'/>
++    <property name='md-clear' type='boolean' value='true' migratable='yes'/>
 +    <property name='misalignsse' type='boolean' value='false'/>
++    <property name='split-lock-detect' type='boolean' value='false'/>
 +    <property name='min-xlevel' type='number' value='2147483656'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
 +    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='realized' type='boolean' value='false'/>
-+    <property name='tsc_scale' type='boolean' value='false'/>
++    <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='false'/>
 +    <property name='topoext' type='boolean' value='false'/>
-+    <property name='hv-vpindex' type='boolean' value='false'/>
-+    <property name='xlevel2' type='number' value='0'/>
++    <property name='amd-stibp' type='boolean' value='false'/>
++    <property name='vmx-preemption-timer' type='boolean' value='true' migratable='yes'/>
 +    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
++    <property name='vmx-vnmi-pending' type='boolean' value='true' migratable='yes'/>
 +    <property name='monitor' type='boolean' value='false'/>
++    <property name='vmx-vintr-pending' type='boolean' value='true' migratable='yes'/>
 +    <property name='avx512er' type='boolean' value='false'/>
 +    <property name='pmm-en' type='boolean' value='false'/>
 +    <property name='pcid' type='boolean' value='true' migratable='yes'/>
++    <property name='taa-no' type='boolean' value='false'/>
 +    <property name='arch-capabilities' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-secondary-ctls' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-xsaves' type='boolean' value='true' migratable='yes'/>
++    <property name='clzero' type='boolean' value='false'/>
 +    <property name='3dnow' type='boolean' value='false'/>
 +    <property name='erms' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-entry-ia32e-mode' type='boolean' value='true' migratable='yes'/>
 +    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
 +    <property name='vpclmulqdq' type='boolean' value='false'/>
++    <property name='vmx-ins-outs' type='boolean' value='true' migratable='yes'/>
 +    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='hv-synic' type='boolean' value='false'/>
 +    <property name='xstore' type='boolean' value='false'/>
-+    <property name='fxsr_opt' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
 +    <property name='rtm' type='boolean' value='true' migratable='yes'/>
++    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
 +    <property name='lmce' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-time' type='boolean' value='false'/>
 +    <property name='perfctr-nb' type='boolean' value='false'/>
-+    <property name='perfctr_nb' type='boolean' value='false'/>
-+    <property name='ffxsr' type='boolean' value='false'/>
-+    <property name='hv-tlbflush' type='boolean' value='false'/>
 +    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
 +    <property name='rdseed' type='boolean' value='true' migratable='yes'/>
 +    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
 +    <property name='vme' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx' type='boolean' value='true' migratable='yes'/>
 +    <property name='dtes64' type='boolean' value='false'/>
 +    <property name='mtrr' type='boolean' value='true' migratable='yes'/>
 +    <property name='rdtscp' type='boolean' value='true' migratable='yes'/>
++    <property name='xsaveerptr' type='boolean' value='false'/>
 +    <property name='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='pause_filter' type='boolean' value='false'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
++    <property name='vmx-rdpmc-exit' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-mtf' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-entry-load-efer' type='boolean' value='true' migratable='yes'/>
 +    <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <hostCPU type='tcg' model='base' migratability='yes'>
-+    <property name='phys-bits' type='number' value='0'/>
-+    <property name='core-id' type='number' value='-1'/>
-+    <property name='xlevel' type='number' value='2147483658'/>
-+    <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='mmx' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdpid' type='boolean' value='false'/>
-+    <property name='arat' type='boolean' value='true' migratable='yes'/>
-+    <property name='gfni' type='boolean' value='false'/>
-+    <property name='ibrs-all' type='boolean' value='false'/>
-+    <property name='pause-filter' type='boolean' value='false'/>
-+    <property name='xsavec' type='boolean' value='false'/>
-+    <property name='intel-pt' type='boolean' value='false'/>
-+    <property name='hv-frequencies' type='boolean' value='false'/>
-+    <property name='tsc-frequency' type='number' value='0'/>
-+    <property name='xd' type='boolean' value='true' migratable='yes'/>
-+    <property name='x-intel-pt-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vendor-id' type='string' value=''/>
-+    <property name='kvm-asyncpf' type='boolean' value='false'/>
-+    <property name='kvm_asyncpf' type='boolean' value='false'/>
-+    <property name='perfctr_core' type='boolean' value='false'/>
-+    <property name='perfctr-core' type='boolean' value='false'/>
-+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='6'/>
-+    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='host-phys-bits-limit' type='number' value='0'/>
-+    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-+    <property name='wbnoinvd' type='boolean' value='false'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-runtime' type='boolean' value='false'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='thread-id' type='number' value='-1'/>
-+    <property name='min-level' type='number' value='13'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='hv-relaxed' type='boolean' value='false'/>
-+    <property name='hv-crash' type='boolean' value='false'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xtpr' type='boolean' value='false'/>
-+    <property name='hv-evmcs' 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='false'/>
-+    <property name='avx512vbmi2' type='boolean' value='false'/>
-+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-+    <property name='stibp' type='boolean' value='false'/>
-+    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-+    <property name='apic-id' type='number' value='4294967295'/>
-+    <property name='rsba' type='boolean' value='false'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='AuthenticAMD'/>
-+    <property name='hv-ipi' type='boolean' value='false'/>
-+    <property name='pku' type='boolean' value='true' migratable='yes'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='cmp_legacy' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='node-id' type='number' value='-1'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb_clean' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-+    <property name='amd-no-ssb' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='false'/>
-+    <property name='npt' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdctl-no' type='boolean' value='false'/>
-+    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-+    <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='svm_lock' type='boolean' value='false'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='pfthreshold' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <property name='x2apic' type='boolean' value='false'/>
-+    <property name='avx512vbmi' type='boolean' value='false'/>
-+    <property name='avx512vnni' type='boolean' value='false'/>
-+    <property name='hv-stimer' type='boolean' value='false'/>
-+    <property name='x-hv-synic-kvm-only' type='boolean' value='false'/>
-+    <property name='i64' type='boolean' value='true' migratable='yes'/>
-+    <property name='flushbyasid' type='boolean' value='false'/>
-+    <property name='f16c' type='boolean' value='false'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pae' 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='kvm_nopiodelay' type='boolean' value='false'/>
-+    <property name='kvm-nopiodelay' type='boolean' value='false'/>
-+    <property name='tm' type='boolean' value='false'/>
-+    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
-+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-+    <property name='socket-id' type='number' value='-1'/>
-+    <property name='mds-no' type='boolean' value='false'/>
-+    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='level' type='number' value='13'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='x-migrate-smi-count' type='boolean' value='true' migratable='yes'/>
-+    <property name='svm' type='boolean' value='true' migratable='yes'/>
-+    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-reset' type='boolean' value='false'/>
-+    <property name='invtsc' type='boolean' value='false'/>
-+    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssbd' type='boolean' value='false'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='kvm-pv-ipi' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='false'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='cldemote' type='boolean' value='false'/>
-+    <property name='hv-reenlightenment' type='boolean' value='false'/>
-+    <property name='kvm_mmu' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512bitalg' type='boolean' value='false'/>
-+    <property name='nodeid_msr' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='model' type='number' value='6'/>
-+    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-+    <property name='invpcid' type='boolean' value='false'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc-deadline' type='boolean' value='false'/>
-+    <property name='skip-l1dfl-vmentry' type='boolean' value='false'/>
-+    <property name='fma' type='boolean' value='false'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='enforce' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='3'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='ds_cpl' type='boolean' value='false'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='true' migratable='yes'/>
-+    <property name='osvw' type='boolean' value='false'/>
-+    <property name='check' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-spinlocks' type='number' value='-1'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='pmu' type='boolean' value='false'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='min-xlevel2' type='number' value='0'/>
-+    <property name='tsc-adjust' type='boolean' value='false'/>
-+    <property name='tsc_adjust' type='boolean' value='false'/>
-+    <property name='kvm-steal-time' type='boolean' value='false'/>
-+    <property name='kvm_steal_time' type='boolean' value='false'/>
-+    <property name='kvmclock' type='boolean' value='false'/>
-+    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='amd-ssbd' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='false'/>
-+    <property name='movdiri' type='boolean' value='false'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vapic' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='ht' 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='vaes' type='boolean' value='false'/>
-+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='false'/>
-+    <property name='movdir64b' type='boolean' value='false'/>
-+    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='umip' type='boolean' value='false'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='false'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-+    <property name='virt-ssbd' type='boolean' value='false'/>
-+    <property name='x-hv-max-vps' type='number' value='-1'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='md-clear' type='boolean' value='false'/>
-+    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-+    <property name='misalignsse' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483658'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='realized' type='boolean' value='false'/>
-+    <property name='tsc_scale' type='boolean' value='false'/>
-+    <property name='tsc-scale' type='boolean' value='false'/>
-+    <property name='topoext' type='boolean' value='false'/>
-+    <property name='hv-vpindex' type='boolean' value='false'/>
-+    <property name='xlevel2' type='number' value='0'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='false'/>
-+    <property name='arch-capabilities' type='boolean' value='false'/>
-+    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-+    <property name='erms' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='vpclmulqdq' type='boolean' value='false'/>
-+    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='hv-synic' type='boolean' value='false'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='fxsr_opt' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='false'/>
-+    <property name='lmce' type='boolean' value='false'/>
-+    <property name='hv-time' type='boolean' value='false'/>
-+    <property name='perfctr-nb' type='boolean' value='false'/>
-+    <property name='perfctr_nb' type='boolean' value='false'/>
-+    <property name='ffxsr' type='boolean' value='false'/>
-+    <property name='hv-tlbflush' type='boolean' value='false'/>
-+    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdseed' type='boolean' value='false'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='false'/>
-+    <property name='vme' 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='pse36' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='pause_filter' type='boolean' value='false'/>
 +    <property name='sha-ni' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
 +    <property name='abm' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/>
 +    <property name='avx512pf' type='boolean' value='false'/>
++    <property name='vmx-hlt-exit' type='boolean' value='true' migratable='yes'/>
 +    <property name='xstore-en' type='boolean' value='false'/>
 +  </hostCPU>
-+  <cpu type='kvm' name='max' usable='yes'/>
-+  <cpu type='kvm' name='host' usable='yes'/>
-+  <cpu type='kvm' name='base' usable='yes'/>
-+  <cpu type='kvm' name='qemu64' usable='yes'/>
-+  <cpu type='kvm' name='qemu32' usable='yes'/>
-+  <cpu type='kvm' name='phenom' usable='no'>
++  <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='mmxext'/>
 +    <blocker name='fxsr-opt'/>
 +    <blocker name='3dnowext'/>
@@ -24584,38 +35533,75 @@ index 0000000000..93c5da537a
 +    <blocker name='sse4a'/>
 +    <blocker name='npt'/>
 +  </cpu>
-+  <cpu type='kvm' name='pentium3' usable='yes'/>
-+  <cpu type='kvm' name='pentium2' usable='yes'/>
-+  <cpu type='kvm' name='pentium' usable='yes'/>
-+  <cpu type='kvm' name='n270' usable='yes'/>
-+  <cpu type='kvm' name='kvm64' usable='yes'/>
-+  <cpu type='kvm' name='kvm32' usable='yes'/>
-+  <cpu type='kvm' name='coreduo' usable='yes'/>
-+  <cpu type='kvm' name='core2duo' usable='yes'/>
-+  <cpu type='kvm' name='athlon' usable='no'>
++  <cpu type='kvm' name='phenom' typename='phenom-x86_64-cpu' usable='no'>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='3dnowext'/>
++    <blocker name='3dnow'/>
++    <blocker name='sse4a'/>
++    <blocker name='npt'/>
++  </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='yes'/>
++  <cpu type='kvm' name='n270' typename='n270-x86_64-cpu' usable='yes'/>
++  <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='yes'/>
++  <cpu type='kvm' name='coreduo' typename='coreduo-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='core2duo-v1' typename='core2duo-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='core2duo' typename='core2duo-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='athlon-v1' typename='athlon-v1-x86_64-cpu' usable='no'>
 +    <blocker name='mmxext'/>
 +    <blocker name='3dnowext'/>
 +    <blocker name='3dnow'/>
 +  </cpu>
-+  <cpu type='kvm' name='Westmere-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='athlon' typename='athlon-x86_64-cpu' usable='no'>
++    <blocker name='mmxext'/>
++    <blocker name='3dnowext'/>
++    <blocker name='3dnow'/>
 +  </cpu>
-+  <cpu type='kvm' name='Westmere' usable='yes'/>
-+  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
++  <cpu type='kvm' name='Westmere-v2' typename='Westmere-v2-x86_64-cpu' usable='yes'/>
++  <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='yes'/>
++  <cpu type='kvm' name='Westmere' typename='Westmere-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Snowridge-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'>
 +    <blocker name='clwb'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='pku'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='pku'/>
++    <blocker name='sha-ni'/>
++    <blocker name='gfni'/>
++    <blocker name='cldemote'/>
++    <blocker name='movdiri'/>
++    <blocker name='movdir64b'/>
++    <blocker name='core-capability'/>
++    <blocker name='split-lock-detect'/>
 +  </cpu>
-+  <cpu type='kvm' name='Skylake-Server' usable='no'>
++  <cpu type='kvm' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
++    <blocker name='clwb'/>
++    <blocker name='sha-ni'/>
++    <blocker name='gfni'/>
++    <blocker name='cldemote'/>
++    <blocker name='movdiri'/>
++    <blocker name='movdir64b'/>
++    <blocker name='core-capability'/>
++    <blocker name='split-lock-detect'/>
++  </cpu>
++  <cpu type='kvm' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
++    <blocker name='clwb'/>
++    <blocker name='sha-ni'/>
++    <blocker name='gfni'/>
++    <blocker name='cldemote'/>
++    <blocker name='movdiri'/>
++    <blocker name='movdir64b'/>
++    <blocker name='core-capability'/>
++    <blocker name='split-lock-detect'/>
++  </cpu>
++  <cpu type='kvm' name='Skylake-Server-v3' typename='Skylake-Server-v3-x86_64-cpu' usable='no'>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512dq'/>
 +    <blocker name='clwb'/>
@@ -24628,16 +35614,84 @@ index 0000000000..93c5da537a
 +    <blocker name='avx512f'/>
 +    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-+  <cpu type='kvm' name='SandyBridge-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-+  <cpu type='kvm' name='Penryn' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G5' usable='no'>
++  <cpu type='kvm' name='Skylake-Server-noTSX-IBRS' typename='Skylake-Server-noTSX-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Skylake-Client-v3' typename='Skylake-Client-v3-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Skylake-Client-noTSX-IBRS' typename='Skylake-Client-noTSX-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='yes'/>
++  <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='yes'/>
++  <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='sse4a'/>
 +    <blocker name='misalignsse'/>
 +    <blocker name='xop'/>
@@ -24646,7 +35700,16 @@ index 0000000000..93c5da537a
 +    <blocker name='npt'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='kvm' name='Opteron_G4' usable='no'>
++  <cpu type='kvm' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='xop'/>
++    <blocker name='fma4'/>
++    <blocker name='tbm'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='Opteron_G4-v1' typename='Opteron_G4-v1-x86_64-cpu' usable='no'>
 +    <blocker name='sse4a'/>
 +    <blocker name='misalignsse'/>
 +    <blocker name='xop'/>
@@ -24654,17 +35717,31 @@ index 0000000000..93c5da537a
 +    <blocker name='npt'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='kvm' name='Opteron_G3' usable='no'>
++  <cpu type='kvm' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='xop'/>
++    <blocker name='fma4'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='Opteron_G3-v1' typename='Opteron_G3-v1-x86_64-cpu' usable='no'>
 +    <blocker name='sse4a'/>
 +    <blocker name='misalignsse'/>
 +  </cpu>
-+  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-+  <cpu type='kvm' name='Nehalem-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Opteron_G3' typename='Opteron_G3-x86_64-cpu' usable='no'>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
 +  </cpu>
-+  <cpu type='kvm' name='Nehalem' usable='yes'/>
-+  <cpu type='kvm' name='KnightsMill' usable='no'>
++  <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='yes'/>
++  <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='yes'/>
++  <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='avx512f'/>
 +    <blocker name='avx512pf'/>
 +    <blocker name='avx512er'/>
@@ -24676,11 +35753,23 @@ index 0000000000..93c5da537a
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512f'/>
 +  </cpu>
-+  <cpu type='kvm' name='IvyBridge-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512pf'/>
++    <blocker name='avx512er'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='avx512-4vnniw'/>
++    <blocker name='avx512-4fmaps'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
 +  </cpu>
-+  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-+  <cpu type='kvm' name='Icelake-Server' usable='no'>
++  <cpu type='kvm' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512dq'/>
 +    <blocker name='clwb'/>
@@ -24697,15 +35786,82 @@ index 0000000000..93c5da537a
 +    <blocker name='avx512bitalg'/>
 +    <blocker name='avx512-vpopcntdq'/>
 +    <blocker name='la57'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ssbd'/>
 +    <blocker name='wbnoinvd'/>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512f'/>
 +    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Icelake-Client' usable='no'>
++  <cpu type='kvm' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <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='wbnoinvd'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Icelake-Server-noTSX' typename='Icelake-Server-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <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='wbnoinvd'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <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='wbnoinvd'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Icelake-Client-v2' typename='Icelake-Client-v2-x86_64-cpu' usable='no'>
 +    <blocker name='avx512vbmi'/>
 +    <blocker name='pku'/>
 +    <blocker name='avx512vbmi2'/>
@@ -24715,20 +35871,72 @@ index 0000000000..93c5da537a
 +    <blocker name='avx512vnni'/>
 +    <blocker name='avx512bitalg'/>
 +    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ssbd'/>
 +    <blocker name='wbnoinvd'/>
 +    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Icelake-Client-v1' typename='Icelake-Client-v1-x86_64-cpu' usable='no'>
++    <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='wbnoinvd'/>
++    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-+  <cpu type='kvm' name='Haswell-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Icelake-Client-noTSX' typename='Icelake-Client-noTSX-x86_64-cpu' usable='no'>
++    <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='wbnoinvd'/>
++    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Haswell' usable='yes'/>
-+  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
++  <cpu type='kvm' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
++    <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='wbnoinvd'/>
++    <blocker name='pku'/>
++  </cpu>
++  <cpu type='kvm' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Haswell' typename='Haswell-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='no'>
++    <blocker name='sha-ni'/>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='cr8legacy'/>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='osvw'/>
++    <blocker name='perfctr-core'/>
++    <blocker name='clzero'/>
++    <blocker name='xsaveerptr'/>
++    <blocker name='ibpb'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'>
 +    <blocker name='sha-ni'/>
 +    <blocker name='mmxext'/>
 +    <blocker name='fxsr-opt'/>
@@ -24740,7 +35948,7 @@ index 0000000000..93c5da537a
 +    <blocker name='npt'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='kvm' name='EPYC' usable='no'>
++  <cpu type='kvm' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
 +    <blocker name='sha-ni'/>
 +    <blocker name='mmxext'/>
 +    <blocker name='fxsr-opt'/>
@@ -24751,7 +35959,46 @@ index 0000000000..93c5da537a
 +    <blocker name='npt'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='kvm' name='Dhyana' usable='no'>
++  <cpu type='kvm' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'>
++    <blocker name='clwb'/>
++    <blocker name='sha-ni'/>
++    <blocker name='rdpid'/>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='cr8legacy'/>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='osvw'/>
++    <blocker name='perfctr-core'/>
++    <blocker name='clzero'/>
++    <blocker name='xsaveerptr'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='ibpb'/>
++    <blocker name='amd-stibp'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'>
++    <blocker name='clwb'/>
++    <blocker name='sha-ni'/>
++    <blocker name='rdpid'/>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='cr8legacy'/>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='osvw'/>
++    <blocker name='perfctr-core'/>
++    <blocker name='clzero'/>
++    <blocker name='xsaveerptr'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='ibpb'/>
++    <blocker name='amd-stibp'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
++    <blocker name='sha-ni'/>
 +    <blocker name='mmxext'/>
 +    <blocker name='fxsr-opt'/>
 +    <blocker name='cr8legacy'/>
@@ -24762,8 +36009,126 @@ index 0000000000..93c5da537a
 +    <blocker name='npt'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='kvm' name='Conroe' usable='yes'/>
-+  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
++  <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
++    <blocker name='sha-ni'/>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='cr8legacy'/>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='osvw'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='cr8legacy'/>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='osvw'/>
++    <blocker name='ibpb'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
++    <blocker name='mmxext'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='cr8legacy'/>
++    <blocker name='sse4a'/>
++    <blocker name='misalignsse'/>
++    <blocker name='osvw'/>
++    <blocker name='ibpb'/>
++    <blocker name='npt'/>
++    <blocker name='nrip-save'/>
++  </cpu>
++  <cpu type='kvm' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'>
++    <blocker name='sha-ni'/>
++    <blocker name='rdctl-no'/>
++  </cpu>
++  <cpu type='kvm' name='Denverton-v1' typename='Denverton-v1-x86_64-cpu' usable='no'>
++    <blocker name='sha-ni'/>
++    <blocker name='rdctl-no'/>
++  </cpu>
++  <cpu type='kvm' name='Denverton' typename='Denverton-x86_64-cpu' usable='no'>
++    <blocker name='sha-ni'/>
++    <blocker name='rdctl-no'/>
++  </cpu>
++  <cpu type='kvm' name='Cooperlake-v1' typename='Cooperlake-v1-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512-bf16'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='mds-no'/>
++    <blocker name='taa-no'/>
++  </cpu>
++  <cpu type='kvm' name='Cooperlake' typename='Cooperlake-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512-bf16'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='mds-no'/>
++    <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='Cascadelake-Server-v3' typename='Cascadelake-Server-v3-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='mds-no'/>
++  </cpu>
++  <cpu type='kvm' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='mds-no'/>
++  </cpu>
++  <cpu type='kvm' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512dq'/>
 +    <blocker name='clwb'/>
@@ -24772,46 +36137,506 @@ index 0000000000..93c5da537a
 +    <blocker name='avx512vl'/>
 +    <blocker name='pku'/>
 +    <blocker name='avx512vnni'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='ssbd'/>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512f'/>
 +    <blocker name='avx512f'/>
 +    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Cascadelake-Server-noTSX' typename='Cascadelake-Server-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='mds-no'/>
 +  </cpu>
-+  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-+  <cpu type='kvm' name='Broadwell-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
++  <cpu type='kvm' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='clwb'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='pku'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512f'/>
++    <blocker name='pku'/>
 +  </cpu>
-+  <cpu type='kvm' name='Broadwell' usable='yes'/>
-+  <cpu type='kvm' name='486' usable='yes'/>
-+  <cpu type='tcg' name='max' usable='yes'/>
-+  <cpu type='tcg' name='host' usable='no'>
++  <cpu type='kvm' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
++  <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
++  <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-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <hostCPU type='tcg' model='base' migratability='yes'>
++    <property name='vmx-entry-load-rtit-ctl' 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='false'/>
++    <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='xsavec' type='boolean' value='false'/>
++    <property name='intel-pt' 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='vmx-eptp-switching' 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='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='sse4.1' type='boolean' value='true' migratable='yes'/>
++    <property name='family' type='number' value='6'/>
++    <property name='vmx-vmwrite-vmexit-fields' 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='false'/>
++    <property name='avx512f' type='boolean' value='false'/>
++    <property name='msr' type='boolean' value='true' migratable='yes'/>
++    <property name='mce' type='boolean' value='true' migratable='yes'/>
++    <property name='mca' type='boolean' value='true' migratable='yes'/>
++    <property name='xcrypt' 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='ds' type='boolean' value='false'/>
++    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
++    <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='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='false'/>
++    <property name='vmx-vmfunc' type='boolean' value='false'/>
++    <property name='vmx-activity-shutdown' 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='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='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='smx' 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='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='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='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='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='x2apic' type='boolean' value='false'/>
++    <property name='avx512vbmi' type='boolean' value='false'/>
++    <property name='avx512vnni' 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='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='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='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='true' migratable='yes'/>
++    <property name='vmx-vpid' type='boolean' value='false'/>
++    <property name='syscall' 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='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='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='vmx-ept' 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='model' type='number' value='6'/>
++    <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='vmx-pause-exit' type='boolean' value='false'/>
++    <property name='invpcid' type='boolean' value='false'/>
++    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
++    <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='false'/>
++    <property name='cx16' type='boolean' value='true' migratable='yes'/>
++    <property name='de' type='boolean' value='true' migratable='yes'/>
++    <property name='stepping' type='number' value='3'/>
++    <property name='xsave' type='boolean' value='true' migratable='yes'/>
++    <property name='clflush' type='boolean' value='true' migratable='yes'/>
++    <property name='skinit' type='boolean' value='false'/>
++    <property name='tsc' type='boolean' value='true' migratable='yes'/>
++    <property name='tce' 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='la57' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-invept' type='boolean' value='false'/>
++    <property name='osvw' 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='kvm-steal-time' type='boolean' value='false'/>
++    <property name='kvmclock' type='boolean' value='false'/>
++    <property name='vmx-zero-len-inject' type='boolean' value='false'/>
++    <property name='pschange-mc-no' type='boolean' value='false'/>
++    <property name='vmx-rdrand-exit' type='boolean' value='false'/>
++    <property name='lwp' type='boolean' value='false'/>
++    <property name='amd-ssbd' type='boolean' value='false'/>
++    <property name='xop' type='boolean' value='false'/>
++    <property name='ibpb' type='boolean' value='false'/>
++    <property name='avx' type='boolean' value='false'/>
++    <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='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='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='false'/>
++    <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='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='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-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='pmm-en' type='boolean' value='false'/>
++    <property name='pcid' type='boolean' value='false'/>
++    <property name='taa-no' type='boolean' value='false'/>
++    <property name='arch-capabilities' type='boolean' value='false'/>
++    <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='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='lmce' type='boolean' value='false'/>
++    <property name='perfctr-nb' type='boolean' value='false'/>
++    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
++    <property name='rdseed' type='boolean' value='false'/>
++    <property name='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='false'/>
++    <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='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
++    <property name='sha-ni' type='boolean' value='false'/>
++    <property name='abm' type='boolean' value='true' migratable='yes'/>
++    <property name='vmx-ept-advanced-exitinfo' 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' usable='yes'/>
-+  <cpu type='tcg' name='qemu64' usable='yes'/>
-+  <cpu type='tcg' name='qemu32' usable='yes'/>
-+  <cpu type='tcg' name='phenom' usable='no'>
++  <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='pentium3' usable='yes'/>
-+  <cpu type='tcg' name='pentium2' usable='yes'/>
-+  <cpu type='tcg' name='pentium' usable='yes'/>
-+  <cpu type='tcg' name='n270' usable='yes'/>
-+  <cpu type='tcg' name='kvm64' usable='yes'/>
-+  <cpu type='tcg' name='kvm32' usable='yes'/>
-+  <cpu type='tcg' name='coreduo' usable='yes'/>
-+  <cpu type='tcg' name='core2duo' usable='yes'/>
-+  <cpu type='tcg' name='athlon' usable='yes'/>
-+  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
++  <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' usable='yes'/>
-+  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
++  <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-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='umip'/>
++    <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='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='split-lock-detect'/>
++  </cpu>
++  <cpu type='tcg' name='Snowridge-v1' typename='Snowridge-v1-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='umip'/>
++    <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='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='split-lock-detect'/>
++  </cpu>
++  <cpu type='tcg' name='Snowridge' typename='Snowridge-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='umip'/>
++    <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='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='split-lock-detect'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Server-v3' typename='Skylake-Server-v3-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Server-v2' typename='Skylake-Server-v2-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -24832,7 +36657,7 @@ index 0000000000..93c5da537a
 +    <blocker name='3dnowprefetch'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Skylake-Server' usable='no'>
++  <cpu type='tcg' name='Skylake-Server-v1' typename='Skylake-Server-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -24852,7 +36677,81 @@ index 0000000000..93c5da537a
 +    <blocker name='3dnowprefetch'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
++  <cpu type='tcg' name='Skylake-Server-noTSX-IBRS' typename='Skylake-Server-noTSX-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Server-IBRS' typename='Skylake-Server-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Server' typename='Skylake-Server-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Client-v3' typename='Skylake-Client-v3-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Client-v2' typename='Skylake-Client-v2-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -24868,7 +36767,7 @@ index 0000000000..93c5da537a
 +    <blocker name='3dnowprefetch'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Skylake-Client' usable='no'>
++  <cpu type='tcg' name='Skylake-Client-v1' typename='Skylake-Client-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -24883,19 +36782,76 @@ index 0000000000..93c5da537a
 +    <blocker name='3dnowprefetch'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
++  <cpu type='tcg' name='Skylake-Client-noTSX-IBRS' typename='Skylake-Client-noTSX-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Client-IBRS' typename='Skylake-Client-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='rdseed'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Skylake-Client' typename='Skylake-Client-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='rdseed'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='SandyBridge-v2' typename='SandyBridge-v2-x86_64-cpu' usable='no'>
 +    <blocker name='x2apic'/>
 +    <blocker name='tsc-deadline'/>
 +    <blocker name='avx'/>
 +    <blocker name='spec-ctrl'/>
 +  </cpu>
-+  <cpu type='tcg' name='SandyBridge' usable='no'>
++  <cpu type='tcg' name='SandyBridge-v1' typename='SandyBridge-v1-x86_64-cpu' usable='no'>
 +    <blocker name='x2apic'/>
 +    <blocker name='tsc-deadline'/>
 +    <blocker name='avx'/>
 +  </cpu>
-+  <cpu type='tcg' name='Penryn' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G5' usable='no'>
++  <cpu type='tcg' name='SandyBridge-IBRS' typename='SandyBridge-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='spec-ctrl'/>
++  </cpu>
++  <cpu type='tcg' name='SandyBridge' typename='SandyBridge-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++  </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='fma'/>
 +    <blocker name='avx'/>
 +    <blocker name='f16c'/>
@@ -24906,7 +36862,18 @@ index 0000000000..93c5da537a
 +    <blocker name='tbm'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='tcg' name='Opteron_G4' usable='no'>
++  <cpu type='tcg' name='Opteron_G5' typename='Opteron_G5-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <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='avx'/>
 +    <blocker name='misalignsse'/>
 +    <blocker name='3dnowprefetch'/>
@@ -24914,16 +36881,33 @@ index 0000000000..93c5da537a
 +    <blocker name='fma4'/>
 +    <blocker name='nrip-save'/>
 +  </cpu>
-+  <cpu type='tcg' name='Opteron_G3' usable='no'>
++  <cpu type='tcg' name='Opteron_G4' typename='Opteron_G4-x86_64-cpu' usable='no'>
++    <blocker name='avx'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <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_G2' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-+  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
++  <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' usable='yes'/>
-+  <cpu type='tcg' name='KnightsMill' usable='no'>
++  <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='fma'/>
 +    <blocker name='x2apic'/>
 +    <blocker name='tsc-deadline'/>
@@ -24940,20 +36924,80 @@ index 0000000000..93c5da537a
 +    <blocker name='avx512-4fmaps'/>
 +    <blocker name='3dnowprefetch'/>
 +  </cpu>
-+  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
++  <cpu type='tcg' name='KnightsMill' typename='KnightsMill-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='avx512f'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512pf'/>
++    <blocker name='avx512er'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='avx512-4vnniw'/>
++    <blocker name='avx512-4fmaps'/>
++    <blocker name='3dnowprefetch'/>
++  </cpu>
++  <cpu type='tcg' name='IvyBridge-v2' typename='IvyBridge-v2-x86_64-cpu' usable='no'>
 +    <blocker name='x2apic'/>
 +    <blocker name='tsc-deadline'/>
 +    <blocker name='avx'/>
 +    <blocker name='f16c'/>
 +    <blocker name='spec-ctrl'/>
 +  </cpu>
-+  <cpu type='tcg' name='IvyBridge' usable='no'>
++  <cpu type='tcg' name='IvyBridge-v1' typename='IvyBridge-v1-x86_64-cpu' usable='no'>
 +    <blocker name='x2apic'/>
 +    <blocker name='tsc-deadline'/>
 +    <blocker name='avx'/>
 +    <blocker name='f16c'/>
 +  </cpu>
-+  <cpu type='tcg' name='Icelake-Server' usable='no'>
++  <cpu type='tcg' name='IvyBridge-IBRS' typename='IvyBridge-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='spec-ctrl'/>
++  </cpu>
++  <cpu type='tcg' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++  </cpu>
++  <cpu type='tcg' name='Icelake-Server-v2' typename='Icelake-Server-v2-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vbmi'/>
++    <blocker name='umip'/>
++    <blocker name='avx512vbmi2'/>
++    <blocker name='gfni'/>
++    <blocker name='vaes'/>
++    <blocker name='vpclmulqdq'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512bitalg'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Icelake-Server-v1' typename='Icelake-Server-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -24985,7 +37029,94 @@ index 0000000000..93c5da537a
 +    <blocker name='wbnoinvd'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Icelake-Client' usable='no'>
++  <cpu type='tcg' name='Icelake-Server-noTSX' typename='Icelake-Server-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vbmi'/>
++    <blocker name='umip'/>
++    <blocker name='avx512vbmi2'/>
++    <blocker name='gfni'/>
++    <blocker name='vaes'/>
++    <blocker name='vpclmulqdq'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512bitalg'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Icelake-Server' typename='Icelake-Server-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vbmi'/>
++    <blocker name='umip'/>
++    <blocker name='avx512vbmi2'/>
++    <blocker name='gfni'/>
++    <blocker name='vaes'/>
++    <blocker name='vpclmulqdq'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512bitalg'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Icelake-Client-v2' typename='Icelake-Client-v2-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512vbmi'/>
++    <blocker name='umip'/>
++    <blocker name='avx512vbmi2'/>
++    <blocker name='gfni'/>
++    <blocker name='vaes'/>
++    <blocker name='vpclmulqdq'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512bitalg'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Icelake-Client-v1' typename='Icelake-Client-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25012,7 +37143,59 @@ index 0000000000..93c5da537a
 +    <blocker name='wbnoinvd'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
++  <cpu type='tcg' name='Icelake-Client-noTSX' typename='Icelake-Client-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512vbmi'/>
++    <blocker name='umip'/>
++    <blocker name='avx512vbmi2'/>
++    <blocker name='gfni'/>
++    <blocker name='vaes'/>
++    <blocker name='vpclmulqdq'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512bitalg'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Icelake-Client' typename='Icelake-Client-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512vbmi'/>
++    <blocker name='umip'/>
++    <blocker name='avx512vbmi2'/>
++    <blocker name='gfni'/>
++    <blocker name='vaes'/>
++    <blocker name='vpclmulqdq'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='avx512bitalg'/>
++    <blocker name='avx512-vpopcntdq'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Haswell-v4' typename='Haswell-v4-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25023,17 +37206,7 @@ index 0000000000..93c5da537a
 +    <blocker name='invpcid'/>
 +    <blocker name='spec-ctrl'/>
 +  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
++  <cpu type='tcg' name='Haswell-v3' typename='Haswell-v3-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25046,7 +37219,17 @@ index 0000000000..93c5da537a
 +    <blocker name='rtm'/>
 +    <blocker name='spec-ctrl'/>
 +  </cpu>
-+  <cpu type='tcg' name='Haswell' usable='no'>
++  <cpu type='tcg' name='Haswell-v2' typename='Haswell-v2-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++  </cpu>
++  <cpu type='tcg' name='Haswell-v1' typename='Haswell-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25058,7 +37241,73 @@ index 0000000000..93c5da537a
 +    <blocker name='invpcid'/>
 +    <blocker name='rtm'/>
 +  </cpu>
-+  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
++  <cpu type='tcg' name='Haswell-noTSX-IBRS' typename='Haswell-noTSX-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='spec-ctrl'/>
++  </cpu>
++  <cpu type='tcg' name='Haswell-noTSX' typename='Haswell-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++  </cpu>
++  <cpu type='tcg' name='Haswell-IBRS' typename='Haswell-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <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='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++  </cpu>
++  <cpu type='tcg' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='osvw'/>
++    <blocker name='topoext'/>
++    <blocker name='perfctr-core'/>
++    <blocker name='clzero'/>
++    <blocker name='xsaveerptr'/>
++    <blocker name='ibpb'/>
++    <blocker name='nrip-save'/>
++    <blocker name='xsavec'/>
++    <blocker name='xsaves'/>
++  </cpu>
++  <cpu type='tcg' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='avx'/>
 +    <blocker name='f16c'/>
@@ -25074,7 +37323,7 @@ index 0000000000..93c5da537a
 +    <blocker name='nrip-save'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='EPYC' usable='no'>
++  <cpu type='tcg' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='avx'/>
 +    <blocker name='f16c'/>
@@ -25089,7 +37338,86 @@ index 0000000000..93c5da537a
 +    <blocker name='nrip-save'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Dhyana' usable='no'>
++  <cpu type='tcg' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='umip'/>
++    <blocker name='rdpid'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='osvw'/>
++    <blocker name='topoext'/>
++    <blocker name='perfctr-core'/>
++    <blocker name='clzero'/>
++    <blocker name='xsaveerptr'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='ibpb'/>
++    <blocker name='amd-stibp'/>
++    <blocker name='nrip-save'/>
++    <blocker name='xsavec'/>
++    <blocker name='xsaves'/>
++  </cpu>
++  <cpu type='tcg' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='umip'/>
++    <blocker name='rdpid'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='osvw'/>
++    <blocker name='topoext'/>
++    <blocker name='perfctr-core'/>
++    <blocker name='clzero'/>
++    <blocker name='xsaveerptr'/>
++    <blocker name='wbnoinvd'/>
++    <blocker name='ibpb'/>
++    <blocker name='amd-stibp'/>
++    <blocker name='nrip-save'/>
++    <blocker name='xsavec'/>
++    <blocker name='xsaves'/>
++  </cpu>
++  <cpu type='tcg' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='osvw'/>
++    <blocker name='topoext'/>
++    <blocker name='ibpb'/>
++    <blocker name='nrip-save'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='EPYC' typename='EPYC-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='osvw'/>
++    <blocker name='topoext'/>
++    <blocker name='nrip-save'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='avx'/>
 +    <blocker name='f16c'/>
@@ -25104,8 +37432,181 @@ index 0000000000..93c5da537a
 +    <blocker name='nrip-save'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Conroe' usable='yes'/>
-+  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
++  <cpu type='tcg' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='rdseed'/>
++    <blocker name='fxsr-opt'/>
++    <blocker name='misalignsse'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='osvw'/>
++    <blocker name='topoext'/>
++    <blocker name='ibpb'/>
++    <blocker name='nrip-save'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++  </cpu>
++  <cpu type='tcg' name='Denverton-v1' typename='Denverton-v1-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++  </cpu>
++  <cpu type='tcg' name='Denverton' typename='Denverton-x86_64-cpu' usable='no'>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='rdseed'/>
++    <blocker name='sha-ni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++  </cpu>
++  <cpu type='tcg' name='Cooperlake-v1' typename='Cooperlake-v1-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='stibp'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='avx512-bf16'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++    <blocker name='mds-no'/>
++    <blocker name='pschange-mc-no'/>
++    <blocker name='taa-no'/>
++  </cpu>
++  <cpu type='tcg' name='Cooperlake' typename='Cooperlake-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='stibp'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='avx512-bf16'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++    <blocker name='mds-no'/>
++    <blocker name='pschange-mc-no'/>
++    <blocker name='taa-no'/>
++  </cpu>
++  <cpu type='tcg' name='Conroe-v1' typename='Conroe-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='tcg' name='Conroe' typename='Conroe-x86_64-cpu' usable='yes'/>
++  <cpu type='tcg' name='Cascadelake-Server-v3' typename='Cascadelake-Server-v3-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++    <blocker name='mds-no'/>
++  </cpu>
++  <cpu type='tcg' name='Cascadelake-Server-v2' typename='Cascadelake-Server-v2-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++    <blocker name='mds-no'/>
++  </cpu>
++  <cpu type='tcg' name='Cascadelake-Server-v1' typename='Cascadelake-Server-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25128,7 +37629,56 @@ index 0000000000..93c5da537a
 +    <blocker name='3dnowprefetch'/>
 +    <blocker name='xsavec'/>
 +  </cpu>
-+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
++  <cpu type='tcg' name='Cascadelake-Server-noTSX' typename='Cascadelake-Server-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='arch-capabilities'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++    <blocker name='rdctl-no'/>
++    <blocker name='ibrs-all'/>
++    <blocker name='skip-l1dfl-vmentry'/>
++    <blocker name='mds-no'/>
++  </cpu>
++  <cpu type='tcg' name='Cascadelake-Server' typename='Cascadelake-Server-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='avx512f'/>
++    <blocker name='avx512dq'/>
++    <blocker name='rdseed'/>
++    <blocker name='avx512cd'/>
++    <blocker name='avx512bw'/>
++    <blocker name='avx512vl'/>
++    <blocker name='avx512vnni'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='ssbd'/>
++    <blocker name='3dnowprefetch'/>
++    <blocker name='xsavec'/>
++  </cpu>
++  <cpu type='tcg' name='Broadwell-v4' typename='Broadwell-v4-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25141,19 +37691,7 @@ index 0000000000..93c5da537a
 +    <blocker name='spec-ctrl'/>
 +    <blocker name='3dnowprefetch'/>
 +  </cpu>
-+  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
++  <cpu type='tcg' name='Broadwell-v3' typename='Broadwell-v3-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25168,7 +37706,19 @@ index 0000000000..93c5da537a
 +    <blocker name='spec-ctrl'/>
 +    <blocker name='3dnowprefetch'/>
 +  </cpu>
-+  <cpu type='tcg' name='Broadwell' usable='no'>
++  <cpu type='tcg' name='Broadwell-v2' typename='Broadwell-v2-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='3dnowprefetch'/>
++  </cpu>
++  <cpu type='tcg' name='Broadwell-v1' typename='Broadwell-v1-x86_64-cpu' usable='no'>
 +    <blocker name='fma'/>
 +    <blocker name='pcid'/>
 +    <blocker name='x2apic'/>
@@ -25182,66 +37732,170 @@ index 0000000000..93c5da537a
 +    <blocker name='rdseed'/>
 +    <blocker name='3dnowprefetch'/>
 +  </cpu>
-+  <cpu type='tcg' name='486' usable='yes'/>
-+  <machine name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
-+  <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
-+  <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='xenpv' maxCpus='1'/>
-+  <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
++  <cpu type='tcg' name='Broadwell-noTSX-IBRS' typename='Broadwell-noTSX-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++  </cpu>
++  <cpu type='tcg' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rdseed'/>
++    <blocker name='3dnowprefetch'/>
++  </cpu>
++  <cpu type='tcg' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='rdseed'/>
++    <blocker name='spec-ctrl'/>
++    <blocker name='3dnowprefetch'/>
++  </cpu>
++  <cpu type='tcg' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='no'>
++    <blocker name='fma'/>
++    <blocker name='pcid'/>
++    <blocker name='x2apic'/>
++    <blocker name='tsc-deadline'/>
++    <blocker name='avx'/>
++    <blocker name='f16c'/>
++    <blocker name='hle'/>
++    <blocker name='avx2'/>
++    <blocker name='invpcid'/>
++    <blocker name='rtm'/>
++    <blocker name='rdseed'/>
++    <blocker name='3dnowprefetch'/>
++  </cpu>
++  <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
++  <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
++  <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
++  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
 +</qemuCaps>
-diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
-index ccc4e45817..775f78e16f 100644
---- a/tests/qemucapabilitiestest.c
-+++ b/tests/qemucapabilitiestest.c
-@@ -178,6 +178,7 @@ mymain(void)
-     DO_TEST("x86_64", "caps_2.11.0");
-     DO_TEST("x86_64", "caps_2.12.0");
-     DO_TEST("x86_64", "caps_3.0.0");
-+    DO_TEST("x86_64", "caps_4.1.0");
-     DO_TEST("aarch64", "caps_2.6.0");
-     DO_TEST("aarch64", "caps_2.10.0");
-     DO_TEST("aarch64", "caps_2.12.0");
+diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
+index 6e32f918f3..65974ca759 100644
+--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
+@@ -13,7 +13,6 @@ QEMU_AUDIO_DRV=none \
+ -object secret,id=masterKey0,format=raw,\
+ file=/tmp/lib/domain--1-test/master-key.aes \
+ -machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+--cpu qemu64 \
+ -m 1024 \
+ -overcommit mem-lock=off \
+ -smp 1,sockets=1,cores=1,threads=1 \
+diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
+index 646d63aa90..58bab55572 100644
+--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
+@@ -13,7 +13,6 @@ QEMU_AUDIO_DRV=none \
+ -object secret,id=masterKey0,format=raw,\
+ file=/tmp/lib/domain--1-test/master-key.aes \
+ -machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+--cpu qemu64 \
+ -m 1024 \
+ -overcommit mem-lock=off \
+ -smp 1,sockets=1,cores=1,threads=1 \
+diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
+index 59dcd98322..381956291c 100644
+--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
+@@ -13,7 +13,6 @@ QEMU_AUDIO_DRV=none \
+ -object secret,id=masterKey0,format=raw,\
+ file=/tmp/lib/domain--1-test/master-key.aes \
+ -machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+--cpu qemu64 \
+ -m 1024 \
+ -overcommit mem-lock=off \
+ -smp 1,sockets=1,cores=1,threads=1 \
+diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
+index 1b0ffee6e8..76df9d2d4d 100644
+--- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
+@@ -13,7 +13,6 @@ QEMU_AUDIO_DRV=none \
+ -object secret,id=masterKey0,format=raw,\
+ file=/tmp/lib/domain--1-test/master-key.aes \
+ -machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+--cpu qemu64 \
+ -m 1024 \
+ -overcommit mem-lock=off \
+ -smp 1,sockets=1,cores=1,threads=1 \
+diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
+index 669992bcf6..2a99f35cf8 100644
+--- a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
+@@ -12,9 +12,6 @@
+   <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>
 -- 
-2.22.0
+2.26.2
 
diff --git a/SOURCES/libvirt-qemu-only-stop-external-devices-after-the-domain.patch b/SOURCES/libvirt-qemu-only-stop-external-devices-after-the-domain.patch
new file mode 100644
index 0000000..a5475cb
--- /dev/null
+++ b/SOURCES/libvirt-qemu-only-stop-external-devices-after-the-domain.patch
@@ -0,0 +1,49 @@
+From cd9f9fa54ff87661a0958027baa0c13fca57d2fc Mon Sep 17 00:00:00 2001
+Message-Id: <cd9f9fa54ff87661a0958027baa0c13fca57d2fc@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 13 May 2020 15:49:12 +0200
+Subject: [PATCH] qemu: only stop external devices after the domain
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A failure in qemuProcessLaunch would lead to qemuExtDevicesStop
+being called twice - once in the cleanup section and then again
+in qemuProcessStop.
+
+However, the first one is called while the QEMU process is
+still running, which is too soon for the swtpm process, because
+the swtmp_ioctl command can lock up:
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1822523
+
+Remove the first call and only leave the one in qemuProcessStop,
+which is called after the QEMU process is killed.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 006782a8bc5a27125211946fcb12a40f7d4ed12a)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <5a8b7f93e0b74cfb27f4bf780eebc7e756a5dcde.1589377631.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_process.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index dffff04554..95c0315e53 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -6962,8 +6962,6 @@ qemuProcessLaunch(virConnectPtr conn,
+     ret = 0;
+ 
+  cleanup:
+-    if (ret < 0)
+-        qemuExtDevicesStop(driver, vm);
+     qemuDomainSecretDestroy(vm);
+     return ret;
+ }
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-pass-virDomainObjPtr-to-qemuExtDevicesSetupCgroup.patch b/SOURCES/libvirt-qemu-pass-virDomainObjPtr-to-qemuExtDevicesSetupCgroup.patch
new file mode 100644
index 0000000..5b8062a
--- /dev/null
+++ b/SOURCES/libvirt-qemu-pass-virDomainObjPtr-to-qemuExtDevicesSetupCgroup.patch
@@ -0,0 +1,66 @@
+From 745aed1c66fcde8c8bf14d67622f02a838dd7ae2 Mon Sep 17 00:00:00 2001
+Message-Id: <745aed1c66fcde8c8bf14d67622f02a838dd7ae2@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:37 +0100
+Subject: [PATCH] qemu: pass virDomainObjPtr to qemuExtDevicesSetupCgroup
+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>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 6baf97ef2c7416f3d81bdc6cf20f121b62c8fd4f)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <fcb334eecdc7d85740f1aa5f7cd9f3d151996f99.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_cgroup.c    | 2 +-
+ src/qemu/qemu_extdevice.c | 3 ++-
+ src/qemu/qemu_extdevice.h | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
+index 45701b4c6e..57a1231855 100644
+--- a/src/qemu/qemu_cgroup.c
++++ b/src/qemu/qemu_cgroup.c
+@@ -1262,7 +1262,7 @@ qemuSetupCgroupForExtDevices(virDomainObjPtr vm,
+                            false, &cgroup_temp) < 0)
+         goto cleanup;
+ 
+-    ret = qemuExtDevicesSetupCgroup(driver, vm->def, cgroup_temp);
++    ret = qemuExtDevicesSetupCgroup(driver, vm, cgroup_temp);
+ 
+  cleanup:
+     virCgroupFree(&cgroup_temp);
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index 7f3bb104d9..bb73787b8d 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -236,9 +236,10 @@ qemuExtDevicesHasDevice(virDomainDefPtr def)
+ 
+ int
+ qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
+-                          virDomainDefPtr def,
++                          virDomainObjPtr vm,
+                           virCgroupPtr cgroup)
+ {
++    virDomainDefPtr def = vm->def;
+     size_t i;
+ 
+     for (i = 0; i < def->nvideos; i++) {
+diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
+index df29968e16..49373a15a1 100644
+--- a/src/qemu/qemu_extdevice.h
++++ b/src/qemu/qemu_extdevice.h
+@@ -58,5 +58,5 @@ void qemuExtDevicesStop(virQEMUDriverPtr driver,
+ bool qemuExtDevicesHasDevice(virDomainDefPtr def);
+ 
+ int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
+-                              virDomainDefPtr def,
++                              virDomainObjPtr vm,
+                               virCgroupPtr cgroup);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-preserve-error-on-bandwidth-rollback.patch b/SOURCES/libvirt-qemu-preserve-error-on-bandwidth-rollback.patch
new file mode 100644
index 0000000..d60acfa
--- /dev/null
+++ b/SOURCES/libvirt-qemu-preserve-error-on-bandwidth-rollback.patch
@@ -0,0 +1,59 @@
+From f4c935bfa5bd3e4f4856dfdf660be0fa50d42798 Mon Sep 17 00:00:00 2001
+Message-Id: <f4c935bfa5bd3e4f4856dfdf660be0fa50d42798@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Mon, 10 Feb 2020 17:05:54 +0100
+Subject: [PATCH] qemu: preserve error on bandwidth rollback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We call APIs that reset the error in the rollback code.
+Preserve the error from the original call that failed.
+
+This turns the boringly cryptic:
+  error: Unable to set interface parameters
+  error: An error occurred, but the cause is unknown
+to the unexpectedly anarchist:
+  error: internal error: Child process (/usr/sbin/tc filter add
+  dev vnet1 parent ffff: protocol all u32 match u32 0 0 police
+  rate 4294968kbps burst 4294968kb mtu 64kb drop flowid :1)
+  unexpected exit status 1: Illegal "rate"
+  Illegal "police"
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Fixes: f02e21cb3379a41cd42f2d8116f2d10dabace83b
+https://bugzilla.redhat.com/show_bug.cgi?id=1800505
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit 457b0e74888f61b759e334d91479c258663835d5)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <a49ef696966d8b8ca28d298ffab16c3a77b1102a.1581350626.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 08f492fa24..af81c4a6e4 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -11642,6 +11642,9 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
+ 
+         if (virNetDevBandwidthSet(net->ifname, newBandwidth, false,
+                                   !virDomainNetTypeSharesHostView(net)) < 0) {
++            virErrorPtr orig_err;
++
++            virErrorPreserveLast(&orig_err);
+             ignore_value(virNetDevBandwidthSet(net->ifname,
+                                                net->bandwidth,
+                                                false,
+@@ -11650,6 +11653,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
+                 ignore_value(virDomainNetBandwidthUpdate(net,
+                                                          net->bandwidth));
+             }
++            virErrorRestore(&orig_err);
+             goto endjob;
+         }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-prevent-attempts-to-detach-a-device-on-a-controller-with-hotplug-off.patch b/SOURCES/libvirt-qemu-prevent-attempts-to-detach-a-device-on-a-controller-with-hotplug-off.patch
new file mode 100644
index 0000000..5c0bf52
--- /dev/null
+++ b/SOURCES/libvirt-qemu-prevent-attempts-to-detach-a-device-on-a-controller-with-hotplug-off.patch
@@ -0,0 +1,79 @@
+From 176ca1e59775810524a2375927725fbe419d9e5c Mon Sep 17 00:00:00 2001
+Message-Id: <176ca1e59775810524a2375927725fbe419d9e5c@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Mon, 18 May 2020 14:53:04 -0400
+Subject: [PATCH] qemu: prevent attempts to detach a device on a controller
+ with hotplug='off'
+
+Although the original patches to support controllers with
+hotplug='off' were checking during hotplug/attach requests that the
+device was being plugged into a PCI controller that didn't have
+hotplug disabled, but I forgot to do the same for device detach (the
+main impetus for adding the feature was to prevent unplugs originating
+from within the guest, so it slipped my mind). So although the guest
+OS was ultimately unable to honor the unplug request, libvirt could
+still be used to make such a request, and since device attach/detach
+are asynchronous operations, the caller to libvirt would receive a
+success status back (the device would stubbornly/correctly remain in
+the domain status XML however)
+
+This patch remedies that, by looking at the controller for the device
+in the detach request, and immediately failing the operation if that
+controller has hotplug=off.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit c0e04c2e62957fe872b5bc3d89d5b1d95f10450c)
+
+https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200518185304.188810-1-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_hotplug.c | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index 3ccc01f0b7..29e1a41f9d 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -5846,6 +5846,36 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
+         return -1;
+     }
+ 
++    if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
++
++        virDomainControllerDefPtr controller;
++        int controllerIdx = virDomainControllerFind(vm->def,
++                                                    VIR_DOMAIN_CONTROLLER_TYPE_PCI,
++                                                    info->addr.pci.bus);
++        if (controllerIdx < 0) {
++            virReportError(VIR_ERR_OPERATION_FAILED,
++                           _("cannot hot unplug %s device with PCI guest address: "
++                             VIR_PCI_DEVICE_ADDRESS_FMT
++                             " - controller not found"),
++                           virDomainDeviceTypeToString(detach.type),
++                           info->addr.pci.domain, info->addr.pci.bus,
++                           info->addr.pci.slot, info->addr.pci.function);
++            return -1;
++        }
++
++        controller = vm->def->controllers[controllerIdx];
++        if (controller->opts.pciopts.hotplug == VIR_TRISTATE_SWITCH_OFF) {
++            virReportError(VIR_ERR_OPERATION_FAILED,
++                           _("cannot hot unplug %s device with PCI guest address: "
++                             VIR_PCI_DEVICE_ADDRESS_FMT
++                             " - not allowed by controller"),
++                           virDomainDeviceTypeToString(detach.type),
++                           info->addr.pci.domain, info->addr.pci.bus,
++                           info->addr.pci.slot, info->addr.pci.function);
++            return -1;
++        }
++    }
++
+     /*
+      * Issue the qemu monitor command to delete the device (based on
+      * its alias), and optionally wait a short time in case the
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-process-SEV-Assume-libDir-to-be-the-directory-to-create-files-in.patch b/SOURCES/libvirt-qemu-process-SEV-Assume-libDir-to-be-the-directory-to-create-files-in.patch
deleted file mode 100644
index 2020e7f..0000000
--- a/SOURCES/libvirt-qemu-process-SEV-Assume-libDir-to-be-the-directory-to-create-files-in.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 0e97054a08adcd9648d006a8b03effa7f7cf2e94 Mon Sep 17 00:00:00 2001
-Message-Id: <0e97054a08adcd9648d006a8b03effa7f7cf2e94@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 3 Jan 2019 10:03:45 +0100
-Subject: [PATCH] qemu: process: SEV: Assume libDir to be the directory to
- create files in
-
-Since SEV operates on a per domain basis, it's very likely that all
-SEV launch-related data will be created under
-/var/lib/libvirt/qemu/<domain_name>. Therefore, when calling into
-qemuProcessSEVCreateFile we can assume @libDir as the directory prefix
-rather than passing it explicitly.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Acked-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 2c4c7de1595330a828015dd750b5ef3874f289d1)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1658112
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <0f59cc4873d5faab4339e79714377da9f889703c.1546506016.git.eskultet@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_process.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c0f95dd5f1..757e2d33a4 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5985,14 +5985,15 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
- 
- 
- static int
--qemuProcessSEVCreateFile(const char *configDir,
-+qemuProcessSEVCreateFile(virDomainObjPtr vm,
-                          const char *name,
-                          const char *data)
- {
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-     char *configFile;
-     int ret = -1;
- 
--    if (!(configFile = virFileBuildPath(configDir, name, ".base64")))
-+    if (!(configFile = virFileBuildPath(priv->libDir, name, ".base64")))
-         return -1;
- 
-     if (virFileRewriteStr(configFile, S_IRUSR | S_IWUSR, data) < 0) {
-@@ -6029,12 +6030,12 @@ qemuProcessPrepareSEVGuestInput(virDomainObjPtr vm)
-     }
- 
-     if (sev->dh_cert) {
--        if (qemuProcessSEVCreateFile(priv->libDir, "dh_cert", sev->dh_cert) < 0)
-+        if (qemuProcessSEVCreateFile(vm, "dh_cert", sev->dh_cert) < 0)
-             return -1;
-     }
- 
-     if (sev->session) {
--        if (qemuProcessSEVCreateFile(priv->libDir, "session", sev->session) < 0)
-+        if (qemuProcessSEVCreateFile(vm, "session", sev->session) < 0)
-             return -1;
-     }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-process-SEV-Relabel-guest-owner-s-SEV-files-created-before-start.patch b/SOURCES/libvirt-qemu-process-SEV-Relabel-guest-owner-s-SEV-files-created-before-start.patch
deleted file mode 100644
index c1e0647..0000000
--- a/SOURCES/libvirt-qemu-process-SEV-Relabel-guest-owner-s-SEV-files-created-before-start.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From dc905fbc1f420a8d7856d9ff7f27b3faae352098 Mon Sep 17 00:00:00 2001
-Message-Id: <dc905fbc1f420a8d7856d9ff7f27b3faae352098@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 3 Jan 2019 10:03:46 +0100
-Subject: [PATCH] qemu: process: SEV: Relabel guest owner's SEV files created
- before start
-
-Before launching a SEV guest we take the base64-encoded guest owner's
-data specified in launchSecurity and create files with the same content
-under /var/lib/libvirt/qemu/<domain>. The reason for this is that we
-need to pass these files on to QEMU which then uses them to communicate
-with the SEV firmware, except when it doesn't have permissions to open
-those files since we don't relabel them.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1658112
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Acked-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 7dc31fe503e540d5b4ee4f94d61842aa6e302e94)
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <6bde21a3bda257a042d6f6c1d78ab1bf12c196d3.1546506016.git.eskultet@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_process.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 757e2d33a4..bc573f96a4 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5990,6 +5990,7 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm,
-                          const char *data)
- {
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-+    virQEMUDriverPtr driver = priv->driver;
-     char *configFile;
-     int ret = -1;
- 
-@@ -6002,6 +6003,9 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm,
-         goto cleanup;
-     }
- 
-+    if (qemuSecurityDomainSetPathLabel(driver, vm, configFile, true) < 0)
-+        goto cleanup;
-+
-     ret = 0;
-  cleanup:
-     VIR_FREE(configFile);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu-put-virtiofsd-in-the-emulator-cgroup.patch b/SOURCES/libvirt-qemu-put-virtiofsd-in-the-emulator-cgroup.patch
new file mode 100644
index 0000000..7ce2a85
--- /dev/null
+++ b/SOURCES/libvirt-qemu-put-virtiofsd-in-the-emulator-cgroup.patch
@@ -0,0 +1,108 @@
+From 6c6f1a32c07941d6fe6208e1ad12dc137dbe7c41 Mon Sep 17 00:00:00 2001
+Message-Id: <6c6f1a32c07941d6fe6208e1ad12dc137dbe7c41@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:47 +0100
+Subject: [PATCH] qemu: put virtiofsd in the emulator cgroup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Wire up the code to put virtiofsd in the emulator cgroup on domain
+startup.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 9de5d69c218faa0e25c5d6a56ab5f6bacbd1a132)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <7653ce933656c9a13c9afa2a019ef11fb192bdc4.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_extdevice.c | 15 +++++++++++++++
+ src/qemu/qemu_virtiofs.c  | 26 ++++++++++++++++++++++++++
+ src/qemu/qemu_virtiofs.h  |  5 +++++
+ 3 files changed, 46 insertions(+)
+
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index bfa770f45a..f66bafb62f 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -248,6 +248,13 @@ qemuExtDevicesHasDevice(virDomainDefPtr def)
+     if (def->tpm && def->tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
+         return true;
+ 
++    for (i = 0; i < def->nfss; i++) {
++        virDomainFSDefPtr fs = def->fss[i];
++
++        if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS)
++            return true;
++    }
++
+     return false;
+ }
+ 
+@@ -272,5 +279,13 @@ qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
+         qemuExtTPMSetupCgroup(driver, def, cgroup) < 0)
+         return -1;
+ 
++    for (i = 0; i < def->nfss; i++) {
++        virDomainFSDefPtr fs = def->fss[i];
++
++        if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS &&
++            qemuVirtioFSSetupCgroup(vm, fs, cgroup) < 0)
++            return -1;
++    }
++
+     return 0;
+ }
+diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
+index 09ab2cef27..194855ece8 100644
+--- a/src/qemu/qemu_virtiofs.c
++++ b/src/qemu/qemu_virtiofs.c
+@@ -299,3 +299,29 @@ qemuVirtioFSStop(virQEMUDriverPtr driver G_GNUC_UNUSED,
+  cleanup:
+     virErrorRestore(&orig_err);
+ }
++
++
++int
++qemuVirtioFSSetupCgroup(virDomainObjPtr vm,
++                        virDomainFSDefPtr fs,
++                        virCgroupPtr cgroup)
++{
++    g_autofree char *pidfile = NULL;
++    pid_t pid = -1;
++    int rc;
++
++    if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias)))
++        return -1;
++
++    rc = virPidFileReadPathIfAlive(pidfile, &pid, NULL);
++    if (rc < 0 || pid == (pid_t) -1) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
++                       _("virtiofsd died unexpectedly"));
++        return -1;
++    }
++
++    if (virCgroupAddProcess(cgroup, pid) < 0)
++        return -1;
++
++    return 0;
++}
+diff --git a/src/qemu/qemu_virtiofs.h b/src/qemu/qemu_virtiofs.h
+index b2f0c57d0c..1db59917c6 100644
+--- a/src/qemu/qemu_virtiofs.h
++++ b/src/qemu/qemu_virtiofs.h
+@@ -35,3 +35,8 @@ void
+ qemuVirtioFSStop(virQEMUDriverPtr driver,
+                  virDomainObjPtr vm,
+                  virDomainFSDefPtr fs);
++
++int
++qemuVirtioFSSetupCgroup(virDomainObjPtr vm,
++                        virDomainFSDefPtr fs,
++                        virCgroupPtr cgroup);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-qemuBuildHostdevCommandLine-Use-a-helper-variable-mdevsrc.patch b/SOURCES/libvirt-qemu-qemuBuildHostdevCommandLine-Use-a-helper-variable-mdevsrc.patch
deleted file mode 100644
index bfe6aef..0000000
--- a/SOURCES/libvirt-qemu-qemuBuildHostdevCommandLine-Use-a-helper-variable-mdevsrc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d34cb86a2b1710c3800dbe84dd7d7e6b12fb691c Mon Sep 17 00:00:00 2001
-Message-Id: <d34cb86a2b1710c3800dbe84dd7d7e6b12fb691c@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:56 +0200
-Subject: [PATCH] qemu: qemuBuildHostdevCommandLine: Use a helper variable
- mdevsrc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Decrease the number of accessors we have to use.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 3b61f333acd9266ff4f09e37515130d67d496f74)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 8a8cbfd7f6..fed4f8faf9 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -5394,7 +5394,9 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
- 
-         /* MDEV */
-         if (virHostdevIsMdevDevice(hostdev)) {
--            switch ((virMediatedDeviceModelType) subsys->u.mdev.model) {
-+            virDomainHostdevSubsysMediatedDevPtr mdevsrc = &subsys->u.mdev;
-+
-+            switch ((virMediatedDeviceModelType) mdevsrc->model) {
-             case VIR_MDEV_MODEL_TYPE_VFIO_PCI:
-                 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-@@ -5402,6 +5404,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
-                                      "supported by this version of QEMU"));
-                     return -1;
-                 }
-+
-                 break;
-             case VIR_MDEV_MODEL_TYPE_VFIO_CCW:
-                 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW)) {
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-remove-chardevStdioLogd-param-from-vhostuser-code-path.patch b/SOURCES/libvirt-qemu-remove-chardevStdioLogd-param-from-vhostuser-code-path.patch
deleted file mode 100644
index 4cd0773..0000000
--- a/SOURCES/libvirt-qemu-remove-chardevStdioLogd-param-from-vhostuser-code-path.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From b99c528bade746897154a3e63c7a53e33becc937 Mon Sep 17 00:00:00 2001
-Message-Id: <b99c528bade746897154a3e63c7a53e33becc937@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 6 Jul 2018 15:46:59 +0100
-Subject: [PATCH] qemu: remove chardevStdioLogd param from vhostuser code path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1597940
-
-The vhostuser network backend is only supported with the UNIX domain
-socket chardev backend, so passing around chardevStdioLogd is not
-required.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 4c76266baca407ae4981a180aed45193e50a8ade)
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_command.c | 20 +++++++-------------
- 1 file changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 4120e4f983..41050bfea3 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8223,8 +8223,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
-                               virDomainDefPtr def,
-                               virDomainNetDefPtr net,
-                               virQEMUCapsPtr qemuCaps,
--                              unsigned int bootindex,
--                              bool chardevStdioLogd)
-+                              unsigned int bootindex)
- {
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-     char *chardev = NULL;
-@@ -8245,7 +8244,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
-                                                cmd, cfg, def,
-                                                net->data.vhostuser,
-                                                net->info.alias, qemuCaps, false,
--                                               chardevStdioLogd)))
-+                                               false)))
-             goto cleanup;
-         break;
- 
-@@ -8319,8 +8318,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-                               virNetDevVPortProfileOp vmop,
-                               bool standalone,
-                               size_t *nnicindexes,
--                              int **nicindexes,
--                              bool chardevStdioLogd)
-+                              int **nicindexes)
- {
-     int ret = -1;
-     char *nic = NULL, *host = NULL;
-@@ -8443,8 +8441,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
- 
-     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
-         ret = qemuBuildVhostuserCommandLine(driver, logManager, secManager, cmd, def,
--                                            net, qemuCaps, bootindex,
--                                            chardevStdioLogd);
-+                                            net, qemuCaps, bootindex);
-         goto cleanup;
-         break;
- 
-@@ -8628,8 +8625,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
-                         bool standalone,
-                         size_t *nnicindexes,
-                         int **nicindexes,
--                        unsigned int *bootHostdevNet,
--                        bool chardevStdioLogd)
-+                        unsigned int *bootHostdevNet)
- {
-     size_t i;
-     int last_good_net = -1;
-@@ -8656,8 +8652,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
-             if (qemuBuildInterfaceCommandLine(driver, logManager, secManager, cmd, def, net,
-                                               qemuCaps, bootNet, vmop,
-                                               standalone, nnicindexes,
--                                              nicindexes,
--                                              chardevStdioLogd) < 0)
-+                                              nicindexes) < 0)
-                 goto error;
- 
-             last_good_net = i;
-@@ -10318,8 +10313,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
- 
-     if (qemuBuildNetCommandLine(driver, logManager, secManager, cmd, def,
-                                 qemuCaps, vmop, standalone,
--                                nnicindexes, nicindexes, &bootHostdevNet,
--                                chardevStdioLogd) < 0)
-+                                nnicindexes, nicindexes, &bootHostdevNet) < 0)
-         goto error;
- 
-     if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps,
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-remove-qemuDomainObjBegin-EndJobWithAgent.patch b/SOURCES/libvirt-qemu-remove-qemuDomainObjBegin-EndJobWithAgent.patch
new file mode 100644
index 0000000..0c478d3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-remove-qemuDomainObjBegin-EndJobWithAgent.patch
@@ -0,0 +1,228 @@
+From bac1c96fbf2bd9d6ef728a813fda793ce1e99267 Mon Sep 17 00:00:00 2001
+Message-Id: <bac1c96fbf2bd9d6ef728a813fda793ce1e99267@dist-git>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Thu, 20 Feb 2020 10:52:27 -0600
+Subject: [PATCH] qemu: remove qemuDomainObjBegin/EndJobWithAgent()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This function potentially grabs both a monitor job and an agent job at
+the same time. This is problematic because it means that a malicious (or
+just buggy) guest agent can cause a denial of service on the host. The
+presence of this function makes it easy to do the wrong thing and hold
+both jobs at the same time. All existing uses have already been removed
+by previous commits.
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 3c436c22a4f94c85c2b5e7b5fb84af48219d78e3)
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1759566
+Message-Id: <20200220165227.11491-6-jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/THREADS.txt   | 58 +++++-------------------------------------
+ src/qemu/qemu_domain.c | 56 ++++------------------------------------
+ src/qemu/qemu_domain.h |  7 -----
+ 3 files changed, 11 insertions(+), 110 deletions(-)
+
+diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt
+index aa428fda6a..a7d8709a43 100644
+--- a/src/qemu/THREADS.txt
++++ b/src/qemu/THREADS.txt
+@@ -61,11 +61,12 @@ There are a number of locks on various objects
+ 
+     Agent job condition is then used when thread wishes to talk to qemu
+     agent monitor. It is possible to acquire just agent job
+-    (qemuDomainObjBeginAgentJob), or only normal job
+-    (qemuDomainObjBeginJob) or both at the same time
+-    (qemuDomainObjBeginJobWithAgent). Which type of job to grab depends
+-    whether caller wishes to communicate only with agent socket, or only
+-    with qemu monitor socket or both, respectively.
++    (qemuDomainObjBeginAgentJob), or only normal job (qemuDomainObjBeginJob)
++    but not both at the same time. Holding an agent job and a normal job would
++    allow an unresponsive or malicious agent to block normal libvirt API and
++    potentially result in a denial of service. Which type of job to grab
++    depends whether caller wishes to communicate only with agent socket, or
++    only with qemu monitor socket.
+ 
+     Immediately after acquiring the virDomainObjPtr lock, any method
+     which intends to update state must acquire asynchronous, normal or
+@@ -141,18 +142,6 @@ To acquire the agent job condition
+ 
+ 
+ 
+-To acquire both normal and agent job condition
+-
+-  qemuDomainObjBeginJobWithAgent()
+-    - Waits until there is no normal and no agent job set
+-    - Sets both job.active and job.agentActive with required job types
+-
+-  qemuDomainObjEndJobWithAgent()
+-    - Sets both job.active and job.agentActive to 0
+-    - Signals on job.cond condition
+-
+-
+-
+ To acquire the asynchronous job condition
+ 
+   qemuDomainObjBeginAsyncJob()
+@@ -292,41 +281,6 @@ Design patterns
+      virDomainObjEndAPI(&obj);
+ 
+ 
+- * Invoking both monitor and agent commands on a virDomainObjPtr
+-
+-     virDomainObjPtr obj;
+-     qemuAgentPtr agent;
+-
+-     obj = qemuDomObjFromDomain(dom);
+-
+-     qemuDomainObjBeginJobWithAgent(obj, QEMU_JOB_TYPE, QEMU_AGENT_JOB_TYPE);
+-
+-     if (!virDomainObjIsActive(dom))
+-         goto cleanup;
+-
+-     ...do prep work...
+-
+-     if (!qemuDomainAgentAvailable(obj, true))
+-         goto cleanup;
+-
+-     agent = qemuDomainObjEnterAgent(obj);
+-     qemuAgentXXXX(agent, ..);
+-     qemuDomainObjExitAgent(obj, agent);
+-
+-     ...
+-
+-     qemuDomainObjEnterMonitor(obj);
+-     qemuMonitorXXXX(priv->mon);
+-     qemuDomainObjExitMonitor(obj);
+-
+-     /* Alternatively, talk to the monitor first and then talk to the agent. */
+-
+-     ...do final work...
+-
+-     qemuDomainObjEndJobWithAgent(obj);
+-     virDomainObjEndAPI(&obj);
+-
+-
+  * Running asynchronous job
+ 
+      virDomainObjPtr obj;
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 0baa80582c..f037f0812e 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -9734,26 +9734,6 @@ qemuDomainObjBeginAgentJob(virQEMUDriverPtr driver,
+                                          QEMU_ASYNC_JOB_NONE, false);
+ }
+ 
+-/**
+- * qemuDomainObjBeginJobWithAgent:
+- *
+- * Grabs both monitor and agent types of job. Use if caller talks to
+- * both monitor and guest agent. However, if @job (or @agentJob) is
+- * QEMU_JOB_NONE (or QEMU_AGENT_JOB_NONE) only agent job is acquired (or
+- * monitor job).
+- *
+- * To end job call qemuDomainObjEndJobWithAgent.
+- */
+-int
+-qemuDomainObjBeginJobWithAgent(virQEMUDriverPtr driver,
+-                               virDomainObjPtr obj,
+-                               qemuDomainJob job,
+-                               qemuDomainAgentJob agentJob)
+-{
+-    return qemuDomainObjBeginJobInternal(driver, obj, job, agentJob,
+-                                         QEMU_ASYNC_JOB_NONE, false);
+-}
+-
+ int qemuDomainObjBeginAsyncJob(virQEMUDriverPtr driver,
+                                virDomainObjPtr obj,
+                                qemuDomainAsyncJob asyncJob,
+@@ -9868,31 +9848,6 @@ qemuDomainObjEndAgentJob(virDomainObjPtr obj)
+     virCondBroadcast(&priv->job.cond);
+ }
+ 
+-void
+-qemuDomainObjEndJobWithAgent(virQEMUDriverPtr driver,
+-                             virDomainObjPtr obj)
+-{
+-    qemuDomainObjPrivatePtr priv = obj->privateData;
+-    qemuDomainJob job = priv->job.active;
+-    qemuDomainAgentJob agentJob = priv->job.agentActive;
+-
+-    priv->jobs_queued--;
+-
+-    VIR_DEBUG("Stopping both jobs: %s %s (async=%s vm=%p name=%s)",
+-              qemuDomainJobTypeToString(job),
+-              qemuDomainAgentJobTypeToString(agentJob),
+-              qemuDomainAsyncJobTypeToString(priv->job.asyncJob),
+-              obj, obj->def->name);
+-
+-    qemuDomainObjResetJob(priv);
+-    qemuDomainObjResetAgentJob(priv);
+-    if (qemuDomainTrackJob(job))
+-        qemuDomainObjSaveStatus(driver, obj);
+-    /* We indeed need to wake up ALL threads waiting because
+-     * grabbing a job requires checking more variables. */
+-    virCondBroadcast(&priv->job.cond);
+-}
+-
+ void
+ qemuDomainObjEndAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj)
+ {
+@@ -9926,9 +9881,9 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj)
+  * obj must be locked before calling
+  *
+  * To be called immediately before any QEMU monitor API call
+- * Must have already either called qemuDomainObjBeginJob() or
+- * qemuDomainObjBeginJobWithAgent() and checked that the VM is
+- * still active; may not be used for nested async jobs.
++ * Must have already called qemuDomainObjBeginJob() and checked
++ * that the VM is still active; may not be used for nested async
++ * jobs.
+  *
+  * To be followed with qemuDomainObjExitMonitor() once complete
+  */
+@@ -10050,9 +10005,8 @@ qemuDomainObjEnterMonitorAsync(virQEMUDriverPtr driver,
+  * obj must be locked before calling
+  *
+  * To be called immediately before any QEMU agent API call.
+- * Must have already called qemuDomainObjBeginAgentJob() or
+- * qemuDomainObjBeginJobWithAgent() and checked that the VM is
+- * still active.
++ * Must have already called qemuDomainObjBeginAgentJob() and
++ * checked that the VM is still active.
+  *
+  * To be followed with qemuDomainObjExitAgent() once complete
+  */
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index cdcb6ecc7a..c581b3a162 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -651,11 +651,6 @@ int qemuDomainObjBeginAgentJob(virQEMUDriverPtr driver,
+                                virDomainObjPtr obj,
+                                qemuDomainAgentJob agentJob)
+     G_GNUC_WARN_UNUSED_RESULT;
+-int qemuDomainObjBeginJobWithAgent(virQEMUDriverPtr driver,
+-                                   virDomainObjPtr obj,
+-                                   qemuDomainJob job,
+-                                   qemuDomainAgentJob agentJob)
+-    G_GNUC_WARN_UNUSED_RESULT;
+ int qemuDomainObjBeginAsyncJob(virQEMUDriverPtr driver,
+                                virDomainObjPtr obj,
+                                qemuDomainAsyncJob asyncJob,
+@@ -674,8 +669,6 @@ int qemuDomainObjBeginJobNowait(virQEMUDriverPtr driver,
+ void qemuDomainObjEndJob(virQEMUDriverPtr driver,
+                          virDomainObjPtr obj);
+ void qemuDomainObjEndAgentJob(virDomainObjPtr obj);
+-void qemuDomainObjEndJobWithAgent(virQEMUDriverPtr driver,
+-                                  virDomainObjPtr obj);
+ void qemuDomainObjEndAsyncJob(virQEMUDriverPtr driver,
+                               virDomainObjPtr obj);
+ void qemuDomainObjAbortAsyncJob(virDomainObjPtr obj);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-rename-qemuAgentGetFSInfoInternalDisk.patch b/SOURCES/libvirt-qemu-rename-qemuAgentGetFSInfoInternalDisk.patch
new file mode 100644
index 0000000..f5a4707
--- /dev/null
+++ b/SOURCES/libvirt-qemu-rename-qemuAgentGetFSInfoInternalDisk.patch
@@ -0,0 +1,53 @@
+From f1ffcda533c6c95e70044aeee86d017ae6132876 Mon Sep 17 00:00:00 2001
+Message-Id: <f1ffcda533c6c95e70044aeee86d017ae6132876@dist-git>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Thu, 20 Feb 2020 10:52:23 -0600
+Subject: [PATCH] qemu: rename qemuAgentGetFSInfoInternalDisk()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function name doesn't give a good idea of what the function does.
+Rename to qemuAgentGetFSInfoFillDisks() to make it more obvious than it
+is filling in the disk information in the fsinfo struct.
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit e888c0f66752bb6516d63a612c20f565cbf9c0ca)
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1759566
+Message-Id: <20200220165227.11491-2-jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_agent.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
+index f759785050..0f099f3b2a 100644
+--- a/src/qemu/qemu_agent.c
++++ b/src/qemu/qemu_agent.c
+@@ -1925,9 +1925,9 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent)
+ }
+ 
+ static int
+-qemuAgentGetFSInfoInternalDisk(virJSONValuePtr jsondisks,
+-                               qemuAgentFSInfoPtr fsinfo,
+-                               virDomainDefPtr vmdef)
++qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
++                            qemuAgentFSInfoPtr fsinfo,
++                            virDomainDefPtr vmdef)
+ {
+     size_t ndisks;
+     size_t i;
+@@ -2139,7 +2139,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon,
+             goto cleanup;
+         }
+ 
+-        if (qemuAgentGetFSInfoInternalDisk(disk, info_ret[i], vmdef) < 0)
++        if (qemuAgentGetFSInfoFillDisks(disk, info_ret[i], vmdef) < 0)
+             goto cleanup;
+     }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-require-reply-from-guest-agent-in-qemuAgentGetInterfaces.patch b/SOURCES/libvirt-qemu-require-reply-from-guest-agent-in-qemuAgentGetInterfaces.patch
deleted file mode 100644
index 1e4477a..0000000
--- a/SOURCES/libvirt-qemu-require-reply-from-guest-agent-in-qemuAgentGetInterfaces.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e9a07e34c638a540e6ecc7fd05834c7682f22631 Mon Sep 17 00:00:00 2001
-Message-Id: <e9a07e34c638a540e6ecc7fd05834c7682f22631@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 10 Jan 2019 12:49:11 +0100
-Subject: [PATCH] qemu: require reply from guest agent in
- qemuAgentGetInterfaces
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since its introduction in commit 0977b8aa071 (released in v1.2.14)
-qemuAgentGetInterfaces calls qemuAgentCommand with needReply=false,
-which allows qemuAgentCommand to return 0 even when it did not get
-any reply from the agent.
-
-Set needReply to true, since we dereference it right after.
-
-This can be hit if libvirt is waiting for an event from the agent
-(e.g. shutdown) and the agent cannot reply in time (e.g. due to
-the guest being shut down), as reported in:
-https://bugzilla.redhat.com/show_bug.cgi?id=1663051
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 7cfd1fbb1332ae5df678b9f41a62156cb2e88c73)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1665000
-
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_agent.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index 986e37b07d..d6fd02a4b6 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -1987,7 +1987,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon,
-     if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL)))
-         goto cleanup;
- 
--    if (qemuAgentCommand(mon, cmd, &reply, false,
-+    if (qemuAgentCommand(mon, cmd, &reply, true,
-                          VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
-         goto cleanup;
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-qemu-snapshot-Allow-snapshots-of-read-only-disks-when-we-can-create-them.patch b/SOURCES/libvirt-qemu-snapshot-Allow-snapshots-of-read-only-disks-when-we-can-create-them.patch
new file mode 100644
index 0000000..2812437
--- /dev/null
+++ b/SOURCES/libvirt-qemu-snapshot-Allow-snapshots-of-read-only-disks-when-we-can-create-them.patch
@@ -0,0 +1,43 @@
+From a229c76e2a5008dbdbcad996ae4f75a3d51b709f Mon Sep 17 00:00:00 2001
+Message-Id: <a229c76e2a5008dbdbcad996ae4f75a3d51b709f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 12 May 2020 17:24:10 +0200
+Subject: [PATCH] qemu: snapshot: Allow snapshots of read-only disks when we
+ can create them
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With -blockdev or when reusing externally created images and thus
+without the need for formatting the image we actually can support
+snapshots of read-only disks. Arguably it's not very useful so they are
+not done by default but users of libvirt such as oVirt are actually
+using this.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1832204
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit fe574ea1f52daebddfdc91dd27234059c375e4bf)
+Message-Id: <2f8f6e53de334a6e3c2d91711fe4dbd81d8b3ee8.1589296861.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 26215f8d6a..7ae8641577 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -14968,7 +14968,7 @@ qemuDomainSnapshotPrepareDiskExternal(virDomainDiskDefPtr disk,
+     int err;
+     int rc;
+ 
+-    if (disk->src->readonly) {
++    if (disk->src->readonly && !(reuse || blockdev)) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                        _("external snapshot for readonly disk %s "
+                          "is not supported"), disk->dst);
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-snapshot-Always-rewrite-backingStore-data-when-reusing-existing-images.patch b/SOURCES/libvirt-qemu-snapshot-Always-rewrite-backingStore-data-when-reusing-existing-images.patch
new file mode 100644
index 0000000..003b246
--- /dev/null
+++ b/SOURCES/libvirt-qemu-snapshot-Always-rewrite-backingStore-data-when-reusing-existing-images.patch
@@ -0,0 +1,46 @@
+From 647f43ec778b6d5dafb256d5dbe4ad1f0a4e9776 Mon Sep 17 00:00:00 2001
+Message-Id: <647f43ec778b6d5dafb256d5dbe4ad1f0a4e9776@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:47 +0100
+Subject: [PATCH] qemu: snapshot: Always rewrite backingStore data when reusing
+ existing images
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Don't adopt the backing store data when reusing images provided by the
+user. This will force a backing chain re-probe as users might have
+passed in something unexpected in the overlay where our view of the
+backing chain would not correspond.
+
+This is done only for inactive snapshots as there we have way less
+verification.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 8e9e73a984165d5e9a82ba1f4531bb30482db5a8)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1524278
+Message-Id: <baa37a0240d05d2441a54e7ad1c1a8648c7e7f65.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index e651c9e819..5c72db2544 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -14678,7 +14678,8 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver,
+         if (virStorageSourceInitChainElement(newsrc, defdisk->src, false) < 0)
+             goto cleanup;
+ 
+-        if (virStorageSourceHasBacking(defdisk->src)) {
++        if (!reuse &&
++            virStorageSourceHasBacking(defdisk->src)) {
+             defdisk->src->readonly = true;
+             newsrc->backingStore = g_steal_pointer(&defdisk->src);
+         } else {
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-snapshot-Prevent-too-nested-domain-XML-when-doing-inactive-snapshot.patch b/SOURCES/libvirt-qemu-snapshot-Prevent-too-nested-domain-XML-when-doing-inactive-snapshot.patch
new file mode 100644
index 0000000..48e23b3
--- /dev/null
+++ b/SOURCES/libvirt-qemu-snapshot-Prevent-too-nested-domain-XML-when-doing-inactive-snapshot.patch
@@ -0,0 +1,48 @@
+From 97dafbcc080bdb3253dbd451c94ab8f687b156ba Mon Sep 17 00:00:00 2001
+Message-Id: <97dafbcc080bdb3253dbd451c94ab8f687b156ba@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:48 +0100
+Subject: [PATCH] qemu: snapshot: Prevent too-nested domain XML when doing
+ inactive snapshot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Similarly to 510d154a0b41aa70aadabc0918d16dee22882394 we need to prevent
+doing too deeply nested backing chains and reject them with a sane error
+message.
+
+Add a loop to go through the snapshots prior to attempting actually
+creating them to prevent some possible inconsistent scenarios.
+
+We don't need to do it when reusing backing chains as we'll be
+re-detecting the backing chain in that case anyways.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit b168fa88b85dec181882816ab65a59a6c4500667)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1524278
+Message-Id: <3272682df55dcc564055a2badb0c61d4680c81a9.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 5c72db2544..833cf9f3d9 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -14632,6 +14632,9 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver,
+         if (!snapdisk->src->format)
+             snapdisk->src->format = VIR_STORAGE_FILE_QCOW2;
+ 
++        if (qemuDomainStorageSourceValidateDepth(defdisk->src, 1, defdisk->dst) < 0)
++            return -1;
++
+         /* creates cmd line args: qemu-img create -f qcow2 -o */
+         if (!(cmd = virCommandNewArgList(qemuImgPath,
+                                          "create",
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-snapshot-go-through-cleanup-on-error.patch b/SOURCES/libvirt-qemu-snapshot-go-through-cleanup-on-error.patch
new file mode 100644
index 0000000..d1fefbd
--- /dev/null
+++ b/SOURCES/libvirt-qemu-snapshot-go-through-cleanup-on-error.patch
@@ -0,0 +1,41 @@
+From 1196c633f969dd9457b9b431fbcd944e35249b5f Mon Sep 17 00:00:00 2001
+Message-Id: <1196c633f969dd9457b9b431fbcd944e35249b5f@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:58 +0100
+Subject: [PATCH] qemu: snapshot: go through cleanup on error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A recent commit added an error check for too-nested backing chains
+followed by a return, even though errors above jump to cleanup.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Fixes: b168fa88b85dec181882816ab65a59a6c4500667
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit c07ef7c563c7d661fd4b59bac190cd1db44bd3e5)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1524278
+Message-Id: <5903cd3cb7845ed3151492457a4e92e57a15fef0.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 833cf9f3d9..e19e1da0bb 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -14633,7 +14633,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver,
+             snapdisk->src->format = VIR_STORAGE_FILE_QCOW2;
+ 
+         if (qemuDomainStorageSourceValidateDepth(defdisk->src, 1, defdisk->dst) < 0)
+-            return -1;
++            goto cleanup;
+ 
+         /* creates cmd line args: qemu-img create -f qcow2 -o */
+         if (!(cmd = virCommandNewArgList(qemuImgPath,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-store-complete-agent-filesystem-information.patch b/SOURCES/libvirt-qemu-store-complete-agent-filesystem-information.patch
new file mode 100644
index 0000000..7d76633
--- /dev/null
+++ b/SOURCES/libvirt-qemu-store-complete-agent-filesystem-information.patch
@@ -0,0 +1,116 @@
+From 668555bc90e36fd571ff3ac5aa798e951a84ee19 Mon Sep 17 00:00:00 2001
+Message-Id: <668555bc90e36fd571ff3ac5aa798e951a84ee19@dist-git>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Thu, 20 Feb 2020 10:52:24 -0600
+Subject: [PATCH] qemu: store complete agent filesystem information
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In an effort to avoid holding both an agent and normal job at the same
+time, we shouldn't access the vm definition from within qemu_agent.c
+(i.e. while the agent job is being held). In preparation, we need to
+store the full filesystem disk information in qemuAgentDiskInfo.  In a
+following commit, we can pass this information back to the caller and
+the caller can search the vm definition to match the filsystem disk to
+an alias.
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit bdb8a800b4920cf9184fd2fd117b17c67ba74dfb)
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1759566
+Message-Id: <20200220165227.11491-3-jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_agent.c | 36 ++++++++++++++++++++----------------
+ 1 file changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
+index 0f099f3b2a..077b5538de 100644
+--- a/src/qemu/qemu_agent.c
++++ b/src/qemu/qemu_agent.c
+@@ -1849,6 +1849,11 @@ typedef qemuAgentDiskInfo *qemuAgentDiskInfoPtr;
+ struct _qemuAgentDiskInfo {
+     char *alias;
+     char *serial;
++    virPCIDeviceAddress pci_controller;
++    char *bus_type;
++    unsigned int bus;
++    unsigned int target;
++    unsigned int unit;
+     char *devnode;
+ };
+ 
+@@ -1872,6 +1877,7 @@ qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info)
+ 
+     VIR_FREE(info->serial);
+     VIR_FREE(info->alias);
++    VIR_FREE(info->bus_type);
+     VIR_FREE(info->devnode);
+     VIR_FREE(info);
+ }
+@@ -1952,10 +1958,6 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+         qemuAgentDiskInfoPtr disk;
+         virDomainDiskDefPtr diskDef;
+         const char *val;
+-        unsigned int bus;
+-        unsigned int target;
+-        unsigned int unit;
+-        virPCIDeviceAddress pci_address;
+ 
+         if (!jsondisk) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -1969,6 +1971,9 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+             return -1;
+         disk = fsinfo->disks[i];
+ 
++        if ((val = virJSONValueObjectGetString(jsondisk, "bus-type")))
++            disk->bus_type = g_strdup(val);
++
+         if ((val = virJSONValueObjectGetString(jsondisk, "serial")))
+             disk->serial = g_strdup(val);
+ 
+@@ -1985,9 +1990,9 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+             } \
+         } while (0)
+ 
+-        GET_DISK_ADDR(jsondisk, &bus, "bus");
+-        GET_DISK_ADDR(jsondisk, &target, "target");
+-        GET_DISK_ADDR(jsondisk, &unit, "unit");
++        GET_DISK_ADDR(jsondisk, &disk->bus, "bus");
++        GET_DISK_ADDR(jsondisk, &disk->target, "target");
++        GET_DISK_ADDR(jsondisk, &disk->unit, "unit");
+ 
+         if (!(pci = virJSONValueObjectGet(jsondisk, "pci-controller"))) {
+             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+@@ -1996,18 +2001,17 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+             return -1;
+         }
+ 
+-        GET_DISK_ADDR(pci, &pci_address.domain, "domain");
+-        GET_DISK_ADDR(pci, &pci_address.bus, "bus");
+-        GET_DISK_ADDR(pci, &pci_address.slot, "slot");
+-        GET_DISK_ADDR(pci, &pci_address.function, "function");
++        GET_DISK_ADDR(pci, &disk->pci_controller.domain, "domain");
++        GET_DISK_ADDR(pci, &disk->pci_controller.bus, "bus");
++        GET_DISK_ADDR(pci, &disk->pci_controller.slot, "slot");
++        GET_DISK_ADDR(pci, &disk->pci_controller.function, "function");
+ 
+ #undef GET_DISK_ADDR
+-
+         if (!(diskDef = virDomainDiskByAddress(vmdef,
+-                                               &pci_address,
+-                                               bus,
+-                                               target,
+-                                               unit)))
++                                               &disk->pci_controller,
++                                               disk->bus,
++                                               disk->target,
++                                               disk->unit)))
+             continue;
+ 
+         disk->alias = g_strdup(diskDef->dst);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-support-interface-teaming-functionality.patch b/SOURCES/libvirt-qemu-support-interface-teaming-functionality.patch
new file mode 100644
index 0000000..524c2aa
--- /dev/null
+++ b/SOURCES/libvirt-qemu-support-interface-teaming-functionality.patch
@@ -0,0 +1,222 @@
+From 16ba1d0258765d9c3b5e2da666ed6d4d933e26d9 Mon Sep 17 00:00:00 2001
+Message-Id: <16ba1d0258765d9c3b5e2da666ed6d4d933e26d9@dist-git>
+From: Laine Stump <laine@redhat.com>
+Date: Thu, 30 Jan 2020 14:12:41 -0500
+Subject: [PATCH] qemu: support interface <teaming> functionality
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The QEMU driver uses the <teaming type='persistent|transient'
+persistent='blah'/> element to setup a "failover" pair of devices -
+the persistent device must be a virtio emulated NIC, with the only
+extra configuration being the addition of ",failover=on" to the device
+commandline, and the transient device must be a hostdev NIC
+(<interface type='hostdev'> or <interface type='network'> with a
+network that is a pool of SRIOV VFs) where the extra configuration is
+the addition of ",failover_pair_id=$aliasOfVirtio" to the device
+commandline. These new options are supported in QEMU 4.2.0 and later.
+
+Extra qemu-specific validation is added to ensure that the device
+type/model is appropriate and that the qemu binary supports these
+commandline options.
+
+The result of this will be:
+
+1) The virtio device presented to the guest will have an extra bit set
+in its PCI capabilities indicating that it can be used as a failover
+backup device. The virtio guest driver will need to be equipped to do
+something with this information - this is included in the Linux
+virtio-net driver in kernel 4.18 and above (and also backported to
+some older distro kernels). Unfortunately there is no way for libvirt
+to learn whether or not the guest driver supports failover - if it
+doesn't then the extra PCI capability will be ignored and the guest OS
+will just see two independent devices. (NB: the current virtio guest
+driver also requires that the MAC addresses of the two NICs match in
+order to pair them into a bond).
+
+2) When a migration is requested, QEMu will automatically unplug the
+transient/hostdev NIC from the guest on the source host before
+starting migration, and automatically re-plug a similar device after
+restarting the guest CPUs on the destination host. While the transient
+NIC is unplugged, all network traffic will go through the
+persistent/virtio device, but when the hostdev NIC is plugged in, it
+will get all the traffic. This means that in normal circumstances the
+guest gets the performance advantage of vfio-assigned "real hardware"
+networking, but it can still be migrated with the only downside being
+a performance penalty (due to using an emulated NIC) during the
+migration.
+
+Signed-off-by: Laine Stump <laine@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit eb9f6cc4b3464707cf689fda9812e5129003bf27)
+
+https://bugzilla.redhat.com/1693587
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200130191244.24174-4-laine@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_command.c                       |  9 +++++
+ src/qemu/qemu_domain.c                        | 36 +++++++++++++++--
+ .../qemuxml2argvdata/net-virtio-teaming.args  | 40 +++++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  4 ++
+ 4 files changed, 86 insertions(+), 3 deletions(-)
+ create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.args
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 7a184c229e..d144855b0d 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -3833,6 +3833,8 @@ qemuBuildNicDevStr(virDomainDefPtr def,
+         }
+         virBufferAsprintf(&buf, ",host_mtu=%u", net->mtu);
+     }
++    if (usingVirtio && net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_PERSISTENT)
++       virBufferAddLit(&buf, ",failover=on");
+ 
+     virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias);
+     virBufferAsprintf(&buf, ",id=%s", net->info.alias);
+@@ -4704,6 +4706,13 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def,
+     if (qemuBuildRomStr(&buf, dev->info) < 0)
+         return NULL;
+ 
++    if (dev->parentnet &&
++        dev->parentnet->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT &&
++        dev->parentnet->teaming.persistent) {
++        virBufferAsprintf(&buf,  ",failover_pair_id=%s",
++                          dev->parentnet->teaming.persistent);
++    }
++
+     return virBufferContentAndReset(&buf);
+ }
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 91a9f0481b..e37404340f 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -6391,12 +6391,20 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net,
+         return -1;
+     }
+ 
++    if (net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT &&
++        actualType != VIR_DOMAIN_NET_TYPE_HOSTDEV) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                       _("interface %s - teaming transient device must be type='hostdev', not '%s'"),
++                       macstr, virDomainNetTypeToString(actualType));
++        return -1;
++    }
+     return 0;
+ }
+ 
+ 
+ static int
+-qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net)
++qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net,
++                                   virQEMUCapsPtr qemuCaps)
+ {
+     bool hasIPv4 = false;
+     bool hasIPv6 = false;
+@@ -6481,7 +6489,29 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net)
+         return -1;
+     }
+ 
+-    if (net->coalesce && !qemuDomainNetSupportsCoalesce(net->type)) {
++    if (net->teaming.type != VIR_DOMAIN_NET_TEAMING_TYPE_NONE &&
++        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_FAILOVER)) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("virtio-net failover (teaming) is not supported with this QEMU binary"));
++        return -1;
++    }
++    if (net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_PERSISTENT
++        && !virDomainNetIsVirtioModel(net)) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                       _("virtio-net teaming persistent interface must be <model type='virtio'/>, not '%s'"),
++                       virDomainNetGetModelString(net));
++        return -1;
++    }
++    if (net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT &&
++        net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
++        net->type != VIR_DOMAIN_NET_TYPE_NETWORK) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
++                       _("virtio-net teaming transient interface must be type='hostdev', not '%s'"),
++                       virDomainNetTypeToString(net->type));
++        return -1;
++    }
++
++   if (net->coalesce && !qemuDomainNetSupportsCoalesce(net->type)) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                        _("coalesce settings on interface type %s are not supported"),
+                        virDomainNetTypeToString(net->type));
+@@ -8377,7 +8407,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
+ 
+     switch ((virDomainDeviceType)dev->type) {
+     case VIR_DOMAIN_DEVICE_NET:
+-        ret = qemuDomainDeviceDefValidateNetwork(dev->data.net);
++        ret = qemuDomainDeviceDefValidateNetwork(dev->data.net, qemuCaps);
+         break;
+ 
+     case VIR_DOMAIN_DEVICE_CHR:
+diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
+new file mode 100644
+index 0000000000..19e7260843
+--- /dev/null
++++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
+@@ -0,0 +1,40 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-i386 \
++-name QEMUGuest1 \
++-S \
++-machine pc,accel=tcg,usb=off,dump-guest-core=off \
++-m 214 \
++-realtime mlock=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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
++server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-usb \
++-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
++-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
++-netdev user,id=hostua-backup0 \
++-device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,\
++mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
++-netdev user,id=hostua-backup1 \
++-device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,\
++mac=66:44:33:22:11:00,bus=pci.0,addr=0x4 \
++-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x5,\
++failover_pair_id=ua-backup0 \
++-device vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x6,\
++failover_pair_id=ua-backup1 \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index b923590930..4d26fe0b55 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1308,6 +1308,10 @@ mymain(void)
+             QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE,
+             QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE);
+     DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size", NONE);
++    DO_TEST("net-virtio-teaming",
++            QEMU_CAPS_VIRTIO_NET_FAILOVER,
++            QEMU_CAPS_DEVICE_VFIO_PCI);
++    DO_TEST_PARSE_ERROR("net-virtio-teaming", NONE);
+     DO_TEST("net-eth", NONE);
+     DO_TEST("net-eth-ifname", NONE);
+     DO_TEST("net-eth-names", NONE);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu-use-QEMU_CAPS_STORAGE_WERROR-for-disk-error-attributes.patch b/SOURCES/libvirt-qemu-use-QEMU_CAPS_STORAGE_WERROR-for-disk-error-attributes.patch
new file mode 100644
index 0000000..20a9b01
--- /dev/null
+++ b/SOURCES/libvirt-qemu-use-QEMU_CAPS_STORAGE_WERROR-for-disk-error-attributes.patch
@@ -0,0 +1,114 @@
+From 94f0a246fd5e53d24feff99704fca0e812c3f50d Mon Sep 17 00:00:00 2001
+Message-Id: <94f0a246fd5e53d24feff99704fca0e812c3f50d@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 1 Apr 2020 17:19:27 +0200
+Subject: [PATCH] qemu: use QEMU_CAPS_STORAGE_WERROR for disk-error attributes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When moving the formatting of this attributes from -drive
+to -device, the QEMU_CAPS_USB_STORAGE_WERROR capability
+was used, because usb-storage was the last device to gain
+this capability.
+
+However this lead to the assumption that QEMU binaries
+without the usb-storage device do not support this,
+leading to breakage on s390x with blockdev.
+
+Fixes: bb4f3543bbf3ebbffa833ae7df55c298920243eb
+https://bugzilla.redhat.com/show_bug.cgi?id=1819250
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 29fc9e96a9db30000137e648b775b6b08e05d43b)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <890258bf43d483173d07687f2eff72c03a243580.1585754141.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_command.c                              |  4 ++--
+ .../disk-error-policy-s390x.s390x-2.12.0.args        | 12 ++++++------
+ .../disk-error-policy-s390x.s390x-latest.args        | 12 ++++++------
+ 3 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index de97504ce1..4653e6ac3c 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -1805,7 +1805,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
+ 
+     /* werror/rerror are really frontend attributes, but older
+      * qemu requires them on -drive instead of -device */
+-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_WERROR))
++    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR))
+         qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt);
+ 
+     if (disk->src->readonly)
+@@ -2256,7 +2256,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
+ 
+     qemuBuildDiskFrontendAttributes(disk, &opt);
+ 
+-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_WERROR))
++    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR))
+         qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt);
+ 
+     return virBufferContentAndReset(&opt);
+diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
+index cf932d1fad..6b93b74ec1 100644
+--- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
++++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
+@@ -26,17 +26,17 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
+ -no-shutdown \
+ -boot strict=on \
+ -drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,\
+-werror=stop,rerror=stop,cache=none \
++cache=none \
+ -device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-id=virtio-disk0,bootindex=1,write-cache=on \
++id=virtio-disk0,bootindex=1,write-cache=on,werror=stop,rerror=stop \
+ -drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,\
+-werror=enospc,cache=none \
++cache=none \
+ -device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,\
+-id=virtio-disk1,write-cache=on \
++id=virtio-disk1,write-cache=on,werror=enospc \
+ -drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,\
+-werror=report,rerror=ignore,cache=none \
++cache=none \
+ -device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,\
+-id=virtio-disk2,write-cache=on \
++id=virtio-disk2,write-cache=on,werror=report,rerror=ignore \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+ resourcecontrol=deny \
+ -msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+index 5748ad7823..b1604675a1 100644
+--- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
++++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+@@ -26,17 +26,17 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
+ -no-shutdown \
+ -boot strict=on \
+ -drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,\
+-werror=stop,rerror=stop,cache=none \
++cache=none \
+ -device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-id=virtio-disk0,bootindex=1,write-cache=on \
++id=virtio-disk0,bootindex=1,write-cache=on,werror=stop,rerror=stop \
+ -drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,\
+-werror=enospc,cache=none \
++cache=none \
+ -device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,\
+-id=virtio-disk1,write-cache=on \
++id=virtio-disk1,write-cache=on,werror=enospc \
+ -drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,\
+-werror=report,rerror=ignore,cache=none \
++cache=none \
+ -device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,\
+-id=virtio-disk2,write-cache=on \
++id=virtio-disk2,write-cache=on,werror=report,rerror=ignore \
+ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+ resourcecontrol=deny \
+ -msg timestamp=on
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemu-use-def-instead-of-vm-def-in-qemuExtDevicesStart.patch b/SOURCES/libvirt-qemu-use-def-instead-of-vm-def-in-qemuExtDevicesStart.patch
new file mode 100644
index 0000000..f8cd2ff
--- /dev/null
+++ b/SOURCES/libvirt-qemu-use-def-instead-of-vm-def-in-qemuExtDevicesStart.patch
@@ -0,0 +1,54 @@
+From ea0983a0cca71ba3fdefe94881fe75ee624adf5f Mon Sep 17 00:00:00 2001
+Message-Id: <ea0983a0cca71ba3fdefe94881fe75ee624adf5f@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:30 +0100
+Subject: [PATCH] qemu: use def instead of vm->def in qemuExtDevicesStart
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We have a helper variable to make the code more concise,
+use it consistently.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit e2ca6eb08731255b9b7cf3e938d20f4eae9fb427)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <3876fc88964781aec976d1a92b810aa9cf53c656.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_extdevice.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index 463f76c21a..1869a42f11 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -159,11 +159,11 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
+     int ret = 0;
+     size_t i;
+ 
+-    if (qemuExtDevicesInitPaths(driver, vm->def) < 0)
++    if (qemuExtDevicesInitPaths(driver, def) < 0)
+         return -1;
+ 
+-    for (i = 0; i < vm->def->nvideos; i++) {
+-        virDomainVideoDefPtr video = vm->def->videos[i];
++    for (i = 0; i < def->nvideos; i++) {
++        virDomainVideoDefPtr video = def->videos[i];
+ 
+         if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
+             ret = qemuExtVhostUserGPUStart(driver, vm, video);
+@@ -172,7 +172,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
+         }
+     }
+ 
+-    if (vm->def->tpm)
++    if (def->tpm)
+         ret = qemuExtTPMStart(driver, vm, incomingMigration);
+ 
+     for (i = 0; i < def->nnets; i++) {
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-use-the-vhost-user-schemas-to-find-binary.patch b/SOURCES/libvirt-qemu-use-the-vhost-user-schemas-to-find-binary.patch
new file mode 100644
index 0000000..965141d
--- /dev/null
+++ b/SOURCES/libvirt-qemu-use-the-vhost-user-schemas-to-find-binary.patch
@@ -0,0 +1,150 @@
+From f15a4eb66ecbfb80340bbab65150b22ab3a313fe Mon Sep 17 00:00:00 2001
+Message-Id: <f15a4eb66ecbfb80340bbab65150b22ab3a313fe@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:48 +0100
+Subject: [PATCH] qemu: use the vhost-user schemas to find binary
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Look into /usr/share/qemu/vhost-user to see whether we can find
+a suitable virtiofsd binary, in case the user did not provide one
+in the domain XML.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 071a1ab92fbbd58f68fb4929d004d6155759067e)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <e422c33d2c825f91b90eb10ef1530406a3492e0e.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_extdevice.c  |  9 +++++++++
+ src/qemu/qemu_vhost_user.c | 39 ++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_vhost_user.h |  4 ++++
+ src/qemu/qemu_virtiofs.c   | 11 +++++++++++
+ src/qemu/qemu_virtiofs.h   |  4 ++++
+ 5 files changed, 67 insertions(+)
+
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index f66bafb62f..07b9117f57 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -105,6 +105,15 @@ qemuExtDevicesPrepareDomain(virQEMUDriverPtr driver,
+         }
+     }
+ 
++    for (i = 0; i < vm->def->nfss; i++) {
++        virDomainFSDefPtr fs = vm->def->fss[i];
++
++        if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
++            if (qemuVirtioFSPrepareDomain(driver, fs) < 0)
++                return -1;
++        }
++    }
++
+     return ret;
+ }
+ 
+diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c
+index 4c25b30664..a3d5ac0fc7 100644
+--- a/src/qemu/qemu_vhost_user.c
++++ b/src/qemu/qemu_vhost_user.c
+@@ -416,3 +416,42 @@ qemuVhostUserFillDomainGPU(virQEMUDriverPtr driver,
+     VIR_FREE(vus);
+     return ret;
+ }
++
++
++int
++qemuVhostUserFillDomainFS(virQEMUDriverPtr driver,
++                          virDomainFSDefPtr fs)
++{
++    qemuVhostUserPtr *vus = NULL;
++    ssize_t nvus = 0;
++    ssize_t i;
++    int ret = -1;
++
++    if ((nvus = qemuVhostUserFetchParsedConfigs(driver->privileged,
++                                                &vus, NULL)) < 0)
++        goto end;
++
++    for (i = 0; i < nvus; i++) {
++        qemuVhostUserPtr vu = vus[i];
++
++        if (vu->type != QEMU_VHOST_USER_TYPE_FS)
++            continue;
++
++        fs->binary = g_strdup(vu->binary);
++        break;
++    }
++
++    if (i == nvus) {
++        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
++                       _("Unable to find a satisfying virtiofsd"));
++        goto end;
++    }
++
++    ret = 0;
++
++ end:
++    for (i = 0; i < nvus; i++)
++        qemuVhostUserFree(vus[i]);
++    g_free(vus);
++    return ret;
++}
+diff --git a/src/qemu/qemu_vhost_user.h b/src/qemu/qemu_vhost_user.h
+index 369ba00caa..e505c8a473 100644
+--- a/src/qemu/qemu_vhost_user.h
++++ b/src/qemu/qemu_vhost_user.h
+@@ -45,3 +45,7 @@ qemuVhostUserFetchConfigs(char ***configs,
+ int
+ qemuVhostUserFillDomainGPU(virQEMUDriverPtr driver,
+                            virDomainVideoDefPtr video);
++
++int
++qemuVhostUserFillDomainFS(virQEMUDriverPtr driver,
++                          virDomainFSDefPtr fs);
+diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
+index 194855ece8..d579ce1d33 100644
+--- a/src/qemu/qemu_virtiofs.c
++++ b/src/qemu/qemu_virtiofs.c
+@@ -28,6 +28,7 @@
+ #include "qemu_conf.h"
+ #include "qemu_extdevice.h"
+ #include "qemu_security.h"
++#include "qemu_vhost_user.h"
+ #include "qemu_virtiofs.h"
+ #include "virpidfile.h"
+ #include "virqemu.h"
+@@ -325,3 +326,13 @@ qemuVirtioFSSetupCgroup(virDomainObjPtr vm,
+ 
+     return 0;
+ }
++
++int
++qemuVirtioFSPrepareDomain(virQEMUDriverPtr driver,
++                          virDomainFSDefPtr fs)
++{
++    if (fs->binary)
++        return 0;
++
++    return qemuVhostUserFillDomainFS(driver, fs);
++}
+diff --git a/src/qemu/qemu_virtiofs.h b/src/qemu/qemu_virtiofs.h
+index 1db59917c6..7de4ea6190 100644
+--- a/src/qemu/qemu_virtiofs.h
++++ b/src/qemu/qemu_virtiofs.h
+@@ -40,3 +40,7 @@ int
+ qemuVirtioFSSetupCgroup(virDomainObjPtr vm,
+                         virDomainFSDefPtr fs,
+                         virCgroupPtr cgroup);
++
++int
++qemuVirtioFSPrepareDomain(virQEMUDriverPtr driver,
++                          virDomainFSDefPtr fs);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-validate-Enforce-compile-time-switch-type-checking-for-videos.patch b/SOURCES/libvirt-qemu-validate-Enforce-compile-time-switch-type-checking-for-videos.patch
deleted file mode 100644
index e39d353..0000000
--- a/SOURCES/libvirt-qemu-validate-Enforce-compile-time-switch-type-checking-for-videos.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 5c8a577f4abefca0b3d4ec2cb7eb5a7a73e9868e Mon Sep 17 00:00:00 2001
-Message-Id: <5c8a577f4abefca0b3d4ec2cb7eb5a7a73e9868e@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:53 +0200
-Subject: [PATCH] qemu: validate: Enforce compile time switch type checking for
- videos
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There wasn't an explicit type case to the video type enum in
-qemuDomainDeviceDefValidateVideo, _TYPE_GOP was also missing from the
-switch.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 767f9e1449b1a36111532847f0c62dc758263c42)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.h | 2 +-
- src/qemu/qemu_domain.c | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 1fc1734bcc..0f10e242fd 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1453,7 +1453,7 @@ struct _virDomainVideoDriverDef {
- };
- 
- struct _virDomainVideoDef {
--    int type;
-+    int type;   /* enum virDomainVideoType */
-     unsigned int ram;  /* kibibytes (multiples of 1024) */
-     unsigned int vram; /* kibibytes (multiples of 1024) */
-     unsigned int vram64; /* kibibytes (multiples of 1024) */
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index dec057e021..a42a6df91b 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4470,10 +4470,11 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
- static int
- qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video)
- {
--    switch (video->type) {
-+    switch ((virDomainVideoType) video->type) {
-     case VIR_DOMAIN_VIDEO_TYPE_XEN:
-     case VIR_DOMAIN_VIDEO_TYPE_VBOX:
-     case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
-+    case VIR_DOMAIN_VIDEO_TYPE_GOP:
-     case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("video type '%s' is not supported with QEMU"),
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu-validate-virtiofs-filesystems.patch b/SOURCES/libvirt-qemu-validate-virtiofs-filesystems.patch
new file mode 100644
index 0000000..40be59b
--- /dev/null
+++ b/SOURCES/libvirt-qemu-validate-virtiofs-filesystems.patch
@@ -0,0 +1,137 @@
+From 3366d4df5aac258013848cf5df7c95d45693c1e0 Mon Sep 17 00:00:00 2001
+Message-Id: <3366d4df5aac258013848cf5df7c95d45693c1e0@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:44 +0100
+Subject: [PATCH] qemu: validate virtiofs filesystems
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reject unsupported configurations.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
+(cherry picked from commit efaf46811c909ee5333360fba1d75ae82352964a)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <1fcb6b7d58c3791799c5d436edaa2faa07e92305.1583322091.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_domain.c | 82 +++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 77 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 402b079b09..79d8de2e42 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -8329,11 +8329,52 @@ qemuDomainDeviceDefValidateIOMMU(const virDomainIOMMUDef *iommu,
+     return 0;
+ }
+ 
++static int
++qemuDomainDefValidateVirtioFSSharedMemory(const virDomainDef *def)
++{
++    size_t numa_nodes = virDomainNumaGetNodeCount(def->numa);
++    size_t i;
++
++    if (numa_nodes == 0) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("virtiofs requires one or more NUMA nodes"));
++        return -1;
++    }
++
++    for (i = 0; i < numa_nodes; i++) {
++        virDomainMemoryAccess node_access =
++            virDomainNumaGetNodeMemoryAccessMode(def->numa, i);
++
++        switch (node_access) {
++        case VIR_DOMAIN_MEMORY_ACCESS_DEFAULT:
++            if (def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_SHARED) {
++                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                               _("virtiofs requires shared memory"));
++                return -1;
++            }
++            break;
++        case VIR_DOMAIN_MEMORY_ACCESS_SHARED:
++            break;
++        case VIR_DOMAIN_MEMORY_ACCESS_PRIVATE:
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs requires shared memory"));
++            return -1;
++
++        case VIR_DOMAIN_MEMORY_ACCESS_LAST:
++        default:
++            virReportEnumRangeError(virDomainMemoryAccess, node_access);
++            return -1;
++
++        }
++    }
++    return 0;
++}
+ 
+ static int
+ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs,
+-                              const virDomainDef *def G_GNUC_UNUSED,
+-                              virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
++                              const virDomainDef *def,
++                              virQEMUDriverPtr driver,
++                              virQEMUCapsPtr qemuCaps)
+ {
+     if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+@@ -8362,8 +8403,39 @@ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs,
+         return -1;
+ 
+     case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS:
+-        /* TODO: vhost-user-fs-pci */
+-        return 0;
++        if (!virQEMUDriverIsPrivileged(driver)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs is not yet supported in session mode"));
++            return -1;
++        }
++        if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs only supports passthrough accessmode"));
++            return -1;
++        }
++        if (fs->wrpolicy != VIR_DOMAIN_FS_WRPOLICY_DEFAULT) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs does not support wrpolicy"));
++            return -1;
++        }
++        if (fs->model != VIR_DOMAIN_FS_MODEL_DEFAULT) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs does not support model"));
++            return -1;
++        }
++        if (fs->format != VIR_STORAGE_FILE_NONE) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs does not support format"));
++            return -1;
++        }
++        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_USER_FS)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("virtiofs is not supported with this QEMU binary"));
++            return -1;
++        }
++        if (qemuDomainDefValidateVirtioFSSharedMemory(def) < 0)
++            return -1;
++        break;
+ 
+     case VIR_DOMAIN_FS_DRIVER_TYPE_LAST:
+     default:
+@@ -8542,7 +8614,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
+         break;
+ 
+     case VIR_DOMAIN_DEVICE_FS:
+-        ret = qemuDomainDeviceDefValidateFS(dev->data.fs, def, qemuCaps);
++        ret = qemuDomainDeviceDefValidateFS(dev->data.fs, def, driver, qemuCaps);
+         break;
+ 
+     case VIR_DOMAIN_DEVICE_NVRAM:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemu-vfio-ap-device-support.patch b/SOURCES/libvirt-qemu-vfio-ap-device-support.patch
deleted file mode 100644
index 9be0d24..0000000
--- a/SOURCES/libvirt-qemu-vfio-ap-device-support.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 4b249d6de82cd42d29aeccccef4ae483c71b1528 Mon Sep 17 00:00:00 2001
-Message-Id: <4b249d6de82cd42d29aeccccef4ae483c71b1528@dist-git>
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Fri, 30 Nov 2018 15:49:24 +0100
-Subject: [PATCH] qemu: vfio-ap device support
-
-Adjusting domain format documentation, adding device address
-support and adding command line generation for vfio-ap.
-Since only one mediated hostdev with model vfio-ap is supported a check
-disallows to define domains with more than one such hostdev device.
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Chris Venteicher <cventeic@redhat.com>
-(cherry picked from commit 11708641983e9107a129c62fd343d0fec228342f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508146
-
-Signed-off-by: Pino Toscano <ptoscano@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- docs/formatdomain.html.in      |  3 ++-
- docs/schemas/domaincommon.rng  |  1 +
- src/conf/domain_conf.c         | 28 ++++++++++++++++++++++++++++
- src/qemu/qemu_command.c        |  8 ++++++++
- src/qemu/qemu_domain_address.c |  4 ++++
- src/util/virmdev.c             |  3 ++-
- src/util/virmdev.h             |  1 +
- 7 files changed, 46 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index c019b26644..54eb298414 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -4528,8 +4528,9 @@
-           <dd>For mediated devices (<span class="since">Since 3.2.0</span>)
-           the <code>model</code> attribute specifies the device API which
-           determines how the host's vfio driver will expose the device to the
--          guest. Currently, <code>model='vfio-pci'</code> and
-+          guest. Currently, <code>model='vfio-pci'</code>,
-           <code>model='vfio-ccw'</code> (<span class="since">Since 4.4.0</span>)
-+          and <code>model='vfio-ap'</code> (<span class="since">Since 4.9.0</span>)
-           is supported. <a href="drvnodedev.html#MDEV">MDEV</a> section
-           provides more information about mediated devices as well as how to
-           create mediated devices on the host.
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 1c6f2a295d..e4ce7804b9 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -4578,6 +4578,7 @@
-       <choice>
-         <value>vfio-pci</value>
-         <value>vfio-ccw</value>
-+        <value>vfio-ap</value>
-       </choice>
-     </attribute>
-     <optional>
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index e013e9f0c5..ea7152eb94 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -4325,6 +4325,31 @@ virDomainDefPostParseGraphics(virDomainDef *def)
- }
- 
- 
-+static int
-+virDomainDefPostParseHostdev(virDomainDefPtr def)
-+{
-+    size_t i;
-+    bool vfioap_found = false;
-+
-+    /* verify settings of hostdevs vfio-ap */
-+    for (i = 0; i < def->nhostdevs; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+
-+        if (virHostdevIsMdevDevice(hostdev) &&
-+            hostdev->source.subsys.u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_AP) {
-+            if (vfioap_found) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                               _("Only one hostdev of model vfio-ap is "
-+                                 "supported"));
-+                return -1;
-+            }
-+            vfioap_found = true;
-+        }
-+    }
-+    return 0;
-+}
-+
-+
- /**
-  * virDomainDriveAddressIsUsedByDisk:
-  * @def: domain definition containing the disks to check
-@@ -5237,6 +5262,9 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
- 
-     virDomainDefPostParseGraphics(def);
- 
-+    if (virDomainDefPostParseHostdev(def) < 0)
-+        return -1;
-+
-     if (virDomainDefPostParseCPU(def) < 0)
-         return -1;
- 
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index a3d605c00f..320ecd902c 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -5430,6 +5430,14 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
-                     return -1;
-                 }
-                 break;
-+            case VIR_MDEV_MODEL_TYPE_VFIO_AP:
-+                if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_AP)) {
-+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                                   _("VFIO AP device assignment is not "
-+                                     "supported by this version of QEMU"));
-+                    return -1;
-+                }
-+                break;
-             case VIR_MDEV_MODEL_TYPE_LAST:
-                 virReportError(VIR_ERR_INTERNAL_ERROR,
-                                _("unexpected vfio type '%d'"), subsys->u.mdev.model);
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index 0cb5af4a87..3e50521c11 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -294,6 +294,10 @@ qemuDomainPrimeVfioDeviceAddresses(virDomainDefPtr def,
-             subsys->u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_CCW &&
-             def->hostdevs[i]->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
-             def->hostdevs[i]->info->type = type;
-+
-+        if (virHostdevIsMdevDevice(def->hostdevs[i]) &&
-+            subsys->u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_AP)
-+            def->hostdevs[i]->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE;
-     }
- }
- 
-diff --git a/src/util/virmdev.c b/src/util/virmdev.c
-index 6c513884b8..1b5897c654 100644
---- a/src/util/virmdev.c
-+++ b/src/util/virmdev.c
-@@ -49,7 +49,8 @@ struct _virMediatedDeviceList {
- 
- VIR_ENUM_IMPL(virMediatedDeviceModel, VIR_MDEV_MODEL_TYPE_LAST,
-               "vfio-pci",
--              "vfio-ccw")
-+              "vfio-ccw",
-+              "vfio-ap")
- 
- static virClassPtr virMediatedDeviceListClass;
- 
-diff --git a/src/util/virmdev.h b/src/util/virmdev.h
-index cfda2cacab..ba411a933a 100644
---- a/src/util/virmdev.h
-+++ b/src/util/virmdev.h
-@@ -26,6 +26,7 @@
- typedef enum {
-     VIR_MDEV_MODEL_TYPE_VFIO_PCI = 0,
-     VIR_MDEV_MODEL_TYPE_VFIO_CCW = 1,
-+    VIR_MDEV_MODEL_TYPE_VFIO_AP  = 2,
- 
-     VIR_MDEV_MODEL_TYPE_LAST
- } virMediatedDeviceModelType;
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-qemu-virtiofs-shorten-pid-filename.patch b/SOURCES/libvirt-qemu-virtiofs-shorten-pid-filename.patch
new file mode 100644
index 0000000..357d4f9
--- /dev/null
+++ b/SOURCES/libvirt-qemu-virtiofs-shorten-pid-filename.patch
@@ -0,0 +1,49 @@
+From aa95c0fea0aa938873717ccb91319b2c3e48d000 Mon Sep 17 00:00:00 2001
+Message-Id: <aa95c0fea0aa938873717ccb91319b2c3e48d000@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Tue, 24 Mar 2020 11:30:17 +0100
+Subject: [PATCH] qemu: virtiofs: shorten pid filename
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is no need to repeat the shortName, since it's
+already present in the directory path.
+
+Also use just 'fs' instead of 'virtiofsd'.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1816577
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Suggested-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7055af6c2253666cd0b7c4c459c5a019da789140)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <619956878ec3e09fe6481c7e25b2820753aa57e5.1585045801.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_virtiofs.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
+index d579ce1d33..b47e19a562 100644
+--- a/src/qemu/qemu_virtiofs.c
++++ b/src/qemu/qemu_virtiofs.c
+@@ -42,13 +42,9 @@ qemuVirtioFSCreatePidFilename(virDomainObjPtr vm,
+                               const char *alias)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+-    g_autofree char *shortName = NULL;
+     g_autofree char *name = NULL;
+ 
+-    if (!(shortName = virDomainDefGetShortName(vm->def)))
+-        return NULL;
+-
+-    name = g_strdup_printf("%s-%s-virtiofsd", shortName, alias);
++    name = g_strdup_printf("%s-fs", alias);
+ 
+     return virPidFileBuildPath(priv->libDir, name);
+ }
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemu-virtiofs-shorten-socket-filename.patch b/SOURCES/libvirt-qemu-virtiofs-shorten-socket-filename.patch
new file mode 100644
index 0000000..66e1e52
--- /dev/null
+++ b/SOURCES/libvirt-qemu-virtiofs-shorten-socket-filename.patch
@@ -0,0 +1,39 @@
+From 33bca0809e436c0040aa17d546c2145e5432b023 Mon Sep 17 00:00:00 2001
+Message-Id: <33bca0809e436c0040aa17d546c2145e5432b023@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Tue, 24 Mar 2020 11:30:18 +0100
+Subject: [PATCH] qemu: virtiofs: shorten socket filename
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use just 'fs' instead of 'virtiofsd'.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1816577
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 223b370aaa6fcbcbfbd4045fde4ae67e047180ad)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Message-Id: <ecf76c8829f804dcdb83eeb90f236316a240795e.1585045801.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_virtiofs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
+index b47e19a562..d9ace4aafe 100644
+--- a/src/qemu/qemu_virtiofs.c
++++ b/src/qemu/qemu_virtiofs.c
+@@ -56,7 +56,7 @@ qemuVirtioFSCreateSocketFilename(virDomainObjPtr vm,
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+ 
+-    return virFileBuildPath(priv->libDir, alias, "-virtiofsd.sock");
++    return virFileBuildPath(priv->libDir, alias, "-fs.sock");
+ }
+ 
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemu-vnc-switch-to-tls-creds-x509.patch b/SOURCES/libvirt-qemu-vnc-switch-to-tls-creds-x509.patch
deleted file mode 100644
index 52ee497..0000000
--- a/SOURCES/libvirt-qemu-vnc-switch-to-tls-creds-x509.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 549657f96937eee9d31a44f9cb202bd61a4ce99d Mon Sep 17 00:00:00 2001
-Message-Id: <549657f96937eee9d31a44f9cb202bd61a4ce99d@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 28 Aug 2018 12:46:45 +0200
-Subject: [PATCH] qemu: vnc: switch to tls-creds-x509
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The tls, x509 and x509verify options were deprecated in QEMU v2.5.0:
-
-commit 3e305e4a4752f70c0b5c3cf5b43ec957881714f7
-Author:     Daniel P. Berrange <berrange@redhat.com>
-
-    ui: convert VNC server to use QCryptoTLSSession
-
-Use the tls-creds-x509 object when available.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598167
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 17f50c82600c11c0ebcb4fc944b3f38b8e06bcdb)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1598167
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_command.c                       | 26 ++++++++++++++-----
- .../graphics-vnc-tls.x86_64-latest.args       |  4 ++-
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index f2b64ed720..5c71abab96 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7892,13 +7892,27 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
-         virBufferAddLit(&opt, ",password");
- 
-     if (cfg->vncTLS) {
--        virBufferAddLit(&opt, ",tls");
--        if (cfg->vncTLSx509verify) {
--            virBufferAddLit(&opt, ",x509verify=");
--            virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
-+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_TLS_CREDS_X509)) {
-+            const char *alias = "vnc-tls-creds0";
-+            if (qemuBuildTLSx509CommandLine(cmd,
-+                                            cfg->vncTLSx509certdir,
-+                                            true,
-+                                            cfg->vncTLSx509verify,
-+                                            NULL,
-+                                            alias,
-+                                            qemuCaps) < 0)
-+                goto error;
-+
-+            virBufferAsprintf(&opt, ",tls-creds=%s", alias);
-         } else {
--            virBufferAddLit(&opt, ",x509=");
--            virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
-+            virBufferAddLit(&opt, ",tls");
-+            if (cfg->vncTLSx509verify) {
-+                virBufferAddLit(&opt, ",x509verify=");
-+                virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
-+            } else {
-+                virBufferAddLit(&opt, ",x509=");
-+                virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
-+            }
-         }
-     }
- 
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-index 01743eff2a..97775fad42 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-@@ -24,7 +24,9 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -no-acpi \
- -boot strict=on \
- -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
---vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
-+-object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,\
-+endpoint=server,verify-peer=yes \
-+-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl \
- -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
- resourcecontrol=deny \
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemuAgentFSInfoFormatParams-Remove-pointless-returned-value.patch b/SOURCES/libvirt-qemuAgentFSInfoFormatParams-Remove-pointless-returned-value.patch
new file mode 100644
index 0000000..d811826
--- /dev/null
+++ b/SOURCES/libvirt-qemuAgentFSInfoFormatParams-Remove-pointless-returned-value.patch
@@ -0,0 +1,137 @@
+From d5bc155a97d1938e0e19f6040ae76cdd0a92ed62 Mon Sep 17 00:00:00 2001
+Message-Id: <d5bc155a97d1938e0e19f6040ae76cdd0a92ed62@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:34 +0100
+Subject: [PATCH] qemuAgentFSInfoFormatParams: Remove pointless returned value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The only caller doesn't check the value and also there are no real
+errors to report anyways.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit da1b1932271ee135537b2809e87dc621748d4630)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1812965
+Message-Id: <04feacc921ce5c6f0333a4c4af7ccef8b22db6a1.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 31 ++++++++++++-------------------
+ 1 file changed, 12 insertions(+), 19 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 26f100177b..8c7e90531a 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -22996,24 +22996,20 @@ qemuDomainGetGuestInfoCheckSupport(unsigned int *types)
+     *types = *types & supportedGuestInfoTypes;
+ }
+ 
+-/* Returns: 0 on success
+- *          -1 otherwise
+- */
+-static int
++static void
+ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo,
+                             int nfs,
+                             virDomainDefPtr vmdef,
+                             virTypedParameterPtr *params,
+                             int *nparams, int *maxparams)
+ {
+-    int ret = -1;
+     size_t i, j;
+ 
+     /* FIXME: get disk target */
+ 
+     if (virTypedParamsAddUInt(params, nparams, maxparams,
+                               "fs.count", nfs) < 0)
+-        goto cleanup;
++        return;
+ 
+     for (i = 0; i < nfs; i++) {
+         char param_name[VIR_TYPED_PARAM_FIELD_LENGTH];
+@@ -23021,17 +23017,17 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo,
+                    "fs.%zu.name", i);
+         if (virTypedParamsAddString(params, nparams, maxparams,
+                                     param_name, fsinfo[i]->name) < 0)
+-            goto cleanup;
++            return;
+         g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+                    "fs.%zu.mountpoint", i);
+         if (virTypedParamsAddString(params, nparams, maxparams,
+                                     param_name, fsinfo[i]->mountpoint) < 0)
+-            goto cleanup;
++            return;
+         g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+                    "fs.%zu.fstype", i);
+         if (virTypedParamsAddString(params, nparams, maxparams,
+                                     param_name, fsinfo[i]->fstype) < 0)
+-            goto cleanup;
++            return;
+ 
+         /* disk usage values are not returned by older guest agents, so
+          * only add the params if the value is set */
+@@ -23040,20 +23036,20 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo,
+         if (fsinfo[i]->total_bytes != -1 &&
+             virTypedParamsAddULLong(params, nparams, maxparams,
+                                     param_name, fsinfo[i]->total_bytes) < 0)
+-            goto cleanup;
++            return;
+ 
+         g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+                    "fs.%zu.used-bytes", i);
+         if (fsinfo[i]->used_bytes != -1 &&
+             virTypedParamsAddULLong(params, nparams, maxparams,
+                                     param_name, fsinfo[i]->used_bytes) < 0)
+-            goto cleanup;
++            return;
+ 
+         g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+                    "fs.%zu.disk.count", i);
+         if (virTypedParamsAddUInt(params, nparams, maxparams,
+                                   param_name, fsinfo[i]->ndisks) < 0)
+-            goto cleanup;
++            return;
+         for (j = 0; j < fsinfo[i]->ndisks; j++) {
+             virDomainDiskDefPtr diskdef = NULL;
+             qemuAgentDiskInfoPtr d = fsinfo[i]->disks[j];
+@@ -23069,7 +23065,7 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo,
+                 if (diskdef->dst &&
+                     virTypedParamsAddString(params, nparams, maxparams,
+                                             param_name, diskdef->dst) < 0)
+-                    goto cleanup;
++                    return;
+             }
+ 
+             g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+@@ -23077,22 +23073,19 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo,
+             if (d->serial &&
+                 virTypedParamsAddString(params, nparams, maxparams,
+                                         param_name, d->serial) < 0)
+-                goto cleanup;
++                return;
+ 
+             g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+                        "fs.%zu.disk.%zu.device", i, j);
+             if (d->devnode &&
+                 virTypedParamsAddString(params, nparams, maxparams,
+                                         param_name, d->devnode) < 0)
+-                goto cleanup;
++                return;
+         }
+     }
+-    ret = nfs;
+-
+- cleanup:
+-    return ret;
+ }
+ 
++
+ static int
+ qemuDomainGetGuestInfo(virDomainPtr dom,
+                        unsigned int types,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuBackupBegin-Don-t-leak-def-on-early-failures.patch b/SOURCES/libvirt-qemuBackupBegin-Don-t-leak-def-on-early-failures.patch
new file mode 100644
index 0000000..4009b29
--- /dev/null
+++ b/SOURCES/libvirt-qemuBackupBegin-Don-t-leak-def-on-early-failures.patch
@@ -0,0 +1,39 @@
+From 148ee94fdde4b4b6a78ff2a734a2bc9105a81166 Mon Sep 17 00:00:00 2001
+Message-Id: <148ee94fdde4b4b6a78ff2a734a2bc9105a81166@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:07 +0200
+Subject: [PATCH] qemuBackupBegin: Don't leak 'def' on early failures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The cleanup path expects that 'def' is assigned to 'priv->backup', but
+that's not the case for early failures. Add a check to stop overwriting
+of 'def' so that it can be freed.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b5212365b640fceb7116dca30518b42bf6ab42df)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <18f55f981e9a6eba7266424fb0f244a2c7102508.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 67d646f477..c207d3b7d0 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -803,7 +803,7 @@ qemuBackupBegin(virDomainObjPtr vm,
+         ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
+     }
+ 
+-    if (ret < 0 && !job_started)
++    if (ret < 0 && !job_started && priv->backup)
+         def = g_steal_pointer(&priv->backup);
+ 
+     if (ret == 0)
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuBackupBegin-Fix-monitor-access-when-rolling-back-due-to-failure.patch b/SOURCES/libvirt-qemuBackupBegin-Fix-monitor-access-when-rolling-back-due-to-failure.patch
new file mode 100644
index 0000000..8be9606
--- /dev/null
+++ b/SOURCES/libvirt-qemuBackupBegin-Fix-monitor-access-when-rolling-back-due-to-failure.patch
@@ -0,0 +1,43 @@
+From 54b47c1f5bf860e2fadeb17a954a109aafd62067 Mon Sep 17 00:00:00 2001
+Message-Id: <54b47c1f5bf860e2fadeb17a954a109aafd62067@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Thu, 26 Mar 2020 18:25:12 +0100
+Subject: [PATCH] qemuBackupBegin: Fix monitor access when rolling back due to
+ failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The code attempting to clean up after a failed pull mode backup job
+wrongly entered monitor but didn't clean up nor exit monitor due to a
+logic bug. Fix the condition.
+
+Introduced in a1521f84a53
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1817327
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit e060b0624d1b78438b759cc5a25da87b28c9736c)
+Message-Id: <95ad49e5316e5f9dd992e463bc7536e3046140d4.1585243469.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 8b66ee8d1f..9a056fa407 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -894,7 +894,7 @@ qemuBackupBegin(virDomainObjPtr vm,
+     qemuCheckpointRollbackMetadata(vm, chk);
+ 
+     if (!job_started && nbd_running &&
+-        qemuDomainObjEnterMonitorAsync(priv->driver, vm, QEMU_ASYNC_JOB_BACKUP) < 0) {
++        qemuDomainObjEnterMonitorAsync(priv->driver, vm, QEMU_ASYNC_JOB_BACKUP) == 0) {
+         ignore_value(qemuMonitorNBDServerStop(priv->mon));
+         ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
+     }
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Don-t-exit-early-when-the-job-has-started.patch b/SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Don-t-exit-early-when-the-job-has-started.patch
new file mode 100644
index 0000000..82d17ab
--- /dev/null
+++ b/SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Don-t-exit-early-when-the-job-has-started.patch
@@ -0,0 +1,75 @@
+From 9dee5f450fba6b084aaef5a46b112942e6efd913 Mon Sep 17 00:00:00 2001
+Message-Id: <9dee5f450fba6b084aaef5a46b112942e6efd913@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:10 +0200
+Subject: [PATCH] qemuBackupDiskDataCleanupOne: Don't exit early when the job
+ has started
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originally the function was cleaning up a failed job only but now
+there's other stuff that needs to be cleared too.
+
+Make only steps which clean up after a failed job depend on the
+'started' field and execute the rest of the code always.
+
+This fixes a leak of the backup job tracking object and the blockdev-add
+helper data.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 165b430eb9a1213ef32f14ace14d8377e9e71446)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <2cd881ed2059b64293b32b42fbe942cc2e147f81.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 25 ++++++++++++-------------
+ 1 file changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index fdc75d3160..c68227f029 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -124,26 +124,25 @@ qemuBackupDiskDataCleanupOne(virDomainObjPtr vm,
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+ 
+-    if (dd->started)
+-        return;
++    if (!dd->started) {
++        if (dd->added) {
++            qemuDomainObjEnterMonitor(priv->driver, vm);
++            qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->srcdata[0]);
++            ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
++        }
+ 
+-    if (dd->added) {
+-        qemuDomainObjEnterMonitor(priv->driver, vm);
+-        qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->srcdata[0]);
+-        ignore_value(qemuDomainObjExitMonitor(priv->driver, vm));
+-    }
++        if (dd->created) {
++            if (virStorageFileUnlink(dd->store) < 0)
++                VIR_WARN("Unable to remove just-created %s", NULLSTR(dd->store->path));
++        }
+ 
+-    if (dd->created) {
+-        if (virStorageFileUnlink(dd->store) < 0)
+-            VIR_WARN("Unable to remove just-created %s", NULLSTR(dd->store->path));
++        if (dd->labelled)
++            qemuDomainStorageSourceAccessRevoke(priv->driver, vm, dd->store);
+     }
+ 
+     if (dd->initialized)
+         virStorageFileDeinit(dd->store);
+ 
+-    if (dd->labelled)
+-        qemuDomainStorageSourceAccessRevoke(priv->driver, vm, dd->store);
+-
+     if (dd->blockjob)
+         qemuBlockJobStartupFinalize(vm, dd->blockjob);
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Free-incrementalBitmap.patch b/SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Free-incrementalBitmap.patch
new file mode 100644
index 0000000..3af93a2
--- /dev/null
+++ b/SOURCES/libvirt-qemuBackupDiskDataCleanupOne-Free-incrementalBitmap.patch
@@ -0,0 +1,37 @@
+From bae38a946b063c4c384ddfb22a0c04137c51d31c Mon Sep 17 00:00:00 2001
+Message-Id: <bae38a946b063c4c384ddfb22a0c04137c51d31c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:11 +0200
+Subject: [PATCH] qemuBackupDiskDataCleanupOne: Free 'incrementalBitmap'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The bitmap name used for the incremental backup would be leaked
+otherwise.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit d55b0811ff9968eafa8d9ed394a365659fa6e0c5)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <fa62b553a1eff375ff1491a51a7db0918c5b89c3.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index c68227f029..5c403f8f35 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -148,6 +148,7 @@ qemuBackupDiskDataCleanupOne(virDomainObjPtr vm,
+ 
+     qemuBlockStorageSourceChainDataFree(dd->crdata);
+     virObjectUnref(dd->terminator);
++    g_free(dd->incrementalBitmap);
+ }
+ 
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuBackupDiskStarted-Fix-improper-dereference-of-array.patch b/SOURCES/libvirt-qemuBackupDiskStarted-Fix-improper-dereference-of-array.patch
new file mode 100644
index 0000000..514572f
--- /dev/null
+++ b/SOURCES/libvirt-qemuBackupDiskStarted-Fix-improper-dereference-of-array.patch
@@ -0,0 +1,38 @@
+From 9bec4051732e43d24808893643826268ab88b8cc Mon Sep 17 00:00:00 2001
+Message-Id: <9bec4051732e43d24808893643826268ab88b8cc@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:09 +0200
+Subject: [PATCH] qemuBackupDiskStarted: Fix improper dereference of array
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The code would repeatedly mark the first disk's blockjob as started
+rather than accessing all the blockjobs. Fix the dereferencing operator.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 214faa0b04ace42aebfa40e1d19aabbf3003f0fe)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <1d33c3080e24baf96a0d9435d1588b4a48a98425.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_backup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 013a82e06d..fdc75d3160 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -479,7 +479,7 @@ qemuBackupDiskStarted(virDomainObjPtr vm,
+     for (i = 0; i < ndd; i++) {
+         dd[i].started = true;
+         dd[i].backupdisk->state = VIR_DOMAIN_BACKUP_DISK_STATE_RUNNING;
+-        qemuBlockJobStarted(dd->blockjob, vm);
++        qemuBlockJobStarted(dd[i].blockjob, vm);
+     }
+ }
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuBlockBitmapChainIsValid-Adjust-to-new-semantics-of-bitmaps.patch b/SOURCES/libvirt-qemuBlockBitmapChainIsValid-Adjust-to-new-semantics-of-bitmaps.patch
new file mode 100644
index 0000000..2f3ba23
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockBitmapChainIsValid-Adjust-to-new-semantics-of-bitmaps.patch
@@ -0,0 +1,95 @@
+From 4fcacae366ef35c336a6b9b0ff35cdf0a3c80760 Mon Sep 17 00:00:00 2001
+Message-Id: <4fcacae366ef35c336a6b9b0ff35cdf0a3c80760@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:50 +0200
+Subject: [PATCH] qemuBlockBitmapChainIsValid: Adjust to new semantics of
+ bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reject duplicates and other problematic bitmaps according to the new
+semantics of bitmap use in libvirt.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 3857b073cb3a44c6a54e040f395ed58531f16634)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <a35c63c398ab7fa25758567ec73228c97ba1fe6f.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 38 +++++++++++++++++++++++---------------
+ 1 file changed, 23 insertions(+), 15 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index a44774c237..38c8269721 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2835,41 +2835,49 @@ qemuBlockGetNamedNodeData(virDomainObjPtr vm,
+ /**
+  * qemuBlockBitmapChainIsValid:
+  *
+- * Validates that the backing chain of @src contains proper consistent bitmap
+- * data for a chain of bitmaps named @bitmapname.
++ * Validates that the backing chain of @src contains bitmaps which libvirt will
++ * consider as properly corresponding to a checkpoint named @bitmapname.
+  *
+- * A valid chain:
+- * 1) bitmaps of same name are in a consecutive subset of images without gap
+- * 2) don't have any inconsistent bitmaps
++ * The bitmaps need to:
++ * 1) start from the top image @src
++ * 2) must be present in consecutive layers
++ * 3) all must be active, persistent and not inconsistent
+  */
+ bool
+ qemuBlockBitmapChainIsValid(virStorageSourcePtr src,
+                             const char *bitmapname,
+                             virHashTablePtr blockNamedNodeData)
+ {
+-    qemuBlockNamedNodeDataBitmapPtr bitmap;
+     virStorageSourcePtr n;
+-    bool chain_started = false;
++    bool found = false;
+     bool chain_ended = false;
+ 
+-    for (n = src; n; n = n->backingStore) {
+-        if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData, n, bitmapname))) {
+-            if (chain_started)
+-                chain_ended = true;
++    for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
++        qemuBlockNamedNodeDataBitmapPtr bitmap;
++
++        if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
++                                                             n, bitmapname))) {
++            /* rule 1, must start from top */
++            if (!found)
++                return false;
++
++            chain_ended = true;
+ 
+             continue;
+         }
+ 
++        /* rule 2, no-gaps */
+         if (chain_ended)
+             return false;
+ 
+-        chain_started = true;
+-
+-        if (bitmap->inconsistent)
++        /* rule 3 */
++        if (bitmap->inconsistent || !bitmap->persistent || !bitmap->recording)
+             return false;
++
++        found = true;
+     }
+ 
+-    return chain_started;
++    return found;
+ }
+ 
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuBlockBitmapsHandleCommitFinish-Use-proper-variable-to-iterate.patch b/SOURCES/libvirt-qemuBlockBitmapsHandleCommitFinish-Use-proper-variable-to-iterate.patch
new file mode 100644
index 0000000..7b828d8
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockBitmapsHandleCommitFinish-Use-proper-variable-to-iterate.patch
@@ -0,0 +1,42 @@
+From 60d5a8463c380b005f16698bca7b38c11b122e03 Mon Sep 17 00:00:00 2001
+Message-Id: <60d5a8463c380b005f16698bca7b38c11b122e03@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 17 Mar 2020 17:12:45 +0100
+Subject: [PATCH] qemuBlockBitmapsHandleCommitFinish: Use proper variable to
+ iterate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function repeatedly checked the first element rather than iterating
+through the array.
+
+Reported-by: Daniel P. Berrangé <berrange@redhat.com>
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Tested-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 7a16318855811ac4ae55d30b77969528099fd180)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <25addb80a3899e5789c32aecab8184066e80cbd0.1584461519.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index dad3e2317f..73cb5ba4bc 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3175,7 +3175,7 @@ qemuBlockBitmapsHandleCommitFinish(virStorageSourcePtr topsrc,
+                     char **disabledbitmaps;
+ 
+                     for (disabledbitmaps = disabledBitmapsBase; *disabledbitmaps; disabledbitmaps++) {
+-                        if (STREQ(*disabledBitmapsBase, bitmap->name)) {
++                        if (STREQ(*disabledbitmaps, bitmap->name)) {
+                             bitmapdata = g_new0(struct qemuBlockBitmapsHandleCommitData, 1);
+ 
+                             bitmapdata->create = false;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuBlockBitmapsHandleCommitStart-Fix-allocation-of-string-list.patch b/SOURCES/libvirt-qemuBlockBitmapsHandleCommitStart-Fix-allocation-of-string-list.patch
new file mode 100644
index 0000000..67416a9
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockBitmapsHandleCommitStart-Fix-allocation-of-string-list.patch
@@ -0,0 +1,41 @@
+From 83452775d46c10e2a33c2727f6c5e1d6e22ebdfe Mon Sep 17 00:00:00 2001
+Message-Id: <83452775d46c10e2a33c2727f6c5e1d6e22ebdfe@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 17 Mar 2020 17:12:44 +0100
+Subject: [PATCH] qemuBlockBitmapsHandleCommitStart: Fix allocation of string
+ list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allocate space also for the terminating NULL.
+
+Reported-by: Daniel P. Berrangé <berrange@redhat.com>
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Tested-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 061057e75461814e36aad1e78e96363d373ac34b)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <562a7faef6100c757b5556592093382b016755bb.1584461519.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 099ceeb802..dad3e2317f 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3019,7 +3019,7 @@ qemuBlockBitmapsHandleCommitStart(virStorageSourcePtr topsrc,
+     if (!(entry = virHashLookup(blockNamedNodeData, basesrc->nodeformat)))
+         return 0;
+ 
+-    bitmaplist = g_new0(char *, entry->nbitmaps);
++    bitmaplist = g_new0(char *, entry->nbitmaps + 1);
+ 
+     for (i = 0; i < entry->nbitmaps; i++) {
+         qemuBlockNamedNodeDataBitmapPtr bitmap = entry->bitmaps[i];
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-extra-wrapping-object-to-JSON-strings.patch b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-extra-wrapping-object-to-JSON-strings.patch
new file mode 100644
index 0000000..5d00325
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-extra-wrapping-object-to-JSON-strings.patch
@@ -0,0 +1,129 @@
+From d4877aae453a0ed1104dfd8aa12806a110f08b07 Mon Sep 17 00:00:00 2001
+Message-Id: <d4877aae453a0ed1104dfd8aa12806a110f08b07@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:05 +0100
+Subject: [PATCH] qemuBlockGetBackingStoreString: Add extra wrapping object to
+ JSON strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QEMU requires an extra wrapper object where only the "file" member is
+populated. This is basically a placeholder for establishing the format
+layer. We did the same in qemuDiskSourceGetProps for the old-school
+JSON usage with -drive but forgot to adopt this for -blockdev.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7ba2208addf1cad4d6c06d3c172cca93f84ead11)
+Message-Id: <9a56b9f7e03d41bf99399b14f399bc9007ed1a4e.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                                          | 2 +-
+ .../imagecreate/qcow2-backing-qcow2-slice.json                 | 2 +-
+ .../qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json | 2 +-
+ .../network-qcow2-backing-chain-cache-unsafe-srconly.json      | 3 ++-
+ .../network-qcow2-backing-chain-encryption_auth-srconly.json   | 3 ++-
+ tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json  | 3 ++-
+ 6 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 5a7364576a..73a424f7a8 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2091,7 +2091,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src,
+     if (!(backingJSON = virJSONValueToString(props, pretty)))
+         return NULL;
+ 
+-    return g_strdup_printf("json:%s", backingJSON);
++    return g_strdup_printf("json:{\"file\":%s}", backingJSON);
+ }
+ 
+ 
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json
+index 2fa27c1933..2526740b9a 100644
+--- a/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json
++++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json
+@@ -10,6 +10,6 @@ format:
+   "driver": "qcow2",
+   "file": "0123456789ABCDEF0123456789ABCDE",
+   "size": 8589934590,
+-  "backing-file": "json:{\"driver\":\"raw\",\"offset\":1234,\"size\":5768,\"file\":{\"driver\":\"file\",\"filename\":\"/var/lib/libvirt/images/i.qcow2\"}}",
++  "backing-file": "json:{\"file\":{\"driver\":\"raw\",\"offset\":1234,\"size\":5768,\"file\":{\"driver\":\"file\",\"filename\":\"/var/lib/libvirt/images/i.qcow2\"}}}",
+   "backing-fmt": "qcow2"
+ }
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json
+index 761002afd9..e76221da16 100644
+--- a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json
++++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json
+@@ -10,6 +10,6 @@ format:
+   "driver": "qcow2",
+   "file": "0123456789ABCDEF0123456789ABCDE",
+   "size": 8589934590,
+-  "backing-file": "json:{\"driver\":\"raw\",\"offset\":9876,\"size\":54321,\"file\":{\"driver\":\"file\",\"filename\":\"/var/lib/libvirt/images/i.img\"}}",
++  "backing-file": "json:{\"file\":{\"driver\":\"raw\",\"offset\":9876,\"size\":54321,\"file\":{\"driver\":\"file\",\"filename\":\"/var/lib/libvirt/images/i.img\"}}}",
+   "backing-fmt": "raw"
+ }
+diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json
+index 2d7eeb3bca..0fb0b8eff9 100644
+--- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json
++++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json
+@@ -16,7 +16,7 @@
+     ]
+   }
+   backing store string:
+-  json:{
++  json:{"file":{
+     "driver": "rbd",
+     "pool": "rbdpool",
+     "image": "rbdimg",
+@@ -31,6 +31,7 @@
+       }
+     ]
+   }
++  }
+ )
+ (
+   source only properties:
+diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json
+index 5679318fbe..777a372471 100644
+--- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json
++++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json
+@@ -16,7 +16,7 @@
+     ]
+   }
+   backing store string:
+-  json:{
++  json:{"file":{
+     "driver": "rbd",
+     "pool": "rbdpool",
+     "image": "rbdimg",
+@@ -31,6 +31,7 @@
+       }
+     ]
+   }
++  }
+ )
+ (
+   source only properties:
+diff --git a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+index 970e1bb8af..26f9557c80 100644
+--- a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+@@ -6,9 +6,10 @@
+     "namespace": 1
+   }
+   backing store string:
+-  json:{
++  json:{"file":{
+     "driver": "nvme",
+     "device": "0000:01:00.0",
+     "namespace": 1
+   }
++  }
+ )
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-pretty-argument.patch b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-pretty-argument.patch
new file mode 100644
index 0000000..8ac3fe8
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Add-pretty-argument.patch
@@ -0,0 +1,103 @@
+From 47842f81b667134e873f4380dfb432ca86a1e50d Mon Sep 17 00:00:00 2001
+Message-Id: <47842f81b667134e873f4380dfb432ca86a1e50d@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:00 +0100
+Subject: [PATCH] qemuBlockGetBackingStoreString: Add 'pretty' argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add support for pretty-printing of the JSON variant of the output for
+consumption in tests. All current callers pass 'false'.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit a83c1dc70e724b9313436c63f57ea24023fd7076)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <9b133a1d7bf6304e0dc9017222bdc09640c11518.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c  | 8 +++++---
+ src/qemu/qemu_block.h  | 3 ++-
+ src/qemu/qemu_driver.c | 4 ++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 5697d4fc73..279b4a38b8 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2014,13 +2014,15 @@ qemuBlockStorageGetCopyOnReadProps(virDomainDiskDefPtr disk)
+ /**
+  * qemuBlockGetBackingStoreString:
+  * @src: storage source to get the string for
++ * @pretty: pretty-print the JSON (if applicable, used by tests)
+  *
+  * Formats a string used in the backing store field of a disk image which
+  * supports backing store. Non-local storage may result in use of the json:
+  * pseudo protocol for any complex configuration.
+  */
+ char *
+-qemuBlockGetBackingStoreString(virStorageSourcePtr src)
++qemuBlockGetBackingStoreString(virStorageSourcePtr src,
++                               bool pretty)
+ {
+     int actualType = virStorageSourceGetActualType(src);
+     g_autoptr(virJSONValue) backingProps = NULL;
+@@ -2087,7 +2089,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src)
+         props = sliceProps;
+     }
+ 
+-    if (!(backingJSON = virJSONValueToString(props, false)))
++    if (!(backingJSON = virJSONValueToString(props, pretty)))
+         return NULL;
+ 
+     ret = g_strdup_printf("json:%s", backingJSON);
+@@ -2115,7 +2117,7 @@ qemuBlockStorageSourceCreateAddBacking(virStorageSourcePtr backing,
+             backingFormatStr = virStorageFileFormatTypeToString(backing->format);
+     }
+ 
+-    if (!(backingFileStr = qemuBlockGetBackingStoreString(backing)))
++    if (!(backingFileStr = qemuBlockGetBackingStoreString(backing, false)))
+         return -1;
+ 
+     if (virJSONValueObjectAdd(props,
+diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
+index 75b25bfea5..506957c3d5 100644
+--- a/src/qemu/qemu_block.h
++++ b/src/qemu/qemu_block.h
+@@ -178,7 +178,8 @@ qemuBlockSnapshotAddBlockdev(virJSONValuePtr actions,
+                              virStorageSourcePtr newsrc);
+ 
+ char *
+-qemuBlockGetBackingStoreString(virStorageSourcePtr src)
++qemuBlockGetBackingStoreString(virStorageSourcePtr src,
++                               bool pretty)
+     ATTRIBUTE_NONNULL(1);
+ 
+ int
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 175a1961c2..3c3c7b6041 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17773,7 +17773,7 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm,
+         if (baseSource) {
+             nodebase = baseSource->nodeformat;
+             if (!backingPath &&
+-                !(backingPath = qemuBlockGetBackingStoreString(baseSource)))
++                !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
+                 goto endjob;
+         }
+         device = disk->src->nodeformat;
+@@ -18941,7 +18941,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
+         nodebase = baseSource->nodeformat;
+         device = qemuDomainDiskGetTopNodename(disk);
+         if (!backingPath && top_parent &&
+-            !(backingPath = qemuBlockGetBackingStoreString(baseSource)))
++            !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
+             goto endjob;
+ 
+         if (bitmapDisableActions) {
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuBlockGetBackingStoreString-Properly-handle-http-s-with-cookies-and-others.patch b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Properly-handle-http-s-with-cookies-and-others.patch
new file mode 100644
index 0000000..0cbae72
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Properly-handle-http-s-with-cookies-and-others.patch
@@ -0,0 +1,226 @@
+From 282f6724e64787451e69dd0f261c7239fa0e79ac Mon Sep 17 00:00:00 2001
+Message-Id: <282f6724e64787451e69dd0f261c7239fa0e79ac@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:07 +0100
+Subject: [PATCH] qemuBlockGetBackingStoreString: Properly handle 'http/s' with
+ cookies and others
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Format cookies into the backing store string without encryption as they
+will not be visible on the command line when formatting a 'target' only
+string. In cases when cookies or other options are used we must use the
+JSON format rather than pure URI.
+
+Add tests to validate the scenario.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 3b06103e695829c4720baaee8286f20568133ebd)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <aea5c926b86d5dad7dc78f30f2f0e8d95807e58e.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                         | 12 ++++++++++-
+ tests/qemublocktest.c                         |  2 ++
+ .../network-http-curlopts-srconly.json        | 17 ++++++++++++++++
+ .../xml2json/network-http-curlopts.json       | 15 ++++++++++++++
+ .../xml2json/network-http-curlopts.xml        | 20 +++++++++++++++++++
+ .../xml2json/network-http-noopts-srconly.json |  9 +++++++++
+ .../xml2json/network-http-noopts.json         | 14 +++++++++++++
+ .../xml2json/network-http-noopts.xml          | 15 ++++++++++++++
+ 8 files changed, 103 insertions(+), 1 deletion(-)
+ create mode 100644 tests/qemublocktestdata/xml2json/network-http-curlopts-srconly.json
+ create mode 100644 tests/qemublocktestdata/xml2json/network-http-curlopts.json
+ create mode 100644 tests/qemublocktestdata/xml2json/network-http-curlopts.xml
+ create mode 100644 tests/qemublocktestdata/xml2json/network-http-noopts-srconly.json
+ create mode 100644 tests/qemublocktestdata/xml2json/network-http-noopts.json
+ create mode 100644 tests/qemublocktestdata/xml2json/network-http-noopts.xml
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 1f48f559e3..ba7318b074 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -685,6 +685,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+     virJSONValuePtr ret = NULL;
+     g_autoptr(virURI) uri = NULL;
+     g_autofree char *uristr = NULL;
++    g_autofree char *cookiestr = NULL;
+ 
+     /**
+      * Common options:
+@@ -714,6 +715,9 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+         if (srcPriv &&
+             srcPriv->httpcookie)
+             cookiealias = srcPriv->httpcookie->s.aes.alias;
++    } else {
++        /* format target string along with cookies */
++        cookiestr = qemuBlockStorageSourceGetCookieString(src);
+     }
+ 
+     ignore_value(virJSONValueObjectCreate(&ret,
+@@ -721,6 +725,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
+                                           "S:username", username,
+                                           "S:password-secret", passwordalias,
+                                           "T:sslverify", src->sslverify,
++                                          "S:cookie", cookiestr,
+                                           "S:cookie-secret", cookiealias,
+                                           "P:timeout", src->timeout,
+                                           "P:readahead", src->readahead,
+@@ -2043,7 +2048,12 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src,
+         /* generate simplified URIs for the easy cases */
+         if (actualType == VIR_STORAGE_TYPE_NETWORK &&
+             src->nhosts == 1 &&
+-            src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) {
++            src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP &&
++            src->timeout == 0 &&
++            src->ncookies == 0 &&
++            src->sslverify == VIR_TRISTATE_BOOL_ABSENT &&
++            src->timeout == 0 &&
++            src->readahead == 0) {
+ 
+             switch ((virStorageNetProtocol) src->protocol) {
+             case VIR_STORAGE_NET_PROTOCOL_NBD:
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index cf56c8a983..8b7a50712d 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1212,6 +1212,8 @@ mymain(void)
+     TEST_DISK_TO_JSON("network-qcow2-backing-chain-cache-unsafe");
+     TEST_DISK_TO_JSON("dir-fat-cache");
+     TEST_DISK_TO_JSON("network-nbd-tls");
++    TEST_DISK_TO_JSON("network-http-noopts");
++    TEST_DISK_TO_JSON("network-http-curlopts");
+ 
+     TEST_DISK_TO_JSON("block-raw-noopts");
+     TEST_DISK_TO_JSON("block-raw-reservations");
+diff --git a/tests/qemublocktestdata/xml2json/network-http-curlopts-srconly.json b/tests/qemublocktestdata/xml2json/network-http-curlopts-srconly.json
+new file mode 100644
+index 0000000000..f5645ac2a6
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/network-http-curlopts-srconly.json
+@@ -0,0 +1,17 @@
++(
++  source only properties:
++  {
++    "driver": "https",
++    "url": "https://host1.example.com:443/something",
++    "sslverify": false,
++    "cookie": "test=123456; blurb=here"
++  }
++  backing store string:
++  json:{"file":{
++    "driver": "https",
++    "url": "https://host1.example.com:443/something",
++    "sslverify": false,
++    "cookie": "test=123456; blurb=here"
++  }
++  }
++)
+diff --git a/tests/qemublocktestdata/xml2json/network-http-curlopts.json b/tests/qemublocktestdata/xml2json/network-http-curlopts.json
+new file mode 100644
+index 0000000000..08dfd1b300
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/network-http-curlopts.json
+@@ -0,0 +1,15 @@
++{
++  "node-name": "node-b-f",
++  "read-only": false,
++  "driver": "qcow2",
++  "file": "node-a-s",
++  "backing": null
++}
++{
++  "driver": "https",
++  "url": "https://host1.example.com:443/something",
++  "sslverify": false,
++  "node-name": "node-a-s",
++  "auto-read-only": true,
++  "discard": "unmap"
++}
+diff --git a/tests/qemublocktestdata/xml2json/network-http-curlopts.xml b/tests/qemublocktestdata/xml2json/network-http-curlopts.xml
+new file mode 100644
+index 0000000000..a656247e2e
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/network-http-curlopts.xml
+@@ -0,0 +1,20 @@
++<disk type='network' device='disk'>
++  <driver name='qemu' type='qcow2'/>
++  <source protocol='https' name='/something'>
++    <host name='host1.example.com'/>
++    <ssl verify='no'/>
++    <cookies>
++      <cookie name='test'>123456</cookie>
++      <cookie name='blurb'>here</cookie>
++    </cookies>
++    <privateData>
++      <nodenames>
++        <nodename type='storage' name='node-a-s'/>
++        <nodename type='format' name='node-b-f'/>
++      </nodenames>
++    </privateData>
++  </source>
++  <backingStore/>
++  <target dev='vda' bus='virtio'/>
++  <alias name='virtio-disk0'/>
++</disk>
+diff --git a/tests/qemublocktestdata/xml2json/network-http-noopts-srconly.json b/tests/qemublocktestdata/xml2json/network-http-noopts-srconly.json
+new file mode 100644
+index 0000000000..1303623036
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/network-http-noopts-srconly.json
+@@ -0,0 +1,9 @@
++(
++  source only properties:
++  {
++    "driver": "https",
++    "url": "https://host1.example.com:443/something"
++  }
++  backing store string:
++  https://host1.example.com:443/something
++)
+diff --git a/tests/qemublocktestdata/xml2json/network-http-noopts.json b/tests/qemublocktestdata/xml2json/network-http-noopts.json
+new file mode 100644
+index 0000000000..d577858236
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/network-http-noopts.json
+@@ -0,0 +1,14 @@
++{
++  "node-name": "node-b-f",
++  "read-only": false,
++  "driver": "qcow2",
++  "file": "node-a-s",
++  "backing": null
++}
++{
++  "driver": "https",
++  "url": "https://host1.example.com:443/something",
++  "node-name": "node-a-s",
++  "auto-read-only": true,
++  "discard": "unmap"
++}
+diff --git a/tests/qemublocktestdata/xml2json/network-http-noopts.xml b/tests/qemublocktestdata/xml2json/network-http-noopts.xml
+new file mode 100644
+index 0000000000..f09ff7ba67
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/network-http-noopts.xml
+@@ -0,0 +1,15 @@
++<disk type='network' device='disk'>
++  <driver name='qemu' type='qcow2'/>
++  <source protocol='https' name='/something'>
++    <host name='host1.example.com'/>
++    <privateData>
++      <nodenames>
++        <nodename type='storage' name='node-a-s'/>
++        <nodename type='format' name='node-b-f'/>
++      </nodenames>
++    </privateData>
++  </source>
++  <backingStore/>
++  <target dev='vda' bus='virtio'/>
++  <alias name='virtio-disk0'/>
++</disk>
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuBlockGetBackingStoreString-Remove-ret-variable.patch b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Remove-ret-variable.patch
new file mode 100644
index 0000000..5f1d249
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockGetBackingStoreString-Remove-ret-variable.patch
@@ -0,0 +1,67 @@
+From 11ec875ccebe3035bb4b6e38406f22d52ed4b7fe Mon Sep 17 00:00:00 2001
+Message-Id: <11ec875ccebe3035bb4b6e38406f22d52ed4b7fe@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:03 +0100
+Subject: [PATCH] qemuBlockGetBackingStoreString: Remove 'ret' variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We can return the appropriate string directly.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit c60fe3106e8b91478e54129b4b1b81cc0543399e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <b3cb9b35035b7e2d3de21de3f067966de5e6765b.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 16 ++++------------
+ 1 file changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 279b4a38b8..20579ec7b3 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2030,13 +2030,10 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src,
+     virJSONValuePtr props = NULL;
+     g_autoptr(virURI) uri = NULL;
+     g_autofree char *backingJSON = NULL;
+-    char *ret = NULL;
+ 
+     if (!src->sliceStorage) {
+-        if (virStorageSourceIsLocalStorage(src)) {
+-            ret = g_strdup(src->path);
+-            return ret;
+-        }
++        if (virStorageSourceIsLocalStorage(src))
++            return g_strdup(src->path);
+ 
+         /* generate simplified URIs for the easy cases */
+         if (actualType == VIR_STORAGE_TYPE_NETWORK &&
+@@ -2055,10 +2052,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src,
+                 if (!(uri = qemuBlockStorageSourceGetURI(src)))
+                     return NULL;
+ 
+-                if (!(ret = virURIFormat(uri)))
+-                    return NULL;
+-
+-                return ret;
++                return virURIFormat(uri);
+ 
+             case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+             case VIR_STORAGE_NET_PROTOCOL_RBD:
+@@ -2092,9 +2086,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src,
+     if (!(backingJSON = virJSONValueToString(props, pretty)))
+         return NULL;
+ 
+-    ret = g_strdup_printf("json:%s", backingJSON);
+-
+-    return ret;
++    return g_strdup_printf("json:%s", backingJSON);
+ }
+ 
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuBlockJobDiskNewCommit-Propagate-disabledBitmapsBase.patch b/SOURCES/libvirt-qemuBlockJobDiskNewCommit-Propagate-disabledBitmapsBase.patch
new file mode 100644
index 0000000..551a140
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockJobDiskNewCommit-Propagate-disabledBitmapsBase.patch
@@ -0,0 +1,72 @@
+From 7943ddf8cee3ffa4ca2b2bfe3b440da344aebdd8 Mon Sep 17 00:00:00 2001
+Message-Id: <7943ddf8cee3ffa4ca2b2bfe3b440da344aebdd8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:28 +0100
+Subject: [PATCH] qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add an argument to qemuBlockJobDiskNewCommit to propagate the list of
+disabled bitmaps into the job data structure.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit a2bf4a13acf55864ddb11261cbaade4aedd28b9f)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <312a928fcee253b6a2657a2f30a6a0aa6d51cae9.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_blockjob.c | 2 ++
+ src/qemu/qemu_blockjob.h | 1 +
+ src/qemu/qemu_driver.c   | 2 +-
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index e894e1634d..63f1cc79c3 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -285,6 +285,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+                           virStorageSourcePtr topparent,
+                           virStorageSourcePtr top,
+                           virStorageSourcePtr base,
++                          char ***disabledBitmapsBase,
+                           bool delete_imgs,
+                           unsigned int jobflags)
+ {
+@@ -310,6 +311,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+     job->data.commit.top = top;
+     job->data.commit.base = base;
+     job->data.commit.deleteCommittedImages = delete_imgs;
++    job->data.commit.disabledBitmapsBase = g_steal_pointer(disabledBitmapsBase);
+     job->jobflags = jobflags;
+ 
+     if (qemuBlockJobRegister(job, vm, disk, true) < 0)
+diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
+index c1d95ea3d8..ee83d318f3 100644
+--- a/src/qemu/qemu_blockjob.h
++++ b/src/qemu/qemu_blockjob.h
+@@ -187,6 +187,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
+                           virStorageSourcePtr topparent,
+                           virStorageSourcePtr top,
+                           virStorageSourcePtr base,
++                          char ***disabledBitmapsBase,
+                           bool delete_imgs,
+                           unsigned int jobflags);
+ 
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 062e028b28..5c2b3cddf1 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18881,7 +18881,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     }
+ 
+     if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
+-                                          baseSource,
++                                          baseSource, NULL,
+                                           flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
+                                           flags)))
+         goto endjob;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuBlockStorageSourceCreateFormat-Force-write-access-when-formatting-images.patch b/SOURCES/libvirt-qemuBlockStorageSourceCreateFormat-Force-write-access-when-formatting-images.patch
new file mode 100644
index 0000000..e36b90d
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockStorageSourceCreateFormat-Force-write-access-when-formatting-images.patch
@@ -0,0 +1,59 @@
+From 57493d29be457a3b2a9f0c781e2a82968ec3e01d Mon Sep 17 00:00:00 2001
+Message-Id: <57493d29be457a3b2a9f0c781e2a82968ec3e01d@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 12 May 2020 17:24:09 +0200
+Subject: [PATCH] qemuBlockStorageSourceCreateFormat: Force write access when
+ formatting images
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We need qemu to be able to write the newly created images so that it can
+format them to the specified storage format.
+
+Force write access by relabelling the images when formatting.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 10d62782798cd6e4d472a764575c189247a263b3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1832204
+Message-Id: <0370c95a3990f94ef136d2de6df63d34989c672a.1589296861.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_block.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 6790f05ff7..a44774c237 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2658,6 +2658,12 @@ qemuBlockStorageSourceCreate(virDomainObjPtr vm,
+         return -1;
+     }
+ 
++    /* grant write access to read-only images during formatting */
++    if (src->readonly &&
++        qemuDomainStorageSourceAccessAllow(priv->driver, vm, src, false,
++                                           false, true) < 0)
++        return -1;
++
+     if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+         goto cleanup;
+ 
+@@ -2684,6 +2690,12 @@ qemuBlockStorageSourceCreate(virDomainObjPtr vm,
+                                            asyncJob) < 0)
+         goto cleanup;
+ 
++    /* revoke write access to read-only images during formatting */
++    if (src->readonly &&
++        qemuDomainStorageSourceAccessAllow(priv->driver, vm, src, true,
++                                           false, true) < 0)
++        goto cleanup;
++
+     if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0)
+         goto cleanup;
+ 
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemuBlockStorageSourceDetachPrepare-Get-rid-of-cleanup-section.patch b/SOURCES/libvirt-qemuBlockStorageSourceDetachPrepare-Get-rid-of-cleanup-section.patch
new file mode 100644
index 0000000..141bba5
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockStorageSourceDetachPrepare-Get-rid-of-cleanup-section.patch
@@ -0,0 +1,55 @@
+From f6f1f6ccc4ade458c159e45d51d627bcde61b303 Mon Sep 17 00:00:00 2001
+Message-Id: <f6f1f6ccc4ade458c159e45d51d627bcde61b303@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:40 +0100
+Subject: [PATCH] qemuBlockStorageSourceDetachPrepare: Get rid of cleanup
+ section
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use g_new0 to completely avoid the 'cleanup' label.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4415b11d6b68643b93014d0e505cb23c5ce63bf0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <378b5200c9dbf740d695333b367b4a2d24746049.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 5bd5c955a4..5144cf266f 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1734,10 +1734,8 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src,
+ {
+     qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
+     g_autoptr(qemuBlockStorageSourceAttachData) data = NULL;
+-    qemuBlockStorageSourceAttachDataPtr ret = NULL;
+ 
+-    if (VIR_ALLOC(data) < 0)
+-        goto cleanup;
++    data = g_new0(qemuBlockStorageSourceAttachData, 1);
+ 
+     if (driveAlias) {
+         data->driveAlias = g_steal_pointer(&driveAlias);
+@@ -1771,11 +1769,7 @@ qemuBlockStorageSourceDetachPrepare(virStorageSourcePtr src,
+             data->encryptsecretAlias = g_strdup(srcpriv->encinfo->s.aes.alias);
+     }
+ 
+-    ret = g_steal_pointer(&data);
+-
+- cleanup:
+-    VIR_FREE(driveAlias);
+-    return ret;
++    return g_steal_pointer(&data);
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuBlockStorageSourceGetBackendProps-Report-errors-on-all-switch-cases.patch b/SOURCES/libvirt-qemuBlockStorageSourceGetBackendProps-Report-errors-on-all-switch-cases.patch
new file mode 100644
index 0000000..a34a367
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockStorageSourceGetBackendProps-Report-errors-on-all-switch-cases.patch
@@ -0,0 +1,65 @@
+From d08dae3e94778cf5860b6bd7b34bfbdc4741464c Mon Sep 17 00:00:00 2001
+Message-Id: <d08dae3e94778cf5860b6bd7b34bfbdc4741464c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:52 +0100
+Subject: [PATCH] qemuBlockStorageSourceGetBackendProps: Report errors on all
+ switch cases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Few switch cases returned failure but didn't report an error. For a
+situation when the backingStore type='volume' was not translated the
+following error would occur:
+
+ $ virsh start VM
+ error: Failed to start domain VM
+ error: An error occurred, but the cause is unknown
+
+After this patch:
+
+ $ virsh start VM
+ error: Failed to start domain VM
+ error: internal error: storage source pool 'tmp' volume 'pull3.qcow2' is not translated
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4e3e69fed45ac58bf19ebbe910213cb552d51f01)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <43cca40afafd5de0aad1f477d63b21d1b10ba796.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 63116ef5f2..0ee10dd770 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1081,8 +1081,14 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src,
+         break;
+ 
+     case VIR_STORAGE_TYPE_VOLUME:
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("storage source pool '%s' volume '%s' is not translated"),
++                       src->srcpool->pool, src->srcpool->volume);
++        return NULL;
++
+     case VIR_STORAGE_TYPE_NONE:
+     case VIR_STORAGE_TYPE_LAST:
++        virReportEnumRangeError(virStorageType, actualType);
+         return NULL;
+ 
+     case VIR_STORAGE_TYPE_NETWORK:
+@@ -1141,6 +1147,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src,
+ 
+         case VIR_STORAGE_NET_PROTOCOL_NONE:
+         case VIR_STORAGE_NET_PROTOCOL_LAST:
++            virReportEnumRangeError(virStorageNetProtocol, src->protocol);
+             return NULL;
+         }
+         break;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuBlockStorageSourceGetFormatRawProps-format-offset-and-size-for-slice.patch b/SOURCES/libvirt-qemuBlockStorageSourceGetFormatRawProps-format-offset-and-size-for-slice.patch
new file mode 100644
index 0000000..70bec7d
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockStorageSourceGetFormatRawProps-format-offset-and-size-for-slice.patch
@@ -0,0 +1,58 @@
+From 23fcd1d6a87e0fcbffc8d4ddfa9cf2b7a226cdd5 Mon Sep 17 00:00:00 2001
+Message-Id: <23fcd1d6a87e0fcbffc8d4ddfa9cf2b7a226cdd5@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:16 +0100
+Subject: [PATCH] qemuBlockStorageSourceGetFormatRawProps: format 'offset' and
+ 'size' for slice
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If we have a 'format' type slice for a raw driver we can directly format
+the values.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c4818812831967b8f882b2c33780aab129e245a2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <beee894a1f4af469391cee6a42a3e95e8946df98.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 710ddfd2cf..b408d4c81f 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1194,16 +1194,21 @@ qemuBlockStorageSourceGetFormatRawProps(virStorageSourcePtr src,
+         secretalias = srcPriv->encinfo->s.aes.alias;
+     }
+ 
+-    /* currently unhandled properties for the 'raw' driver:
+-     * 'offset'
+-     * 'size'
+-     */
+-
+     if (virJSONValueObjectAdd(props,
+                               "s:driver", driver,
+                               "S:key-secret", secretalias, NULL) < 0)
+         return -1;
+ 
++    /* Currently only storage slices are supported. We'll have to calculate
++     * the union of the slices here if we don't want to be adding needless
++     * 'raw' nodes. */
++    if (src->sliceStorage &&
++        virJSONValueObjectAdd(props,
++                              "U:offset", src->sliceStorage->offset,
++                              "U:size", src->sliceStorage->size,
++                              NULL) < 0)
++        return -1;
++
+     return 0;
+ }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuBlockStorageSourceGetURI-Pass-through-query-component.patch b/SOURCES/libvirt-qemuBlockStorageSourceGetURI-Pass-through-query-component.patch
new file mode 100644
index 0000000..259f558
--- /dev/null
+++ b/SOURCES/libvirt-qemuBlockStorageSourceGetURI-Pass-through-query-component.patch
@@ -0,0 +1,136 @@
+From 2d27c71da092e9232c2d79738a431c04db649a96 Mon Sep 17 00:00:00 2001
+Message-Id: <2d27c71da092e9232c2d79738a431c04db649a96@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:46 +0200
+Subject: [PATCH] qemuBlockStorageSourceGetURI: Pass through query component
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the storage source has the query part set, format it in the output.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 216860dd8b93c7da4d625055cf353e0eedda6093)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <832f573fd69341b7d730925c9df5b23e5f168408.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_block.c                                    | 2 ++
+ src/qemu/qemu_domain.c                                   | 9 +++++++++
+ tests/qemuxml2argvdata/disk-cdrom-network.args           | 4 ++--
+ .../disk-cdrom-network.x86_64-2.12.0.args                | 4 ++--
+ .../disk-cdrom-network.x86_64-latest.args                | 3 ++-
+ tests/qemuxml2argvdata/disk-cdrom-network.xml            | 2 +-
+ .../disk-network-http.x86_64-latest.args                 | 5 +++--
+ 7 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index e7577c1312..6790f05ff7 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -437,6 +437,8 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src)
+         }
+     }
+ 
++    uri->query = g_strdup(src->query);
++
+     uri->server = g_strdup(src->hosts->name);
+ 
+     return g_steal_pointer(&uri);
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 4007b4dbda..bb28716ff0 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -7107,6 +7107,15 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
+         }
+     }
+ 
++    if (src->query &&
++        (actualType != VIR_STORAGE_TYPE_NETWORK ||
++         (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
++          src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP))) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("query is supported only with HTTP(S) protocols"));
++        return -1;
++    }
++
+     return 0;
+ }
+ 
+diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args
+index be19bad68a..81ff324a0f 100644
+--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
++++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
+@@ -30,8 +30,8 @@ id=drive-ide0-0-0,readonly=on \
+ -drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\
+ id=drive-ide0-0-1,readonly=on \
+ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
+--drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\
+-id=drive-ide0-1-0,readonly=on \
++-drive 'file=https://host.name:443/url/path/file.iso?test=val,format=raw,\
++if=none,id=drive-ide0-1-0,readonly=on' \
+ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
+ -drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\
+ id=drive-ide0-1-1,readonly=on \
+diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
+index 1ece3d6f46..81f6b400aa 100644
+--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
++++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
+@@ -32,8 +32,8 @@ id=drive-ide0-0-0,readonly=on \
+ -drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\
+ id=drive-ide0-0-1,readonly=on \
+ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
+--drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\
+-id=drive-ide0-1-0,readonly=on \
++-drive 'file=https://host.name:443/url/path/file.iso?test=val,format=raw,\
++if=none,id=drive-ide0-1-0,readonly=on' \
+ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
+ -drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\
+ id=drive-ide0-1-1,readonly=on \
+diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
+index 0b4ac07f07..2515b256d0 100644
+--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
+@@ -37,7 +37,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw",\
+ "file":"libvirt-3-storage"}' \
+ -device ide-cd,bus=ide.0,unit=1,drive=libvirt-3-format,id=ide0-0-1 \
+--blockdev '{"driver":"https","url":"https://host.name:443/url/path/file.iso",\
++-blockdev '{"driver":"https",\
++"url":"https://host.name:443/url/path/file.iso?test=val",\
+ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw",\
+ "file":"libvirt-2-storage"}' \
+diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.xml b/tests/qemuxml2argvdata/disk-cdrom-network.xml
+index 0bdc0e1883..44473f8ad4 100644
+--- a/tests/qemuxml2argvdata/disk-cdrom-network.xml
++++ b/tests/qemuxml2argvdata/disk-cdrom-network.xml
+@@ -39,7 +39,7 @@
+     </disk>
+     <disk type='network' device='cdrom'>
+       <driver name='qemu' type='raw'/>
+-      <source protocol='https' name='/url/path/file.iso'>
++      <source protocol='https' name='/url/path/file.iso' query='test=val'>
+         <host name='host.name' port='443'/>
+       </source>
+       <target dev='hdc' bus='ide'/>
+diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+index 46aa5f23ce..d1bf0b9caa 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+@@ -54,8 +54,9 @@ id=virtio-disk2 \
+ -object secret,id=libvirt-1-storage-httpcookie-secret0,\
+ data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+--blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
+-"sslverify":false,"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\
++-blockdev '{"driver":"https",\
++"url":"https://example.org:1234/test4.img?par=val&other=ble","sslverify":false,\
++"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\
+ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-1-storage"}' \
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuBuildMemoryBackendProps-Pass-priv-instead-of-its-individual-members.patch b/SOURCES/libvirt-qemuBuildMemoryBackendProps-Pass-priv-instead-of-its-individual-members.patch
deleted file mode 100644
index 778d3b0..0000000
--- a/SOURCES/libvirt-qemuBuildMemoryBackendProps-Pass-priv-instead-of-its-individual-members.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c59ebd3e7bd1307ef6907a830dc9617eb6fe39b2 Mon Sep 17 00:00:00 2001
-Message-Id: <c59ebd3e7bd1307ef6907a830dc9617eb6fe39b2@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Dec 2018 11:47:35 +0100
-Subject: [PATCH] qemuBuildMemoryBackendProps: Pass @priv instead of its
- individual members
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624223
-
-So far we have two arguments that we are passing to
-qemuBuildMemoryBackendProps() and that are taken from domain
-private data: @qemuCaps and @autoNodeset. In the next commit I
-will use one more item from there. Therefore, instead of having
-it as yet another argument to the function, pass pointer to the
-private data object.
-
-There is one change in qemuDomainAttachMemory() where previously
-@autoNodeset was NULL but now is priv->autoNodeset (which may be
-set). This is safe to do as @autoNodeset is advisory only.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 9923584c628e160705124ad81d782a7214aac8d3)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-
-Conflicts:
-src/qemu/qemu_command.c: Context mostly, as memfd backend is not
-                         backported (24b74d187ca).
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <71d56cdc7e5cdd0c9b664ded2a4cf93e3e9d38b0.1545129996.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c | 28 +++++++++++++---------------
- src/qemu/qemu_command.h |  3 +--
- src/qemu/qemu_hotplug.c |  2 +-
- 3 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index c06f396b44..fa2b904239 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3041,22 +3041,21 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
-  * @backendProps: [out] constructed object
-  * @alias: alias of the device
-  * @cfg: qemu driver config object
-- * @qemuCaps: qemu capabilities object
-+ * @priv: pointer to domain private object
-  * @def: domain definition object
-  * @mem: memory definition object
-- * @autoNodeset: fallback nodeset in case of automatic NUMA placement
-  * @force: forcibly use one of the backends
-  *
-  * Creates a configuration object that represents memory backend of given guest
-- * NUMA node (domain @def and @mem). Use @autoNodeset to fine tune the
-+ * NUMA node (domain @def and @mem). Use @priv->autoNodeset to fine tune the
-  * placement of the memory on the host NUMA nodes.
-  *
-  * By default, if no memory-backend-* object is necessary to fulfil the guest
-  * configuration value of 1 is returned. This behaviour can be suppressed by
-  * setting @force to true in which case 0 would be returned.
-  *
-- * Then, if one of the two memory-backend-* should be used, the @qemuCaps is
-- * consulted to check if qemu does support it.
-+ * Then, if one of the two memory-backend-* should be used, the @priv->qemuCaps
-+ * is consulted to check if qemu does support it.
-  *
-  * Returns: 0 on success,
-  *          1 on success and if there's no need to use memory-backend-*
-@@ -3066,10 +3065,9 @@ int
- qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-                             const char *alias,
-                             virQEMUDriverConfigPtr cfg,
--                            virQEMUCapsPtr qemuCaps,
-+                            qemuDomainObjPrivatePtr priv,
-                             virDomainDefPtr def,
-                             virDomainMemoryDefPtr mem,
--                            virBitmapPtr autoNodeset,
-                             bool force)
- {
-     const char *backendType = "memory-backend-file";
-@@ -3207,7 +3205,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
- 
-         if (!mem->nvdimmPath &&
-             discard == VIR_TRISTATE_BOOL_YES) {
--            if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD)) {
-+            if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD)) {
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                _("this QEMU doesn't support memory discard"));
-                 goto cleanup;
-@@ -3244,7 +3242,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-     if (mem->sourceNodes) {
-         nodemask = mem->sourceNodes;
-     } else {
--        if (virDomainNumatuneMaybeGetNodeset(def->numa, autoNodeset,
-+        if (virDomainNumatuneMaybeGetNodeset(def->numa, priv->autoNodeset,
-                                              &nodemask, mem->targetNode) < 0)
-             goto cleanup;
-     }
-@@ -3270,13 +3268,13 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-     } else {
-         /* otherwise check the required capability */
-         if (STREQ(backendType, "memory-backend-file") &&
--            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) {
-+            !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                            _("this qemu doesn't support the "
-                              "memory-backend-file object"));
-             goto cleanup;
-         } else if (STREQ(backendType, "memory-backend-ram") &&
--                   !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM)) {
-+                   !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM)) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                            _("this qemu doesn't support the "
-                              "memory-backend-ram object"));
-@@ -3319,8 +3317,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
-     mem.targetNode = cell;
-     mem.info.alias = alias;
- 
--    if ((rc = qemuBuildMemoryBackendProps(&props, alias, cfg, priv->qemuCaps,
--                                          def, &mem, priv->autoNodeset, false)) < 0)
-+    if ((rc = qemuBuildMemoryBackendProps(&props, alias, cfg,
-+                                          priv, def, &mem, false)) < 0)
-         goto cleanup;
- 
-     if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0)
-@@ -3356,8 +3354,8 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf,
-     if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0)
-         goto cleanup;
- 
--    if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv->qemuCaps,
--                                    def, mem, priv->autoNodeset, true) < 0)
-+    if (qemuBuildMemoryBackendProps(&props, alias, cfg,
-+                                    priv, def, mem, true) < 0)
-         goto cleanup;
- 
-     if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0)
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index e8cd8ed04e..bf46bde48f 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -125,10 +125,9 @@ int qemuBuildControllerDevStr(const virDomainDef *domainDef,
- int qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-                                 const char *alias,
-                                 virQEMUDriverConfigPtr cfg,
--                                virQEMUCapsPtr qemuCaps,
-+                                qemuDomainObjPrivatePtr priv,
-                                 virDomainDefPtr def,
-                                 virDomainMemoryDefPtr mem,
--                                virBitmapPtr autoNodeset,
-                                 bool force);
- 
- char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem);
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 410cdca3c5..5b9a5683bb 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -2121,7 +2121,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
-         goto cleanup;
- 
-     if (qemuBuildMemoryBackendProps(&props, objalias, cfg,
--                                    priv->qemuCaps, vm->def, mem, NULL, true) < 0)
-+                                    priv, vm->def, mem, true) < 0)
-         goto cleanup;
- 
-     if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemuCheckpointCreateXML-Check-VM-liveness-first.patch b/SOURCES/libvirt-qemuCheckpointCreateXML-Check-VM-liveness-first.patch
new file mode 100644
index 0000000..ec95846
--- /dev/null
+++ b/SOURCES/libvirt-qemuCheckpointCreateXML-Check-VM-liveness-first.patch
@@ -0,0 +1,57 @@
+From 5155fcbbff955e9c1446b3564af2252a5c15548a Mon Sep 17 00:00:00 2001
+Message-Id: <5155fcbbff955e9c1446b3564af2252a5c15548a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 3 Apr 2020 14:32:56 +0200
+Subject: [PATCH] qemuCheckpointCreateXML: Check VM liveness first
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move the liveness check prior to the capability check. If the VM is
+offline the capabilities are not initialized and thus we'd report the
+wrong error.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1812531
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 4257c203737e5ef616588e80794cc705a5fb475a)
+
+Note that this patch is backported as a conflict resolution for the bugs
+below
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1819755
+
+Message-Id: <94fcc1654f3e2fb2d4c1da07347d686180bac532.1585916255.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 19822bd74d..16480518fa 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -649,15 +649,15 @@ qemuCheckpointCreateXML(virDomainPtr domain,
+         update_current = false;
+     }
+ 
+-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
++    if (!virDomainObjIsActive(vm)) {
+         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+-                       _("incremental backup is not supported yet"));
++                       _("cannot create checkpoint for inactive domain"));
+         return NULL;
+     }
+ 
+-    if (!virDomainObjIsActive(vm)) {
++    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) {
+         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+-                       _("cannot create checkpoint for inactive domain"));
++                       _("incremental backup is not supported yet"));
+         return NULL;
+     }
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Reopen-images-for-bitmap-modifications.patch b/SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Reopen-images-for-bitmap-modifications.patch
new file mode 100644
index 0000000..a5fc7df
--- /dev/null
+++ b/SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Reopen-images-for-bitmap-modifications.patch
@@ -0,0 +1,54 @@
+From 74ee4616dd3159f4456ec9d4fd22b4604394440b Mon Sep 17 00:00:00 2001
+Message-Id: <74ee4616dd3159f4456ec9d4fd22b4604394440b@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:17 +0100
+Subject: [PATCH] qemuCheckpointDiscardBitmaps: Reopen images for bitmap
+ modifications
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Qemu's bitmap APIs don't reopen the appropriate images read-write for
+modification. It's libvirt's duty to reopen them via blockdev-reopen
+if we wish to modify the bitmaps.
+
+Use the new helpers to reopen the images for bitmap manipulation.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit c6d117528cc0ddb325abd67d69b6d4ebc1bfe608)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <c5378d64ab79d29e62b5b65d1566825b5bc88eff.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index fe54af74ec..6e3a432022 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -302,6 +302,10 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+                                                false, false, false) < 0)
+             goto relabel;
+ 
++        if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) &&
++            qemuBlockReopenReadWrite(vm, src, QEMU_ASYNC_JOB_NONE) < 0)
++            goto relabel;
++
+         relabelimages = g_slist_prepend(relabelimages, src);
+     }
+ 
+@@ -314,6 +318,9 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     for (next = relabelimages; next; next = next->next) {
+         virStorageSourcePtr src = next->data;
+ 
++        if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
++            ignore_value(qemuBlockReopenReadOnly(vm, src, QEMU_ASYNC_JOB_NONE));
++
+         ignore_value(qemuDomainStorageSourceAccessAllow(driver, vm, src,
+                                                         true, false, false));
+     }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Use-correct-field-for-checkpoint-bitmap-name.patch b/SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Use-correct-field-for-checkpoint-bitmap-name.patch
new file mode 100644
index 0000000..493690d
--- /dev/null
+++ b/SOURCES/libvirt-qemuCheckpointDiscardBitmaps-Use-correct-field-for-checkpoint-bitmap-name.patch
@@ -0,0 +1,40 @@
+From ec3392c1d5a9886279ee086ee3d421106b9b1e32 Mon Sep 17 00:00:00 2001
+Message-Id: <ec3392c1d5a9886279ee086ee3d421106b9b1e32@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:18 +0100
+Subject: [PATCH] qemuCheckpointDiscardBitmaps: Use correct field for
+ checkpoint bitmap name
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The code deleting checkpoints needs the name of the parent checkpoint's
+disk's bitmap but was using the disk alias instead. This would create
+wrong bitmaps after deleting some checkpoints.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 0ce8b0fbe2d0cbaf26da0402270720b776ebfb0f)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <c32db1af44e71870d172233acdfddf050ed73441.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_checkpoint.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 6e3a432022..19822bd74d 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -285,7 +285,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+          * ancestor. */
+         if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, parent,
+                                                                   chkdisk->name)))
+-            parentbitmap = parentchkdisk->name;
++            parentbitmap = parentchkdisk->bitmap;
+ 
+         if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, blockNamedNodeData,
+                                              chkdisk->bitmap, parentbitmap,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainBlockCommit-Handle-bitmaps-on-start-of-commit.patch b/SOURCES/libvirt-qemuDomainBlockCommit-Handle-bitmaps-on-start-of-commit.patch
new file mode 100644
index 0000000..d21c343
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockCommit-Handle-bitmaps-on-start-of-commit.patch
@@ -0,0 +1,96 @@
+From e735d0f163806b34f9e65dacdf5e10b52c0478fd Mon Sep 17 00:00:00 2001
+Message-Id: <e735d0f163806b34f9e65dacdf5e10b52c0478fd@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:29 +0100
+Subject: [PATCH] qemuDomainBlockCommit: Handle bitmaps on start of commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On start of the commit job, we need to disable any active bitmap in the
+base. Use qemuBlockBitmapsHandleCommitStart to calculate which and call
+the appropriate QMP APIs. We use blockdev-reopen to make the 'base'
+writable to disable the bitmaps.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 2b9091f089279a7bac523095a2ccd146fa20800b)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <2aca5706f8412d27ff38da69582c522aca058054.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 43 +++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 42 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 5c2b3cddf1..2f8fee2ef0 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18724,6 +18724,8 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     const char *nodebase = NULL;
+     bool persistjob = false;
+     bool blockdev = false;
++    g_autoptr(virJSONValue) bitmapDisableActions = NULL;
++    VIR_AUTOSTRINGLIST bitmapDisableList = NULL;
+ 
+     virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW |
+                   VIR_DOMAIN_BLOCK_COMMIT_ACTIVE |
+@@ -18880,8 +18882,29 @@ qemuDomainBlockCommit(virDomainPtr dom,
+             goto endjob;
+     }
+ 
++    if (blockdev &&
++        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) {
++        g_autoptr(virHashTable) blockNamedNodeData = NULL;
++        if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
++            goto endjob;
++
++        if (qemuBlockBitmapsHandleCommitStart(topSource, baseSource,
++                                              blockNamedNodeData,
++                                              &bitmapDisableActions,
++                                              &bitmapDisableList) < 0)
++            goto endjob;
++
++        /* if we don't have terminator on 'base' we can't reopen it */
++        if (bitmapDisableActions && !baseSource->backingStore) {
++            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
++                           _("can't handle bitmaps on unterminated backing image '%s'"),
++                           base);
++            goto endjob;
++        }
++    }
++
+     if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
+-                                          baseSource, NULL,
++                                          baseSource, &bitmapDisableList,
+                                           flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
+                                           flags)))
+         goto endjob;
+@@ -18903,6 +18926,24 @@ qemuDomainBlockCommit(virDomainPtr dom,
+         if (!backingPath && top_parent &&
+             !(backingPath = qemuBlockGetBackingStoreString(baseSource)))
+             goto endjob;
++
++        if (bitmapDisableActions) {
++            int rc;
++
++            if (qemuBlockReopenReadWrite(vm, baseSource, QEMU_ASYNC_JOB_NONE) < 0)
++                goto endjob;
++
++            qemuDomainObjEnterMonitor(driver, vm);
++            rc = qemuMonitorTransaction(priv->mon, &bitmapDisableActions);
++            if (qemuDomainObjExitMonitor(driver, vm) < 0)
++                goto endjob;
++
++            if (qemuBlockReopenReadOnly(vm, baseSource, QEMU_ASYNC_JOB_NONE) < 0)
++                goto endjob;
++
++            if (rc < 0)
++                goto endjob;
++        }
+     } else {
+         device = job->name;
+     }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainBlockCommit-Move-checks-depending-on-capabilities-after-liveness-check.patch b/SOURCES/libvirt-qemuDomainBlockCommit-Move-checks-depending-on-capabilities-after-liveness-check.patch
new file mode 100644
index 0000000..e377e10
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockCommit-Move-checks-depending-on-capabilities-after-liveness-check.patch
@@ -0,0 +1,70 @@
+From b482f451983e159f3e9752c8d4f2f5d36e6e9dce Mon Sep 17 00:00:00 2001
+Message-Id: <b482f451983e159f3e9752c8d4f2f5d36e6e9dce@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:19 +0100
+Subject: [PATCH] qemuDomainBlockCommit: Move checks depending on capabilities
+ after liveness check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since capabilities are not present for inactive VMs we'd report that we
+don't support '--delete' or committing while checkpoints exist rather
+than the proper error.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit d4b5bb5d56e0ba346a01c605b7316f4394907115)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <74ee257babd3eb042be2fcc5d3a101d503b99ad2.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 441bb02b6b..062e028b28 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18738,9 +18738,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     if (virDomainBlockCommitEnsureACL(dom->conn, vm->def) < 0)
+         goto cleanup;
+ 
+-    if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
+-        goto cleanup;
+-
+     if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+         goto cleanup;
+ 
+@@ -18749,12 +18746,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
+ 
+     blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
+ 
+-    if (!blockdev && (flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE)) {
+-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+-                       _("deleting committed images is not supported by this VM"));
+-        goto endjob;
+-    }
+-
+     /* Convert bandwidth MiB to bytes, if necessary */
+     if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) {
+         if (speed > LLONG_MAX >> 20) {
+@@ -18779,6 +18770,15 @@ qemuDomainBlockCommit(virDomainPtr dom,
+     if (qemuDomainDiskBlockJobIsActive(disk))
+         goto endjob;
+ 
++    if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
++        goto endjob;
++
++    if (!blockdev && (flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE)) {
++        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                       _("deleting committed images is not supported by this VM"));
++        goto endjob;
++    }
++
+     if (!top || STREQ(top, disk->dst))
+         topSource = disk->src;
+     else if (virStorageFileParseChainIndex(disk->dst, top, &topIndex) < 0 ||
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainBlockCopyCommon-Record-updated-flags-to-block-job.patch b/SOURCES/libvirt-qemuDomainBlockCopyCommon-Record-updated-flags-to-block-job.patch
new file mode 100644
index 0000000..cf6e8b3
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockCopyCommon-Record-updated-flags-to-block-job.patch
@@ -0,0 +1,49 @@
+From 60e014701c6406fd3e1c68a1745e25ffcf918288 Mon Sep 17 00:00:00 2001
+Message-Id: <60e014701c6406fd3e1c68a1745e25ffcf918288@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:37 +0100
+Subject: [PATCH] qemuDomainBlockCopyCommon: Record updated flags to block job
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For a long time we've masked out VIR_DOMAIN_BLOCK_COPY_SHALLOW if
+there's no backing chain for the copied disk to simplify the code.
+
+One of the refactors of the block copy code caused that we no longer
+update the 'flags' variable just the local copies. This was okay until
+in ccd4228afff we started storing the job flags in the block job data.
+
+Given that we modify how we call qemu we also should modify @flags so
+that the correct value is recorded in the block job data.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit c2b6bc73774f6202e6368ea6823ce9b1cf3521f7)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1803092
+Message-Id: <71dccc8326d856c3d014c6290524a9da4a75e2df.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index bedd69ea2b..5a4e979907 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -18242,8 +18242,10 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
+     }
+ 
+     /* clear the _SHALLOW flag if there is only one layer */
+-    if (!virStorageSourceHasBacking(disk->src))
++    if (!virStorageSourceHasBacking(disk->src)) {
++        flags &= ~VIR_DOMAIN_BLOCK_COPY_SHALLOW;
+         mirror_shallow = false;
++    }
+ 
+     if (qemuDomainBlockCopyCommonValidateUserMirrorBackingStore(mirror,
+                                                                 mirror_shallow,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainBlockPivot-Copy-bitmaps-backing-checkpoints-for-virDomainBlockCopy.patch b/SOURCES/libvirt-qemuDomainBlockPivot-Copy-bitmaps-backing-checkpoints-for-virDomainBlockCopy.patch
new file mode 100644
index 0000000..79b9b89
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockPivot-Copy-bitmaps-backing-checkpoints-for-virDomainBlockCopy.patch
@@ -0,0 +1,84 @@
+From 85658fdaaf7b24f64c31950f4bf710c0dcdafacd Mon Sep 17 00:00:00 2001
+Message-Id: <85658fdaaf7b24f64c31950f4bf710c0dcdafacd@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:27 +0100
+Subject: [PATCH] qemuDomainBlockPivot: Copy bitmaps backing checkpoints for
+ virDomainBlockCopy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use qemuBlockBitmapsHandleBlockcopy to calculate bitmaps to copy over
+for a block-copy job.
+
+We copy them when pivoting to the new image as at that point we are
+certain that we don't dirty any bitmap unnecessarily.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 54030892f5122ef120c1e8ffb6e0546871030272)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <c60a7a567a634836370fc9c0c38317569fa5a22d.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 28 +++++++++++++++++++++++++---
+ 1 file changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 71c75b25a6..caeb76a20c 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17552,6 +17552,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+     int ret = -1;
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
++    g_autoptr(virJSONValue) actions = NULL;
+ 
+     switch ((qemuBlockJobType) job->type) {
+     case QEMU_BLOCKJOB_TYPE_NONE:
+@@ -17572,6 +17573,20 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         return -1;
+ 
+     case QEMU_BLOCKJOB_TYPE_COPY:
++        if (blockdev && !job->jobflagsmissing) {
++            g_autoptr(virHashTable) blockNamedNodeData = NULL;
++            bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
++
++            if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
++                return -1;
++
++            if (qemuBlockBitmapsHandleBlockcopy(disk->src, disk->mirror,
++                                                blockNamedNodeData,
++                                                shallow, &actions) < 0)
++                return -1;
++        }
++        break;
++
+     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+         break;
+     }
+@@ -17584,10 +17599,17 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+     }
+ 
+     qemuDomainObjEnterMonitor(driver, vm);
+-    if (blockdev)
+-        ret = qemuMonitorJobComplete(priv->mon, job->name);
+-    else
++    if (blockdev) {
++        int rc = 0;
++
++        if (actions)
++            rc = qemuMonitorTransaction(priv->mon, &actions);
++
++        if (rc == 0)
++            ret = qemuMonitorJobComplete(priv->mon, job->name);
++    } else {
+         ret = qemuMonitorDrivePivot(priv->mon, job->name);
++    }
+     if (qemuDomainObjExitMonitor(driver, vm) < 0)
+         return -1;
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuDomainBlockPivot-Handle-merging-of-bitmaps-when-pivoting-an-active-block-commit.patch b/SOURCES/libvirt-qemuDomainBlockPivot-Handle-merging-of-bitmaps-when-pivoting-an-active-block-commit.patch
new file mode 100644
index 0000000..6d902d1
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockPivot-Handle-merging-of-bitmaps-when-pivoting-an-active-block-commit.patch
@@ -0,0 +1,61 @@
+From fa5d6a3c048e15f466a5bd2f7cc6de0b106d69a2 Mon Sep 17 00:00:00 2001
+Message-Id: <fa5d6a3c048e15f466a5bd2f7cc6de0b106d69a2@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:30 +0100
+Subject: [PATCH] qemuDomainBlockPivot: Handle merging of bitmaps when pivoting
+ an active block-commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Active layer block commit makes the 'base' image the new top image of
+the disk after it finishes. This means that all bitmap operations need
+to be handled prior to this happening as we'd lose writes otherwise.
+
+The ideal place is to handle it when pivoting to the new image as only
+guest-writes would be happening after this point.
+
+Use qemuBlockBitmapsHandleCommitFinish to calculate the merging
+transaction.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 8502b4b0595ac040f22e1ec8c2ab6375506c14a3)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <7fbaf9f9a8533489334c5b08e6451b23011ab657.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 2f8fee2ef0..05e525e935 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17626,6 +17626,23 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         break;
+ 
+     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
++        /* we technically don't need reopen here, but we couldn't prepare
++         * the bitmaps if it wasn't present thus must skip this */
++        if (blockdev &&
++            virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) {
++            g_autoptr(virHashTable) blockNamedNodeData = NULL;
++
++            if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
++                return -1;
++
++            if (qemuBlockBitmapsHandleCommitFinish(job->data.commit.top,
++                                                   job->data.commit.base,
++                                                   blockNamedNodeData,
++                                                   &actions,
++                                                   job->data.commit.disabledBitmapsBase) < 0)
++                return -1;
++        }
++
+         break;
+     }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainBlockPivot-Ignore-failures-of-creating-active-layer-bitmap.patch b/SOURCES/libvirt-qemuDomainBlockPivot-Ignore-failures-of-creating-active-layer-bitmap.patch
new file mode 100644
index 0000000..17a09fa
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockPivot-Ignore-failures-of-creating-active-layer-bitmap.patch
@@ -0,0 +1,42 @@
+From 0084cc867b6de11a1b5ac1207ada57a3cc43acaf Mon Sep 17 00:00:00 2001
+Message-Id: <0084cc867b6de11a1b5ac1207ada57a3cc43acaf@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 21 Jul 2020 13:56:25 +0200
+Subject: [PATCH] qemuDomainBlockPivot: Ignore failures of creating active
+ layer bitmap
+
+Ignore errors from creating "libvirt-tmp-activewrite" bitmap. This
+prevents failures of finishing blockjobs if the bitmap already exists.
+
+Note that if the bitmap exists, the worst case that can happen is that
+more bits are marked as dirty in the resulting merge.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 66dc4992fa8a51c4e774d32bcf75f26b1365e998)
+
+rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
+rhel-av-8.2.1: not cloned yet
+Message-Id: <9cec292732836005d59b50a0701acb804ed1dda5.1595332476.git.pkrempa@redhat.com>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 454d7b1c16..b5df0c63d4 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17659,7 +17659,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         }
+ 
+         if (bitmapactions && rc == 0)
+-            rc = qemuMonitorTransaction(priv->mon, &bitmapactions);
++            ignore_value(qemuMonitorTransaction(priv->mon, &bitmapactions));
+ 
+         if (rc == 0)
+             ret = qemuMonitorJobComplete(priv->mon, job->name);
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuDomainBlockPivot-Move-check-prior-to-executing-the-pivot-steps.patch b/SOURCES/libvirt-qemuDomainBlockPivot-Move-check-prior-to-executing-the-pivot-steps.patch
new file mode 100644
index 0000000..946b816
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockPivot-Move-check-prior-to-executing-the-pivot-steps.patch
@@ -0,0 +1,60 @@
+From 5e36101be25d8e80eb14635d9e3eccccaba43550 Mon Sep 17 00:00:00 2001
+Message-Id: <5e36101be25d8e80eb14635d9e3eccccaba43550@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:36 +0100
+Subject: [PATCH] qemuDomainBlockPivot: Move check prior to executing the pivot
+ steps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move the check whether the job is already synchronised to the beginning
+of the function so that we don't try to do some of the steps necessary
+for pivoting prior to actually wanting to pivot.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit a89ba6524c01473f3e5272dc787f01f806df32bb)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1803092
+Message-Id: <17682fad2c82b2f48505b3f8776bb75201eb2d89.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 0bdb2851ec..bedd69ea2b 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17561,6 +17561,13 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+     bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
+     g_autoptr(virJSONValue) actions = NULL;
+ 
++    if (job->state != QEMU_BLOCKJOB_STATE_READY) {
++        virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
++                       _("block job '%s' not ready for pivot yet"),
++                       job->name);
++        return -1;
++    }
++
+     switch ((qemuBlockJobType) job->type) {
+     case QEMU_BLOCKJOB_TYPE_NONE:
+     case QEMU_BLOCKJOB_TYPE_LAST:
+@@ -17598,13 +17605,6 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+         break;
+     }
+ 
+-    if (job->state != QEMU_BLOCKJOB_STATE_READY) {
+-        virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
+-                       _("block job '%s' not ready for pivot yet"),
+-                       job->name);
+-        return -1;
+-    }
+-
+     qemuDomainObjEnterMonitor(driver, vm);
+     if (blockdev) {
+         int rc = 0;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainBlockPivot-Rename-actions-to-bitmapactions.patch b/SOURCES/libvirt-qemuDomainBlockPivot-Rename-actions-to-bitmapactions.patch
new file mode 100644
index 0000000..3054d1d
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainBlockPivot-Rename-actions-to-bitmapactions.patch
@@ -0,0 +1,73 @@
+From 31a752d5bdd63d431b619ec5045b431fc3ca6bef Mon Sep 17 00:00:00 2001
+Message-Id: <31a752d5bdd63d431b619ec5045b431fc3ca6bef@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 21 Jul 2020 13:56:24 +0200
+Subject: [PATCH] qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions'
+
+There are two possible 'transaction' command arguments in the function.
+Rename 'actions' as they deal with creating bitmaps only.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 24ac1a7c04fded2f8639478abead72bb57506162)
+
+rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
+rhel-av-8.2.1: not cloned yet
+Message-Id: <6a3969721f1e701a16eb3679dcc37c9908c753ae.1595332476.git.pkrempa@redhat.com>
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ad5ef7d67d..454d7b1c16 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -17564,7 +17564,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+     int ret = -1;
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
+-    g_autoptr(virJSONValue) actions = NULL;
++    g_autoptr(virJSONValue) bitmapactions = NULL;
+     g_autoptr(virJSONValue) reopenactions = NULL;
+ 
+     if (job->state != QEMU_BLOCKJOB_STATE_READY) {
+@@ -17597,9 +17597,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+             bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
+             bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;
+ 
+-            actions = virJSONValueNewArray();
++            bitmapactions = virJSONValueNewArray();
+ 
+-            if (qemuMonitorTransactionBitmapAdd(actions,
++            if (qemuMonitorTransactionBitmapAdd(bitmapactions,
+                                                 disk->mirror->nodeformat,
+                                                 "libvirt-tmp-activewrite",
+                                                 false,
+@@ -17632,9 +17632,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+ 
+     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
+         if (blockdev) {
+-            actions = virJSONValueNewArray();
++            bitmapactions = virJSONValueNewArray();
+ 
+-            if (qemuMonitorTransactionBitmapAdd(actions,
++            if (qemuMonitorTransactionBitmapAdd(bitmapactions,
+                                                 job->data.commit.base->nodeformat,
+                                                 "libvirt-tmp-activewrite",
+                                                 false,
+@@ -17658,8 +17658,8 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
+             }
+         }
+ 
+-        if (actions && rc == 0)
+-            rc = qemuMonitorTransaction(priv->mon, &actions);
++        if (bitmapactions && rc == 0)
++            rc = qemuMonitorTransaction(priv->mon, &bitmapactions);
+ 
+         if (rc == 0)
+             ret = qemuMonitorJobComplete(priv->mon, job->name);
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemuDomainDeviceDefValidateNetwork-Check-for-range-only-if-IP-prefix-set.patch b/SOURCES/libvirt-qemuDomainDeviceDefValidateNetwork-Check-for-range-only-if-IP-prefix-set.patch
deleted file mode 100644
index 85c00f7..0000000
--- a/SOURCES/libvirt-qemuDomainDeviceDefValidateNetwork-Check-for-range-only-if-IP-prefix-set.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 46deb7c0c9e483ba57e9f9638e31482a9af026c9 Mon Sep 17 00:00:00 2001
-Message-Id: <46deb7c0c9e483ba57e9f9638e31482a9af026c9@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 9 Jul 2018 12:07:39 +0200
-Subject: [PATCH] qemuDomainDeviceDefValidateNetwork: Check for range only if
- IP prefix set
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1515533
-
-The @prefix attribute to <ip/> element for interface type user is
-optional. Therefore, if left out it has value of zero in which
-case we should not check whether it falls into <4, 27> range.
-Otherwise we fail parsing domain XML for no good reason.
-
-Broken by commit b62b8090b2ad4524a5bf9d40d0d1c17a9d57f5a0.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit a6fbbce73e2965edde45ece7c034e4b39bb8405d)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@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 fa952f8306..f9bcf76f44 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4386,7 +4386,8 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net)
-                 }
-                 hasIPv4 = true;
- 
--                if (ip->prefix < 4 || ip->prefix > 27) {
-+                if (ip->prefix > 0 &&
-+                    (ip->prefix < 4 || ip->prefix > 27)) {
-                     virReportError(VIR_ERR_XML_ERROR, "%s",
-                                    _("invalid prefix, must be in range of 4-27"));
-                     return -1;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemuDomainDeviceDiskDefPostParseRestoreSecAlias-Hardcode-restored-aliases.patch b/SOURCES/libvirt-qemuDomainDeviceDiskDefPostParseRestoreSecAlias-Hardcode-restored-aliases.patch
new file mode 100644
index 0000000..7f3cc34
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainDeviceDiskDefPostParseRestoreSecAlias-Hardcode-restored-aliases.patch
@@ -0,0 +1,58 @@
+From 1246cae822ca95a8392463631af1126d915eaf5e Mon Sep 17 00:00:00 2001
+Message-Id: <1246cae822ca95a8392463631af1126d915eaf5e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:51 +0100
+Subject: [PATCH] qemuDomainDeviceDiskDefPostParseRestoreSecAlias: Hardcode
+ restored aliases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In order to be able to change the function generating the alias and thus
+also the aliases itself, we must hardcode the old format for the case of
+upgrading form libvirt which didn't record them in the status XML yet.
+
+Note that this code path is tested by
+'tests/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml'
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 95a8c4332dd42ab6a558117a07134a7fdb2ce8f4)
+
+ Conflicts:
+	src/qemu/qemu_domain.c
+        Global cleanups from ae9f630e502 not backported.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <4b880854049d398ffe424b811af69f4b1a074c9d.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 6221e7090f..897e21726a 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -9062,16 +9062,14 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDefPtr disk,
+     }
+ 
+     if (restoreAuthSecret) {
+-        if (!(authalias = qemuDomainGetSecretAESAlias(disk->info.alias, false)))
+-            goto cleanup;
++        authalias = g_strdup_printf("%s-secret0", disk->info.alias);
+ 
+         if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &authalias) < 0)
+             goto cleanup;
+     }
+ 
+     if (restoreEncSecret) {
+-        if (!(encalias = qemuDomainGetSecretAESAlias(disk->info.alias, true)))
+-            goto cleanup;
++        encalias = g_strdup_printf("%s-luks-secret0", disk->info.alias);
+ 
+         if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &encalias) < 0)
+             goto cleanup;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainGetGuestInfo-Don-t-try-to-free-a-negative-number-of-entries.patch b/SOURCES/libvirt-qemuDomainGetGuestInfo-Don-t-try-to-free-a-negative-number-of-entries.patch
new file mode 100644
index 0000000..677b0ad
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainGetGuestInfo-Don-t-try-to-free-a-negative-number-of-entries.patch
@@ -0,0 +1,77 @@
+From c03fef652341b4ee8969b2a0229e2ef9046a9cee Mon Sep 17 00:00:00 2001
+Message-Id: <c03fef652341b4ee8969b2a0229e2ef9046a9cee@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:35 +0100
+Subject: [PATCH] qemuDomainGetGuestInfo: Don't try to free a negative number
+ of entries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+'nfs' variable was set to -1 or -2 on agent failure. Cleanup then tried
+to free 'nfs' elements of the array which resulted into a crash.
+
+Make 'nfs' size_t and assign it only on successful agent call.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1812965
+
+Broken by commit 599ae372d8cf092
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 0fdb7385e416c9a0830dc60c0a56d55428963d74)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1812965
+Message-Id: <6eb97463bb380d32591ef82336095bf1ef370bca.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_agent.c  |  2 +-
+ src/qemu/qemu_driver.c | 12 ++++++++----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
+index ef2d2c500b..f13126aeee 100644
+--- a/src/qemu/qemu_agent.c
++++ b/src/qemu/qemu_agent.c
+@@ -1954,7 +1954,7 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
+     return 0;
+ }
+ 
+-/* Returns: 0 on success
++/* Returns: number of entries in '@info' on success
+  *          -2 when agent command is not supported by the agent
+  *          -1 otherwise
+  */
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 8c7e90531a..0bdb2851ec 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -23101,7 +23101,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+     g_autofree char *hostname = NULL;
+     unsigned int supportedTypes = types;
+     int rc;
+-    int nfs = 0;
++    size_t nfs = 0;
+     qemuAgentFSInfoPtr *agentfsinfo = NULL;
+     size_t i;
+ 
+@@ -23154,9 +23154,13 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+         }
+     }
+     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
+-        rc = nfs = qemuAgentGetFSInfo(agent, &agentfsinfo);
+-        if (rc < 0 && !(rc == -2 && types == 0))
+-            goto exitagent;
++        rc = qemuAgentGetFSInfo(agent, &agentfsinfo);
++        if (rc < 0) {
++            if (!(rc == -2 && types == 0))
++                goto exitagent;
++        } else {
++            nfs = rc;
++        }
+     }
+ 
+     ret = 0;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainGetGuestInfo-don-t-assign-NULL-hostname.patch b/SOURCES/libvirt-qemuDomainGetGuestInfo-don-t-assign-NULL-hostname.patch
new file mode 100644
index 0000000..40e3ec7
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainGetGuestInfo-don-t-assign-NULL-hostname.patch
@@ -0,0 +1,49 @@
+From 1e8e5094ee8112244c32704539202dd02866cfd6 Mon Sep 17 00:00:00 2001
+Message-Id: <1e8e5094ee8112244c32704539202dd02866cfd6@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:33 +0100
+Subject: [PATCH] qemuDomainGetGuestInfo: don't assign NULL hostname
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Don't rely on error check and assign hostname only when non-NULL.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 530ac288618b2f46e49f3ce86d4d89e7607ee3fe)
+https://bugzilla.redhat.com/show_bug.cgi?id=1812965
+Message-Id: <cb3528a36549edc5fdd23cb1e573e99fc43e9d15.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 05e525e935..175a1961c2 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -23254,14 +23254,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
+     }
+     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_HOSTNAME) {
+         rc = qemuAgentGetHostname(agent, &hostname);
+-        if (rc < 0 && !(rc == -2 && types == 0)) {
++        if (rc < 0 && !(rc == -2 && types == 0))
+             goto exitagent;
+-        } else {
+-            if (virTypedParamsAddString(params, nparams, &maxparams, "hostname",
+-                                        hostname) < 0)
+-                goto exitagent;
+-        }
+     }
++
++    if (hostname &&
++        virTypedParamsAddString(params, nparams, &maxparams, "hostname", hostname) < 0)
++        goto exitagent;
++
+     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
+         rc = qemuAgentGetFSInfo(agent, &agentfsinfo);
+         if (rc < 0) {
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainGetSecretAESAlias-Replace-outstanding-uses-with-qemuAliasForSecret.patch b/SOURCES/libvirt-qemuDomainGetSecretAESAlias-Replace-outstanding-uses-with-qemuAliasForSecret.patch
new file mode 100644
index 0000000..baf5d1a
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainGetSecretAESAlias-Replace-outstanding-uses-with-qemuAliasForSecret.patch
@@ -0,0 +1,110 @@
+From a3072c4077a72bf85636a7f0fe63fb40b96410f4 Mon Sep 17 00:00:00 2001
+Message-Id: <a3072c4077a72bf85636a7f0fe63fb40b96410f4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:55 +0100
+Subject: [PATCH] qemuDomainGetSecretAESAlias: Replace outstanding uses with
+ qemuAliasForSecret
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are two last callers of this function. Replace them by
+qemuAliasForSecret and delete qemuDomainGetSecretAESAlias.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 43a3d2e02ed09fafa04b61815c23651b0a94ef58)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <b70522a89f40d60b92029c6c7c5d10842c175fbb.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_alias.c            | 29 -----------------------------
+ src/qemu/qemu_alias.h            |  3 ---
+ src/qemu/qemu_hotplug.c          |  2 +-
+ src/qemu/qemu_migration_params.c |  2 +-
+ 4 files changed, 2 insertions(+), 34 deletions(-)
+
+diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
+index 50ad054c6c..7889f16bb2 100644
+--- a/src/qemu/qemu_alias.c
++++ b/src/qemu/qemu_alias.c
+@@ -763,35 +763,6 @@ qemuDomainGetMasterKeyAlias(void)
+ }
+ 
+ 
+-/* qemuDomainGetSecretAESAlias:
+- * @srcalias: Source alias used to generate the secret alias
+- * @isLuks: True when we are generating a secret for LUKS encrypt/decrypt
+- *
+- * Generate and return an alias for the encrypted secret
+- *
+- * Returns NULL or a string containing the alias
+- */
+-char *
+-qemuDomainGetSecretAESAlias(const char *srcalias,
+-                            bool isLuks)
+-{
+-    char *alias;
+-
+-    if (!srcalias) {
+-        virReportError(VIR_ERR_INVALID_ARG, "%s",
+-                       _("encrypted secret alias requires valid source alias"));
+-        return NULL;
+-    }
+-
+-    if (isLuks)
+-        alias = g_strdup_printf("%s-luks-secret0", srcalias);
+-    else
+-        alias = g_strdup_printf("%s-secret0", srcalias);
+-
+-    return alias;
+-}
+-
+-
+ /* qemuAliasForSecret:
+  * @parentalias: alias of the parent object
+  * @obj: optional sub-object of the parent device the secret is for
+diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
+index 645956d024..490aa568a9 100644
+--- a/src/qemu/qemu_alias.h
++++ b/src/qemu/qemu_alias.h
+@@ -83,9 +83,6 @@ char *qemuAliasFromHostdev(const virDomainHostdevDef *hostdev);
+ 
+ char *qemuDomainGetMasterKeyAlias(void);
+ 
+-char *qemuDomainGetSecretAESAlias(const char *srcalias,
+-                                  bool isLuks);
+-
+ char *qemuAliasForSecret(const char *parentalias,
+                          const char *obj);
+ 
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index a473bab3e1..3ccc01f0b7 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -1844,7 +1844,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr driver,
+      * secret UUID and we have a serial TCP chardev, then formulate a
+      * secAlias which we'll attempt to destroy. */
+     if (cfg->chardevTLSx509secretUUID &&
+-        !(secAlias = qemuDomainGetSecretAESAlias(inAlias, false)))
++        !(secAlias = qemuAliasForSecret(inAlias, NULL)))
+         return -1;
+ 
+     qemuDomainObjEnterMonitor(driver, vm);
+diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
+index 0a3b0f8741..28fb006374 100644
+--- a/src/qemu/qemu_migration_params.c
++++ b/src/qemu/qemu_migration_params.c
+@@ -1084,7 +1084,7 @@ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver,
+         return;
+ 
+     tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE);
+-    secAlias = qemuDomainGetSecretAESAlias(QEMU_MIGRATION_TLS_ALIAS_BASE, false);
++    secAlias = qemuAliasForSecret(QEMU_MIGRATION_TLS_ALIAS_BASE, NULL);
+ 
+     qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, tlsAlias);
+     g_clear_pointer(&QEMU_DOMAIN_PRIVATE(vm)->migSecinfo, qemuDomainSecretInfoFree);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainGetStatsIOThread-Don-t-leak-array-with-0-iothreads.patch b/SOURCES/libvirt-qemuDomainGetStatsIOThread-Don-t-leak-array-with-0-iothreads.patch
new file mode 100644
index 0000000..9b92a10
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainGetStatsIOThread-Don-t-leak-array-with-0-iothreads.patch
@@ -0,0 +1,48 @@
+From 388611da8330fb19693caf927680e9af08d5738e Mon Sep 17 00:00:00 2001
+Message-Id: <388611da8330fb19693caf927680e9af08d5738e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:27 +0100
+Subject: [PATCH] qemuDomainGetStatsIOThread: Don't leak array with 0 iothreads
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+qemuMonitorGetIOThreads returns a NULL-terminated list even when 0
+iothreads are present. The caller didn't perform cleanup if there were 0
+iothreads leaking the array.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804548
+
+Fixes: d1eac92784573559b6fd56836e33b215c89308e3
+Reported-by: Jing Yan <jiyan@redhat.com>
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9bf9e0ae6af38c806f4672ca7b12a6b38d5a9581)
+Message-Id: <eef614566ad383a1393a295caa6e2550381eb3e7.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index af81c4a6e4..69e4f7264b 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -21532,8 +21532,12 @@ qemuDomainGetStatsIOThread(virQEMUDriverPtr driver,
+     if ((niothreads = qemuDomainGetIOThreadsMon(driver, dom, &iothreads)) < 0)
+         return -1;
+ 
+-    if (niothreads == 0)
+-        return 0;
++    /* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we must free
++     * it even if it returns 0 */
++    if (niothreads == 0) {
++        ret = 0;
++        goto cleanup;
++    }
+ 
+     if (virTypedParamListAddUInt(params, niothreads, "iothread.count") < 0)
+         goto cleanup;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuDomainNestedJobAllowed-Allow-QEMU_JOB_NONE.patch b/SOURCES/libvirt-qemuDomainNestedJobAllowed-Allow-QEMU_JOB_NONE.patch
deleted file mode 100644
index 6ce3fe0..0000000
--- a/SOURCES/libvirt-qemuDomainNestedJobAllowed-Allow-QEMU_JOB_NONE.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a6912230c999761dd5a5e23f1bdec8ae00255760 Mon Sep 17 00:00:00 2001
-Message-Id: <a6912230c999761dd5a5e23f1bdec8ae00255760@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 4 Jul 2018 14:51:17 +0200
-Subject: [PATCH] qemuDomainNestedJobAllowed: Allow QEMU_JOB_NONE
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598084
-
-When creating a snapshot with --quiesce an async job is grabbed
-and just before executing guest fs-freeze command an agent job is
-grabbed. This is achieved by calling
-
-  qemuDomainObjBeginJobInternal(job = QEMU_JOB_NONE,
-                                agentJob = QEMU_AGENT_JOB_MODIFY);
-
-Since there already is an async job set on the domain (by the
-same thread) qemuDomainNestedJobAllowed(priv, job) is consulted
-if @job is allowed by job mask. But this function returns false
-(meaning sync @job is not allowed) which leads to a deadlock.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 2647a363676833371ba400374ecfa51c84fec5c0)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_domain.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 3f3bb94685..fa952f8306 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -6386,7 +6386,9 @@ qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj)
- static bool
- qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, qemuDomainJob job)
- {
--    return !priv->job.asyncJob || (priv->job.mask & JOB_MASK(job)) != 0;
-+    return !priv->job.asyncJob ||
-+           job == QEMU_JOB_NONE ||
-+           (priv->job.mask & JOB_MASK(job)) != 0;
- }
- 
- bool
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemuDomainRemoveRNGDevice-Remove-associated-chardev-too.patch b/SOURCES/libvirt-qemuDomainRemoveRNGDevice-Remove-associated-chardev-too.patch
deleted file mode 100644
index 61af820..0000000
--- a/SOURCES/libvirt-qemuDomainRemoveRNGDevice-Remove-associated-chardev-too.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From d50cf2d60114e7e33c2bd25fb67566a889057b77 Mon Sep 17 00:00:00 2001
-Message-Id: <d50cf2d60114e7e33c2bd25fb67566a889057b77@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 8 Apr 2019 10:57:30 +0200
-Subject: [PATCH] qemuDomainRemoveRNGDevice: Remove associated chardev too
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1656014
-
-An RNG device can consists of more devices than RND device
-itself. For instance, in case of EGD there is a chardev that
-connects to EGD daemon and feeds the qemu with random data. When
-doing RNG device removal we have to remove the associated chardev
-as well.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-
-(cherry picked from commit 7730a2ead4279e3a11771e1069096747988410cf)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-14-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index abe2632556..8394efa739 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -4408,7 +4408,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver,
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     ssize_t idx;
-     int ret = -1;
--    int rc;
-+    int rc = 0;
- 
-     VIR_DEBUG("Removing RNG device %s from domain %p %s",
-               rng->info.alias, vm, vm->def->name);
-@@ -4422,7 +4422,17 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver,
- 
-     qemuDomainObjEnterMonitor(driver, vm);
- 
--    rc = qemuMonitorDelObject(priv->mon, objAlias);
-+    if (qemuDomainDetachExtensionDevice(priv->mon, &rng->info) < 0)
-+        rc = -1;
-+
-+    if (rc == 0 &&
-+        qemuMonitorDelObject(priv->mon, objAlias) < 0)
-+        rc = -1;
-+
-+    if (rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD &&
-+        rc == 0 &&
-+        qemuMonitorDetachCharDev(priv->mon, charAlias) < 0)
-+        rc = -1;
- 
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto cleanup;
-@@ -4431,7 +4441,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver,
-         rc == 0 &&
-         qemuDomainDelChardevTLSObjects(driver, vm, rng->source.chardev,
-                                        charAlias) < 0)
--        goto cleanup;
-+        rc = -1;
- 
-     virDomainAuditRNG(vm, rng, NULL, "detach", rc == 0);
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-VIR_AUTOCLOSE-for-intermediatefd.patch b/SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-VIR_AUTOCLOSE-for-intermediatefd.patch
new file mode 100644
index 0000000..c29aa79
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-VIR_AUTOCLOSE-for-intermediatefd.patch
@@ -0,0 +1,56 @@
+From 6442aa5565de857371a7076c56ced84fbea0ec66 Mon Sep 17 00:00:00 2001
+Message-Id: <6442aa5565de857371a7076c56ced84fbea0ec66@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 16 Jan 2020 10:03:51 +0100
+Subject: [PATCH] qemuDomainSaveImageStartVM: Use VIR_AUTOCLOSE for
+ @intermediatefd
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1718707
+
+(cherry picked from commit 1c16f261d0764ff70fb33ece4367f25e741cdb74)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <f181efbc202853298ca06eecf78e7dad1063dc16.1579165329.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index d6b1e9f00c..9de5bc6a32 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -6803,7 +6803,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+     int ret = -1;
+     bool restored = false;
+     virObjectEventPtr event;
+-    int intermediatefd = -1;
++    VIR_AUTOCLOSE intermediatefd = -1;
+     virCommandPtr cmd = NULL;
+     g_autofree char *errbuf = NULL;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+@@ -6829,6 +6829,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+ 
+         if (virCommandRunAsync(cmd, NULL) < 0) {
+             *fd = intermediatefd;
++            intermediatefd = -1;
+             goto cleanup;
+         }
+     }
+@@ -6872,8 +6873,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+ 
+         virErrorRestore(&orig_err);
+     }
+-    VIR_FORCE_CLOSE(intermediatefd);
+-
+     if (VIR_CLOSE(*fd) < 0) {
+         virReportSystemError(errno, _("cannot close file: %s"), path);
+         restored = false;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-g_autoptr-for-virCommand.patch b/SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-g_autoptr-for-virCommand.patch
new file mode 100644
index 0000000..3ef3c35
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSaveImageStartVM-Use-g_autoptr-for-virCommand.patch
@@ -0,0 +1,46 @@
+From 09776b6ac6421a03fe2ff72eb6146a9ca0119259 Mon Sep 17 00:00:00 2001
+Message-Id: <09776b6ac6421a03fe2ff72eb6146a9ca0119259@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 16 Jan 2020 10:03:52 +0100
+Subject: [PATCH] qemuDomainSaveImageStartVM: Use g_autoptr() for virCommand
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1718707
+
+(cherry picked from commit 82e127e34350dc0ed908611a3b2a4fbd78ad9903)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <5d41d06ee27842659082e67dd6abf40c3c59ae5d.1579165329.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 9de5bc6a32..e1c0550b9a 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -6804,7 +6804,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+     bool restored = false;
+     virObjectEventPtr event;
+     VIR_AUTOCLOSE intermediatefd = -1;
+-    virCommandPtr cmd = NULL;
++    g_autoptr(virCommand) cmd = NULL;
+     g_autofree char *errbuf = NULL;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+     virQEMUSaveHeaderPtr header = &data->header;
+@@ -6920,7 +6920,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
+ 
+  cleanup:
+     virObjectUnref(cookie);
+-    virCommandFree(cmd);
+     if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0)
+         VIR_WARN("failed to restore save state label on %s", path);
+     return ret;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuDomainSaveMemory-Don-t-enforce-dynamicOwnership.patch b/SOURCES/libvirt-qemuDomainSaveMemory-Don-t-enforce-dynamicOwnership.patch
deleted file mode 100644
index f1244da..0000000
--- a/SOURCES/libvirt-qemuDomainSaveMemory-Don-t-enforce-dynamicOwnership.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 94ba115a0dc13cedaf652513ac6cacd419672627 Mon Sep 17 00:00:00 2001
-Message-Id: <94ba115a0dc13cedaf652513ac6cacd419672627@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 25 Jul 2018 08:27:10 +0200
-Subject: [PATCH] qemuDomainSaveMemory: Don't enforce dynamicOwnership
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1589115
-
-When doing a memory snapshot qemuOpenFile() is used. This means
-that the file where memory is saved is firstly attempted to be
-created under root:root (because that's what libvirtd is running
-under) and if this fails the second attempt is done under
-domain's uid:gid. This does not make much sense - qemu is given
-opened FD so it does not need to access the file. Moreover, if
-dynamicOwnership is set in qemu.conf and the file lives on a
-squashed NFS this is deadly combination and very likely to fail.
-
-The fix consists of using:
-
-  qemuOpenFileAs(fallback_uid = cfg->user,
-                 fallback_gid = cfg->group,
-                 dynamicOwnership = false)
-
-In other words, dynamicOwnership is turned off for memory
-snapshot (chown() will still be attempted if the file does not
-live on NFS) and instead of using domain DAC label, configured
-user:group is set as fallback.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 8c8c32339ae965fa6991462e98be1f5890ac7499)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_driver.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index e8a595f17e..f85248e3c7 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -3185,6 +3185,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-                      unsigned int flags,
-                      qemuDomainAsyncJob asyncJob)
- {
-+    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-     bool needUnlink = false;
-     int ret = -1;
-     int fd = -1;
-@@ -3202,9 +3203,10 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-             goto cleanup;
-         }
-     }
--    fd = qemuOpenFile(driver, vm, path,
--                      O_WRONLY | O_TRUNC | O_CREAT | directFlag,
--                      &needUnlink);
-+
-+    fd = qemuOpenFileAs(cfg->user, cfg->group, false, path,
-+                        O_WRONLY | O_TRUNC | O_CREAT | directFlag,
-+                        &needUnlink);
-     if (fd < 0)
-         goto cleanup;
- 
-@@ -3244,6 +3246,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-  cleanup:
-     VIR_FORCE_CLOSE(fd);
-     virFileWrapperFdFree(wrapperFd);
-+    virObjectUnref(cfg);
- 
-     if (ret < 0 && needUnlink)
-         unlink(path);
-@@ -3793,9 +3796,9 @@ doCoreDump(virQEMUDriverPtr driver,
-     /* Core dumps usually imply last-ditch analysis efforts are
-      * desired, so we intentionally do not unlink even if a file was
-      * created.  */
--    if ((fd = qemuOpenFile(driver, vm, path,
--                           O_CREAT | O_TRUNC | O_WRONLY | directFlag,
--                           NULL)) < 0)
-+    if ((fd = qemuOpenFileAs(cfg->user, cfg->group, false, path,
-+                             O_CREAT | O_TRUNC | O_WRONLY | directFlag,
-+                             NULL)) < 0)
-         goto cleanup;
- 
-     if (!(wrapperFd = virFileWrapperFdNew(&fd, path, flags)))
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemuDomainSecretAESSetup-Allocate-and-return-secinfo-here.patch b/SOURCES/libvirt-qemuDomainSecretAESSetup-Allocate-and-return-secinfo-here.patch
new file mode 100644
index 0000000..335c90c
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretAESSetup-Allocate-and-return-secinfo-here.patch
@@ -0,0 +1,146 @@
+From fe42b8bb2e4a456a5b2297313f3859221013fdfc Mon Sep 17 00:00:00 2001
+Message-Id: <fe42b8bb2e4a456a5b2297313f3859221013fdfc@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:46 +0100
+Subject: [PATCH] qemuDomainSecretAESSetup: Allocate and return 'secinfo' here
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Rather than passing in an empty qemuDomainSecretInfoPtr allocate it
+in this function and return it. This is done by absorbing the check from
+qemuDomainSecretInfoNew and removing the internals of
+qemuDomainSecretInfoNew.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bad8637892ae8fc310b252651876738ca4fdee0d)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <94071336dbc97ed64a1a5dcbb82da32e5199f117.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 53 ++++++++++++++++++------------------------
+ 1 file changed, 22 insertions(+), 31 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index b26187659e..37e361b1f4 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1529,21 +1529,20 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr secinfo,
+  * @seclookupdef: Pointer to seclookupdef data
+  * @isLuks: True/False for is for luks (alias generation)
+  *
+- * Taking a secinfo, fill in the AES specific information using the
++ * Encrypts a secret looked up via @seclookupdef for use with qemu.
+  *
+- * Returns 0 on success, -1 on failure with error message
++ * Returns qemuDomainSecretInfoPtr filled with the necessary information.
+  */
+-static int
++static qemuDomainSecretInfoPtr
+ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+-                         qemuDomainSecretInfoPtr secinfo,
+                          const char *srcalias,
+                          virSecretUsageType usageType,
+                          const char *username,
+                          virSecretLookupTypeDefPtr seclookupdef,
+                          bool isLuks)
+ {
++    g_autoptr(qemuDomainSecretInfo) secinfo = NULL;
+     g_autoptr(virConnect) conn = virGetConnectSecret();
+-    int ret = -1;
+     g_autofree uint8_t *raw_iv = NULL;
+     size_t ivlen = QEMU_DOMAIN_AES_IV_LEN;
+     uint8_t *secret = NULL;
+@@ -1552,19 +1551,27 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     size_t ciphertextlen = 0;
+ 
+     if (!conn)
+-        return -1;
++        return NULL;
++
++    if (!qemuDomainSupportsEncryptedSecret(priv)) {
++        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                       _("encrypted secrets are not supported"));
++        return NULL;
++    }
++
++    secinfo = g_new0(qemuDomainSecretInfo, 1);
+ 
+     secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
+     secinfo->s.aes.username = g_strdup(username);
+ 
+     if (!(secinfo->s.aes.alias = qemuDomainGetSecretAESAlias(srcalias, isLuks)))
+-        return -1;
++        return NULL;
+ 
+     raw_iv = g_new0(uint8_t, ivlen);
+ 
+     /* Create a random initialization vector */
+     if (virRandomBytes(raw_iv, ivlen) < 0)
+-        return -1;
++        return NULL;
+ 
+     /* Encode the IV and save that since qemu will need it */
+     secinfo->s.aes.iv = g_base64_encode(raw_iv, ivlen);
+@@ -1572,13 +1579,13 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     /* Grab the unencoded secret */
+     if (virSecretGetSecretString(conn, seclookupdef, usageType,
+                                  &secret, &secretlen) < 0)
+-        goto cleanup;
++        goto error;
+ 
+     if (virCryptoEncryptData(VIR_CRYPTO_CIPHER_AES256CBC,
+                              priv->masterKey, QEMU_DOMAIN_MASTER_KEY_LEN,
+                              raw_iv, ivlen, secret, secretlen,
+                              &ciphertext, &ciphertextlen) < 0)
+-        goto cleanup;
++        goto error;
+ 
+     /* Clear out the secret */
+     memset(secret, 0, secretlen);
+@@ -1587,11 +1594,11 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     secinfo->s.aes.ciphertext = g_base64_encode(ciphertext,
+                                                 ciphertextlen);
+ 
+-    ret = 0;
++    return g_steal_pointer(&secinfo);
+ 
+- cleanup:
++ error:
+     VIR_DISPOSE_N(secret, secretlen);
+-    return ret;
++    return NULL;
+ }
+ 
+ 
+@@ -1663,24 +1670,8 @@ qemuDomainSecretInfoNew(qemuDomainObjPrivatePtr priv,
+                         virSecretLookupTypeDefPtr lookupDef,
+                         bool isLuks)
+ {
+-    qemuDomainSecretInfoPtr secinfo = NULL;
+-
+-    if (!qemuDomainSupportsEncryptedSecret(priv)) {
+-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+-                       _("encrypted secrets are not supported"));
+-        return NULL;
+-    }
+-
+-    if (VIR_ALLOC(secinfo) < 0)
+-        return NULL;
+-
+-    if (qemuDomainSecretAESSetup(priv, secinfo, srcAlias, usageType, username,
+-                                 lookupDef, isLuks) < 0) {
+-        g_clear_pointer(&secinfo, qemuDomainSecretInfoFree);
+-        return NULL;
+-    }
+-
+-    return secinfo;
++    return qemuDomainSecretAESSetup(priv, srcAlias, usageType, username,
++                                    lookupDef, isLuks);
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretAESSetup-Automatically-free-non-secret-locals.patch b/SOURCES/libvirt-qemuDomainSecretAESSetup-Automatically-free-non-secret-locals.patch
new file mode 100644
index 0000000..89984ae
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretAESSetup-Automatically-free-non-secret-locals.patch
@@ -0,0 +1,88 @@
+From 044e5a7db716235c167f76974d4bd7566248cf9a Mon Sep 17 00:00:00 2001
+Message-Id: <044e5a7db716235c167f76974d4bd7566248cf9a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:45 +0100
+Subject: [PATCH] qemuDomainSecretAESSetup: Automatically free non-secret
+ locals
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use g_autofree for the ciphertext and init vector as they are not
+secret and thus don't have to be cleared and use g_new0 to allocate the
+iv for parity.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 88126d5f0ec3899dbc3bc223d120de159ded9dca)
+
+ Conflicts:
+    src/qemu/qemu_domain.c:
+    20fa2bc6e52e01feaf39d12d38bcf8eaec4c9a46 was not backported
+    and thus this patch also effectively backports the modification
+    the patch mentioned above did to qemuDomainSecretAESSetup as it
+    would not result in a clean backport.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <6d4512020332b977f8de5843469e0d030f4f65d3.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index b77488026a..b26187659e 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1542,16 +1542,15 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+                          virSecretLookupTypeDefPtr seclookupdef,
+                          bool isLuks)
+ {
+-    virConnectPtr conn;
++    g_autoptr(virConnect) conn = virGetConnectSecret();
+     int ret = -1;
+-    uint8_t *raw_iv = NULL;
++    g_autofree uint8_t *raw_iv = NULL;
+     size_t ivlen = QEMU_DOMAIN_AES_IV_LEN;
+     uint8_t *secret = NULL;
+     size_t secretlen = 0;
+-    uint8_t *ciphertext = NULL;
++    g_autofree uint8_t *ciphertext = NULL;
+     size_t ciphertextlen = 0;
+ 
+-    conn = virGetConnectSecret();
+     if (!conn)
+         return -1;
+ 
+@@ -1559,14 +1558,13 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     secinfo->s.aes.username = g_strdup(username);
+ 
+     if (!(secinfo->s.aes.alias = qemuDomainGetSecretAESAlias(srcalias, isLuks)))
+-        goto cleanup;
++        return -1;
+ 
+-    if (VIR_ALLOC_N(raw_iv, ivlen) < 0)
+-        goto cleanup;
++    raw_iv = g_new0(uint8_t, ivlen);
+ 
+     /* Create a random initialization vector */
+     if (virRandomBytes(raw_iv, ivlen) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     /* Encode the IV and save that since qemu will need it */
+     secinfo->s.aes.iv = g_base64_encode(raw_iv, ivlen);
+@@ -1592,10 +1590,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     ret = 0;
+ 
+  cleanup:
+-    VIR_DISPOSE_N(raw_iv, ivlen);
+     VIR_DISPOSE_N(secret, secretlen);
+-    VIR_DISPOSE_N(ciphertext, ciphertextlen);
+-    virObjectUnref(conn);
+     return ret;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretAESSetup-Split-out-lookup-of-secret-data.patch b/SOURCES/libvirt-qemuDomainSecretAESSetup-Split-out-lookup-of-secret-data.patch
new file mode 100644
index 0000000..03eed00
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretAESSetup-Split-out-lookup-of-secret-data.patch
@@ -0,0 +1,174 @@
+From 881121d506d6482d4bdbf557994f31d6eb55af3f Mon Sep 17 00:00:00 2001
+Message-Id: <881121d506d6482d4bdbf557994f31d6eb55af3f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:47 +0100
+Subject: [PATCH] qemuDomainSecretAESSetup: Split out lookup of secret data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Split out the lookup of the secret from the secret driver into
+qemuDomainSecretAESSetupFromSecret so that we can also instantiate
+secret objects in qemu with data from other sources.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 88663e59ef62346cdea7e260c5d598c2e738c674)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <159609ccfe0ca42a20409e83f3f0d521113d8938.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 87 ++++++++++++++++++++++++++----------------
+ 1 file changed, 54 insertions(+), 33 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 37e361b1f4..c286f50650 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1522,37 +1522,28 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr secinfo,
+ 
+ /* qemuDomainSecretAESSetup:
+  * @priv: pointer to domain private object
+- * @secinfo: Pointer to secret info
+- * @srcalias: Alias of the disk/hostdev used to generate the secret alias
+- * @usageType: The virSecretUsageType
+- * @username: username to use for authentication (may be NULL)
+- * @seclookupdef: Pointer to seclookupdef data
+- * @isLuks: True/False for is for luks (alias generation)
++ * @alias: alias of the secret
++ * @username: username to use (may be NULL)
++ * @secret: secret data
++ * @secretlen: length of @secret
+  *
+- * Encrypts a secret looked up via @seclookupdef for use with qemu.
++ * Encrypts @secret for use with qemu.
+  *
+  * Returns qemuDomainSecretInfoPtr filled with the necessary information.
+  */
+ static qemuDomainSecretInfoPtr
+ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+-                         const char *srcalias,
+-                         virSecretUsageType usageType,
++                         const char *alias,
+                          const char *username,
+-                         virSecretLookupTypeDefPtr seclookupdef,
+-                         bool isLuks)
++                         uint8_t *secret,
++                         size_t secretlen)
+ {
+     g_autoptr(qemuDomainSecretInfo) secinfo = NULL;
+-    g_autoptr(virConnect) conn = virGetConnectSecret();
+     g_autofree uint8_t *raw_iv = NULL;
+     size_t ivlen = QEMU_DOMAIN_AES_IV_LEN;
+-    uint8_t *secret = NULL;
+-    size_t secretlen = 0;
+     g_autofree uint8_t *ciphertext = NULL;
+     size_t ciphertextlen = 0;
+ 
+-    if (!conn)
+-        return NULL;
+-
+     if (!qemuDomainSupportsEncryptedSecret(priv)) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                        _("encrypted secrets are not supported"));
+@@ -1562,11 +1553,9 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     secinfo = g_new0(qemuDomainSecretInfo, 1);
+ 
+     secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
++    secinfo->s.aes.alias = g_strdup(alias);
+     secinfo->s.aes.username = g_strdup(username);
+ 
+-    if (!(secinfo->s.aes.alias = qemuDomainGetSecretAESAlias(srcalias, isLuks)))
+-        return NULL;
+-
+     raw_iv = g_new0(uint8_t, ivlen);
+ 
+     /* Create a random initialization vector */
+@@ -1576,29 +1565,61 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+     /* Encode the IV and save that since qemu will need it */
+     secinfo->s.aes.iv = g_base64_encode(raw_iv, ivlen);
+ 
+-    /* Grab the unencoded secret */
+-    if (virSecretGetSecretString(conn, seclookupdef, usageType,
+-                                 &secret, &secretlen) < 0)
+-        goto error;
+-
+     if (virCryptoEncryptData(VIR_CRYPTO_CIPHER_AES256CBC,
+                              priv->masterKey, QEMU_DOMAIN_MASTER_KEY_LEN,
+                              raw_iv, ivlen, secret, secretlen,
+                              &ciphertext, &ciphertextlen) < 0)
+-        goto error;
+-
+-    /* Clear out the secret */
+-    memset(secret, 0, secretlen);
++        return NULL;
+ 
+     /* Now encode the ciphertext and store to be passed to qemu */
+     secinfo->s.aes.ciphertext = g_base64_encode(ciphertext,
+                                                 ciphertextlen);
+ 
+     return g_steal_pointer(&secinfo);
++}
++
++
++/**
++ * qemuDomainSecretAESSetupFromSecret:
++ * @priv: pointer to domain private object
++ * @srcalias: Alias of the disk/hostdev used to generate the secret alias
++ * @usageType: The virSecretUsageType
++ * @username: username to use for authentication (may be NULL)
++ * @seclookupdef: Pointer to seclookupdef data
++ * @isLuks: True/False for is for luks (alias generation)
++ *
++ * Looks up a secret in the secret driver based on @usageType and @seclookupdef
++ * and builds qemuDomainSecretInfoPtr from it.
++ */
++static qemuDomainSecretInfoPtr
++qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivatePtr priv,
++                                   const char *srcalias,
++                                   virSecretUsageType usageType,
++                                   const char *username,
++                                   virSecretLookupTypeDefPtr seclookupdef,
++                                   bool isLuks)
++{
++    g_autoptr(virConnect) conn = virGetConnectSecret();
++    qemuDomainSecretInfoPtr secinfo;
++    g_autofree char *alias = NULL;
++    uint8_t *secret = NULL;
++    size_t secretlen = 0;
++
++    if (!conn)
++        return NULL;
++
++    if (!(alias = qemuDomainGetSecretAESAlias(srcalias, isLuks)))
++        return NULL;
++
++    if (virSecretGetSecretString(conn, seclookupdef, usageType,
++                                 &secret, &secretlen) < 0)
++        return NULL;
++
++    secinfo = qemuDomainSecretAESSetup(priv, alias, username, secret, secretlen);
+ 
+- error:
+     VIR_DISPOSE_N(secret, secretlen);
+-    return NULL;
++
++    return secinfo;
+ }
+ 
+ 
+@@ -1670,8 +1691,8 @@ qemuDomainSecretInfoNew(qemuDomainObjPrivatePtr priv,
+                         virSecretLookupTypeDefPtr lookupDef,
+                         bool isLuks)
+ {
+-    return qemuDomainSecretAESSetup(priv, srcAlias, usageType, username,
+-                                    lookupDef, isLuks);
++    return qemuDomainSecretAESSetupFromSecret(priv, srcAlias, usageType, username,
++                                              lookupDef, isLuks);
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretAESSetupFromSecret-Use-qemuAliasForSecret.patch b/SOURCES/libvirt-qemuDomainSecretAESSetupFromSecret-Use-qemuAliasForSecret.patch
new file mode 100644
index 0000000..2aba2b0
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretAESSetupFromSecret-Use-qemuAliasForSecret.patch
@@ -0,0 +1,123 @@
+From 055d76ce856aecab3dfe3106429c926df405143b Mon Sep 17 00:00:00 2001
+Message-Id: <055d76ce856aecab3dfe3106429c926df405143b@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:53 +0100
+Subject: [PATCH] qemuDomainSecretAESSetupFromSecret: Use 'qemuAliasForSecret'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace qemuDomainGetSecretAESAlias by the new function so that we can
+reuse qemuDomainSecretAESSetupFromSecret also for setting up other kinds
+of objects.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 86fecaedf556dbd4d32efe28638c811be0e595d3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <88a582c0e5b8a73dd88f6872530c80b404149fb3.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 30 ++++++++++++++----------------
+ 1 file changed, 14 insertions(+), 16 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 0047a1d316..3599e0c9aa 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1583,34 +1583,32 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv,
+  * qemuDomainSecretAESSetupFromSecret:
+  * @priv: pointer to domain private object
+  * @srcalias: Alias of the disk/hostdev used to generate the secret alias
++ * @secretuse: specific usage for the secret (may be NULL if main object is using it)
+  * @usageType: The virSecretUsageType
+  * @username: username to use for authentication (may be NULL)
+  * @seclookupdef: Pointer to seclookupdef data
+- * @isLuks: True/False for is for luks (alias generation)
+  *
+  * Looks up a secret in the secret driver based on @usageType and @seclookupdef
+- * and builds qemuDomainSecretInfoPtr from it.
++ * and builds qemuDomainSecretInfoPtr from it. @use describes the usage of the
++ * secret in case if @srcalias requires more secrets for various usage cases.
+  */
+ static qemuDomainSecretInfoPtr
+ qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivatePtr priv,
+                                    const char *srcalias,
++                                   const char *secretuse,
+                                    virSecretUsageType usageType,
+                                    const char *username,
+-                                   virSecretLookupTypeDefPtr seclookupdef,
+-                                   bool isLuks)
++                                   virSecretLookupTypeDefPtr seclookupdef)
+ {
+     g_autoptr(virConnect) conn = virGetConnectSecret();
+     qemuDomainSecretInfoPtr secinfo;
+-    g_autofree char *alias = NULL;
++    g_autofree char *alias = qemuAliasForSecret(srcalias, secretuse);
+     uint8_t *secret = NULL;
+     size_t secretlen = 0;
+ 
+     if (!conn)
+         return NULL;
+ 
+-    if (!(alias = qemuDomainGetSecretAESAlias(srcalias, isLuks)))
+-        return NULL;
+-
+     if (virSecretGetSecretString(conn, seclookupdef, usageType,
+                                  &secret, &secretlen) < 0)
+         return NULL;
+@@ -1695,9 +1693,9 @@ qemuDomainSecretInfoTLSNew(qemuDomainObjPrivatePtr priv,
+     }
+     seclookupdef.type = VIR_SECRET_LOOKUP_TYPE_UUID;
+ 
+-    return qemuDomainSecretAESSetupFromSecret(priv, srcAlias,
++    return qemuDomainSecretAESSetupFromSecret(priv, srcAlias, NULL,
+                                               VIR_SECRET_USAGE_TYPE_TLS,
+-                                              NULL, &seclookupdef, false);
++                                              NULL, &seclookupdef);
+ }
+ 
+ 
+@@ -1788,10 +1786,10 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+                                                             &src->auth->seclookupdef);
+         } else {
+             srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasprotocol,
++                                                                  NULL,
+                                                                   usageType,
+                                                                   src->auth->username,
+-                                                                  &src->auth->seclookupdef,
+-                                                                  false);
++                                                                  &src->auth->seclookupdef);
+         }
+ 
+         if (!srcPriv->secinfo)
+@@ -1800,10 +1798,10 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+ 
+     if (hasEnc) {
+         if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasformat,
++                                                                    "luks",
+                                                                     VIR_SECRET_USAGE_TYPE_VOLUME,
+                                                                     NULL,
+-                                                                    &src->encryption->secrets[0]->seclookupdef,
+-                                                                    true)))
++                                                                    &src->encryption->secrets[0]->seclookupdef)))
+               return -1;
+     }
+ 
+@@ -1864,10 +1862,10 @@ qemuDomainSecretHostdevPrepare(qemuDomainObjPrivatePtr priv,
+             } else {
+                 srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
+                                                                       hostdev->info->alias,
++                                                                      NULL,
+                                                                       usageType,
+                                                                       src->auth->username,
+-                                                                      &src->auth->seclookupdef,
+-                                                                      false);
++                                                                      &src->auth->seclookupdef);
+             }
+ 
+             if (!srcPriv->secinfo)
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretInfo-Register-autoptr-cleanup-function.patch b/SOURCES/libvirt-qemuDomainSecretInfo-Register-autoptr-cleanup-function.patch
new file mode 100644
index 0000000..48eacaa
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretInfo-Register-autoptr-cleanup-function.patch
@@ -0,0 +1,36 @@
+From 865a4770a5145a0df11a42bb0efc7e72e862a236 Mon Sep 17 00:00:00 2001
+Message-Id: <865a4770a5145a0df11a42bb0efc7e72e862a236@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:44 +0100
+Subject: [PATCH] qemuDomainSecretInfo: Register autoptr cleanup function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b544481a91e6f3ee0e7534e0fc3d2cfb3bb60dba)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <f8b983d058091e9cd0631589334d72a1ecc1ec7d.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
+index 89a967efd7..bd9ac85ae2 100644
+--- a/src/qemu/qemu_domain.h
++++ b/src/qemu/qemu_domain.h
+@@ -1035,6 +1035,8 @@ bool qemuDomainSupportsEncryptedSecret(qemuDomainObjPrivatePtr priv);
+ void qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr secinfo)
+     ATTRIBUTE_NONNULL(1);
+ 
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDomainSecretInfo, qemuDomainSecretInfoFree);
++
+ void qemuDomainSecretInfoDestroy(qemuDomainSecretInfoPtr secinfo);
+ 
+ void qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Change-aliases-for-disk-secrets.patch b/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Change-aliases-for-disk-secrets.patch
new file mode 100644
index 0000000..66eaa43
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Change-aliases-for-disk-secrets.patch
@@ -0,0 +1,640 @@
+From 753a2f4071eadeed34e92c9b3b98423ae33fbfad Mon Sep 17 00:00:00 2001
+Message-Id: <753a2f4071eadeed34e92c9b3b98423ae33fbfad@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:54 +0100
+Subject: [PATCH] qemuDomainSecretStorageSourcePrepare: Change aliases for disk
+ secrets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originally there was only the secret for authentication so we didn't use
+any suffix to tell it apart. With the introduction of encryption we
+added a 'luks' suffix for the encryption secrets. Since encryption is
+really generic and authentication is not the only secret modify the
+aliases for the secrets to better describe what they are used for.
+
+This is possible as we store the disk secrets in the status XML thus
+only new machines will use the new secrets.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 70d2758a9cee795b26563fe33b38a2396efa2324)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <ca3a038969c81a17495add50a445901d5e42de5a.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c                        |  4 +--
+ ...-backing-chains-noindex.x86_64-2.12.0.args |  4 +--
+ ...-backing-chains-noindex.x86_64-latest.args |  6 ++--
+ ...sk-hostdev-scsi-virtio-iscsi-auth-AES.args |  6 ++--
+ .../disk-network-iscsi.x86_64-2.12.0.args     | 12 +++----
+ .../disk-network-iscsi.x86_64-latest.args     |  8 ++---
+ .../disk-network-rbd.x86_64-2.12.0.args       |  4 +--
+ .../disk-network-rbd.x86_64-latest.args       |  4 +--
+ ...isk-network-source-auth.x86_64-2.12.0.args | 10 +++---
+ ...isk-network-source-auth.x86_64-latest.args |  8 ++---
+ .../disk-nvme.x86_64-latest.args              |  4 +--
+ .../encrypted-disk-usage.args                 |  4 +--
+ tests/qemuxml2argvdata/encrypted-disk.args    |  4 +--
+ .../luks-disks-source-qcow2.args              | 24 +++++++-------
+ ...luks-disks-source-qcow2.x86_64-latest.args | 32 +++++++++----------
+ tests/qemuxml2argvdata/luks-disks-source.args | 26 ++++++++-------
+ tests/qemuxml2argvdata/luks-disks.args        | 10 +++---
+ tests/qemuxml2argvdata/user-aliases.args      |  4 +--
+ 18 files changed, 90 insertions(+), 84 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 3599e0c9aa..65df463acc 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1786,7 +1786,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+                                                             &src->auth->seclookupdef);
+         } else {
+             srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasprotocol,
+-                                                                  NULL,
++                                                                  "auth",
+                                                                   usageType,
+                                                                   src->auth->username,
+                                                                   &src->auth->seclookupdef);
+@@ -1798,7 +1798,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+ 
+     if (hasEnc) {
+         if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasformat,
+-                                                                    "luks",
++                                                                    "encryption",
+                                                                     VIR_SECRET_USAGE_TYPE_VOLUME,
+                                                                     NULL,
+                                                                     &src->encryption->secrets[0]->seclookupdef)))
+diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+index a8675debd5..47691339d6 100644
+--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
++++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+@@ -39,12 +39,12 @@ id=virtio-disk1 \
+ if=none,id=drive-virtio-disk2 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\
+ id=virtio-disk2 \
+--object secret,id=virtio-disk3-secret0,\
++-object secret,id=virtio-disk3-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
+ mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\
+-6322,file.password-secret=virtio-disk3-secret0,format=qcow2,if=none,\
++6322,file.password-secret=virtio-disk3-auth-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk3' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\
+ id=virtio-disk3 \
+diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+index 4108943574..23ceb0aa48 100644
+--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+@@ -80,15 +80,15 @@ id=virtio-disk2 \
+ "node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qcow2",\
+ "file":"libvirt-15-storage","backing":null}' \
+--object secret,id=libvirt-14-storage-secret0,\
++-object secret,id=libvirt-14-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\
+ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org",\
+ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\
+ "auth-client-required":["cephx","none"],\
+-"key-secret":"libvirt-14-storage-secret0","node-name":"libvirt-14-storage",\
+-"auto-read-only":true,"discard":"unmap"}' \
++"key-secret":"libvirt-14-storage-auth-secret0",\
++"node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qcow2",\
+ "file":"libvirt-14-storage","backing":"libvirt-15-format"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-14-format,\
+diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
+index aece52dad2..47b014aacc 100644
+--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
++++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
+@@ -28,13 +28,13 @@ server,nowait \
+ -no-acpi \
+ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+ -usb \
+--object secret,id=virtio-disk0-secret0,\
++-object secret,id=virtio-disk0-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file.driver=iscsi,file.portal=example.org:6000,\
+ file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,\
+-file.user=myname,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\
+-id=drive-virtio-disk0 \
++file.user=myname,file.password-secret=virtio-disk0-auth-secret0,format=raw,\
++if=none,id=drive-virtio-disk0 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+ -object secret,id=hostdev0-secret0,\
+diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+index 55347521da..930d8d5db2 100644
+--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
++++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+@@ -38,22 +38,22 @@ file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,\
+ if=none,id=drive-virtio-disk1 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\
+ id=virtio-disk1 \
+--object secret,id=virtio-disk2-secret0,\
++-object secret,id=virtio-disk2-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file.driver=iscsi,file.portal=example.org:6000,\
+ file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,\
+-file.user=myname,file.password-secret=virtio-disk2-secret0,format=raw,if=none,\
+-id=drive-virtio-disk2 \
++file.user=myname,file.password-secret=virtio-disk2-auth-secret0,format=raw,\
++if=none,id=drive-virtio-disk2 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\
+ id=virtio-disk2 \
+--object secret,id=virtio-disk3-secret0,\
++-object secret,id=virtio-disk3-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file.driver=iscsi,file.portal=example.org:6000,\
+ file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,\
+-file.user=myname,file.password-secret=virtio-disk3-secret0,format=raw,if=none,\
+-id=drive-virtio-disk3 \
++file.user=myname,file.password-secret=virtio-disk3-auth-secret0,format=raw,\
++if=none,id=drive-virtio-disk3 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,\
+ id=virtio-disk3 \
+ -drive file.driver=iscsi,file.portal=example.org:3260,\
+diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+index 8831db6622..1cb2f369f6 100644
+--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+@@ -42,23 +42,23 @@ id=virtio-disk0,bootindex=1 \
+ "file":"libvirt-4-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-4-format,\
+ id=virtio-disk1 \
+--object secret,id=libvirt-3-storage-secret0,\
++-object secret,id=libvirt-3-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\
+ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\
+-"user":"myname","password-secret":"libvirt-3-storage-secret0",\
++"user":"myname","password-secret":"libvirt-3-storage-auth-secret0",\
+ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-3-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
+ id=virtio-disk2 \
+--object secret,id=libvirt-2-storage-secret0,\
++-object secret,id=libvirt-2-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\
+ "target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\
+-"user":"myname","password-secret":"libvirt-2-storage-secret0",\
++"user":"myname","password-secret":"libvirt-2-storage-auth-secret0",\
+ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-2-storage"}' \
+diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
+index 18cb534552..21d1c2deba 100644
+--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
++++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
+@@ -45,12 +45,12 @@ id=virtio-disk2 \
+ format=raw,if=none,id=drive-virtio-disk3 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\
+ id=virtio-disk3 \
+--object secret,id=virtio-disk4-secret0,\
++-object secret,id=virtio-disk4-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
+ mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\
+-6322,file.password-secret=virtio-disk4-secret0,format=raw,if=none,\
++6322,file.password-secret=virtio-disk4-auth-secret0,format=raw,if=none,\
+ id=drive-virtio-disk4' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\
+ id=virtio-disk4 \
+diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
+index 2d05e63cd2..4c26dad497 100644
+--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
+@@ -56,14 +56,14 @@ id=virtio-disk2 \
+ "file":"libvirt-3-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-3-format,\
+ id=virtio-disk3 \
+--object secret,id=libvirt-2-storage-secret0,\
++-object secret,id=libvirt-2-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\
+ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org",\
+ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\
+ "auth-client-required":["cephx","none"],\
+-"key-secret":"libvirt-2-storage-secret0","node-name":"libvirt-2-storage",\
++"key-secret":"libvirt-2-storage-auth-secret0","node-name":"libvirt-2-storage",\
+ "auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-2-storage"}' \
+diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
+index f34c6b678d..279d5c73ec 100644
+--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
++++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
+@@ -27,21 +27,21 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -no-acpi \
+ -boot strict=on \
+ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+--object secret,id=virtio-disk0-secret0,\
++-object secret,id=virtio-disk0-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file.driver=iscsi,file.portal=example.org:6000,\
+ file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,\
+-file.user=myname,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\
+-id=drive-virtio-disk0 \
++file.user=myname,file.password-secret=virtio-disk0-auth-secret0,format=raw,\
++if=none,id=drive-virtio-disk0 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+--object secret,id=virtio-disk1-secret0,\
++-object secret,id=virtio-disk1-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
+ mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\
+-6322,file.password-secret=virtio-disk1-secret0,format=raw,if=none,\
++6322,file.password-secret=virtio-disk1-auth-secret0,format=raw,if=none,\
+ id=drive-virtio-disk1' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\
+ id=virtio-disk1 \
+diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
+index 057cd97273..182c8ab883 100644
+--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
+@@ -27,25 +27,25 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+ -no-acpi \
+ -boot strict=on \
+ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+--object secret,id=libvirt-2-storage-secret0,\
++-object secret,id=libvirt-2-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\
+ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\
+-"user":"myname","password-secret":"libvirt-2-storage-secret0",\
++"user":"myname","password-secret":"libvirt-2-storage-auth-secret0",\
+ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-2-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-2-format,\
+ id=virtio-disk0,bootindex=1 \
+--object secret,id=libvirt-1-storage-secret0,\
++-object secret,id=libvirt-1-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\
+ "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org",\
+ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\
+ "auth-client-required":["cephx","none"],\
+-"key-secret":"libvirt-1-storage-secret0","node-name":"libvirt-1-storage",\
++"key-secret":"libvirt-1-storage-auth-secret0","node-name":"libvirt-1-storage",\
+ "auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+ "file":"libvirt-1-storage"}' \
+diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
+index 3393a9129b..2d52c58dff 100644
+--- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
+@@ -46,7 +46,7 @@ id=virtio-disk1 \
+ "file":"libvirt-2-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-2-format,\
+ id=virtio-disk2 \
+--object secret,id=libvirt-1-format-luks-secret0,\
++-object secret,id=libvirt-1-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,\
+@@ -54,7 +54,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ "auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-1-format","read-only":false,\
+ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-1-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},\
+ "file":"libvirt-1-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
+ id=virtio-disk3,write-cache=on \
+diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args
+index 4522d2cb84..8641701293 100644
+--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
++++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
+@@ -27,11 +27,11 @@ path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+ -no-shutdown \
+ -no-acpi \
+ -usb \
+--object secret,id=virtio-disk0-luks-secret0,\
++-object secret,id=virtio-disk0-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk0-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk0 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
+index 4522d2cb84..8641701293 100644
+--- a/tests/qemuxml2argvdata/encrypted-disk.args
++++ b/tests/qemuxml2argvdata/encrypted-disk.args
+@@ -27,11 +27,11 @@ path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+ -no-shutdown \
+ -no-acpi \
+ -usb \
+--object secret,id=virtio-disk0-luks-secret0,\
++-object secret,id=virtio-disk0-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk0-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk0 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+index ab1c864cf6..e7a29b2e03 100644
+--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
++++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+@@ -27,53 +27,53 @@ path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+ -no-shutdown \
+ -no-acpi \
+ -usb \
+--object secret,id=virtio-disk0-luks-secret0,\
++-object secret,id=virtio-disk0-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk0-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk0 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+--object secret,id=virtio-disk1-luks-secret0,\
++-object secret,id=virtio-disk1-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk2,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk1-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk1-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk1 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
+ id=virtio-disk1 \
+--object secret,id=virtio-disk2-luks-secret0,\
++-object secret,id=virtio-disk2-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\
+ 6000/iqn.1992-01.com.example%3Astorage/1,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk2-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk2 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\
+ id=virtio-disk2 \
+--object secret,id=virtio-disk3-luks-secret0,\
++-object secret,id=virtio-disk3-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=iscsi://iscsi.example.com:3260/demo-target/3,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk3-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk3 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,\
+ id=virtio-disk3 \
+--object secret,id=virtio-disk4-luks-secret0,\
++-object secret,id=virtio-disk4-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\
+ 6321\;mon2.example.org\:6322\;mon3.example.org\:6322,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk4-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk4-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk4' \
+ -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk4,\
+ id=virtio-disk4 \
+--object secret,id=virtio-disk5-luks-secret0,\
++-object secret,id=virtio-disk5-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk5,encrypt.format=luks,\
+-encrypt.key-secret=virtio-disk5-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=virtio-disk5-encryption-secret0,format=qcow2,if=none,\
+ id=drive-virtio-disk5 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk5,\
+ id=virtio-disk5 \
+diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
+index 021bcb6961..44e4c5698d 100644
+--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
+@@ -28,53 +28,53 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
+ -no-acpi \
+ -boot strict=on \
+ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+--object secret,id=libvirt-7-format-luks-secret0,\
++-object secret,id=libvirt-7-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",\
+ "node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-7-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-7-format-encryption-secret0"},\
+ "file":"libvirt-7-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-7-format,\
+ id=virtio-disk0,bootindex=1 \
+--object secret,id=libvirt-6-format-luks-secret0,\
++-object secret,id=libvirt-6-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2",\
+ "node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-6-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-6-format-encryption-secret0"},\
+ "file":"libvirt-6-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-6-format,\
+ id=virtio-disk1 \
+--object secret,id=libvirt-5-storage-secret0,\
++-object secret,id=libvirt-5-storage-auth-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+--object secret,id=libvirt-5-format-luks-secret0,\
++-object secret,id=libvirt-5-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"iscsi","portal":"example.org:6000",\
+ "target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\
+-"user":"myname","password-secret":"libvirt-5-storage-secret0",\
++"user":"myname","password-secret":"libvirt-5-storage-auth-secret0",\
+ "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-5-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-5-format-encryption-secret0"},\
+ "file":"libvirt-5-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-5-format,\
+ id=virtio-disk2 \
+--object secret,id=libvirt-4-format-luks-secret0,\
++-object secret,id=libvirt-4-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260",\
+ "target":"demo-target","lun":3,"transport":"tcp",\
+ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-4-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-4-format-encryption-secret0"},\
+ "file":"libvirt-4-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=libvirt-4-format,\
+ id=virtio-disk3 \
+--object secret,id=libvirt-3-format-luks-secret0,\
++-object secret,id=libvirt-3-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"rbd","pool":"pool","image":"image",\
+@@ -82,25 +82,25 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ "port":"6322"},{"host":"mon3.example.org","port":"6322"}],\
+ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-3-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-3-format-encryption-secret0"},\
+ "file":"libvirt-3-storage"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=libvirt-3-format,\
+ id=virtio-disk4 \
+--object secret,id=libvirt-2-format-luks-secret0,\
++-object secret,id=libvirt-2-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"file","filename":"/storage/guest_disks/base.qcow2",\
+ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-2-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-secret0"},\
+ "file":"libvirt-2-storage","backing":null}' \
+--object secret,id=libvirt-1-format-luks-secret0,\
++-object secret,id=libvirt-1-format-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk5",\
+ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
+-"encrypt":{"format":"luks","key-secret":"libvirt-1-format-luks-secret0"},\
++"encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},\
+ "file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x8,drive=libvirt-1-format,\
+ id=virtio-disk5 \
+diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args
+index 4566f84ff1..e2bd559212 100644
+--- a/tests/qemuxml2argvdata/luks-disks-source.args
++++ b/tests/qemuxml2argvdata/luks-disks-source.args
+@@ -27,41 +27,45 @@ path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+ -no-shutdown \
+ -no-acpi \
+ -usb \
+--object secret,id=virtio-disk0-luks-secret0,\
++-object secret,id=virtio-disk0-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk,\
+-key-secret=virtio-disk0-luks-secret0,format=luks,if=none,id=drive-virtio-disk0 \
++key-secret=virtio-disk0-encryption-secret0,format=luks,if=none,\
++id=drive-virtio-disk0 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+--object secret,id=virtio-disk1-luks-secret0,\
++-object secret,id=virtio-disk1-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk2,\
+-key-secret=virtio-disk1-luks-secret0,format=luks,if=none,id=drive-virtio-disk1 \
++key-secret=virtio-disk1-encryption-secret0,format=luks,if=none,\
++id=drive-virtio-disk1 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
+ id=virtio-disk1 \
+--object secret,id=virtio-disk2-luks-secret0,\
++-object secret,id=virtio-disk2-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\
+-6000/iqn.1992-01.com.example%3Astorage/1,key-secret=virtio-disk2-luks-secret0,\
+-format=luks,if=none,id=drive-virtio-disk2 \
++6000/iqn.1992-01.com.example%3Astorage/1,\
++key-secret=virtio-disk2-encryption-secret0,format=luks,if=none,\
++id=drive-virtio-disk2 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\
+ id=virtio-disk2 \
+--object secret,id=virtio-disk3-luks-secret0,\
++-object secret,id=virtio-disk3-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=iscsi://iscsi.example.com:3260/demo-target/3,\
+-key-secret=virtio-disk3-luks-secret0,format=luks,if=none,id=drive-virtio-disk3 \
++key-secret=virtio-disk3-encryption-secret0,format=luks,if=none,\
++id=drive-virtio-disk3 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,\
+ id=virtio-disk3 \
+--object secret,id=virtio-disk4-luks-secret0,\
++-object secret,id=virtio-disk4-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\
+ 6321\;mon2.example.org\:6322\;mon3.example.org\:6322,\
+-key-secret=virtio-disk4-luks-secret0,format=luks,if=none,\
++key-secret=virtio-disk4-encryption-secret0,format=luks,if=none,\
+ id=drive-virtio-disk4' \
+ -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk4,\
+ id=virtio-disk4 \
+diff --git a/tests/qemuxml2argvdata/luks-disks.args b/tests/qemuxml2argvdata/luks-disks.args
+index db1ae45b60..47626966f2 100644
+--- a/tests/qemuxml2argvdata/luks-disks.args
++++ b/tests/qemuxml2argvdata/luks-disks.args
+@@ -27,18 +27,20 @@ path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+ -no-shutdown \
+ -no-acpi \
+ -usb \
+--object secret,id=virtio-disk0-luks-secret0,\
++-object secret,id=virtio-disk0-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk,\
+-key-secret=virtio-disk0-luks-secret0,format=luks,if=none,id=drive-virtio-disk0 \
++key-secret=virtio-disk0-encryption-secret0,format=luks,if=none,\
++id=drive-virtio-disk0 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+ id=virtio-disk0,bootindex=1 \
+--object secret,id=virtio-disk1-luks-secret0,\
++-object secret,id=virtio-disk1-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/storage/guest_disks/encryptdisk2,\
+-key-secret=virtio-disk1-luks-secret0,format=luks,if=none,id=drive-virtio-disk1 \
++key-secret=virtio-disk1-encryption-secret0,format=luks,if=none,\
++id=drive-virtio-disk1 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\
+ id=virtio-disk1 \
+ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
+index 54463386cd..88e540bc3c 100644
+--- a/tests/qemuxml2argvdata/user-aliases.args
++++ b/tests/qemuxml2argvdata/user-aliases.args
+@@ -48,11 +48,11 @@ id=drive-ua-myDisk1,cache=none \
+ id=drive-ua-myDisk2 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-ua-myDisk2,id=ua-myDisk2,\
+ bootindex=1 \
+--object secret,id=ua-myEncryptedDisk1-luks-secret0,\
++-object secret,id=ua-myEncryptedDisk1-encryption-secret0,\
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -drive file=/var/lib/libvirt/images/OtherDemo.img,encrypt.format=luks,\
+-encrypt.key-secret=ua-myEncryptedDisk1-luks-secret0,format=qcow2,if=none,\
++encrypt.key-secret=ua-myEncryptedDisk1-encryption-secret0,format=qcow2,if=none,\
+ id=drive-ua-myEncryptedDisk1 \
+ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-ua-myEncryptedDisk1,\
+ id=ua-myEncryptedDisk1 \
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Fix-naming-of-alias-variables.patch b/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Fix-naming-of-alias-variables.patch
new file mode 100644
index 0000000..497e01d
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Fix-naming-of-alias-variables.patch
@@ -0,0 +1,60 @@
+From d1569e303d1132059ee4144371b9060ca59c445a Mon Sep 17 00:00:00 2001
+Message-Id: <d1569e303d1132059ee4144371b9060ca59c445a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:50 +0100
+Subject: [PATCH] qemuDomainSecretStorageSourcePrepare: Fix naming of alias
+ variables
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The naming of the variables was tied to what they are used for not what
+the alias represents. Since we'll need to use some of the aliases for
+another type of secrets fix the name so that it makes sense.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b05322fc0376670edd54f9689ac8cda852581edc)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <ecb2064811e2bab26024bdd8dd90dafc4c23d3eb.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index af23079d5d..6221e7090f 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1759,8 +1759,8 @@ qemuDomainDiskHasEncryptionSecret(virStorageSourcePtr src)
+ static int
+ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+                                      virStorageSourcePtr src,
+-                                     const char *authalias,
+-                                     const char *encalias)
++                                     const char *aliasprotocol,
++                                     const char *aliasformat)
+ {
+     qemuDomainStorageSourcePrivatePtr srcPriv;
+     bool iscsiHasPS = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET);
+@@ -1787,7 +1787,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+                                                             src->auth->username,
+                                                             &src->auth->seclookupdef);
+         } else {
+-            srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, authalias,
++            srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasprotocol,
+                                                                   usageType,
+                                                                   src->auth->username,
+                                                                   &src->auth->seclookupdef,
+@@ -1799,7 +1799,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+     }
+ 
+     if (hasEnc) {
+-        if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, encalias,
++        if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv, aliasformat,
+                                                                     VIR_SECRET_USAGE_TYPE_VOLUME,
+                                                                     NULL,
+                                                                     &src->encryption->secrets[0]->seclookupdef,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Setup-secret-for-http-cookies.patch b/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Setup-secret-for-http-cookies.patch
new file mode 100644
index 0000000..f537f21
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSecretStorageSourcePrepare-Setup-secret-for-http-cookies.patch
@@ -0,0 +1,90 @@
+From 899a3adeded6a120a9d8f1298af482247f4696fa Mon Sep 17 00:00:00 2001
+Message-Id: <899a3adeded6a120a9d8f1298af482247f4696fa@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:03 +0100
+Subject: [PATCH] qemuDomainSecretStorageSourcePrepare: Setup secret for http
+ cookies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QEMU's curl driver requires the cookies concatenated and allows themi to
+be passed in via a secret. Prepare the value for the secret and encrypt
+it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 877cd358873982d4d6a36b7e65a8605c663e5765)
+
+Conflicts:
+  src/qemu/qemu_domain.c:
+  Refactor to virBufferTrim not backported.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <e61490666a540093eac6c219c07a12c6b7d4c72a.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 33 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 32 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 9391bc37e0..cc47e7a2f0 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -1740,6 +1740,30 @@ qemuDomainDiskHasEncryptionSecret(virStorageSourcePtr src)
+ }
+ 
+ 
++static qemuDomainSecretInfoPtr
++qemuDomainSecretStorageSourcePrepareCookies(qemuDomainObjPrivatePtr priv,
++                                            virStorageSourcePtr src,
++                                            const char *aliasprotocol)
++{
++    g_autofree char *secretalias = qemuAliasForSecret(aliasprotocol, "httpcookie");
++    g_autofree char *cookies = NULL;
++    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
++    size_t i;
++
++    for (i = 0; i < src->ncookies; i++) {
++        virStorageNetCookieDefPtr cookie = src->cookies[i];
++
++        virBufferAsprintf(&buf, "%s=%s; ", cookie->name, cookie->value);
++    }
++
++    virBufferTrim(&buf, "; ", -1);
++    cookies = virBufferContentAndReset(&buf);
++
++    return qemuDomainSecretAESSetup(priv, secretalias, NULL,
++                                    (uint8_t *) cookies, strlen(cookies));
++}
++
++
+ /**
+  * qemuDomainSecretStorageSourcePrepare:
+  * @priv: domain private object
+@@ -1765,7 +1789,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+     bool hasAuth = qemuDomainStorageSourceHasAuth(src);
+     bool hasEnc = qemuDomainDiskHasEncryptionSecret(src);
+ 
+-    if (!hasAuth && !hasEnc)
++    if (!hasAuth && !hasEnc && src->ncookies == 0)
+         return 0;
+ 
+     if (!(src->privateData = qemuDomainStorageSourcePrivateNew()))
+@@ -1805,6 +1829,13 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivatePtr priv,
+               return -1;
+     }
+ 
++    if (src->ncookies &&
++        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
++        !(srcPriv->httpcookie = qemuDomainSecretStorageSourcePrepareCookies(priv,
++                                                                            src,
++                                                                            aliasprotocol)))
++        return -1;
++
+     return 0;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Don-t-load-the-relative-path-with-blockdev.patch b/SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Don-t-load-the-relative-path-with-blockdev.patch
new file mode 100644
index 0000000..c9a9567
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Don-t-load-the-relative-path-with-blockdev.patch
@@ -0,0 +1,42 @@
+From 84b0e095a5dd885a532a4108e95adea0b5dca184 Mon Sep 17 00:00:00 2001
+Message-Id: <84b0e095a5dd885a532a4108e95adea0b5dca184@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:42 +0200
+Subject: [PATCH] qemuDomainSnapshotDiskPrepareOne: Don't load the relative
+ path with blockdev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since we are refreshing the relative paths when doing the blockjobs we
+no longer need to load them upfront when doing the snapshot.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2ace7a87a8aced68c2504fd4dd4e2df4302c3eeb)
+https://bugzilla.redhat.com/show_bug.cgi?id=1818655
+Message-Id: <7763b0a5b018f04230220b81038e60dc12706799.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_driver.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 27a50f60ef..4701a1905e 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15441,8 +15441,9 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
+         dd->initialized = true;
+ 
+         /* relative backing store paths need to be updated so that relative
+-         * block commit still works */
+-        if (reuse) {
++         * block commit still works. With blockdev we must update it when doing
++         * commit anyways so it's skipped here */
++        if (reuse && !blockdev) {
+             if (supportsBacking) {
+                 g_autofree char *backingStoreStr = NULL;
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Fix-logic-of-relative-backing-store-update.patch b/SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Fix-logic-of-relative-backing-store-update.patch
new file mode 100644
index 0000000..29d41fb
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainSnapshotDiskPrepareOne-Fix-logic-of-relative-backing-store-update.patch
@@ -0,0 +1,78 @@
+From a3a9d320ac8cde96c976378b92dc4fcf553d9287 Mon Sep 17 00:00:00 2001
+Message-Id: <a3a9d320ac8cde96c976378b92dc4fcf553d9287@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 3 Apr 2020 14:32:55 +0200
+Subject: [PATCH] qemuDomainSnapshotDiskPrepareOne: Fix logic of relative
+ backing store update
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 2ace7a87a8aced68c250 introduced a logic bug by an improperly
+modified condition where we'd skip to the else branch when reusing of
+external images was requested and blockdev is available.
+
+The original intentions were to skip the backing store update with
+blockdev.
+
+Fix it by only asserting the boolean which was used to track whether we
+support update of the backing store only when blockdev is not present
+along with the appropriate rename.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1820016
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit ae64a75a8713cf14b25b40078766c2da93e001ff)
+Message-Id: <c4ce185df3fb6d88aa7282d523b0a5c7ccff2aad.1585916255.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 4701a1905e..26215f8d6a 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15403,7 +15403,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
+ {
+     virDomainDiskDefPtr persistdisk;
+     bool supportsCreate;
+-    bool supportsBacking;
++    bool updateRelativeBacking = false;
+ 
+     dd->disk = disk;
+ 
+@@ -15432,19 +15432,22 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
+     }
+ 
+     supportsCreate = virStorageFileSupportsCreate(dd->src);
+-    supportsBacking = virStorageFileSupportsBackingChainTraversal(dd->src);
+ 
+-    if (supportsCreate || supportsBacking) {
++    /* relative backing store paths need to be updated so that relative
++     * block commit still works. With blockdev we must update it when doing
++     * commit anyways so it's skipped here */
++    if (!blockdev &&
++        virStorageFileSupportsBackingChainTraversal(dd->src))
++        updateRelativeBacking = true;
++
++    if (supportsCreate || updateRelativeBacking) {
+         if (qemuDomainStorageFileInit(driver, vm, dd->src, NULL) < 0)
+             return -1;
+ 
+         dd->initialized = true;
+ 
+-        /* relative backing store paths need to be updated so that relative
+-         * block commit still works. With blockdev we must update it when doing
+-         * commit anyways so it's skipped here */
+-        if (reuse && !blockdev) {
+-            if (supportsBacking) {
++        if (reuse) {
++            if (updateRelativeBacking) {
+                 g_autofree char *backingStoreStr = NULL;
+ 
+                 if (virStorageFileGetBackingStoreStr(dd->src, &backingStoreStr) < 0)
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuDomainValidateStorageSource-Reject-unsupported-slices.patch b/SOURCES/libvirt-qemuDomainValidateStorageSource-Reject-unsupported-slices.patch
new file mode 100644
index 0000000..1401c13
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainValidateStorageSource-Reject-unsupported-slices.patch
@@ -0,0 +1,52 @@
+From 038231283c69bf7c9c9fadd2157f53f8b3f719d3 Mon Sep 17 00:00:00 2001
+Message-Id: <038231283c69bf7c9c9fadd2157f53f8b3f719d3@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:17 +0100
+Subject: [PATCH] qemuDomainValidateStorageSource: Reject unsupported slices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We support explicit storage slices only when using blockdev. Storage
+slices expressed via the backing store string are left to qemu to
+open correctly.
+
+Reject storage slices configured via the XML for non-blockdev usage.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit a6eeda986e458e6746268069b1f610c27e89d6e2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <10cfef14fcb49c7daef4f869d622ebdf3aa6a4d5.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index cf069e2b79..7b414b79c7 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -6936,6 +6936,18 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
+         return -1;
+     }
+ 
++    if (src->sliceStorage) {
++        /* In pre-blockdev era we can't configure the slice so we can allow them
++         * only for detected backing store entries as they are populated
++         * from a place that qemu would be able to read */
++        if (!src->detected &&
++            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("storage slice is not supported by this QEMU binary"));
++            return -1;
++        }
++    }
++
+     return 0;
+ }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuDomainValidateStorageSource-Relax-PR-validation.patch b/SOURCES/libvirt-qemuDomainValidateStorageSource-Relax-PR-validation.patch
deleted file mode 100644
index 3d0e624..0000000
--- a/SOURCES/libvirt-qemuDomainValidateStorageSource-Relax-PR-validation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 448e9008661651e4a232e3919e13cc9114c4bdc9 Mon Sep 17 00:00:00 2001
-Message-Id: <448e9008661651e4a232e3919e13cc9114c4bdc9@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 11 Jul 2018 17:27:24 +0200
-Subject: [PATCH] qemuDomainValidateStorageSource: Relax PR validation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1470007
-
-Rather than rejecting the user provided path and alias for the
-managed PR reservation we will ignore the provided path. The
-reason is that migration XML does contain path even for managed
-reservations.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 900403a3b2fe76ec3e03086c24a2d5480a7a6b06)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_domain.c | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f9bcf76f44..cfecbaca74 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4615,19 +4615,11 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
-         }
-     }
- 
--    if (src->pr) {
--        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("reservations not supported with this QEMU binary"));
--            return -1;
--        }
--
--        if (virStoragePRDefIsManaged(src->pr) && src->pr->path) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("'path' attribute should not be provided for "
--                             "managed reservations"));
--            return -1;
--        }
-+    if (src->pr &&
-+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("reservations not supported with this QEMU binary"));
-+        return -1;
-     }
- 
-     return 0;
-@@ -12831,6 +12823,7 @@ qemuDomainPrepareStorageSourcePR(virStorageSourcePtr src,
-         return 0;
- 
-     if (virStoragePRDefIsManaged(src->pr)) {
-+        VIR_FREE(src->pr->path);
-         if (!(src->pr->path = qemuDomainGetManagedPRSocketPath(priv)))
-             return -1;
-         if (VIR_STRDUP(src->pr->mgralias, qemuDomainGetManagedPRAlias()) < 0)
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemuDomainValidateStorageSource-Validate-new-network-storage-parameters.patch b/SOURCES/libvirt-qemuDomainValidateStorageSource-Validate-new-network-storage-parameters.patch
new file mode 100644
index 0000000..e3e7b54
--- /dev/null
+++ b/SOURCES/libvirt-qemuDomainValidateStorageSource-Validate-new-network-storage-parameters.patch
@@ -0,0 +1,113 @@
+From 5e76dbcf3922074cbf708c3ffe8adc6e108bac76 Mon Sep 17 00:00:00 2001
+Message-Id: <5e76dbcf3922074cbf708c3ffe8adc6e108bac76@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:59 +0100
+Subject: [PATCH] qemuDomainValidateStorageSource: Validate new network storage
+ parameters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ensure that the new fields are allowed only when -blockdev is used or
+when they are in the detected part of the backing chain where qemu will
+handle them internally.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c1409e308f8e10f28ff4977309b2573a1a2d8763)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <3b47d0ff8f492506588d6ddeda49d2e4e43cc5aa.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 75 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 75 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 65df463acc..2920e699f6 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -6953,6 +6953,81 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
+         }
+     }
+ 
++    if (src->sslverify != VIR_TRISTATE_BOOL_ABSENT) {
++        if (actualType != VIR_STORAGE_TYPE_NETWORK ||
++            (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_FTPS)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("ssl verification is supported only with HTTPS/FTPS protocol"));
++            return -1;
++        }
++
++        if (!src->detected &&
++            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("ssl verification setting is not supported by this QEMU binary"));
++            return -1;
++        }
++    }
++
++    if (src->ncookies > 0) {
++        if (actualType != VIR_STORAGE_TYPE_NETWORK ||
++            (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("http cookies are supported only with HTTP(S) protocol"));
++            return -1;
++        }
++
++        if (!src->detected &&
++            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("http cookies are not supported by this QEMU binary"));
++            return -1;
++        }
++
++        if (virStorageSourceNetCookiesValidate(src) < 0)
++            return -1;
++    }
++
++    if (src->readahead > 0) {
++        if (actualType != VIR_STORAGE_TYPE_NETWORK ||
++            (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_FTP &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_FTPS)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("readaehad is supported only with HTTP(S)/FTP(s) protocols"));
++            return -1;
++        }
++
++        if (!src->detected &&
++            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("readahead setting is not supported with this QEMU binary"));
++            return -1;
++        }
++    }
++
++    if (src->timeout > 0) {
++        if (actualType != VIR_STORAGE_TYPE_NETWORK ||
++            (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_FTP &&
++             src->protocol != VIR_STORAGE_NET_PROTOCOL_FTPS)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("timeout is supported only with HTTP(S)/FTP(s) protocols"));
++            return -1;
++        }
++
++        if (!src->detected &&
++            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("timeout setting is not supported with this QEMU binary"));
++            return -1;
++        }
++    }
++
+     return 0;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuExtDevicesStart-pass-logManager.patch b/SOURCES/libvirt-qemuExtDevicesStart-pass-logManager.patch
new file mode 100644
index 0000000..1f2000e
--- /dev/null
+++ b/SOURCES/libvirt-qemuExtDevicesStart-pass-logManager.patch
@@ -0,0 +1,67 @@
+From 27ae8a1488afd910dccd1f76d1fa31a3c8560d04 Mon Sep 17 00:00:00 2001
+Message-Id: <27ae8a1488afd910dccd1f76d1fa31a3c8560d04@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:36 +0100
+Subject: [PATCH] qemuExtDevicesStart: pass logManager
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Pass logManager to qemuExtDevicesStart for future usage.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit b164eac5e1d4ebe17e673f0427b70f862a670f94)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <44ec9897e79f7482dc22611526a154915bb02cdb.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_extdevice.c | 1 +
+ src/qemu/qemu_extdevice.h | 1 +
+ src/qemu/qemu_process.c   | 4 +++-
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
+index 9c0c0fd573..7f3bb104d9 100644
+--- a/src/qemu/qemu_extdevice.c
++++ b/src/qemu/qemu_extdevice.c
+@@ -153,6 +153,7 @@ qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
+ int
+ qemuExtDevicesStart(virQEMUDriverPtr driver,
+                     virDomainObjPtr vm,
++                    virLogManagerPtr logManager G_GNUC_UNUSED,
+                     bool incomingMigration)
+ {
+     virDomainDefPtr def = vm->def;
+diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
+index 5cf777ab4b..df29968e16 100644
+--- a/src/qemu/qemu_extdevice.h
++++ b/src/qemu/qemu_extdevice.h
+@@ -46,6 +46,7 @@ void qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
+ 
+ int qemuExtDevicesStart(virQEMUDriverPtr driver,
+                         virDomainObjPtr vm,
++                        virLogManagerPtr logManager,
+                         bool incomingMigration)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
+     G_GNUC_WARN_UNUSED_RESULT;
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index a7bbab9e56..0476f18517 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -6705,7 +6705,9 @@ qemuProcessLaunch(virConnectPtr conn,
+     if (qemuProcessGenID(vm, flags) < 0)
+         goto cleanup;
+ 
+-    if (qemuExtDevicesStart(driver, vm, incoming != NULL) < 0)
++    if (qemuExtDevicesStart(driver, vm,
++                            qemuDomainLogContextGetManager(logCtxt),
++                            incoming != NULL) < 0)
+         goto cleanup;
+ 
+     VIR_DEBUG("Building emulator command line");
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieAddNBD-Exit-early-if-there-are-no-disks.patch b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Exit-early-if-there-are-no-disks.patch
new file mode 100644
index 0000000..f9d3ab4
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Exit-early-if-there-are-no-disks.patch
@@ -0,0 +1,56 @@
+From 44d255b6cc7315537e66f1d97e4893e321b694b8 Mon Sep 17 00:00:00 2001
+Message-Id: <44d255b6cc7315537e66f1d97e4893e321b694b8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:02 +0100
+Subject: [PATCH] qemuMigrationCookieAddNBD: Exit early if there are no disks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Refactor the logic to skip the body of the function if there's nothing
+to do.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit bdff9d4513694da8d9b2bb60a1f808fb1c286388)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <b12c9b8c4ca78e848e43ab4ae7706a5694cfb49c.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
+index 299bf17c9e..73ae815818 100644
+--- a/src/qemu/qemu_migration_cookie.c
++++ b/src/qemu/qemu_migration_cookie.c
+@@ -464,8 +464,13 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     if (VIR_ALLOC(mig->nbd) < 0)
+         return -1;
+ 
+-    if (vm->def->ndisks &&
+-        VIR_ALLOC_N(mig->nbd->disks, vm->def->ndisks) < 0)
++    mig->nbd->port = priv->nbdPort;
++    mig->flags |= QEMU_MIGRATION_COOKIE_NBD;
++
++    if (vm->def->ndisks == 0)
++        return 0;
++
++    if (VIR_ALLOC_N(mig->nbd->disks, vm->def->ndisks) < 0)
+         return -1;
+     mig->nbd->ndisks = 0;
+ 
+@@ -496,9 +501,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+         mig->nbd->ndisks++;
+     }
+ 
+-    mig->nbd->port = priv->nbdPort;
+-    mig->flags |= QEMU_MIGRATION_COOKIE_NBD;
+-
+     ret = 0;
+  cleanup:
+     virHashFree(stats);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieAddNBD-Fix-filling-of-capacity-when-blockdev-is-used.patch b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Fix-filling-of-capacity-when-blockdev-is-used.patch
new file mode 100644
index 0000000..08304a4
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Fix-filling-of-capacity-when-blockdev-is-used.patch
@@ -0,0 +1,74 @@
+From 0c415216f2005b3c33379db3b37fb9c03e30a658 Mon Sep 17 00:00:00 2001
+Message-Id: <0c415216f2005b3c33379db3b37fb9c03e30a658@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:08 +0100
+Subject: [PATCH] qemuMigrationCookieAddNBD: Fix filling of 'capacity' when
+ blockdev is used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With -blockdev we must look up via the nodename rather than the 'drive'
+alias which is not present any more.
+
+This fixes the pre-creation of storage volumes on migration with
+non-shared storage.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit b9e87908dbcff23cc3fdf3d8629849560d2e7268)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <60eb81e2479cac5fc9ae3cc40abb106e0a127e6e.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
+index 734d95f4f1..a5a9edffc3 100644
+--- a/src/qemu/qemu_migration_cookie.c
++++ b/src/qemu/qemu_migration_cookie.c
+@@ -455,6 +455,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(virHashTable) stats = virHashNew(virHashValueFree);
++    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
+     size_t i;
+     int rc;
+ 
+@@ -474,7 +475,10 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+ 
+     if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0)
+         return -1;
+-    rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
++    if (blockdev)
++        rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats);
++    else
++        rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
+     if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
+         return -1;
+ 
+@@ -482,9 +486,14 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+         virDomainDiskDefPtr disk = vm->def->disks[i];
+         qemuBlockStats *entry;
+ 
+-        if (!disk->info.alias ||
+-            !(entry = virHashLookup(stats, disk->info.alias)))
+-            continue;
++        if (blockdev) {
++            if (!(entry = virHashLookup(stats, disk->src->nodeformat)))
++                continue;
++        } else {
++            if (!disk->info.alias ||
++                !(entry = virHashLookup(stats, disk->info.alias)))
++                continue;
++        }
+ 
+         mig->nbd->disks[mig->nbd->ndisks].target = g_strdup(disk->dst);
+         mig->nbd->disks[mig->nbd->ndisks].capacity = entry->capacity;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieAddNBD-Move-monitor-call-out-of-the-loop.patch b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Move-monitor-call-out-of-the-loop.patch
new file mode 100644
index 0000000..c78172d
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Move-monitor-call-out-of-the-loop.patch
@@ -0,0 +1,65 @@
+From fe9aca2a6860fbb84faed53b10fabc95b1c73a7a Mon Sep 17 00:00:00 2001
+Message-Id: <fe9aca2a6860fbb84faed53b10fabc95b1c73a7a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:05 +0100
+Subject: [PATCH] qemuMigrationCookieAddNBD: Move monitor call out of the loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The data is gathered only once so we can move the whole block which
+fetches the data out of the loop and get rid of the logic which
+prevents multiple calls.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 464345e153b805467a22fca4615350e992e6d470)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <4c88d7cb39985ba204cd126d6adb740f58d19d6f.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.c | 23 +++++++++--------------
+ 1 file changed, 9 insertions(+), 14 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
+index 1c3de13983..33ab6cb7a5 100644
+--- a/src/qemu/qemu_migration_cookie.c
++++ b/src/qemu/qemu_migration_cookie.c
+@@ -472,24 +472,19 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     mig->nbd->disks = g_new0(struct qemuMigrationCookieNBDDisk, vm->def->ndisks);
+     mig->nbd->ndisks = 0;
+ 
++    if (!(stats = virHashCreate(10, virHashValueFree)))
++        goto cleanup;
++
++    if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0)
++        goto cleanup;
++    rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
++    if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
++        goto cleanup;
++
+     for (i = 0; i < vm->def->ndisks; i++) {
+         virDomainDiskDefPtr disk = vm->def->disks[i];
+         qemuBlockStats *entry;
+ 
+-        if (!stats) {
+-            if (!(stats = virHashCreate(10, virHashValueFree)))
+-                goto cleanup;
+-
+-            if (qemuDomainObjEnterMonitorAsync(driver, vm,
+-                                               priv->job.asyncJob) < 0)
+-                goto cleanup;
+-            rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
+-            if (qemuDomainObjExitMonitor(driver, vm) < 0)
+-                goto cleanup;
+-            if (rc < 0)
+-                goto cleanup;
+-        }
+-
+         if (!disk->info.alias ||
+             !(entry = virHashLookup(stats, disk->info.alias)))
+             continue;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieAddNBD-Remove-ret-variable-and-cleanup-label.patch b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Remove-ret-variable-and-cleanup-label.patch
new file mode 100644
index 0000000..e123f21
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Remove-ret-variable-and-cleanup-label.patch
@@ -0,0 +1,61 @@
+From ea4867bfe2c2990f62c3158b875f56dbf540f372 Mon Sep 17 00:00:00 2001
+Message-Id: <ea4867bfe2c2990f62c3158b875f56dbf540f372@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:07 +0100
+Subject: [PATCH] qemuMigrationCookieAddNBD: Remove 'ret' variable and
+ 'cleanup' label
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit d409411213152d204b85daf05468c4f7f17c1616)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <1feef9fdcf0e2f1178e8136192d91a6558cc6149.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
+index 968a9b589c..734d95f4f1 100644
+--- a/src/qemu/qemu_migration_cookie.c
++++ b/src/qemu/qemu_migration_cookie.c
+@@ -456,7 +456,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     g_autoptr(virHashTable) stats = virHashNew(virHashValueFree);
+     size_t i;
+-    int ret = -1, rc;
++    int rc;
+ 
+     /* It is not a bug if there already is a NBD data */
+     qemuMigrationCookieNBDFree(mig->nbd);
+@@ -473,10 +473,10 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     mig->nbd->ndisks = 0;
+ 
+     if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0)
+-        goto cleanup;
++        return -1;
+     rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
+     if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < vm->def->ndisks; i++) {
+         virDomainDiskDefPtr disk = vm->def->disks[i];
+@@ -491,9 +491,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+         mig->nbd->ndisks++;
+     }
+ 
+-    ret = 0;
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-glib-memory-allocators.patch b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-glib-memory-allocators.patch
new file mode 100644
index 0000000..c212e54
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-glib-memory-allocators.patch
@@ -0,0 +1,47 @@
+From b3f938e7c0907ea9222827550fd3dfa0c1f1e1fd Mon Sep 17 00:00:00 2001
+Message-Id: <b3f938e7c0907ea9222827550fd3dfa0c1f1e1fd@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:04 +0100
+Subject: [PATCH] qemuMigrationCookieAddNBD: Use glib memory allocators
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 8efeeb59a6e76fa9515deb7d3d26ae570e0fb7a7)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <5872c474b94250bb0994748d9b769883ecbea6f8.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
+index 73ae815818..1c3de13983 100644
+--- a/src/qemu/qemu_migration_cookie.c
++++ b/src/qemu/qemu_migration_cookie.c
+@@ -461,8 +461,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     /* It is not a bug if there already is a NBD data */
+     qemuMigrationCookieNBDFree(mig->nbd);
+ 
+-    if (VIR_ALLOC(mig->nbd) < 0)
+-        return -1;
++    mig->nbd = g_new0(qemuMigrationCookieNBD, 1);
+ 
+     mig->nbd->port = priv->nbdPort;
+     mig->flags |= QEMU_MIGRATION_COOKIE_NBD;
+@@ -470,8 +469,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     if (vm->def->ndisks == 0)
+         return 0;
+ 
+-    if (VIR_ALLOC_N(mig->nbd->disks, vm->def->ndisks) < 0)
+-        return -1;
++    mig->nbd->disks = g_new0(struct qemuMigrationCookieNBDDisk, vm->def->ndisks);
+     mig->nbd->ndisks = 0;
+ 
+     for (i = 0; i < vm->def->ndisks; i++) {
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-virHashNew-and-automatic-freeing-of-virHashTablePtr.patch b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-virHashNew-and-automatic-freeing-of-virHashTablePtr.patch
new file mode 100644
index 0000000..c6850bd
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieAddNBD-Use-virHashNew-and-automatic-freeing-of-virHashTablePtr.patch
@@ -0,0 +1,57 @@
+From 3e6ecac77da1e9f302f81a68dded6bd226430682 Mon Sep 17 00:00:00 2001
+Message-Id: <3e6ecac77da1e9f302f81a68dded6bd226430682@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:06 +0100
+Subject: [PATCH] qemuMigrationCookieAddNBD: Use virHashNew and automatic
+ freeing of virHashTablePtr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Swithc to the helper which doesn't require checking of the return value.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 45eefb2c78cfe2b14d5bc5fb150ffbed18991fde)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <06db6f97ebb2266ea197ce13cbc9051e4c839fdf.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
+index 33ab6cb7a5..968a9b589c 100644
+--- a/src/qemu/qemu_migration_cookie.c
++++ b/src/qemu/qemu_migration_cookie.c
+@@ -454,7 +454,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+                           virDomainObjPtr vm)
+ {
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+-    virHashTablePtr stats = NULL;
++    g_autoptr(virHashTable) stats = virHashNew(virHashValueFree);
+     size_t i;
+     int ret = -1, rc;
+ 
+@@ -472,9 +472,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+     mig->nbd->disks = g_new0(struct qemuMigrationCookieNBDDisk, vm->def->ndisks);
+     mig->nbd->ndisks = 0;
+ 
+-    if (!(stats = virHashCreate(10, virHashValueFree)))
+-        goto cleanup;
+-
+     if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0)
+         goto cleanup;
+     rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
+@@ -496,7 +493,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
+ 
+     ret = 0;
+  cleanup:
+-    virHashFree(stats);
+     return ret;
+ }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationCookieNBD-Extract-embedded-struct.patch b/SOURCES/libvirt-qemuMigrationCookieNBD-Extract-embedded-struct.patch
new file mode 100644
index 0000000..22753ff
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationCookieNBD-Extract-embedded-struct.patch
@@ -0,0 +1,52 @@
+From 92ec9a02d57b18eac3abc33e0807cd70c6bb46c5 Mon Sep 17 00:00:00 2001
+Message-Id: <92ec9a02d57b18eac3abc33e0807cd70c6bb46c5@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:03 +0100
+Subject: [PATCH] qemuMigrationCookieNBD: Extract embedded struct
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Extract the struct so that it's type has a name.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 3093822d1d8e3bbd01ea59f35a9fea1228f9268f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <e05be367f0869dbbf726cea7e91925fc48bb683f.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_cookie.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h
+index 20e1ed60ca..1e88684589 100644
+--- a/src/qemu/qemu_migration_cookie.h
++++ b/src/qemu/qemu_migration_cookie.h
+@@ -84,16 +84,18 @@ struct _qemuMigrationCookieNetwork {
+     qemuMigrationCookieNetDataPtr net;
+ };
+ 
++struct qemuMigrationCookieNBDDisk {
++    char *target;                   /* Disk target */
++    unsigned long long capacity;    /* And its capacity */
++};
++
+ typedef struct _qemuMigrationCookieNBD qemuMigrationCookieNBD;
+ typedef qemuMigrationCookieNBD *qemuMigrationCookieNBDPtr;
+ struct _qemuMigrationCookieNBD {
+     int port; /* on which port does NBD server listen for incoming data */
+ 
+     size_t ndisks;  /* Number of items in @disk array */
+-    struct {
+-        char *target;                   /* Disk target */
+-        unsigned long long capacity;    /* And its capacity */
+-    } *disks;
++    struct qemuMigrationCookieNBDDisk *disks;
+ };
+ 
+ typedef struct _qemuMigrationCookieCaps qemuMigrationCookieCaps;
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMigrationParamsResetTLS-Adapt-to-modern-memory-management.patch b/SOURCES/libvirt-qemuMigrationParamsResetTLS-Adapt-to-modern-memory-management.patch
new file mode 100644
index 0000000..cbecf93
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationParamsResetTLS-Adapt-to-modern-memory-management.patch
@@ -0,0 +1,59 @@
+From f3179ed39f95ec25c9d4c6ec8ef67d54abd6c5ad Mon Sep 17 00:00:00 2001
+Message-Id: <f3179ed39f95ec25c9d4c6ec8ef67d54abd6c5ad@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:42 +0100
+Subject: [PATCH] qemuMigrationParamsResetTLS: Adapt to modern memory
+ management
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use g_autofree instead of VIR_FREE and delete the comment mentioning
+possible failure to allocate memory.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3b6110655013e9ae0ee933406c1ff0c7af2d4734)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <86a9b24e53e4de2830c6ff33639837b14f20d282.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_params.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
+index f61796713f..60b41e287a 100644
+--- a/src/qemu/qemu_migration_params.c
++++ b/src/qemu/qemu_migration_params.c
+@@ -1074,8 +1074,8 @@ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver,
+                             qemuMigrationParamsPtr origParams,
+                             unsigned long apiFlags)
+ {
+-    char *tlsAlias = NULL;
+-    char *secAlias = NULL;
++    g_autofree char *tlsAlias = NULL;
++    g_autofree char *secAlias = NULL;
+ 
+     /* There's nothing to do if QEMU does not support TLS migration or we were
+      * not asked to enable it. */
+@@ -1083,17 +1083,11 @@ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver,
+         !(apiFlags & VIR_MIGRATE_TLS))
+         return;
+ 
+-    /* NB: If either or both fail to allocate memory we can still proceed
+-     *     since the next time we migrate another deletion attempt will be
+-     *     made after successfully generating the aliases. */
+     tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE);
+     secAlias = qemuDomainGetSecretAESAlias(QEMU_MIGRATION_TLS_ALIAS_BASE, false);
+ 
+     qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, tlsAlias);
+     g_clear_pointer(&QEMU_DOMAIN_PRIVATE(vm)->migSecinfo, qemuDomainSecretInfoFree);
+-
+-    VIR_FREE(tlsAlias);
+-    VIR_FREE(secAlias);
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuMigrationParamsResetTLS-Fix-comment.patch b/SOURCES/libvirt-qemuMigrationParamsResetTLS-Fix-comment.patch
new file mode 100644
index 0000000..0360a14
--- /dev/null
+++ b/SOURCES/libvirt-qemuMigrationParamsResetTLS-Fix-comment.patch
@@ -0,0 +1,39 @@
+From 8e6004601d38241aafb9a3f04cc572bb4eb5e4c5 Mon Sep 17 00:00:00 2001
+Message-Id: <8e6004601d38241aafb9a3f04cc572bb4eb5e4c5@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:11:43 +0100
+Subject: [PATCH] qemuMigrationParamsResetTLS: Fix comment
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The comment mentioned that the function resets migration params, but
+that is not true as of commit eb54cb473a8d140e0dd4a7bd42e8bcd72b056368
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 7a34e04d82ba61613c5fa1f8c265cbf2c0276b39)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <3d8e22ae485964827bf28bd1d1529e7757b2350c.1584391726.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_migration_params.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
+index 60b41e287a..0a3b0f8741 100644
+--- a/src/qemu/qemu_migration_params.c
++++ b/src/qemu/qemu_migration_params.c
+@@ -1065,7 +1065,7 @@ qemuMigrationParamsDisableTLS(virDomainObjPtr vm,
+  * @apiFlags: API flags used to start the migration
+  *
+  * Deconstruct all the setup possibly done for TLS - delete the TLS and
+- * security objects, free the secinfo, and reset the migration params to "".
++ * security objects and free the secinfo
+  */
+ static void
+ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuMonitorBlockdevAdd-Take-double-pointer-argument.patch b/SOURCES/libvirt-qemuMonitorBlockdevAdd-Take-double-pointer-argument.patch
new file mode 100644
index 0000000..bcec2a6
--- /dev/null
+++ b/SOURCES/libvirt-qemuMonitorBlockdevAdd-Take-double-pointer-argument.patch
@@ -0,0 +1,146 @@
+From f5fe33504d90bf47d3f766470a04b16eca56bfd8 Mon Sep 17 00:00:00 2001
+Message-Id: <f5fe33504d90bf47d3f766470a04b16eca56bfd8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:04 +0100
+Subject: [PATCH] qemuMonitorBlockdevAdd: Take double pointer argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Modify qemuMonitorBlockdevAdd so that it takes a double pointer for the
+@props argument so that it's cleared inside the call. This allows
+writing cleaner callers.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit db57e9daf5ab25bd7a1f377c4dde160b0896ad64)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798366
+Message-Id: <1b4429b82826f69f18b506b8fbd648ff0ac70c38.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c        | 14 ++------------
+ src/qemu/qemu_monitor.c      | 16 ++++++----------
+ src/qemu/qemu_monitor.h      |  2 +-
+ src/qemu/qemu_monitor_json.c |  5 +++--
+ src/qemu/qemu_monitor_json.h |  2 +-
+ 5 files changed, 13 insertions(+), 26 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 0ee10dd770..710ddfd2cf 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -1537,13 +1537,8 @@ static int
+ qemuBlockStorageSourceAttachApplyStorage(qemuMonitorPtr mon,
+                                          qemuBlockStorageSourceAttachDataPtr data)
+ {
+-    int rv;
+-
+     if (data->storageProps) {
+-        rv = qemuMonitorBlockdevAdd(mon, data->storageProps);
+-        data->storageProps = NULL;
+-
+-        if (rv < 0)
++        if (qemuMonitorBlockdevAdd(mon, &data->storageProps) < 0)
+             return -1;
+ 
+         data->storageAttached = true;
+@@ -1570,13 +1565,8 @@ static int
+ qemuBlockStorageSourceAttachApplyFormat(qemuMonitorPtr mon,
+                                         qemuBlockStorageSourceAttachDataPtr data)
+ {
+-    int rv;
+-
+     if (data->formatProps) {
+-        rv = qemuMonitorBlockdevAdd(mon, data->formatProps);
+-        data->formatProps = NULL;
+-
+-        if (rv < 0)
++        if (qemuMonitorBlockdevAdd(mon, &data->formatProps) < 0)
+             return -1;
+ 
+         data->formatAttached = true;
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index 0e67851690..e3ee48613a 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -4391,23 +4391,19 @@ qemuMonitorBlockdevCreate(qemuMonitorPtr mon,
+  * @mon: monitor object
+  * @props: JSON object describing the blockdev to add
+  *
+- * Adds a new block device (BDS) to qemu. Note that @props is always consumed
+- * by this function and should not be accessed after calling this function.
++ * Adds a new block device (BDS) to qemu. Note that *@props is consumed
++ * and set to NULL on success.
+  */
+ int
+ qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
+-                       virJSONValuePtr props)
++                       virJSONValuePtr *props)
+ {
+-    VIR_DEBUG("props=%p (node-name=%s)", props,
+-              NULLSTR(virJSONValueObjectGetString(props, "node-name")));
++    VIR_DEBUG("props=%p (node-name=%s)", *props,
++              NULLSTR(virJSONValueObjectGetString(*props, "node-name")));
+ 
+-    QEMU_CHECK_MONITOR_GOTO(mon, error);
++    QEMU_CHECK_MONITOR(mon);
+ 
+     return qemuMonitorJSONBlockdevAdd(mon, props);
+-
+- error:
+-    virJSONValueFree(props);
+-    return -1;
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index cca2cdcb27..6a6b8efaee 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -1323,7 +1323,7 @@ int qemuMonitorBlockdevCreate(qemuMonitorPtr mon,
+                               virJSONValuePtr props);
+ 
+ int qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
+-                           virJSONValuePtr props);
++                           virJSONValuePtr *props);
+ 
+ int qemuMonitorBlockdevDel(qemuMonitorPtr mon,
+                            const char *nodename);
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 05a44882f0..3827574ef6 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -8811,12 +8811,13 @@ qemuMonitorJSONBlockdevCreate(qemuMonitorPtr mon,
+ 
+ int
+ qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+-                           virJSONValuePtr props)
++                           virJSONValuePtr *props)
+ {
+     g_autoptr(virJSONValue) cmd = NULL;
+     g_autoptr(virJSONValue) reply = NULL;
++    virJSONValuePtr pr = g_steal_pointer(props);
+ 
+-    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", props)))
++    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", pr)))
+         return -1;
+ 
+     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
+index 61f5b0061d..fd2e09025e 100644
+--- a/src/qemu/qemu_monitor_json.h
++++ b/src/qemu/qemu_monitor_json.h
+@@ -597,7 +597,7 @@ int qemuMonitorJSONBlockdevCreate(qemuMonitorPtr mon,
+     ATTRIBUTE_NONNULL(1);
+ 
+ int qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+-                               virJSONValuePtr props)
++                               virJSONValuePtr *props)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+ 
+ int qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMonitorJSONBlockdevAdd-Refactor-cleanup.patch b/SOURCES/libvirt-qemuMonitorJSONBlockdevAdd-Refactor-cleanup.patch
new file mode 100644
index 0000000..ef8503f
--- /dev/null
+++ b/SOURCES/libvirt-qemuMonitorJSONBlockdevAdd-Refactor-cleanup.patch
@@ -0,0 +1,61 @@
+From bcbd86ca0e51a5f4fe41b128403d0a86c29150fa Mon Sep 17 00:00:00 2001
+Message-Id: <bcbd86ca0e51a5f4fe41b128403d0a86c29150fa@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:02 +0100
+Subject: [PATCH] qemuMonitorJSONBlockdevAdd: Refactor cleanup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use automatic variable freeing and get rid of the cleanup section.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit 643294110c12a41faf2cf24c19948aaee0fcf36f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798366
+Message-Id: <ad40c6fde708c751fe9be90fd55e9b146cd26cd6.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_monitor_json.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 8cd98dbf26..ad490dd324 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -8813,25 +8813,19 @@ int
+ qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+                            virJSONValuePtr props)
+ {
+-    virJSONValuePtr cmd;
+-    virJSONValuePtr reply = NULL;
+-    int ret = -1;
++    g_autoptr(virJSONValue) cmd = NULL;
++    g_autoptr(virJSONValue) reply = NULL;
+ 
+     if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", props)))
+         return -1;
+ 
+     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+-        goto cleanup;
++        return -1;
+ 
+-    ret = 0;
+-
+- cleanup:
+-    virJSONValueFree(cmd);
+-    virJSONValueFree(reply);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMonitorJSONBlockdevDel-Refactor-cleanup.patch b/SOURCES/libvirt-qemuMonitorJSONBlockdevDel-Refactor-cleanup.patch
new file mode 100644
index 0000000..7378fcc
--- /dev/null
+++ b/SOURCES/libvirt-qemuMonitorJSONBlockdevDel-Refactor-cleanup.patch
@@ -0,0 +1,63 @@
+From 21199b5d14d4d21d2a1bdf9f17767d3c4b0bc00d Mon Sep 17 00:00:00 2001
+Message-Id: <21199b5d14d4d21d2a1bdf9f17767d3c4b0bc00d@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:03 +0100
+Subject: [PATCH] qemuMonitorJSONBlockdevDel: Refactor cleanup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use automatic variable freeing and get rid of the cleanup section.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+(cherry picked from commit a592d589aa5015f5beb0f1d4302ceffe9fe7f7e8)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798366
+Message-Id: <e997465c781bb23dad07483313a29f4df2df9a1c.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_monitor_json.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index ad490dd324..05a44882f0 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -8833,9 +8833,8 @@ int
+ qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
+                            const char *nodename)
+ {
+-    virJSONValuePtr cmd;
+-    virJSONValuePtr reply = NULL;
+-    int ret = -1;
++    g_autoptr(virJSONValue) cmd = NULL;
++    g_autoptr(virJSONValue) reply = NULL;
+ 
+     if (!(cmd = qemuMonitorJSONMakeCommand("blockdev-del",
+                                            "s:node-name", nodename,
+@@ -8843,17 +8842,12 @@ qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
+         return -1;
+ 
+     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+-        goto cleanup;
++        return -1;
+ 
+-    ret = 0;
+-
+- cleanup:
+-    virJSONValueFree(cmd);
+-    virJSONValueFree(reply);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuMonitorTestProcessCommandDefaultValidate-Output-validator-output-to-stderr.patch b/SOURCES/libvirt-qemuMonitorTestProcessCommandDefaultValidate-Output-validator-output-to-stderr.patch
new file mode 100644
index 0000000..f5301c3
--- /dev/null
+++ b/SOURCES/libvirt-qemuMonitorTestProcessCommandDefaultValidate-Output-validator-output-to-stderr.patch
@@ -0,0 +1,80 @@
+From 881e24d9b7545122a4b74f4545135bffe98fab4c Mon Sep 17 00:00:00 2001
+Message-Id: <881e24d9b7545122a4b74f4545135bffe98fab4c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:04 -0400
+Subject: [PATCH] qemuMonitorTestProcessCommandDefaultValidate: Output
+ validator output to stderr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Trying to squeeze the validator output into the monitor reply message
+doesn't make sense and doesn't work well as it's not well formed JSON:
+
+54) qemuMonitorJSONAddNetdev                                          ... libvirt:  error : internal error: cannot parse json { "error":  { "desc": "failed to validate arguments of 'netdev_add' against QAPI schema: {
+   ERROR: variant 'test' for discriminator 'type' not found
+",    "class": "UnexpectedCommand" } }: lexical error: invalid character inside string.
+          ev_add' against QAPI schema: {    ERROR: variant 'test' for
+                     (right here) ------^
+FAILED
+
+Output it to stderr if requested and just note that schema validation
+failed in the error message:
+
+54) qemuMonitorJSONAddNetdev                                          ...
+failed to validate arguments of 'netdev_add' against QAPI schema
+args:
+{
+  "id": "net0",
+  "type": "test"
+}
+
+validator output:
+ {
+   ERROR: variant 'test' for discriminator 'type' not found
+
+libvirt: QEMU Driver error : internal error: unable to execute QEMU command 'netdev_add': failed to validate arguments of 'netdev_add' against QAPI schema (to see debug output use VIR_TEST_DEBUG=2)
+FAILED
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5a13eb165559039bda2c1e0e4149dba0e0af820e)
+
+Required on 8.2.1 branch due to adding caps_5.0.0.x86_64.replies
+Prerequisite for https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-2-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tests/qemumonitortestutils.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
+index b29e5d8cd2..b72f186374 100644
+--- a/tests/qemumonitortestutils.c
++++ b/tests/qemumonitortestutils.c
+@@ -537,10 +537,19 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonitorTestPtr test,
+     }
+ 
+     if (testQEMUSchemaValidate(args, schemaroot, test->qapischema, &debug) < 0) {
++        if (virTestGetDebug() == 2) {
++            g_autofree char *argstr = virJSONValueToString(args, true);
++            fprintf(stderr,
++                    "\nfailed to validate arguments of '%s' against QAPI schema\n"
++                    "args:\n%s\nvalidator output:\n %s\n",
++                    cmdname, NULLSTR(argstr), virBufferCurrentContent(&debug));
++        }
++
+         if (qemuMonitorReportError(test,
+                                    "failed to validate arguments of '%s' "
+-                                   "against QAPI schema: %s",
+-                                   cmdname, virBufferCurrentContent(&debug)) == 0)
++                                   "against QAPI schema "
++                                   "(to see debug output use VIR_TEST_DEBUG=2)",
++                                   cmdname) == 0)
+             return 1;
+         return -1;
+     }
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemuProcessBuildDestroyMemoryPathsImpl-Don-t-overwrite-error.patch b/SOURCES/libvirt-qemuProcessBuildDestroyMemoryPathsImpl-Don-t-overwrite-error.patch
deleted file mode 100644
index 0329ea3..0000000
--- a/SOURCES/libvirt-qemuProcessBuildDestroyMemoryPathsImpl-Don-t-overwrite-error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ab0cc413165b8a80d68b30b7e69c611f7087a29b Mon Sep 17 00:00:00 2001
-Message-Id: <ab0cc413165b8a80d68b30b7e69c611f7087a29b@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 3 Jan 2019 10:03:43 +0100
-Subject: [PATCH] qemuProcessBuildDestroyMemoryPathsImpl: Don't overwrite error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The qemuSecurityDomainSetPathLabel() function reports perfect
-error itself. Do not overwrite it to something less meaningful.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 577e68dff90e617a20165dfede0390faa1e24031)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1658112
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <7ca28756d9a136d67b01df15efe1271266017164.1546506016.git.eskultet@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_process.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c220accfaf..34aac69afc 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -3672,11 +3672,8 @@ qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriverPtr driver,
-         }
- 
-         if (qemuSecurityDomainSetPathLabel(driver->securityManager,
--                                           def, path, true) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                            _("Unable to label %s"), path);
-+                                           def, path, true) < 0)
-             return -1;
--        }
-     } else {
-         if (virFileDeleteTree(path) < 0)
-             return -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemuProcessStartPRDaemonHook-Try-to-set-NS-iff-domain-was-started-with-one.patch b/SOURCES/libvirt-qemuProcessStartPRDaemonHook-Try-to-set-NS-iff-domain-was-started-with-one.patch
deleted file mode 100644
index 5ad49b9..0000000
--- a/SOURCES/libvirt-qemuProcessStartPRDaemonHook-Try-to-set-NS-iff-domain-was-started-with-one.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d003bd56fc1e7fc166e7a350e471644431a48988 Mon Sep 17 00:00:00 2001
-Message-Id: <d003bd56fc1e7fc166e7a350e471644431a48988@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 11 Jul 2018 17:27:23 +0200
-Subject: [PATCH] qemuProcessStartPRDaemonHook: Try to set NS iff domain was
- started with one
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1470007
-
-Users have possibility to disable qemu namespace feature (e.g.
-because they are running on *BSD which lacks Linux NS support).
-If that's the case we should not try to move qemu-pr-helper into
-the same namespace as qemu is in.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit dd1d58cabc850324bb9a7ed836985d34697aa7b2)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 40d35cbe6b..f200729cb1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2522,12 +2522,14 @@ qemuProcessStartPRDaemonHook(void *opaque)
-     int *fds = NULL;
-     int ret = -1;
- 
--    if (virProcessGetNamespaces(vm->pid, &nfds, &fds) < 0)
--        return ret;
-+    if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) {
-+        if (virProcessGetNamespaces(vm->pid, &nfds, &fds) < 0)
-+            return ret;
- 
--    if (nfds > 0 &&
--        virProcessSetNamespaces(nfds, fds) < 0)
--        goto cleanup;
-+        if (nfds > 0 &&
-+            virProcessSetNamespaces(nfds, fds) < 0)
-+            goto cleanup;
-+    }
- 
-     ret = 0;
-  cleanup:
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu_capabilities-Inroduce-virQEMUCapsGetCPUModelX86Data.patch b/SOURCES/libvirt-qemu_capabilities-Inroduce-virQEMUCapsGetCPUModelX86Data.patch
deleted file mode 100644
index 4ad6900..0000000
--- a/SOURCES/libvirt-qemu_capabilities-Inroduce-virQEMUCapsGetCPUModelX86Data.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 2d8d4379690e55d8d9a0b194ddef33d073154c7b Mon Sep 17 00:00:00 2001
-Message-Id: <2d8d4379690e55d8d9a0b194ddef33d073154c7b@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:03 +0200
-Subject: [PATCH] qemu_capabilities: Inroduce virQEMUCapsGetCPUModelX86Data
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code for transforming qemuMonitorCPUModelInfo data from QEMU into
-virCPUDefPtr consumable by virCPU* APIs was hidden inside
-virQEMUCapsInitCPUModelX86. This patch moves it into a new function to
-make it usable in tests.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 30e4faac2f3e72aec29be9963d7a5394153e812f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <e91c6c1e8de59a6cc151154f7c2a9eae79249fa5.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 50 ++++++++++++++++++++++++------------
- src/qemu/qemu_capspriv.h     |  4 +++
- 2 files changed, 38 insertions(+), 16 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 5539d168cd..5a7160d02e 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2812,28 +2812,17 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
- }
- 
- 
--/**
-- * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,
-- *          1 when the caller should fall back to using virCapsPtr->host.cpu,
-- *         -1 on error.
-- */
--static int
--virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
--                           virDomainVirtType type,
--                           qemuMonitorCPUModelInfoPtr model,
--                           virCPUDefPtr cpu,
--                           bool migratable)
-+virCPUDataPtr
-+virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,
-+                              bool migratable)
- {
--    virCPUDataPtr data = NULL;
-     unsigned long long sigFamily = 0;
-     unsigned long long sigModel = 0;
-     unsigned long long sigStepping = 0;
--    int ret = -1;
-+    virCPUDataPtr data = NULL;
-+    virCPUDataPtr ret = NULL;
-     size_t i;
- 
--    if (!model)
--        return 1;
--
-     if (!(data = virCPUDataNew(VIR_ARCH_X86_64)))
-         goto cleanup;
- 
-@@ -2874,6 +2863,35 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
-     if (virCPUx86DataSetSignature(data, sigFamily, sigModel, sigStepping) < 0)
-         goto cleanup;
- 
-+    VIR_STEAL_PTR(ret, data);
-+
-+ cleanup:
-+    virCPUDataFree(data);
-+    return ret;
-+}
-+
-+
-+/**
-+ * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,
-+ *          1 when the caller should fall back to using virCapsPtr->host.cpu,
-+ *         -1 on error.
-+ */
-+static int
-+virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
-+                           virDomainVirtType type,
-+                           qemuMonitorCPUModelInfoPtr model,
-+                           virCPUDefPtr cpu,
-+                           bool migratable)
-+{
-+    virCPUDataPtr data = NULL;
-+    int ret = -1;
-+
-+    if (!model)
-+        return 1;
-+
-+    if (!(data = virQEMUCapsGetCPUModelX86Data(model, migratable)))
-+        goto cleanup;
-+
-     if (cpuDecode(cpu, data, virQEMUCapsGetCPUDefinitions(qemuCaps, type)) < 0)
-         goto cleanup;
- 
-diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
-index cb5e0dd9a9..70cdbbc504 100644
---- a/src/qemu/qemu_capspriv.h
-+++ b/src/qemu/qemu_capspriv.h
-@@ -80,6 +80,10 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
-                            qemuMonitorCPUModelInfoPtr modelInfo);
- 
-+virCPUDataPtr
-+virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,
-+                              bool migratable);
-+
- virCPUDefPtr
- virQEMUCapsProbeHostCPUForEmulator(virArch hostArch,
-                                    virQEMUCapsPtr qemuCaps,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_capabilities-Introduce-virQEMUCapsGetCPUModelInfo.patch b/SOURCES/libvirt-qemu_capabilities-Introduce-virQEMUCapsGetCPUModelInfo.patch
deleted file mode 100644
index e28993f..0000000
--- a/SOURCES/libvirt-qemu_capabilities-Introduce-virQEMUCapsGetCPUModelInfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 161668ec1a5e6b5cba0136ef50926b5c53802941 Mon Sep 17 00:00:00 2001
-Message-Id: <161668ec1a5e6b5cba0136ef50926b5c53802941@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:04 +0200
-Subject: [PATCH] qemu_capabilities: Introduce virQEMUCapsGetCPUModelInfo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a simple wrapper around virQEMUCapsGetHostCPUData usable in
-tests for getting qemuMonitorCPUModelInfoPtr from QEMU caps.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8aa47cc072fb9a3a8e8b15c6509aae648f5c24e0)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <4e467c308f24313e69e21c637663f6744482b266.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 10 ++++++++++
- src/qemu/qemu_capspriv.h     |  4 ++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 5a7160d02e..942cbf272d 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3049,6 +3049,16 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+qemuMonitorCPUModelInfoPtr
-+virQEMUCapsGetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-+                           virDomainVirtType type)
-+{
-+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-+
-+    return cpuData->info;
-+}
-+
-+
- void
- virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
-diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
-index 70cdbbc504..c3b7f934a9 100644
---- a/src/qemu/qemu_capspriv.h
-+++ b/src/qemu/qemu_capspriv.h
-@@ -75,6 +75,10 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
- void
- virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps);
- 
-+qemuMonitorCPUModelInfoPtr
-+virQEMUCapsGetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-+                           virDomainVirtType type);
-+
- void
- virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_capabilities-Rework-domain-caps-cache.patch b/SOURCES/libvirt-qemu_capabilities-Rework-domain-caps-cache.patch
new file mode 100644
index 0000000..38774cc
--- /dev/null
+++ b/SOURCES/libvirt-qemu_capabilities-Rework-domain-caps-cache.patch
@@ -0,0 +1,328 @@
+From dbc6ca0acac24c12b30b74b706c848489f008d71 Mon Sep 17 00:00:00 2001
+Message-Id: <dbc6ca0acac24c12b30b74b706c848489f008d71@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 24 Jan 2020 15:05:51 +0100
+Subject: [PATCH] qemu_capabilities: Rework domain caps cache
+
+Since v5.6.0-48-g270583ed98 we try to cache domain capabilities,
+i.e. store filled virDomainCaps in a hash table in virQEMUCaps
+for future use. However, there's a race condition in the way it's
+implemented. We use virQEMUCapsGetDomainCapsCache() to obtain the
+pointer to the hash table, then we search the hash table for
+cached data and if none is found the domcaps is constructed and
+put into the table. Problem is that this is all done without any
+locking, so if there are two threads trying to do the same, one
+will succeed and the other will fail inserting the data into the
+table.
+
+Also, the API looks a bit fishy - obtaining pointer to the hash
+table is dangerous.
+
+The solution is to use a mutex that guards the whole operation
+with the hash table. Then, the API can be changes to return
+virDomainCapsPtr directly.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1791790
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit c76009313f8068c848cad6cb517daf42e6716bb9)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1794691
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <48a4b2f9ab1e8157e4b7baf1b506e90861a39308.1579874719.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_capabilities.c | 122 +++++++++++++++++++++++++++++++++--
+ src/qemu/qemu_capabilities.h |  12 +++-
+ src/qemu/qemu_conf.c         |  65 +++----------------
+ 3 files changed, 136 insertions(+), 63 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 84c62a4e28..edefb70309 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -594,6 +594,26 @@ struct _virQEMUCapsAccel {
+     qemuMonitorCPUDefsPtr cpuModels;
+ };
+ 
++
++typedef struct _virQEMUDomainCapsCache virQEMUDomainCapsCache;
++typedef virQEMUDomainCapsCache *virQEMUDomainCapsCachePtr;
++struct _virQEMUDomainCapsCache {
++    virObjectLockable parent;
++
++    virHashTablePtr cache;
++};
++
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDomainCapsCache, virObjectUnref);
++
++static virClassPtr virQEMUDomainCapsCacheClass;
++static void virQEMUDomainCapsCacheDispose(void *obj)
++{
++    virQEMUDomainCapsCachePtr cache = obj;
++
++    virHashFree(cache->cache);
++}
++
++
+ /*
+  * Update the XML parser/formatter when adding more
+  * information to this struct so that it gets cached
+@@ -625,7 +645,7 @@ struct _virQEMUCaps {
+ 
+     virArch arch;
+ 
+-    virHashTablePtr domCapsCache;
++    virQEMUDomainCapsCachePtr domCapsCache;
+ 
+     size_t ngicCapabilities;
+     virGICCapability *gicCapabilities;
+@@ -651,6 +671,9 @@ static int virQEMUCapsOnceInit(void)
+     if (!VIR_CLASS_NEW(virQEMUCaps, virClassForObject()))
+         return -1;
+ 
++    if (!(VIR_CLASS_NEW(virQEMUDomainCapsCache, virClassForObjectLockable())))
++        return -1;
++
+     return 0;
+ }
+ 
+@@ -1620,6 +1643,22 @@ int virQEMUCapsGetDefaultVersion(virCapsPtr caps,
+ }
+ 
+ 
++static virQEMUDomainCapsCachePtr
++virQEMUDomainCapsCacheNew(void)
++{
++    g_autoptr(virQEMUDomainCapsCache) cache = NULL;
++
++    if (virQEMUCapsInitialize() < 0)
++        return NULL;
++
++    if (!(cache = virObjectLockableNew(virQEMUDomainCapsCacheClass)))
++        return NULL;
++
++    if (!(cache->cache = virHashCreate(5, virObjectFreeHashData)))
++        return NULL;
++
++    return g_steal_pointer(&cache);
++}
+ 
+ 
+ virQEMUCapsPtr
+@@ -1637,7 +1676,7 @@ virQEMUCapsNew(void)
+     if (!(qemuCaps->flags = virBitmapNew(QEMU_CAPS_LAST)))
+         goto error;
+ 
+-    if (!(qemuCaps->domCapsCache = virHashCreate(5, virObjectFreeHashData)))
++    if (!(qemuCaps->domCapsCache = virQEMUDomainCapsCacheNew()))
+         goto error;
+ 
+     return qemuCaps;
+@@ -1827,7 +1866,7 @@ void virQEMUCapsDispose(void *obj)
+ {
+     virQEMUCapsPtr qemuCaps = obj;
+ 
+-    virHashFree(qemuCaps->domCapsCache);
++    virObjectUnref(qemuCaps->domCapsCache);
+     virBitmapFree(qemuCaps->flags);
+ 
+     VIR_FREE(qemuCaps->package);
+@@ -1987,9 +2026,82 @@ const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps)
+ }
+ 
+ 
+-virHashTablePtr virQEMUCapsGetDomainCapsCache(virQEMUCapsPtr qemuCaps)
++struct virQEMUCapsSearchDomcapsData {
++    const char *path;
++    const char *machine;
++    virArch arch;
++    virDomainVirtType virttype;
++};
++
++
++static int
++virQEMUCapsSearchDomcaps(const void *payload,
++                         const void *name G_GNUC_UNUSED,
++                         const void *opaque)
+ {
+-    return qemuCaps->domCapsCache;
++    virDomainCapsPtr domCaps = (virDomainCapsPtr) payload;
++    struct virQEMUCapsSearchDomcapsData *data = (struct virQEMUCapsSearchDomcapsData *) opaque;
++
++    if (STREQ_NULLABLE(data->path, domCaps->path) &&
++        STREQ_NULLABLE(data->machine, domCaps->machine) &&
++        data->arch == domCaps->arch &&
++        data->virttype == domCaps->virttype)
++        return 1;
++
++    return 0;
++}
++
++
++virDomainCapsPtr
++virQEMUCapsGetDomainCapsCache(virQEMUCapsPtr qemuCaps,
++                              const char *machine,
++                              virArch arch,
++                              virDomainVirtType virttype,
++                              virArch hostarch,
++                              bool privileged,
++                              virFirmwarePtr *firmwares,
++                              size_t nfirmwares)
++{
++    virQEMUDomainCapsCachePtr cache = qemuCaps->domCapsCache;
++    virDomainCapsPtr domCaps = NULL;
++    const char *path = virQEMUCapsGetBinary(qemuCaps);
++    struct virQEMUCapsSearchDomcapsData data = {
++        .path = path,
++        .machine = machine,
++        .arch = arch,
++        .virttype = virttype,
++    };
++
++    virObjectLock(cache);
++
++    domCaps = virHashSearch(cache->cache, virQEMUCapsSearchDomcaps, &data, NULL);
++
++    if (!domCaps) {
++        g_autoptr(virDomainCaps) tempDomCaps = NULL;
++        g_autofree char *key = NULL;
++
++        /* hash miss, build new domcaps */
++        if (!(tempDomCaps = virDomainCapsNew(path, machine,
++                                             arch, virttype)))
++            goto cleanup;
++
++        if (virQEMUCapsFillDomainCaps(qemuCaps, hostarch, tempDomCaps,
++                                      privileged, firmwares, nfirmwares) < 0)
++            goto cleanup;
++
++        key = g_strdup_printf("%d:%d:%s:%s", arch, virttype,
++                              NULLSTR(machine), path);
++
++        if (virHashAddEntry(cache->cache, key, tempDomCaps) < 0)
++            goto cleanup;
++
++        domCaps = g_steal_pointer(&tempDomCaps);
++    }
++
++    virObjectRef(domCaps);
++ cleanup:
++    virObjectUnlock(cache);
++    return domCaps;
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 193c19fc81..d76c1dbfa9 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -571,7 +571,17 @@ const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps);
+ virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps);
+ unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps);
+ const char *virQEMUCapsGetPackage(virQEMUCapsPtr qemuCaps);
+-virHashTablePtr virQEMUCapsGetDomainCapsCache(virQEMUCapsPtr qemuCaps);
++
++virDomainCapsPtr
++virQEMUCapsGetDomainCapsCache(virQEMUCapsPtr qemuCaps,
++                              const char *machine,
++                              virArch arch,
++                              virDomainVirtType virttype,
++                              virArch hostarch,
++                              bool privileged,
++                              virFirmwarePtr *firmwares,
++                              size_t nfirmwares);
++
+ unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps);
+ int virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
+                                  virDomainVirtType type,
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index e33ef4895e..029996427e 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -1338,31 +1338,6 @@ virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver,
+ }
+ 
+ 
+-struct virQEMUDriverSearchDomcapsData {
+-    const char *path;
+-    const char *machine;
+-    virArch arch;
+-    virDomainVirtType virttype;
+-};
+-
+-
+-static int
+-virQEMUDriverSearchDomcaps(const void *payload,
+-                           const void *name G_GNUC_UNUSED,
+-                           const void *opaque)
+-{
+-    virDomainCapsPtr domCaps = (virDomainCapsPtr) payload;
+-    struct virQEMUDriverSearchDomcapsData *data = (struct virQEMUDriverSearchDomcapsData *) opaque;
+-
+-    if (STREQ_NULLABLE(data->path, domCaps->path) &&
+-        STREQ_NULLABLE(data->machine, domCaps->machine) &&
+-        data->arch == domCaps->arch &&
+-        data->virttype == domCaps->virttype)
+-        return 1;
+-
+-    return 0;
+-}
+-
+ /**
+  * virQEMUDriverGetDomainCapabilities:
+  *
+@@ -1381,40 +1356,16 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver,
+                                    virArch arch,
+                                    virDomainVirtType virttype)
+ {
+-    g_autoptr(virDomainCaps) domCaps = NULL;
+     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+-    virHashTablePtr domCapsCache = virQEMUCapsGetDomainCapsCache(qemuCaps);
+-    struct virQEMUDriverSearchDomcapsData data = {
+-        .path = virQEMUCapsGetBinary(qemuCaps),
+-        .machine = machine,
+-        .arch = arch,
+-        .virttype = virttype,
+-    };
+ 
+-    domCaps = virHashSearch(domCapsCache,
+-                            virQEMUDriverSearchDomcaps, &data, NULL);
+-    if (!domCaps) {
+-        g_autofree char *key = NULL;
+-
+-        /* hash miss, build new domcaps */
+-        if (!(domCaps = virDomainCapsNew(data.path, data.machine,
+-                                         data.arch, data.virttype)))
+-            return NULL;
+-
+-        if (virQEMUCapsFillDomainCaps(qemuCaps, driver->hostarch, domCaps,
+-                                      driver->privileged,
+-                                      cfg->firmwares, cfg->nfirmwares) < 0)
+-            return NULL;
+-
+-        key = g_strdup_printf("%d:%d:%s:%s", data.arch, data.virttype,
+-                              NULLSTR(data.machine), NULLSTR(data.path));
+-
+-        if (virHashAddEntry(domCapsCache, key, domCaps) < 0)
+-            return NULL;
+-    }
+-
+-    virObjectRef(domCaps);
+-    return g_steal_pointer(&domCaps);
++    return virQEMUCapsGetDomainCapsCache(qemuCaps,
++                                         machine,
++                                         arch,
++                                         virttype,
++                                         driver->hostarch,
++                                         driver->privileged,
++                                         cfg->firmwares,
++                                         cfg->nfirmwares);
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu_capabilities-Use-virQEMUCapsGetCPUModelInfo.patch b/SOURCES/libvirt-qemu_capabilities-Use-virQEMUCapsGetCPUModelInfo.patch
deleted file mode 100644
index d3429bd..0000000
--- a/SOURCES/libvirt-qemu_capabilities-Use-virQEMUCapsGetCPUModelInfo.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From deeb15a330b987612c8f50df1de8b2acfc2ed703 Mon Sep 17 00:00:00 2001
-Message-Id: <deeb15a330b987612c8f50df1de8b2acfc2ed703@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:05 +0200
-Subject: [PATCH] qemu_capabilities: Use virQEMUCapsGetCPUModelInfo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Most places in qemu_capabilities.c which call virQEMUCapsGetHostCPUData
-actually need qemuMonitorCPUModelInfoPtr from QEMU caps. Let's use the
-wrapper introduced in the previous commit instead.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 793a9293caabc9876bf7734150ba3acdd85d1649)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1686895
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <6d9804c79ffda5aed3e1ac772b7cc003e930490d.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c | 31 ++++++++++++++-----------------
- 1 file changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 942cbf272d..851cb73cfc 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2395,7 +2395,6 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-     const char *model;
-     qemuMonitorCPUModelExpansionType type;
-     virDomainVirtType virtType;
--    virQEMUCapsHostCPUDataPtr cpuData;
-     int ret = -1;
- 
-     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
-@@ -2409,8 +2408,6 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-         model = "host";
-     }
- 
--    cpuData = virQEMUCapsGetHostCPUData(qemuCaps, virtType);
--
-     /* Some x86_64 features defined in cpu_map.xml use spelling which differ
-      * from the one preferred by QEMU. Static expansion would give us only the
-      * preferred spelling, thus we need to do a full expansion on the result of
-@@ -2462,7 +2459,8 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-         modelInfo->migratability = true;
-     }
- 
--    VIR_STEAL_PTR(cpuData->info, modelInfo);
-+    virQEMUCapsSetCPUModelInfo(qemuCaps, virtType, modelInfo);
-+    modelInfo = NULL;
-     ret = 0;
- 
-  cleanup:
-@@ -2487,24 +2485,24 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps,
-                           bool migratable,
-                           char ***features)
- {
--    virQEMUCapsHostCPUDataPtr data;
-+    qemuMonitorCPUModelInfoPtr modelInfo;
-     char **list;
-     size_t i;
-     size_t n;
-     int ret = -1;
- 
-     *features = NULL;
--    data = virQEMUCapsGetHostCPUData(qemuCaps, virtType);
-+    modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, virtType);
- 
--    if (!data->info)
-+    if (!modelInfo)
-         return 0;
- 
--    if (VIR_ALLOC_N(list, data->info->nprops + 1) < 0)
-+    if (VIR_ALLOC_N(list, modelInfo->nprops + 1) < 0)
-         return -1;
- 
-     n = 0;
--    for (i = 0; i < data->info->nprops; i++) {
--        qemuMonitorCPUPropertyPtr prop = data->info->props + i;
-+    for (i = 0; i < modelInfo->nprops; i++) {
-+        qemuMonitorCPUPropertyPtr prop = modelInfo->props + i;
- 
-         if (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO)
-             continue;
-@@ -2514,7 +2512,7 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps,
-     }
- 
-     VIR_STEAL_PTR(*features, list);
--    if (migratable && !data->info->migratability)
-+    if (migratable && !modelInfo->migratability)
-         ret = 1;
-     else
-         ret = 0;
-@@ -2915,17 +2913,17 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
-                         virCPUDefPtr cpu,
-                         bool migratable)
- {
--    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-+    qemuMonitorCPUModelInfoPtr modelInfo = virQEMUCapsGetCPUModelInfo(qemuCaps, type);
-     int ret = 1;
- 
--    if (migratable && cpuData->info && !cpuData->info->migratability)
-+    if (migratable && modelInfo && !modelInfo->migratability)
-         return 1;
- 
-     if (ARCH_IS_S390(qemuCaps->arch)) {
--        ret = virQEMUCapsInitCPUModelS390(qemuCaps, type, cpuData->info,
-+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, type, modelInfo,
-                                           cpu, migratable);
-     } else if (ARCH_IS_X86(qemuCaps->arch)) {
--        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, cpuData->info,
-+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, modelInfo,
-                                          cpu, migratable);
-     }
- 
-@@ -3655,8 +3653,7 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                                   virBufferPtr buf,
-                                   virDomainVirtType type)
- {
--    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
--    qemuMonitorCPUModelInfoPtr model = cpuData->info;
-+    qemuMonitorCPUModelInfoPtr model = virQEMUCapsGetCPUModelInfo(qemuCaps, type);
-     const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
-     size_t i;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_command-Use-canonical-names-of-CPU-features.patch b/SOURCES/libvirt-qemu_command-Use-canonical-names-of-CPU-features.patch
deleted file mode 100644
index 64028b2..0000000
--- a/SOURCES/libvirt-qemu_command-Use-canonical-names-of-CPU-features.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 243a37dbf1a42f75a2529b954dac40bb0dd4059e Mon Sep 17 00:00:00 2001
-Message-Id: <243a37dbf1a42f75a2529b954dac40bb0dd4059e@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:55 +0200
-Subject: [PATCH] qemu_command: Use canonical names of CPU features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building QEMU command line, we should use the preferred spelling of
-each CPU feature without relying on compatibility aliases (which may be
-removed at some point).
-
-The "unavailable-features" CPU property is used as a witness for the
-correct names of the features in our translation table.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 5030a7450b0f0117a7903303572c6bda6c012327)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-            - several refactors are missing
-
-	tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
-	tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
-	tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
-	tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
-	tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
-            - these were not backported
-
-	tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-            - downstream patch to add rtm=on and hle=on for Haswell
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <5d34d0b9087230e4dc0f0936b34e73b5f1781832.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_capabilities.c                              | 8 +++++++-
- src/qemu/qemu_capabilities.h                              | 1 +
- src/qemu/qemu_command.c                                   | 2 ++
- tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml          | 1 +
- tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args | 6 +++---
- 5 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index fb260eae96..c48d66b39b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -516,6 +516,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
-               "machine.pseries.cap-nested-hv",
-               "x86-max-cpu",
-               "cpu-unavailable-features",
-+              "canonical-cpu-features",
-     );
- 
- 
-@@ -2799,7 +2800,9 @@ virQEMUCapsCPUFeatureTranslate(virQEMUCapsPtr qemuCaps,
-     if (ARCH_IS_X86(qemuCaps->arch))
-         table = virQEMUCapsCPUFeaturesX86;
- 
--    if (!table || !feature)
-+    if (!table ||
-+        !feature ||
-+        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES))
-         return feature;
- 
-     for (entry = table; entry->libvirt; entry++) {
-@@ -4381,6 +4384,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
-             virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW);
-     }
- 
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES))
-+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES);
-+
-     /* Probe for SEV capabilities */
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEV_GUEST)) {
-         int rc = virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon);
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 5aa41efdb0..1767b2ab6c 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -496,6 +496,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
-     QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */
-     QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */
-+    QEMU_CAPS_CANONICAL_CPU_FEATURES, /* avoid CPU feature aliases */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index bea9a208e5..b5c0588e3c 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6819,6 +6819,8 @@ qemuBuildCpuFeature(virQEMUCapsPtr qemuCaps,
-                     const char *name,
-                     bool state)
- {
-+    name = virQEMUCapsCPUFeatureToQEMU(qemuCaps, name);
-+
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
-         virBufferAsprintf(buf, ",%s=%s", name, state ? "on" : "off");
-     else
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-index 95d26dfce8..9245641df8 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -216,6 +216,7 @@
-   <flag name='vfio-pci.display'/>
-   <flag name='x86-max-cpu'/>
-   <flag name='cpu-unavailable-features'/>
-+  <flag name='canonical-cpu-features'/>
-   <version>4000050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>473743</microcodeVersion>
-diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-index 898b987086..6bc88bbe86 100644
---- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-@@ -10,9 +10,9 @@ QEMU_AUDIO_DRV=none \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -machine pc,accel=tcg,usb=off,dump-guest-core=off \
---cpu Haswell,pclmuldq=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,rtm=on,hle=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,\
-+cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,rtm=on,hle=on,\
-+kvm-pv-eoi=on,kvm-pv-unhalt=on \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_command-Use-consistent-syntax-for-CPU-features.patch b/SOURCES/libvirt-qemu_command-Use-consistent-syntax-for-CPU-features.patch
deleted file mode 100644
index 4c375b5..0000000
--- a/SOURCES/libvirt-qemu_command-Use-consistent-syntax-for-CPU-features.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From b3f714b0907ff1a906d8725efb26733caa913b01 Mon Sep 17 00:00:00 2001
-Message-Id: <b3f714b0907ff1a906d8725efb26733caa913b01@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:47 +0200
-Subject: [PATCH] qemu_command: Use consistent syntax for CPU features
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Normal CPU features use modern -cpu ...,feature=on|off syntax when
-available, but kvm features kept using the old +feature or -feature.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit e1ba4073961091522b1560472c5559124bd3c034)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
-	tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
-	tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
-	tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
-	tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
-            - not backported
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <da608f8dcef1eeb3e62d4c1d921c8182c1b4d533.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c | 46 +++++++++++++++++++----------------------
- 1 file changed, 21 insertions(+), 25 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 7ffc4358e3..bea9a208e5 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6813,6 +6813,19 @@ qemuBuildGlobalControllerCommandLine(virCommandPtr cmd,
- }
- 
- 
-+static void
-+qemuBuildCpuFeature(virQEMUCapsPtr qemuCaps,
-+                    virBufferPtr buf,
-+                    const char *name,
-+                    bool state)
-+{
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
-+        virBufferAsprintf(buf, ",%s=%s", name, state ? "on" : "off");
-+    else
-+        virBufferAsprintf(buf, ",%c%s", state ? '+' : '-', name);
-+}
-+
-+
- static int
- qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
-                         const virDomainDef *def,
-@@ -6890,18 +6903,12 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
-         switch ((virCPUFeaturePolicy) cpu->features[i].policy) {
-         case VIR_CPU_FEATURE_FORCE:
-         case VIR_CPU_FEATURE_REQUIRE:
--            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
--                virBufferAsprintf(buf, ",%s=on", cpu->features[i].name);
--            else
--                virBufferAsprintf(buf, ",+%s", cpu->features[i].name);
-+            qemuBuildCpuFeature(qemuCaps, buf, cpu->features[i].name, true);
-             break;
- 
-         case VIR_CPU_FEATURE_DISABLE:
-         case VIR_CPU_FEATURE_FORBID:
--            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
--                virBufferAsprintf(buf, ",%s=off", cpu->features[i].name);
--            else
--                virBufferAsprintf(buf, ",-%s", cpu->features[i].name);
-+            qemuBuildCpuFeature(qemuCaps, buf, cpu->features[i].name, false);
-             break;
- 
-         case VIR_CPU_FEATURE_OPTIONAL:
-@@ -6982,8 +6989,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
- 
-         if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK &&
-             timer->present != -1) {
--            virBufferAsprintf(&buf, ",%ckvmclock",
--                              timer->present ? '+' : '-');
-+            qemuBuildCpuFeature(qemuCaps, &buf, "kvmclock",
-+                                !!timer->present);
-         } else if (timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK &&
-                    timer->present == 1) {
-             virBufferAddLit(&buf, ",hv_time");
-@@ -6994,24 +7001,13 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-     }
- 
-     if (def->apic_eoi) {
--        char sign;
--        if (def->apic_eoi == VIR_TRISTATE_SWITCH_ON)
--            sign = '+';
--        else
--            sign = '-';
--
--        virBufferAsprintf(&buf, ",%ckvm_pv_eoi", sign);
-+        qemuBuildCpuFeature(qemuCaps, &buf, "kvm_pv_eoi",
-+                            def->apic_eoi == VIR_TRISTATE_SWITCH_ON);
-     }
- 
-     if (def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK]) {
--        char sign;
--        if (def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK] ==
--            VIR_TRISTATE_SWITCH_ON)
--            sign = '+';
--        else
--            sign = '-';
--
--        virBufferAsprintf(&buf, ",%ckvm_pv_unhalt", sign);
-+        qemuBuildCpuFeature(qemuCaps, &buf, "kvm_pv_unhalt",
-+                            def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK] == VIR_TRISTATE_SWITCH_ON);
-     }
- 
-     if (def->features[VIR_DOMAIN_FEATURE_HYPERV] == VIR_TRISTATE_SWITCH_ON) {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_conf-Avoid-dereferencing-NULL-in-virQEMUDriverGetHost-NUMACaps-CPU.patch b/SOURCES/libvirt-qemu_conf-Avoid-dereferencing-NULL-in-virQEMUDriverGetHost-NUMACaps-CPU.patch
new file mode 100644
index 0000000..2723729
--- /dev/null
+++ b/SOURCES/libvirt-qemu_conf-Avoid-dereferencing-NULL-in-virQEMUDriverGetHost-NUMACaps-CPU.patch
@@ -0,0 +1,85 @@
+From f06f903d5cb3c14853a7213b6a70c078380b7a62 Mon Sep 17 00:00:00 2001
+Message-Id: <f06f903d5cb3c14853a7213b6a70c078380b7a62@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 24 Jan 2020 15:05:50 +0100
+Subject: [PATCH] qemu_conf: Avoid dereferencing NULL in
+ virQEMUDriverGetHost{NUMACaps, CPU}
+
+When fixing [1] I've ran attached reproducer and had it spawn
+1024 threads and query capabilities XML in each one of them. This
+lead libvirtd to hit the RLIMIT_NOFILE limit which was kind of
+expected. What wasn't expected was a subsequent segfault. It
+happened because virCPUProbeHost failed and returned NULL. We've
+taken the NULL and passed it to virCapabilitiesHostNUMARef()
+which dereferenced it. Code inspection showed the same flas in
+virQEMUDriverGetHostNUMACaps(), so I'm fixing both places.
+
+1: https://bugzilla.redhat.com/show_bug.cgi?id=1791790
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit cc361a34c53210d682dbc5f2d506b4a23b71e399)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1794691
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <5de22b27463cd2803b3910d7ef45a0e4bc08ad47.1579874719.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_conf.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 3d2f0e7bbb..e33ef4895e 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -1201,32 +1201,42 @@ virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver,
+ virCapsHostNUMAPtr
+ virQEMUDriverGetHostNUMACaps(virQEMUDriverPtr driver)
+ {
++    virCapsHostNUMAPtr hostnuma;
++
+     qemuDriverLock(driver);
+ 
+     if (!driver->hostnuma)
+         driver->hostnuma = virCapabilitiesHostNUMANewHost();
+ 
++    hostnuma = driver->hostnuma;
++
+     qemuDriverUnlock(driver);
+ 
+-    virCapabilitiesHostNUMARef(driver->hostnuma);
++    if (hostnuma)
++        virCapabilitiesHostNUMARef(hostnuma);
+ 
+-    return driver->hostnuma;
++    return hostnuma;
+ }
+ 
+ 
+ virCPUDefPtr
+ virQEMUDriverGetHostCPU(virQEMUDriverPtr driver)
+ {
++    virCPUDefPtr hostcpu;
++
+     qemuDriverLock(driver);
+ 
+     if (!driver->hostcpu)
+         driver->hostcpu = virCPUProbeHost(virArchFromHost());
+ 
++    hostcpu = driver->hostcpu;
++
+     qemuDriverUnlock(driver);
+ 
+-    virCPUDefRef(driver->hostcpu);
++    if (hostcpu)
++        virCPUDefRef(hostcpu);
+ 
+-    return driver->hostcpu;
++    return hostcpu;
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu_domain-Modify-access-to-a-NVMe-disk-iff-needed.patch b/SOURCES/libvirt-qemu_domain-Modify-access-to-a-NVMe-disk-iff-needed.patch
new file mode 100644
index 0000000..5defcdf
--- /dev/null
+++ b/SOURCES/libvirt-qemu_domain-Modify-access-to-a-NVMe-disk-iff-needed.patch
@@ -0,0 +1,52 @@
+From 659d623740e3f15135b4c7b1e44d18ee08e67a11 Mon Sep 17 00:00:00 2001
+Message-Id: <659d623740e3f15135b4c7b1e44d18ee08e67a11@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 14 Feb 2020 16:17:08 +0100
+Subject: [PATCH] qemu_domain: Modify access to a NVMe disk iff needed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If a domain has a NVMe disk it already has the access configured.
+Trying to configure it again on a commit or some other operation
+is wrong and condemned to failure.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b18328256b565806c04c153ce49fc3641412b35b)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1519005#c24
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <ee3871eb043b3ae82daca2e365b696c8963665f7.1581693409.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_domain.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 1bed117eb0..8e0e919f9a 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -11828,13 +11828,12 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver,
+ 
+     revoke_lockspace = true;
+ 
+-    if (qemuDomainStorageSourceAccessModifyNVMe(driver, vm, src, false) < 0)
+-        goto revoke;
+-
+-    revoke_nvme = true;
+-
+-    /* When modifying access of existing @src namespace does not need update */
+     if (!(flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_MODIFY_ACCESS)) {
++        if (qemuDomainStorageSourceAccessModifyNVMe(driver, vm, src, false) < 0)
++            goto revoke;
++
++        revoke_nvme = true;
++
+         if (qemuDomainNamespaceSetupDisk(vm, src) < 0)
+             goto revoke;
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemu_domain-NVLink2-bridge-detection-function-for-PPC64.patch b/SOURCES/libvirt-qemu_domain-NVLink2-bridge-detection-function-for-PPC64.patch
deleted file mode 100644
index 6722b86..0000000
--- a/SOURCES/libvirt-qemu_domain-NVLink2-bridge-detection-function-for-PPC64.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 8996236421b4adf090ac721e8d525953deb9687a Mon Sep 17 00:00:00 2001
-Message-Id: <8996236421b4adf090ac721e8d525953deb9687a@dist-git>
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Fri, 3 May 2019 13:54:52 +0200
-Subject: [PATCH] qemu_domain: NVLink2 bridge detection function for PPC64
-
-The NVLink2 support in QEMU implements the detection of NVLink2
-capable devices by verifying the attributes of the VFIO mem region
-QEMU allocates for the NVIDIA GPUs. To properly allocate an
-adequate amount of memLock, Libvirt needs this information before
-a QEMU instance is even created, thus querying QEMU is not
-possible and opening a VFIO window is too much.
-
-An alternative is presented in this patch. Making the following
-assumptions:
-
-- if we want GPU RAM to be available in the guest, an NVLink2 bridge
-must be passed through;
-
-- an unknown PCI device can be classified as a NVLink2 bridge
-if its device tree node has 'ibm,gpu', 'ibm,nvlink',
-'ibm,nvlink-speed' and 'memory-region'.
-
-This patch introduces a helper called @ppc64VFIODeviceIsNV2Bridge
-that checks the device tree node of a given PCI device and
-check if it meets the criteria to be a NVLink2 bridge. This
-new function will be used in a follow-up patch that, using the
-first assumption, will set up the rlimits of the guest
-accordingly.
-
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit cc9f03801c2618102027ddc4a988193ae290b651)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1505998
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <99efa386adcf68789b7c8cffda2ef24f5f47f0c4.1556884443.git.eskultet@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_domain.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f91de0b743..a8bc618389 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9805,6 +9805,36 @@ qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver,
- }
- 
- 
-+/**
-+ * ppc64VFIODeviceIsNV2Bridge:
-+ * @device: string with the PCI device address
-+ *
-+ * This function receives a string that represents a PCI device,
-+ * such as '0004:04:00.0', and tells if the device is a NVLink2
-+ * bridge.
-+ */
-+static ATTRIBUTE_UNUSED bool
-+ppc64VFIODeviceIsNV2Bridge(const char *device)
-+{
-+    const char *nvlink2Files[] = {"ibm,gpu", "ibm,nvlink",
-+                                  "ibm,nvlink-speed", "memory-region"};
-+    size_t i;
-+
-+    for (i = 0; i < ARRAY_CARDINALITY(nvlink2Files); i++) {
-+        VIR_AUTOFREE(char *) file = NULL;
-+
-+        if ((virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s",
-+                         device, nvlink2Files[i])) < 0)
-+            return false;
-+
-+        if (!virFileExists(file))
-+            return false;
-+    }
-+
-+    return true;
-+}
-+
-+
- /**
-  * getPPC64MemLockLimitBytes:
-  * @def: domain definition
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu_domain-add-a-PPC64-memLockLimit-helper.patch b/SOURCES/libvirt-qemu_domain-add-a-PPC64-memLockLimit-helper.patch
deleted file mode 100644
index 82280d5..0000000
--- a/SOURCES/libvirt-qemu_domain-add-a-PPC64-memLockLimit-helper.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 051451a1b9cefa42ecfd6d27dcb6a12ef49de072 Mon Sep 17 00:00:00 2001
-Message-Id: <051451a1b9cefa42ecfd6d27dcb6a12ef49de072@dist-git>
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Fri, 3 May 2019 13:54:51 +0200
-Subject: [PATCH] qemu_domain: add a PPC64 memLockLimit helper
-
-There is a lot of documentation in the comments about how PPC64 handles
-passthrough VFIO devices to calculate the @memLockLimit. And more will
-be added with the PPC64 NVLink2 support code.
-
-Let's remove the PPC64 code from qemuDomainGetMemLockLimitBytes()
-body and put it into a helper function. This will simplify the
-flow of qemuDomainGetMemLockLimitBytes() that handles all the other
-platforms and improves readability of the PPC64 specifics.
-
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 7a686fd2eae8d5674bb1213d8517dc5814fa6bf3)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1505998
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <ccdf9fefeb624585559606d00b6ac19b574733b3.1556884443.git.eskultet@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/qemu/qemu_domain.c | 171 ++++++++++++++++++++++-------------------
- 1 file changed, 93 insertions(+), 78 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index d936090d87..f91de0b743 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9805,6 +9805,97 @@ qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver,
- }
- 
- 
-+/**
-+ * getPPC64MemLockLimitBytes:
-+ * @def: domain definition
-+ *
-+ * A PPC64 helper that calculates the memory locking limit in order for
-+ * the guest to operate properly.
-+ */
-+static unsigned long long
-+getPPC64MemLockLimitBytes(virDomainDefPtr def)
-+{
-+    unsigned long long memKB = 0;
-+    unsigned long long baseLimit = 0;
-+    unsigned long long memory = 0;
-+    unsigned long long maxMemory = 0;
-+    unsigned long long passthroughLimit = 0;
-+    size_t i, nPCIHostBridges = 0;
-+    bool usesVFIO = false;
-+
-+    for (i = 0; i < def->ncontrollers; i++) {
-+        virDomainControllerDefPtr cont = def->controllers[i];
-+
-+        if (!virDomainControllerIsPSeriesPHB(cont))
-+            continue;
-+
-+        nPCIHostBridges++;
-+    }
-+
-+    for (i = 0; i < def->nhostdevs; i++) {
-+        virDomainHostdevDefPtr dev = def->hostdevs[i];
-+
-+        if (dev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
-+            dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-+            dev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
-+            usesVFIO = true;
-+            break;
-+        }
-+    }
-+
-+    memory = virDomainDefGetMemoryTotal(def);
-+
-+    if (def->mem.max_memory)
-+        maxMemory = def->mem.max_memory;
-+    else
-+        maxMemory = memory;
-+
-+    /* baseLimit := maxMemory / 128                                  (a)
-+     *              + 4 MiB * #PHBs + 8 MiB                          (b)
-+     *
-+     * (a) is the hash table
-+     *
-+     * (b) is accounting for the 32-bit DMA window - it could be either the
-+     * KVM accelerated TCE tables for emulated devices, or the VFIO
-+     * userspace view. The 4 MiB per-PHB (including the default one) covers
-+     * a 2GiB DMA window: default is 1GiB, but it's possible it'll be
-+     * increased to help performance. The 8 MiB extra should be plenty for
-+     * the TCE table index for any reasonable number of PHBs and several
-+     * spapr-vlan or spapr-vscsi devices (512kB + a tiny bit each) */
-+    baseLimit = maxMemory / 128 +
-+                4096 * nPCIHostBridges +
-+                8192;
-+
-+    /* passthroughLimit := max( 2 GiB * #PHBs,                       (c)
-+     *                          memory                               (d)
-+     *                          + memory * 1/512 * #PHBs + 8 MiB )   (e)
-+     *
-+     * (c) is the pre-DDW VFIO DMA window accounting. We're allowing 2 GiB
-+     * rather than 1 GiB
-+     *
-+     * (d) is the with-DDW (and memory pre-registration and related
-+     * features) DMA window accounting - assuming that we only account RAM
-+     * once, even if mapped to multiple PHBs
-+     *
-+     * (e) is the with-DDW userspace view and overhead for the 64-bit DMA
-+     * window. This is based a bit on expected guest behaviour, but there
-+     * really isn't a way to completely avoid that. We assume the guest
-+     * requests a 64-bit DMA window (per PHB) just big enough to map all
-+     * its RAM. 4 kiB page size gives the 1/512; it will be less with 64
-+     * kiB pages, less still if the guest is mapped with hugepages (unlike
-+     * the default 32-bit DMA window, DDW windows can use large IOMMU
-+     * pages). 8 MiB is for second and further level overheads, like (b) */
-+    if (usesVFIO)
-+        passthroughLimit = MAX(2 * 1024 * 1024 * nPCIHostBridges,
-+                               memory +
-+                               memory / 512 * nPCIHostBridges + 8192);
-+
-+    memKB = baseLimit + passthroughLimit;
-+
-+    return memKB << 10;
-+}
-+
-+
- /**
-  * qemuDomainGetMemLockLimitBytes:
-  * @def: domain definition
-@@ -9836,84 +9927,8 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def)
-     if (def->mem.locked)
-         return VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
- 
--    if (ARCH_IS_PPC64(def->os.arch) && def->virtType == VIR_DOMAIN_VIRT_KVM) {
--        unsigned long long maxMemory;
--        unsigned long long memory;
--        unsigned long long baseLimit;
--        unsigned long long passthroughLimit = 0;
--        size_t nPCIHostBridges = 0;
--        bool usesVFIO = false;
--
--        for (i = 0; i < def->ncontrollers; i++) {
--            virDomainControllerDefPtr cont = def->controllers[i];
--
--            if (!virDomainControllerIsPSeriesPHB(cont))
--                continue;
--
--            nPCIHostBridges++;
--        }
--
--        for (i = 0; i < def->nhostdevs; i++) {
--            virDomainHostdevDefPtr dev = def->hostdevs[i];
--
--            if (dev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
--                dev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
--                dev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
--                usesVFIO = true;
--                break;
--            }
--        }
--
--        memory = virDomainDefGetMemoryTotal(def);
--
--        if (def->mem.max_memory)
--            maxMemory = def->mem.max_memory;
--        else
--            maxMemory = memory;
--
--        /* baseLimit := maxMemory / 128                                  (a)
--         *              + 4 MiB * #PHBs + 8 MiB                          (b)
--         *
--         * (a) is the hash table
--         *
--         * (b) is accounting for the 32-bit DMA window - it could be either the
--         * KVM accelerated TCE tables for emulated devices, or the VFIO
--         * userspace view. The 4 MiB per-PHB (including the default one) covers
--         * a 2GiB DMA window: default is 1GiB, but it's possible it'll be
--         * increased to help performance. The 8 MiB extra should be plenty for
--         * the TCE table index for any reasonable number of PHBs and several
--         * spapr-vlan or spapr-vscsi devices (512kB + a tiny bit each) */
--        baseLimit = maxMemory / 128 +
--                    4096 * nPCIHostBridges +
--                    8192;
--
--        /* passthroughLimit := max( 2 GiB * #PHBs,                       (c)
--         *                          memory                               (d)
--         *                          + memory * 1/512 * #PHBs + 8 MiB )   (e)
--         *
--         * (c) is the pre-DDW VFIO DMA window accounting. We're allowing 2 GiB
--         * rather than 1 GiB
--         *
--         * (d) is the with-DDW (and memory pre-registration and related
--         * features) DMA window accounting - assuming that we only account RAM
--         * once, even if mapped to multiple PHBs
--         *
--         * (e) is the with-DDW userspace view and overhead for the 64-bit DMA
--         * window. This is based a bit on expected guest behaviour, but there
--         * really isn't a way to completely avoid that. We assume the guest
--         * requests a 64-bit DMA window (per PHB) just big enough to map all
--         * its RAM. 4 kiB page size gives the 1/512; it will be less with 64
--         * kiB pages, less still if the guest is mapped with hugepages (unlike
--         * the default 32-bit DMA window, DDW windows can use large IOMMU
--         * pages). 8 MiB is for second and further level overheads, like (b) */
--        if (usesVFIO)
--            passthroughLimit = MAX(2 * 1024 * 1024 * nPCIHostBridges,
--                                   memory +
--                                   memory / 512 * nPCIHostBridges + 8192);
--
--        memKB = baseLimit + passthroughLimit;
--        goto done;
--    }
-+    if (ARCH_IS_PPC64(def->os.arch) && def->virtType == VIR_DOMAIN_VIRT_KVM)
-+        return getPPC64MemLockLimitBytes(def);
- 
-     /* For device passthrough using VFIO the guest memory and MMIO memory
-      * regions need to be locked persistent in order to allow DMA.
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu_hotplug-Attach-guestfwd-using-netdev_add.patch b/SOURCES/libvirt-qemu_hotplug-Attach-guestfwd-using-netdev_add.patch
deleted file mode 100644
index 7d56c49..0000000
--- a/SOURCES/libvirt-qemu_hotplug-Attach-guestfwd-using-netdev_add.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c120b5738e38dfa06bcd958d65c18308cab977b2 Mon Sep 17 00:00:00 2001
-Message-Id: <c120b5738e38dfa06bcd958d65c18308cab977b2@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 14:44:46 +0200
-Subject: [PATCH] qemu_hotplug: Attach guestfwd using netdev_add
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624204
-
-The guestfwd channels are -netdevs really. Hotplug them as such.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 903315dc8ffeb2af651207f090a53526decabc92)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624204
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <16a7ca67708755fe216f78295c56eae44275f5b1.1561639408.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hotplug.c | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index da9d56ffb1..468389fa7a 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1864,10 +1864,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-     char *tlsAlias = NULL;
-     const char *secAlias = NULL;
-     bool need_release = false;
-+    bool guestfwd = false;
- 
--    if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
--        qemuDomainPrepareChannel(chr, priv->channelTargetDir) < 0)
--        goto cleanup;
-+    if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) {
-+        guestfwd = chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD;
-+
-+        if (qemuDomainPrepareChannel(chr, priv->channelTargetDir) < 0)
-+            goto cleanup;
-+    }
- 
-     if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0)
-         goto cleanup;
-@@ -1909,8 +1913,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-         goto exit_monitor;
-     chardevAttached = true;
- 
--    if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
--        goto exit_monitor;
-+    if (guestfwd) {
-+        if (qemuMonitorAddNetdev(priv->mon, devstr,
-+                                 NULL, NULL, 0, NULL, NULL, 0) < 0)
-+            goto exit_monitor;
-+    } else {
-+        if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
-+            goto exit_monitor;
-+    }
- 
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto audit;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_hotplug-Check-for-duplicate-drive-addresses.patch b/SOURCES/libvirt-qemu_hotplug-Check-for-duplicate-drive-addresses.patch
deleted file mode 100644
index bc3d90e..0000000
--- a/SOURCES/libvirt-qemu_hotplug-Check-for-duplicate-drive-addresses.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6402d8133b33af901247afccdc78b332b453ff11 Mon Sep 17 00:00:00 2001
-Message-Id: <6402d8133b33af901247afccdc78b332b453ff11@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 18 Apr 2019 19:36:33 +0200
-Subject: [PATCH] qemu_hotplug: Check for duplicate drive addresses
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1692296
-RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1692354
-
-This tries to fix the same problem as f1d65853000 but it's doing
-so in a less invasive way.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-(cherry picked from commit ddc72f99027b063feaf34e5fda89916b6b2c8943)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <a40b26d1696401699fae7aeea2714f8b51935766.1555608962.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hotplug.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 397a2bdde2..776cd75474 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -612,6 +612,12 @@ qemuDomainAttachSCSIDisk(virQEMUDriverPtr driver,
-         return -1;
-     }
- 
-+    if (virDomainSCSIDriveAddressIsUsed(vm->def, &disk->info.addr.drive)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("Domain already contains a disk with that address"));
-+        return -1;
-+    }
-+
-     /* Let's make sure the disk has a controller defined and loaded before
-      * trying to add it. The controller used by the disk must exist before a
-      * qemu command line string is generated.
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemu_hotplug-Detach-guestfwd-using-netdev_del.patch b/SOURCES/libvirt-qemu_hotplug-Detach-guestfwd-using-netdev_del.patch
deleted file mode 100644
index 8930cf3..0000000
--- a/SOURCES/libvirt-qemu_hotplug-Detach-guestfwd-using-netdev_del.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From a86cb3601add390b718377be021128fc18e4c9b2 Mon Sep 17 00:00:00 2001
-Message-Id: <a86cb3601add390b718377be021128fc18e4c9b2@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 14:44:47 +0200
-Subject: [PATCH] qemu_hotplug: Detach guestfwd using netdev_del
-
-The guestfwd channels are -netdevs really. Hotunplug them as
-such. Also, DEVICE_DELETED event is not triggered (surprisingly,
-since we're not issuing device_del rather than netdev_del) and
-associated chardev is removed automagically too. This means that
-we need to do qemuDomainRemoveChrDevice() minus monitor call to
-remove the chardev.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 112f3a8d0f324c0705326957cca4508602b25eba)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624204
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <de45d53975997bcdbb4260055664a7b0a0079bbe.1561639408.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_hotplug.c | 48 ++++++++++++++++++++++++++++-------------
- 1 file changed, 33 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 468389fa7a..05489cf116 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -4355,25 +4355,28 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver,
- static int
- qemuDomainRemoveChrDevice(virQEMUDriverPtr driver,
-                           virDomainObjPtr vm,
--                          virDomainChrDefPtr chr)
-+                          virDomainChrDefPtr chr,
-+                          bool monitor)
- {
-     virObjectEventPtr event;
-     char *charAlias = NULL;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     int ret = -1;
--    int rc;
-+    int rc = 0;
- 
-     VIR_DEBUG("Removing character device %s from domain %p %s",
-               chr->info.alias, vm, vm->def->name);
- 
--    if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias)))
--        goto cleanup;
-+    if (monitor) {
-+        if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias)))
-+            goto cleanup;
- 
--    qemuDomainObjEnterMonitor(driver, vm);
--    rc = qemuMonitorDetachCharDev(priv->mon, charAlias);
-+        qemuDomainObjEnterMonitor(driver, vm);
-+        rc = qemuMonitorDetachCharDev(priv->mon, charAlias);
- 
--    if (qemuDomainObjExitMonitor(driver, vm) < 0)
--        goto cleanup;
-+        if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+            goto cleanup;
-+    }
- 
-     if (rc == 0 &&
-         qemuDomainDelChardevTLSObjects(driver, vm, chr->source, charAlias) < 0)
-@@ -4674,7 +4677,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver,
-         break;
- 
-     case VIR_DOMAIN_DEVICE_CHR:
--        ret = qemuDomainRemoveChrDevice(driver, vm, dev->data.chr);
-+        ret = qemuDomainRemoveChrDevice(driver, vm, dev->data.chr, true);
-         break;
-     case VIR_DOMAIN_DEVICE_RNG:
-         ret = qemuDomainRemoveRNGDevice(driver, vm, dev->data.rng);
-@@ -5749,6 +5752,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
-     virDomainDefPtr vmdef = vm->def;
-     virDomainChrDefPtr tmpChr;
-     char *devstr = NULL;
-+    bool guestfwd = false;
- 
-     if (!(tmpChr = virDomainChrFind(vmdef, chr))) {
-         virReportError(VIR_ERR_DEVICE_MISSING,
-@@ -5758,6 +5762,11 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
-         goto cleanup;
-     }
- 
-+    /* guestfwd channels are not really -device rather than
-+     * -netdev. We need to treat them slightly differently. */
-+    guestfwd = tmpChr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
-+               tmpChr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD;
-+
-     if (!tmpChr->info.alias && qemuAssignDeviceChrAlias(vmdef, tmpChr, -1) < 0)
-         goto cleanup;
- 
-@@ -5766,22 +5775,31 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
-     if (qemuBuildChrDeviceStr(&devstr, vmdef, tmpChr, priv->qemuCaps) < 0)
-         goto cleanup;
- 
--    if (!async)
-+    if (!async && !guestfwd)
-         qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info);
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    if (devstr && qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) {
--        ignore_value(qemuDomainObjExitMonitor(driver, vm));
--        goto cleanup;
-+    if (guestfwd) {
-+        if (qemuMonitorRemoveNetdev(priv->mon, tmpChr->info.alias) < 0) {
-+            ignore_value(qemuDomainObjExitMonitor(driver, vm));
-+            goto cleanup;
-+        }
-+    } else {
-+        if (devstr && qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) {
-+            ignore_value(qemuDomainObjExitMonitor(driver, vm));
-+            goto cleanup;
-+        }
-     }
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto cleanup;
- 
--    if (async) {
-+    if (guestfwd) {
-+        ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr, false);
-+    } else if (async) {
-         ret = 0;
-     } else {
-         if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1)
--            ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr);
-+            ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr, true);
-     }
- 
-  cleanup:
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_hotplug-remove-another-erroneous-qemuDomainDetachExtensionDevice-call.patch b/SOURCES/libvirt-qemu_hotplug-remove-another-erroneous-qemuDomainDetachExtensionDevice-call.patch
deleted file mode 100644
index 9b5bd21..0000000
--- a/SOURCES/libvirt-qemu_hotplug-remove-another-erroneous-qemuDomainDetachExtensionDevice-call.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0ca4828af101259cf2cbe30004c68f2081394f91 Mon Sep 17 00:00:00 2001
-Message-Id: <0ca4828af101259cf2cbe30004c68f2081394f91@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 8 Apr 2019 10:57:32 +0200
-Subject: [PATCH] qemu_hotplug: remove another erroneous
- qemuDomainDetachExtensionDevice() call
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-qemuDomainRemoveRNGDevice() calls qemuDomainDetachExtensionDevice().
-According to commit 1d1e264f1 that added this code, it should not be
-necessary to explicitly remove the zPCI extension device for a PCI
-device during unplug, because "QEMU implements an unplug callback
-which will unplug both PCI and zPCI device in a cascaded way". In
-fact, no other devices call qemuDomainDetachExtensionDevice() during
-their qemuDomainRemove*Device() function, so it should be removed from
-qemuDomainRemoveRNGDevice as well.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-
-(cherry picked from commit e18e9b72a99f93cd4b14f39c60baa7c5ea35e5db)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-16-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index f16213c6e0..410cdca3c5 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -4422,9 +4422,6 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver,
- 
-     qemuDomainObjEnterMonitor(driver, vm);
- 
--    if (qemuDomainDetachExtensionDevice(priv->mon, &rng->info) < 0)
--        rc = -1;
--
-     if (rc == 0 &&
-         qemuMonitorDelObject(priv->mon, objAlias) < 0)
-         rc = -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_hotplug-remove-erroneous-call-to-qemuDomainDetachExtensionDevice.patch b/SOURCES/libvirt-qemu_hotplug-remove-erroneous-call-to-qemuDomainDetachExtensionDevice.patch
deleted file mode 100644
index b026299..0000000
--- a/SOURCES/libvirt-qemu_hotplug-remove-erroneous-call-to-qemuDomainDetachExtensionDevice.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 77404a4f0ff85fbc0a2c24afc736ffbd8b82ef4d Mon Sep 17 00:00:00 2001
-Message-Id: <77404a4f0ff85fbc0a2c24afc736ffbd8b82ef4d@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 8 Apr 2019 10:57:31 +0200
-Subject: [PATCH] qemu_hotplug: remove erroneous call to
- qemuDomainDetachExtensionDevice()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-qemuDomainDetachControllerDevice() calls
-qemuDomainDetachExtensionDevice() when the controller type is
-PCI. This is incorrect in multiple ways:
-
-* Any code that tears down a device should be in the
-  qemuDomainRemove*Device() function (which is called after libvirt
-  gets a DEVICE_DELETED event from qemu indicating that the guest is
-  finished with the device on its end. The qemuDomainDetach*Device()
-  functions should only contain code that ensures the requested
-  operation is valid, and sends the command to qemu to initiate the
-  unplug.
-
-* qemuDomainDetachExtensionDevice() is a function that applies to
-  devices that plug into a PCI slot, *not* necessarily PCI controllers
-  (which is what's being checked in the offending code). The proper
-  way to check for this would be to see if the DeviceInfo for the
-  controller device had a PCI address, not to check if the controller
-  is a PCI controller (the code being removed was doing the latter).
-
-* According to commit 1d1e264f1 that added this code (and other
-  support for hotplugging zPCI devices on s390), it's not necessary to
-  explicitly detach the zPCI device when unplugging a PCI device. To
-  quote:
-
-       There's no need to implement hot unplug for zPCI as QEMU
-       implements an unplug callback which will unplug both PCI and
-       zPCI device in a cascaded way.
-
-  and the evidence bears this out - all the other uses of
-  qemuDomainDetachExtensionDevice() (except one, which I believe is
-  also in error, and is being removed in a separate patch) are only to
-  remove the zPCI extension device in cases where it was successfully
-  added, but there was some other failure later in the hotplug process
-  (so there was no regular PCI device to remove and trigger removal of
-  the zPCI extension device).
-
-* PCI controllers are not hot pluggable, so this is dead code
-  anyway. (The only controllers that can currently be
-  hotplugged/unplugged are SCSI controllers).
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-
-(cherry picked from commit 143291698358f5a1e693c768893d89038420af25)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1508149
-
-Conflicts:
-
-  * src/qemu/qemu_hotplug.c
-    + the code dealing with entering and exiting the monitor is
-      quite a bit different because we don't have backported
-      qemuDomainDeleteDevice() downstream
-      - missing 4cd13478ac33
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190408085732.28684-15-abologna@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_hotplug.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 8394efa739..f16213c6e0 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -5077,17 +5077,11 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
-         qemuDomainMarkDeviceForRemoval(vm, &detach->info);
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    if (detach->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
--        qemuDomainDetachExtensionDevice(priv->mon, &detach->info)) {
--        goto exit_monitor;
--    }
--
-     if (qemuMonitorDelDevice(priv->mon, detach->info.alias)) {
-         ignore_value(qemuDomainObjExitMonitor(driver, vm));
-         goto cleanup;
-     }
- 
-- exit_monitor:
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto cleanup;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_migration-Avoid-writing-to-freed-memory.patch b/SOURCES/libvirt-qemu_migration-Avoid-writing-to-freed-memory.patch
deleted file mode 100644
index 1dac6b3..0000000
--- a/SOURCES/libvirt-qemu_migration-Avoid-writing-to-freed-memory.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 14898a26978613278b0a2508c077179144d54b39 Mon Sep 17 00:00:00 2001
-Message-Id: <14898a26978613278b0a2508c077179144d54b39@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 2 Aug 2018 16:56:02 +0200
-Subject: [PATCH] qemu_migration: Avoid writing to freed memory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When a domain is killed on the source host while it is being migrated
-and libvirtd is waiting for the migration to finish (waiting for the
-domain condition in qemuMigrationSrcWaitForCompletion), the run-time
-state including priv->job.current may already be freed once
-virDomainObjWait returns with -1. Thus the priv->job.current pointer
-cached in jobInfo is no longer valid and setting jobInfo->status may
-crash the daemon.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1593137
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit dddcb601ebf97ef222a03bb27b2357e831e8a0cc)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1615854
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/qemu/qemu_migration.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 435cd174af..825a9d399b 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -1584,7 +1584,8 @@ qemuMigrationSrcWaitForCompletion(virQEMUDriverPtr driver,
- 
-         if (events) {
-             if (virDomainObjWait(vm) < 0) {
--                jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
-+                if (virDomainObjIsActive(vm))
-+                    jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
-                 return -2;
-             }
-         } else {
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu_monitor-Introduce-qemuMonitorJSONGetPRManagerInfo.patch b/SOURCES/libvirt-qemu_monitor-Introduce-qemuMonitorJSONGetPRManagerInfo.patch
deleted file mode 100644
index fbea3ca..0000000
--- a/SOURCES/libvirt-qemu_monitor-Introduce-qemuMonitorJSONGetPRManagerInfo.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 968116c9fb74569a6ea61e7eef6a87b6e766a61b Mon Sep 17 00:00:00 2001
-Message-Id: <968116c9fb74569a6ea61e7eef6a87b6e766a61b@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 11 Jul 2018 17:27:27 +0200
-Subject: [PATCH] qemu_monitor: Introduce qemuMonitorJSONGetPRManagerInfo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1470007
-
-This function fetches status of all pr-managers. So far, qemu
-reports only a single attribute "connected" but that fits our
-needs.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 5f085862e87668e77333cc369bf66ff3b6c19ae8)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_monitor.c      | 25 ++++++++++++
- src/qemu/qemu_monitor.h      |  9 ++++
- src/qemu/qemu_monitor_json.c | 79 ++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_monitor_json.h |  4 ++
- 4 files changed, 117 insertions(+)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 86b2b6e985..bc116e4e2d 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4346,3 +4346,28 @@ qemuMonitorGetSEVMeasurement(qemuMonitorPtr mon)
- 
-     return qemuMonitorJSONGetSEVMeasurement(mon);
- }
-+
-+
-+int
-+qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
-+                            virHashTablePtr *retinfo)
-+{
-+    int ret = -1;
-+    virHashTablePtr info = NULL;
-+
-+    *retinfo = NULL;
-+
-+    QEMU_CHECK_MONITOR(mon);
-+
-+    if (!(info = virHashCreate(10, virHashValueFree)))
-+        goto cleanup;
-+
-+    if (qemuMonitorJSONGetPRManagerInfo(mon, info) < 0)
-+        goto cleanup;
-+
-+    VIR_STEAL_PTR(*retinfo, info);
-+    ret = 0;
-+ cleanup:
-+    virHashFree(info);
-+    return ret;
-+}
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index a906bc8410..e8ed2d044c 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1157,4 +1157,13 @@ int qemuMonitorBlockdevDel(qemuMonitorPtr mon,
- char *
- qemuMonitorGetSEVMeasurement(qemuMonitorPtr mon);
- 
-+typedef struct _qemuMonitorPRManagerInfo qemuMonitorPRManagerInfo;
-+typedef qemuMonitorPRManagerInfo *qemuMonitorPRManagerInfoPtr;
-+struct _qemuMonitorPRManagerInfo {
-+    bool connected;
-+};
-+
-+int qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
-+                                virHashTablePtr *retinfo);
-+
- #endif /* QEMU_MONITOR_H */
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 03c94cd88b..66c525ed0c 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -8065,3 +8065,82 @@ qemuMonitorJSONGetSEVMeasurement(qemuMonitorPtr mon)
-     virJSONValueFree(reply);
-     return measurement;
- }
-+
-+
-+/*
-+ * Example return data
-+ *
-+ * "return": [
-+ *   { "connected": true, "id": "pr-helper0" }
-+ *  ]
-+ */
-+static int
-+qemuMonitorJSONExtractPRManagerInfo(virJSONValuePtr reply,
-+                                    virHashTablePtr info)
-+{
-+    qemuMonitorPRManagerInfoPtr entry = NULL;
-+    virJSONValuePtr data;
-+    int ret = -1;
-+    size_t i;
-+
-+    data = virJSONValueObjectGetArray(reply, "return");
-+
-+    for (i = 0; i < virJSONValueArraySize(data); i++) {
-+        virJSONValuePtr prManager = virJSONValueArrayGet(data, i);
-+        const char *alias;
-+
-+        if (!(alias = virJSONValueObjectGetString(prManager, "id")))
-+            goto malformed;
-+
-+        if (VIR_ALLOC(entry) < 0)
-+            goto cleanup;
-+
-+        if (virJSONValueObjectGetBoolean(prManager,
-+                                         "connected",
-+                                         &entry->connected) < 0) {
-+            goto malformed;
-+        }
-+
-+        if (virHashAddEntry(info, alias, entry) < 0)
-+            goto cleanup;
-+
-+        entry = NULL;
-+    }
-+
-+    ret = 0;
-+ cleanup:
-+    VIR_FREE(entry);
-+    return ret;
-+
-+ malformed:
-+    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                   _("malformed prManager reply"));
-+    goto cleanup;
-+}
-+
-+
-+int
-+qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon,
-+                                virHashTablePtr info)
-+{
-+    int ret = -1;
-+    virJSONValuePtr cmd;
-+    virJSONValuePtr reply = NULL;
-+
-+    if (!(cmd = qemuMonitorJSONMakeCommand("query-pr-managers",
-+                                           NULL)))
-+        return -1;
-+
-+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-+        goto cleanup;
-+
-+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
-+        goto cleanup;
-+
-+    ret = qemuMonitorJSONExtractPRManagerInfo(reply, info);
-+ cleanup:
-+    virJSONValueFree(cmd);
-+    virJSONValueFree(reply);
-+    return ret;
-+
-+}
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 6bc0dd3ad2..66536ceb97 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -550,4 +550,8 @@ int qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
-                                const char *nodename)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
-+int qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon,
-+                                    virHashTablePtr info)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-+
- #endif /* QEMU_MONITOR_JSON_H */
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-qemu_process-Prefer-generic-qemuMonitorGetGuestCPU.patch b/SOURCES/libvirt-qemu_process-Prefer-generic-qemuMonitorGetGuestCPU.patch
deleted file mode 100644
index 881c87c..0000000
--- a/SOURCES/libvirt-qemu_process-Prefer-generic-qemuMonitorGetGuestCPU.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 894b1e28647f0fd46da3ffc64afc358d438153f9 Mon Sep 17 00:00:00 2001
-Message-Id: <894b1e28647f0fd46da3ffc64afc358d438153f9@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:04 +0200
-Subject: [PATCH] qemu_process: Prefer generic qemuMonitorGetGuestCPU
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When updating guest CPU definition according to the vCPU actually
-created by QEMU, we want to use the generic qemuMonitorGetGuestCPU to
-get both CPUID and MSR features.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 63acb7bfd56f117309e4fcaf438639d4d7bc7dcb)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <711a363fde6df79fe9a26b6b4cb0a185cc5ad3cb.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_process.c | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 59a739f262..d147e524ee 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4013,6 +4013,16 @@ qemuProcessVerifyCPUFeatures(virDomainDefPtr def,
- }
- 
- 
-+static const char *
-+qemuProcessTranslateCPUFeatures(const char *name,
-+                                void *opaque)
-+{
-+    virQEMUCapsPtr qemuCaps = opaque;
-+
-+    return virQEMUCapsCPUFeatureFromQEMU(qemuCaps, name);
-+}
-+
-+
- static int
- qemuProcessFetchGuestCPU(virQEMUDriverPtr driver,
-                          virDomainObjPtr vm,
-@@ -4023,18 +4033,28 @@ qemuProcessFetchGuestCPU(virQEMUDriverPtr driver,
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     virCPUDataPtr dataEnabled = NULL;
-     virCPUDataPtr dataDisabled = NULL;
-+    bool generic;
-     int rc;
- 
-     *enabled = NULL;
-     *disabled = NULL;
- 
--    if (!ARCH_IS_X86(vm->def->os.arch))
-+    generic = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES);
-+
-+    if (!generic && !ARCH_IS_X86(vm->def->os.arch))
-         return 0;
- 
-     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-         goto error;
- 
--    rc = qemuMonitorGetGuestCPUx86(priv->mon, &dataEnabled, &dataDisabled);
-+    if (generic) {
-+        rc = qemuMonitorGetGuestCPU(priv->mon,
-+                                    vm->def->os.arch,
-+                                    qemuProcessTranslateCPUFeatures, priv->qemuCaps,
-+                                    &dataEnabled, &dataDisabled);
-+    } else {
-+        rc = qemuMonitorGetGuestCPUx86(priv->mon, &dataEnabled, &dataDisabled);
-+    }
- 
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         goto error;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemu_security-Fully-implement-qemuSecurityDomainSetPathLabel.patch b/SOURCES/libvirt-qemu_security-Fully-implement-qemuSecurityDomainSetPathLabel.patch
deleted file mode 100644
index 49f1358..0000000
--- a/SOURCES/libvirt-qemu_security-Fully-implement-qemuSecurityDomainSetPathLabel.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 86f741bf77f39d4af3698b71797e430c2a6989c3 Mon Sep 17 00:00:00 2001
-Message-Id: <86f741bf77f39d4af3698b71797e430c2a6989c3@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 3 Jan 2019 10:03:44 +0100
-Subject: [PATCH] qemu_security: Fully implement qemuSecurityDomainSetPathLabel
-
-Even though the current use of the function does not require full
-implementation with transactions (none of the callers pass a path
-somewhere under /dev), it doesn't hurt either. Moreover, in
-future patches the paradigm is going to shift so that any API
-that touches a file is required to use transactions.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit da24db2d30352c094f76dffb523e7f344ff8e30d)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1658112
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <4de2beabd9868259f1856f7eafcc835b5b2a3d6b.1546506016.git.eskultet@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_domain.c   |  3 +--
- src/qemu/qemu_process.c  | 15 ++++++---------
- src/qemu/qemu_security.c | 30 ++++++++++++++++++++++++++++++
- src/qemu/qemu_security.h |  6 +++++-
- 4 files changed, 42 insertions(+), 12 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 95b84af78a..c9899b9e6d 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -801,8 +801,7 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver,
-         goto cleanup;
-     }
- 
--    if (qemuSecurityDomainSetPathLabel(driver->securityManager,
--                                       vm->def, path, false) < 0)
-+    if (qemuSecurityDomainSetPathLabel(driver, vm, path, false) < 0)
-         goto cleanup;
- 
-     ret = 0;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 34aac69afc..c0f95dd5f1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2778,8 +2778,7 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm)
-         virCgroupAddMachineTask(priv->cgroup, cpid) < 0)
-         goto cleanup;
- 
--    if (qemuSecurityDomainSetPathLabel(driver->securityManager,
--                                       vm->def, socketPath, true) < 0)
-+    if (qemuSecurityDomainSetPathLabel(driver, vm, socketPath, true) < 0)
-         goto cleanup;
- 
-     priv->prDaemonRunning = true;
-@@ -3656,7 +3655,7 @@ qemuProcessNeedMemoryBackingPath(virDomainDefPtr def,
- 
- static int
- qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriverPtr driver,
--                                       virDomainDefPtr def,
-+                                       virDomainObjPtr vm,
-                                        const char *path,
-                                        bool build)
- {
-@@ -3671,8 +3670,7 @@ qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriverPtr driver,
-             return -1;
-         }
- 
--        if (qemuSecurityDomainSetPathLabel(driver->securityManager,
--                                           def, path, true) < 0)
-+        if (qemuSecurityDomainSetPathLabel(driver, vm, path, true) < 0)
-             return -1;
-     } else {
-         if (virFileDeleteTree(path) < 0)
-@@ -3708,7 +3706,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr driver,
-             if (!path)
-                 goto cleanup;
- 
--            if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm->def,
-+            if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm,
-                                                        path, build) < 0)
-                 goto cleanup;
- 
-@@ -3720,7 +3718,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr driver,
-         if (qemuGetMemoryBackingDomainPath(vm->def, cfg, &path) < 0)
-             goto cleanup;
- 
--        if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm->def,
-+        if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm,
-                                                    path, build) < 0)
-             goto cleanup;
- 
-@@ -4904,8 +4902,7 @@ qemuProcessMakeDir(virQEMUDriverPtr driver,
-         goto cleanup;
-     }
- 
--    if (qemuSecurityDomainSetPathLabel(driver->securityManager,
--                                       vm->def, path, true) < 0)
-+    if (qemuSecurityDomainSetPathLabel(driver, vm, path, true) < 0)
-         goto cleanup;
- 
-     ret = 0;
-diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
-index af3be42854..268def309a 100644
---- a/src/qemu/qemu_security.c
-+++ b/src/qemu/qemu_security.c
-@@ -493,3 +493,33 @@ qemuSecurityCleanupTPMEmulator(virQEMUDriverPtr driver,
- {
-     virSecurityManagerRestoreTPMLabels(driver->securityManager, def);
- }
-+
-+
-+int
-+qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
-+                               virDomainObjPtr vm,
-+                               const char *path,
-+                               bool allowSubtree)
-+{
-+    int ret = -1;
-+
-+    if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) &&
-+        virSecurityManagerTransactionStart(driver->securityManager) < 0)
-+        goto cleanup;
-+
-+    if (virSecurityManagerDomainSetPathLabel(driver->securityManager,
-+                                             vm->def,
-+                                             path,
-+                                             allowSubtree) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) &&
-+        virSecurityManagerTransactionCommit(driver->securityManager,
-+                                            vm->pid) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+ cleanup:
-+    virSecurityManagerTransactionAbort(driver->securityManager);
-+    return ret;
-+}
-diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
-index a189b63828..fd11fbdd9d 100644
---- a/src/qemu/qemu_security.h
-+++ b/src/qemu/qemu_security.h
-@@ -95,12 +95,16 @@ int qemuSecurityStartTPMEmulator(virQEMUDriverPtr driver,
- void qemuSecurityCleanupTPMEmulator(virQEMUDriverPtr driver,
-                                     virDomainDefPtr def);
- 
-+int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
-+                                   virDomainObjPtr vm,
-+                                   const char *path,
-+                                   bool allowSubtree);
-+
- /* Please note that for these APIs there is no wrapper yet. Do NOT blindly add
-  * new APIs here. If an API can touch a /dev file add a proper wrapper instead.
-  */
- # define qemuSecurityCheckAllLabel virSecurityManagerCheckAllLabel
- # define qemuSecurityClearSocketLabel virSecurityManagerClearSocketLabel
--# define qemuSecurityDomainSetPathLabel virSecurityManagerDomainSetPathLabel
- # define qemuSecurityGenLabel virSecurityManagerGenLabel
- # define qemuSecurityGetBaseLabel virSecurityManagerGetBaseLabel
- # define qemuSecurityGetDOI virSecurityManagerGetDOI
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemublocktest-Add-JSON-JSON-test-cases-for-block-device-backends.patch b/SOURCES/libvirt-qemublocktest-Add-JSON-JSON-test-cases-for-block-device-backends.patch
new file mode 100644
index 0000000..feb2a18
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-JSON-JSON-test-cases-for-block-device-backends.patch
@@ -0,0 +1,149 @@
+From b385c22388eb9810f654936decc970bc882d6c8b Mon Sep 17 00:00:00 2001
+Message-Id: <b385c22388eb9810f654936decc970bc882d6c8b@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:12 +0100
+Subject: [PATCH] qemublocktest: Add JSON->JSON test cases for block device
+ backends
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add testing of the interpretation of the JSON pseudo-protocol backing
+store into JSON structs for blockdev. This will be used to test JSON
+pseudo-URIs used by libguestfs while actually also validating the output
+against the QMP schema. Since libguestfs uses obsolete/undocumented
+values the outputs will differ and a benefit is that modern output is
+used now.
+
+The example test case covers the fields and values used by libguestfs
+when using the https driver.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit d089234110282069e9a6dfe879ca257d114bb5bd)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <f63c18cbdf69b27bd91fe44250737cf89b3cb090.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         | 65 +++++++++++++++++++
+ .../jsontojson/curl-libguestfs-in.json        |  1 +
+ .../jsontojson/curl-libguestfs-out.json       |  9 +++
+ 3 files changed, 75 insertions(+)
+ create mode 100644 tests/qemublocktestdata/jsontojson/curl-libguestfs-in.json
+ create mode 100644 tests/qemublocktestdata/jsontojson/curl-libguestfs-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index d2ba85c5e5..d8bd811b4d 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -128,6 +128,57 @@ testBackingXMLjsonXML(const void *args)
+     return 0;
+ }
+ 
++static const char *testJSONtoJSONPath = abs_srcdir "/qemublocktestdata/jsontojson/";
++
++struct testJSONtoJSONData {
++    const char *name;
++    virHashTablePtr schema;
++    virJSONValuePtr schemaroot;
++};
++
++static int
++testJSONtoJSON(const void *args)
++{
++    const struct testJSONtoJSONData *data = args;
++    g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
++    g_autoptr(virJSONValue) jsonsrcout = NULL;
++    g_autoptr(virStorageSource) src = NULL;
++    g_autofree char *actual = NULL;
++    g_autofree char *in = NULL;
++    g_autofree char *infile = g_strdup_printf("%s%s-in.json", testJSONtoJSONPath,
++                                              data->name);
++    g_autofree char *outfile = g_strdup_printf("%s%s-out.json", testJSONtoJSONPath,
++                                              data->name);
++
++    if (virTestLoadFile(infile, &in) < 0)
++        return -1;
++
++    if (virStorageSourceNewFromBackingAbsolute(in, &src) < 0) {
++        fprintf(stderr, "failed to parse disk json\n");
++        return -1;
++    }
++
++    if (!(jsonsrcout = qemuBlockStorageSourceGetBackendProps(src, false, false, true))) {
++        fprintf(stderr, "failed to format disk source json\n");
++        return -1;
++    }
++
++    if (!(actual = virJSONValueToString(jsonsrcout, true)))
++        return -1;
++
++    if (testQEMUSchemaValidate(jsonsrcout, data->schemaroot,
++                               data->schema, &debug) < 0) {
++        g_autofree char *debugmsg = virBufferContentAndReset(&debug);
++
++        VIR_TEST_VERBOSE("json does not conform to QAPI schema");
++        VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
++                       actual, NULLSTR(debugmsg));
++        return -1;
++    }
++
++    return virTestCompareToFile(actual, outfile);
++}
++
+ 
+ struct testQemuDiskXMLToJSONData {
+     virQEMUDriverPtr driver;
+@@ -875,6 +926,7 @@ mymain(void)
+     virQEMUDriver driver;
+     struct testBackingXMLjsonXMLdata xmljsonxmldata;
+     struct testQemuDiskXMLToJSONData diskxmljsondata;
++    struct testJSONtoJSONData jsontojsondata;
+     struct testQemuImageCreateData imagecreatedata;
+     struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
+     struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
+@@ -1068,6 +1120,19 @@ mymain(void)
+     TEST_DISK_TO_JSON("block-raw-noopts");
+     TEST_DISK_TO_JSON("block-raw-reservations");
+ 
++#define TEST_JSON_TO_JSON(nme) \
++    do { \
++        jsontojsondata.name = nme; \
++        if (virTestRun("JSON to JSON " nme, testJSONtoJSON, \
++                       &jsontojsondata) < 0) \
++            ret = -1; \
++    } while (0)
++
++    jsontojsondata.schema = qmp_schema_x86_64;
++    jsontojsondata.schemaroot = qmp_schemaroot_x86_64_blockdev_add;
++
++    TEST_JSON_TO_JSON("curl-libguestfs");
++
+ #define TEST_IMAGE_CREATE(testname, testbacking) \
+     do { \
+         imagecreatedata.name = testname; \
+diff --git a/tests/qemublocktestdata/jsontojson/curl-libguestfs-in.json b/tests/qemublocktestdata/jsontojson/curl-libguestfs-in.json
+new file mode 100644
+index 0000000000..0b92dabc6d
+--- /dev/null
++++ b/tests/qemublocktestdata/jsontojson/curl-libguestfs-in.json
+@@ -0,0 +1 @@
++json:{"file.driver":"https","file.url":"https://test.host/whatever.img","file.timeout":2000,"file.readahead":65536,"file.sslverify":"off","file.cookie":"some_cookie=\"some_value_or_whatever\""}
+diff --git a/tests/qemublocktestdata/jsontojson/curl-libguestfs-out.json b/tests/qemublocktestdata/jsontojson/curl-libguestfs-out.json
+new file mode 100644
+index 0000000000..e130c7bd3c
+--- /dev/null
++++ b/tests/qemublocktestdata/jsontojson/curl-libguestfs-out.json
+@@ -0,0 +1,9 @@
++{
++  "driver": "https",
++  "url": "https://test.host:443/whatever.img",
++  "sslverify": false,
++  "timeout": 2000,
++  "readahead": 65536,
++  "auto-read-only": true,
++  "discard": "unmap"
++}
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-basic-tests-for-backup-bitmap-handling.patch b/SOURCES/libvirt-qemublocktest-Add-basic-tests-for-backup-bitmap-handling.patch
new file mode 100644
index 0000000..e6a6f03
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-basic-tests-for-backup-bitmap-handling.patch
@@ -0,0 +1,139 @@
+From 747e726988e43451139b3113e7b5f60b2f50e17e Mon Sep 17 00:00:00 2001
+Message-Id: <747e726988e43451139b3113e7b5f60b2f50e17e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:58 +0200
+Subject: [PATCH] qemublocktest: Add 'basic' tests for backup bitmap handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The 'basic' case is just a single backing store layer containing the
+bitmaps so we just copy the bitmaps over to the backup bitmap.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 8c6e2da25e55081164cb5eb02ddece38500c5cff)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <94d168ffd27a6da8ffec1dfb37268e79c395c21e.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  4 +++
+ .../backupmerge/basic-deep-out.json           | 25 +++++++++++++++++++
+ .../backupmerge/basic-flat-out.json           | 25 +++++++++++++++++++
+ .../backupmerge/basic-intermediate-out.json   | 25 +++++++++++++++++++
+ 4 files changed, 79 insertions(+)
+ create mode 100644 tests/qemublocktestdata/backupmerge/basic-deep-out.json
+ create mode 100644 tests/qemublocktestdata/backupmerge/basic-flat-out.json
+ create mode 100644 tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index dcdc9eade0..7a0159f659 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1262,6 +1262,10 @@ mymain(void)
+ 
+     TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
+ 
++    TEST_BACKUP_BITMAP_CALCULATE("basic-flat", bitmapSourceChain, "current", "basic");
++    TEST_BACKUP_BITMAP_CALCULATE("basic-intermediate", bitmapSourceChain, "d", "basic");
++    TEST_BACKUP_BITMAP_CALCULATE("basic-deep", bitmapSourceChain, "a", "basic");
++
+ #define TEST_CHECKPOINT_DELETE(testname, delbmp, named) \
+     do { \
+         checkpointdeletedata.name = testname; \
+diff --git a/tests/qemublocktestdata/backupmerge/basic-deep-out.json b/tests/qemublocktestdata/backupmerge/basic-deep-out.json
+new file mode 100644
+index 0000000000..ff77af789b
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/basic-deep-out.json
+@@ -0,0 +1,25 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "target_node",
++      "name": "target-bitmap-name",
++      "persistent": false,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "target_node",
++      "target": "target-bitmap-name",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/backupmerge/basic-flat-out.json b/tests/qemublocktestdata/backupmerge/basic-flat-out.json
+new file mode 100644
+index 0000000000..4637bbc377
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/basic-flat-out.json
+@@ -0,0 +1,25 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "target_node",
++      "name": "target-bitmap-name",
++      "persistent": false,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "target_node",
++      "target": "target-bitmap-name",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json b/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
+new file mode 100644
+index 0000000000..f2f3b3f568
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
+@@ -0,0 +1,25 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "target_node",
++      "name": "target-bitmap-name",
++      "persistent": false,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "target_node",
++      "target": "target-bitmap-name",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-basic-tests-for-commit-bitmap-handling.patch b/SOURCES/libvirt-qemublocktest-Add-basic-tests-for-commit-bitmap-handling.patch
new file mode 100644
index 0000000..cb3709c
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-basic-tests-for-commit-bitmap-handling.patch
@@ -0,0 +1,355 @@
+From 433f551418c9b40b5da9bf36abb5f9eba0662369 Mon Sep 17 00:00:00 2001
+Message-Id: <433f551418c9b40b5da9bf36abb5f9eba0662369@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:01 +0200
+Subject: [PATCH] qemublocktest: Add 'basic' tests for commit bitmap handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In the 'basic' case we have few bitmaps in only the top layer. Simulate
+commit into the backing of the top layer and also 2 levels deep.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 79bc7c1828212c165d8b71bd6166ca24695a8ecd)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <9973a947b47bb20fa2e3f03e1a36541c2f1f3018.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |   4 +
+ .../bitmapblockcommit/basic-1-2               | 145 ++++++++++++++++++
+ .../bitmapblockcommit/basic-1-3               | 145 ++++++++++++++++++
+ .../bitmapblockcommit/basic-2-3               |   1 +
+ 4 files changed, 295 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index f0e80a0738..43abc49534 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1357,6 +1357,10 @@ mymain(void)
+ 
+     TEST_BITMAP_BLOCKCOMMIT("empty", 1, 2, "empty");
+ 
++    TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
++    TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
++    TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
++
+  cleanup:
+     qemuTestDriverFree(&driver);
+     VIR_FREE(capslatest_x86_64);
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+new file mode 100644
+index 0000000000..d393d31044
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+@@ -0,0 +1,145 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "a",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+new file mode 100644
+index 0000000000..3fa902c354
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+@@ -0,0 +1,145 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "a",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+new file mode 100644
+index 0000000000..9260011852
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+@@ -0,0 +1 @@
++merge bitmpas:
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-empty-case-for-blockcopy-bitmap-handling-test.patch b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-blockcopy-bitmap-handling-test.patch
new file mode 100644
index 0000000..137f4fa
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-blockcopy-bitmap-handling-test.patch
@@ -0,0 +1,47 @@
+From 57911844644ca352154859050e59444aca4e4ca5 Mon Sep 17 00:00:00 2001
+Message-Id: <57911844644ca352154859050e59444aca4e4ca5@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:42 +0200
+Subject: [PATCH] qemublocktest: Add 'empty' case for blockcopy bitmap handling
+ test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 264d7cf444633c0d2d20b30b612754943fede5a3)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <f49b64f231bb06e6d65232aa9bedaf11a5ce4497.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                                          | 3 +++
+ tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json    | 0
+ tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json | 0
+ 3 files changed, 3 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 5f1c68f6de..2009cad228 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1407,6 +1407,9 @@ mymain(void)
+             ret = -1; \
+     } while (0)
+ 
++    TEST_BITMAP_BLOCKCOPY("empty-shallow", true, "empty");
++    TEST_BITMAP_BLOCKCOPY("empty-deep", false, "empty");
++
+     TEST_BITMAP_BLOCKCOPY("basic-shallow", true, "basic");
+     TEST_BITMAP_BLOCKCOPY("basic-deep", false, "basic");
+ 
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/empty-deep-out.json
+new file mode 100644
+index 0000000000..e69de29bb2
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/empty-shallow-out.json
+new file mode 100644
+index 0000000000..e69de29bb2
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-bitmap-handling.patch b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-bitmap-handling.patch
new file mode 100644
index 0000000..ce24ad9
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-bitmap-handling.patch
@@ -0,0 +1,46 @@
+From 04bc9dbf9940f6976c5320ce628f97197625e4d7 Mon Sep 17 00:00:00 2001
+Message-Id: <04bc9dbf9940f6976c5320ce628f97197625e4d7@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:43 +0200
+Subject: [PATCH] qemublocktest: Add 'empty' case for checkpoint bitmap
+ handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit cc1a33b59940f9e2a0856ac49dd9b8a185df8a01)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <c29f12f53fef11d76aa14ece56ac5f43f74cb21d.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                           | 2 ++
+ tests/qemublocktestdata/bitmapblockcommit/empty | 2 ++
+ 2 files changed, 4 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/empty
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 2009cad228..36e3378f5b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1429,6 +1429,8 @@ mymain(void)
+         ret = -1; \
+     } while (0)
+ 
++    TEST_BITMAP_BLOCKCOMMIT("empty", 1, 2, "empty");
++
+     TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
+     TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
+     TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/empty b/tests/qemublocktestdata/bitmapblockcommit/empty
+new file mode 100644
+index 0000000000..bfc58f994e
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/empty
+@@ -0,0 +1,2 @@
++pre job bitmap disable:
++merge bitmpas:
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-deletion.patch b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-deletion.patch
new file mode 100644
index 0000000..92139fb
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-checkpoint-deletion.patch
@@ -0,0 +1,68 @@
+From 081af2b88972972f000593d10629f0f269a7ad41 Mon Sep 17 00:00:00 2001
+Message-Id: <081af2b88972972f000593d10629f0f269a7ad41@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:41 +0200
+Subject: [PATCH] qemublocktest: Add 'empty' case for checkpoint deletion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the new test data for checkpoint deletion testing. This test also
+requires modification of the internals to allow checking for test
+failure.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 88f175d88718114c032107df102d7c8071f0a38e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <957325a358cad71b3002dd03c3ec656ee4f225a9.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                               | 13 +++++++------
+ .../checkpointdelete/empty-out.json                 |  1 +
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/empty-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 3ef6ccec9b..5f1c68f6de 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -851,14 +851,13 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+                                          data->parentbitmap,
+                                          actions,
+                                          "testdisk",
+-                                         &reopenimages) < 0) {
+-        VIR_TEST_VERBOSE("failed to generate checkpoint delete transaction\n");
+-        return -1;
++                                         &reopenimages) >= 0) {
++        if (virJSONValueToBuffer(actions, &buf, true) < 0)
++            return -1;
++    } else {
++        virBufferAddLit(&buf, "NULL\n");
+     }
+ 
+-    if (virJSONValueToBuffer(actions, &buf, true) < 0)
+-        return -1;
+-
+     if (reopenimages) {
+         virBufferAddLit(&buf, "reopen nodes:\n");
+ 
+@@ -1332,6 +1331,8 @@ mymain(void)
+         ret = -1; \
+     } while (0)
+ 
++    TEST_CHECKPOINT_DELETE_MERGE("empty", "a", NULL, "empty");
++
+     TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL, "basic");
+     TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a", "basic");
+     TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b", "basic");
+diff --git a/tests/qemublocktestdata/checkpointdelete/empty-out.json b/tests/qemublocktestdata/checkpointdelete/empty-out.json
+new file mode 100644
+index 0000000000..7951defec1
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/empty-out.json
+@@ -0,0 +1 @@
++NULL
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-empty-case-for-incremental-backup-test.patch b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-incremental-backup-test.patch
new file mode 100644
index 0000000..5e9f808
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-empty-case-for-incremental-backup-test.patch
@@ -0,0 +1,74 @@
+From 60c3e3fd52b1d2fe5fbab42d762248a02b5143f6 Mon Sep 17 00:00:00 2001
+Message-Id: <60c3e3fd52b1d2fe5fbab42d762248a02b5143f6@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:40 +0200
+Subject: [PATCH] qemublocktest: Add 'empty' case for incremental backup test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the new test data when calculating incremental backup operations. As
+incremental backup fails with no bitmap the test code is modified to
+allow testing this case too.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 218d00f443a5e211ea3664996c610f62b18425f7)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <45ec7a3b4dce5f583d2864991e16cdc090b8dfce.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         | 19 ++++++++++---------
+ .../backupmerge/empty-out.json                |  1 +
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+ create mode 100644 tests/qemublocktestdata/backupmerge/empty-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 2063ca0be7..3ef6ccec9b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -793,17 +793,16 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
+ 
+     incremental = testQemuBackupGetIncremental(data->incremental);
+ 
+-    if (!(mergebitmaps = qemuBackupDiskPrepareOneBitmapsChain(incremental,
+-                                                              data->chain,
+-                                                              nodedata,
+-                                                              "testdisk"))) {
+-        VIR_TEST_VERBOSE("failed to calculate merged bitmaps");
+-        return -1;
++    if ((mergebitmaps = qemuBackupDiskPrepareOneBitmapsChain(incremental,
++                                                             data->chain,
++                                                             nodedata,
++                                                             "testdisk"))) {
++        if (!(actual = virJSONValueToString(mergebitmaps, true)))
++            return -1;
++    } else {
++        actual = g_strdup("NULL\n");
+     }
+ 
+-    if (!(actual = virJSONValueToString(mergebitmaps, true)))
+-        return -1;
+-
+     return virTestCompareToFile(actual, expectpath);
+ }
+ 
+@@ -1311,6 +1310,8 @@ mymain(void)
+             ret = -1; \
+     } while (0)
+ 
++    TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
++
+     TEST_BACKUP_BITMAP_CALCULATE("basic-flat", bitmapSourceChain, "current", "basic");
+     TEST_BACKUP_BITMAP_CALCULATE("basic-intermediate", bitmapSourceChain, "d", "basic");
+     TEST_BACKUP_BITMAP_CALCULATE("basic-deep", bitmapSourceChain, "a", "basic");
+diff --git a/tests/qemublocktestdata/backupmerge/empty-out.json b/tests/qemublocktestdata/backupmerge/empty-out.json
+new file mode 100644
+index 0000000000..7951defec1
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/empty-out.json
+@@ -0,0 +1 @@
++NULL
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-empty-test-case-for-bitmaps.patch b/SOURCES/libvirt-qemublocktest-Add-empty-test-case-for-bitmaps.patch
new file mode 100644
index 0000000..e4744ab
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-empty-test-case-for-bitmaps.patch
@@ -0,0 +1,133 @@
+From 07e5713853789cc0b216c7d3731cbda68f905eac Mon Sep 17 00:00:00 2001
+Message-Id: <07e5713853789cc0b216c7d3731cbda68f905eac@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:39 +0200
+Subject: [PATCH] qemublocktest: Add 'empty' test case for bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add test data for an image without bitmaps.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 15ef0c1c3891feaa949e082d922c54ebe6563e40)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <2e329c1ef636060b4c094cac8c0d3558994986ce.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                     |  4 ++
+ tests/qemublocktestdata/bitmap/empty.json | 70 +++++++++++++++++++++++
+ tests/qemublocktestdata/bitmap/empty.out  |  1 +
+ 3 files changed, 75 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmap/empty.json
+ create mode 100644 tests/qemublocktestdata/bitmap/empty.out
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index d15965d9eb..2063ca0be7 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1291,6 +1291,8 @@ mymain(void)
+             ret = -1; \
+     } while (0)
+ 
++    TEST_BITMAP_DETECT("empty");
++
+     TEST_BITMAP_DETECT("basic");
+     TEST_BITMAP_DETECT("synthetic");
+     TEST_BITMAP_DETECT("snapshots");
+@@ -1359,6 +1361,8 @@ mymain(void)
+             ret = -1; \
+     } while (0)
+ 
++    TEST_BITMAP_VALIDATE("empty", "a", false);
++
+     TEST_BITMAP_VALIDATE("basic", "a", true);
+     TEST_BITMAP_VALIDATE("basic", "b", true);
+     TEST_BITMAP_VALIDATE("basic", "c", true);
+diff --git a/tests/qemublocktestdata/bitmap/empty.json b/tests/qemublocktestdata/bitmap/empty.json
+new file mode 100644
+index 0000000000..ec43b25f0d
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/empty.json
+@@ -0,0 +1,70 @@
++[
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.qcow2",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 200704,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-1-format",
++        "backing_file_depth": 0,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.qcow2",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 197120,
++            "filename": "/tmp/pull4.qcow2",
++            "format": "file",
++            "actual-size": 200704,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-1-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.qcow2",
++        "encryption_key_missing": false
++    }
++]
+diff --git a/tests/qemublocktestdata/bitmap/empty.out b/tests/qemublocktestdata/bitmap/empty.out
+new file mode 100644
+index 0000000000..3787cbd354
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/empty.out
+@@ -0,0 +1 @@
++libvirt-1-format:
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-more-tests-for-block-commit-bitmap-handling-with-snapshots.patch b/SOURCES/libvirt-qemublocktest-Add-more-tests-for-block-commit-bitmap-handling-with-snapshots.patch
new file mode 100644
index 0000000..8d09264
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-more-tests-for-block-commit-bitmap-handling-with-snapshots.patch
@@ -0,0 +1,945 @@
+From 2eb309fcc6bc22e5eff4fe048683176056a43a94 Mon Sep 17 00:00:00 2001
+Message-Id: <2eb309fcc6bc22e5eff4fe048683176056a43a94@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:26 +0100
+Subject: [PATCH] qemublocktest: Add more tests for block-commit bitmap
+ handling with snapshots
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Test handling of more complex cases of merging bitmaps accross
+snapshots.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 8f096cd8808b186d451ec100c646dc8ddd974735)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <45bfd1540594f663240f64a58a369c31cd83e607.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  15 ++
+ .../bitmapblockcommit/snapshots-1-2           |  49 +++++++
+ .../bitmapblockcommit/snapshots-1-3           |  76 ++++++++++
+ .../bitmapblockcommit/snapshots-1-4           | 126 +++++++++++++++++
+ .../bitmapblockcommit/snapshots-1-5           | 130 ++++++++++++++++++
+ .../bitmapblockcommit/snapshots-2-3           |  49 +++++++
+ .../bitmapblockcommit/snapshots-2-4           |  99 +++++++++++++
+ .../bitmapblockcommit/snapshots-2-5           | 103 ++++++++++++++
+ .../bitmapblockcommit/snapshots-3-4           |  72 ++++++++++
+ .../bitmapblockcommit/snapshots-3-5           |  76 ++++++++++
+ .../bitmapblockcommit/snapshots-4-5           |  33 +++++
+ 11 files changed, 828 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 63ac80b584..ad68b37c80 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1392,6 +1392,21 @@ mymain(void)
+     TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
+     TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
+ 
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-2", 1, 2, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-3", 1, 3, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-4", 1, 4, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-5", 1, 5, "snapshots");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-3", 2, 3, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-4", 2, 4, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-5", 2, 5, "snapshots");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-3-4", 3, 4, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-3-5", 3, 5, "snapshots");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
++
++
+  cleanup:
+     qemuTestDriverFree(&driver);
+     VIR_FREE(capslatest_x86_64);
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+new file mode 100644
+index 0000000000..0015b9ceb3
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+@@ -0,0 +1,49 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+new file mode 100644
+index 0000000000..5691b408aa
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+@@ -0,0 +1,76 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+new file mode 100644
+index 0000000000..454001531a
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+@@ -0,0 +1,126 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+new file mode 100644
+index 0000000000..2fd43d7917
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+@@ -0,0 +1,130 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+new file mode 100644
+index 0000000000..d719a90bd7
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+@@ -0,0 +1,49 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+new file mode 100644
+index 0000000000..9e37962344
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+@@ -0,0 +1,99 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+new file mode 100644
+index 0000000000..d6b20a5d05
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+@@ -0,0 +1,103 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+new file mode 100644
+index 0000000000..b96e8910d7
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+@@ -0,0 +1,72 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+new file mode 100644
+index 0000000000..9570c34c40
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+@@ -0,0 +1,76 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+new file mode 100644
+index 0000000000..7e1020d96e
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+@@ -0,0 +1,33 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  }
++]
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-new-synthetic-bitmap-detection-and-validation-test-case.patch b/SOURCES/libvirt-qemublocktest-Add-new-synthetic-bitmap-detection-and-validation-test-case.patch
new file mode 100644
index 0000000..5019da5
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-new-synthetic-bitmap-detection-and-validation-test-case.patch
@@ -0,0 +1,593 @@
+From 3afb35cc6b6dabd52fe508766d5a914d74135f69 Mon Sep 17 00:00:00 2001
+Message-Id: <3afb35cc6b6dabd52fe508766d5a914d74135f69@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:52 +0200
+Subject: [PATCH] qemublocktest: Add new 'synthetic' bitmap detection and
+ validation test case
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Based on the 'snapshots' example with manual tweaks to introduce
+inactive, transient, inconsistent and duplicate bitmaps in various parts
+of the chain to exercise detection and new validation code.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit b3845f0e3d0ec58b25274cb6b70906f44333069f)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <6e6222a085da03ad17af728db3bdb9027c0d8b0e.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  11 +
+ tests/qemublocktestdata/bitmap/synthetic.json | 506 ++++++++++++++++++
+ tests/qemublocktestdata/bitmap/synthetic.out  |  15 +
+ 3 files changed, 532 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmap/synthetic.json
+ create mode 100644 tests/qemublocktestdata/bitmap/synthetic.out
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index af81f1b77a..2f675d7e03 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1302,6 +1302,7 @@ mymain(void)
+ 
+     TEST_BITMAP_DETECT("basic");
+     TEST_BITMAP_DETECT("snapshots");
++    TEST_BITMAP_DETECT("synthetic");
+ 
+ #define TEST_BACKUP_BITMAP_CALCULATE(testname, source, incrbackup, named) \
+     do { \
+@@ -1357,6 +1358,16 @@ mymain(void)
+     TEST_BITMAP_VALIDATE("snapshots", "d", true);
+     TEST_BITMAP_VALIDATE("snapshots", "current", true);
+ 
++    TEST_BITMAP_VALIDATE("synthetic", "a", false);
++    TEST_BITMAP_VALIDATE("synthetic", "b", false);
++    TEST_BITMAP_VALIDATE("synthetic", "c", false);
++    TEST_BITMAP_VALIDATE("synthetic", "d", false);
++    TEST_BITMAP_VALIDATE("synthetic", "current", false);
++    TEST_BITMAP_VALIDATE("synthetic", "top-ok", true);
++    TEST_BITMAP_VALIDATE("synthetic", "top-inactive", false);
++    TEST_BITMAP_VALIDATE("synthetic", "top-transient", false);
++    TEST_BITMAP_VALIDATE("synthetic", "top-inactive-transient", false);
++
+ #define TEST_BITMAP_BLOCKCOPY(testname, shllw, ndf) \
+     do { \
+         blockbitmapblockcopydata.name = testname; \
+diff --git a/tests/qemublocktestdata/bitmap/synthetic.json b/tests/qemublocktestdata/bitmap/synthetic.json
+new file mode 100644
+index 0000000000..3712c8e5fc
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/synthetic.json
+@@ -0,0 +1,506 @@
++[
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 10485760,
++      "filename": "/tmp/bitmaps.1590749073",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 208896,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
++            {
++              "flags": [
++                "in-use",
++                "auto"
++              ],
++              "name": "current",
++              "granularity": 65536
++            }
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.1590749012",
++      "backing-filename": "/tmp/bitmaps.1590749012",
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-1-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.1590749012",
++    "dirty-bitmaps": [
++      {
++        "name": "current",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "inconsistent": true,
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "top-ok",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "top-inactive",
++        "recording": false,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "top-transient",
++        "recording": true,
++        "persistent": false,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "top-transient-inactive",
++        "recording": false,
++        "persistent": false,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590749073",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 328192,
++      "filename": "/tmp/bitmaps.1590749073",
++      "format": "file",
++      "actual-size": 208896,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-1-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590749073",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 10485760,
++      "filename": "/tmp/bitmaps.1590749012",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 208896,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
++            {
++              "flags": [
++                "auto"
++              ],
++              "name": "d",
++              "granularity": 65536
++            }
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.1590748995",
++      "backing-filename": "/tmp/bitmaps.1590748995",
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-2-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.1590748995",
++    "dirty-bitmaps": [
++      {
++        "name": "d",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590749012",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 328192,
++      "filename": "/tmp/bitmaps.1590749012",
++      "format": "file",
++      "actual-size": 208896,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-2-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590749012",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 10485760,
++      "filename": "/tmp/bitmaps.1590748995",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 212992,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
++            {
++              "flags": [
++                "auto"
++              ],
++              "name": "c",
++              "granularity": 65536
++            },
++            {
++              "flags": [
++                "auto"
++              ],
++              "name": "b",
++              "granularity": 65536
++            }
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.1590748992",
++      "backing-filename": "/tmp/bitmaps.1590748992",
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-3-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.1590748992",
++    "dirty-bitmaps": [
++      {
++        "name": "b",
++        "recording": true,
++        "persistent": false,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "c",
++        "recording": false,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "d",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590748995",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 393728,
++      "filename": "/tmp/bitmaps.1590748995",
++      "format": "file",
++      "actual-size": 212992,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-3-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590748995",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 10485760,
++      "filename": "/tmp/bitmaps.1590748992",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 200704,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.qcow2",
++      "backing-filename": "/tmp/bitmaps.qcow2",
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-4-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.qcow2",
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590748992",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 197120,
++      "filename": "/tmp/bitmaps.1590748992",
++      "format": "file",
++      "actual-size": 200704,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-4-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1590748992",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 10485760,
++      "filename": "/tmp/bitmaps.qcow2",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 208896,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
++            {
++              "flags": [
++                "auto"
++              ],
++              "name": "a",
++              "granularity": 65536
++            }
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-5-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "dirty-bitmaps": [
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.qcow2",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 328192,
++      "filename": "/tmp/bitmaps.qcow2",
++      "format": "file",
++      "actual-size": 208896,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-5-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.qcow2",
++    "encryption_key_missing": false
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmap/synthetic.out b/tests/qemublocktestdata/bitmap/synthetic.out
+new file mode 100644
+index 0000000000..cde7228e01
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/synthetic.out
+@@ -0,0 +1,15 @@
++libvirt-1-format:
++  current: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
++   top-ok: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++ 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-2-format:
++        d: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++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-4-format:
++libvirt-5-format:
++        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-backup-bitmap-handling.patch b/SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-backup-bitmap-handling.patch
new file mode 100644
index 0000000..90d07cc
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-backup-bitmap-handling.patch
@@ -0,0 +1,161 @@
+From 8528b76210e54f664f2098e0127dac811f12800a Mon Sep 17 00:00:00 2001
+Message-Id: <8528b76210e54f664f2098e0127dac811f12800a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:59 +0200
+Subject: [PATCH] qemublocktest: Add 'snapshots' tests for backup bitmap
+ handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The 'snapshots' case has multiple layers so we need to make sure that
+the bitmaps are merged with the appropriate temporary bitmaps formatted
+from the allocation bitmap for any backing chain layer above.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit b630cf4c0d8446a301fd23e87c9e8d60d547b5e8)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <3ef354322f829f47c91738060dd6557462e6d6d5.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  4 ++
+ .../backupmerge/snapshots-deep-out.json       | 41 +++++++++++++++++++
+ .../backupmerge/snapshots-flat-out.json       | 25 +++++++++++
+ .../snapshots-intermediate-out.json           | 29 +++++++++++++
+ 4 files changed, 99 insertions(+)
+ create mode 100644 tests/qemublocktestdata/backupmerge/snapshots-deep-out.json
+ create mode 100644 tests/qemublocktestdata/backupmerge/snapshots-flat-out.json
+ create mode 100644 tests/qemublocktestdata/backupmerge/snapshots-intermediate-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 7a0159f659..8ce878f15b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1266,6 +1266,10 @@ mymain(void)
+     TEST_BACKUP_BITMAP_CALCULATE("basic-intermediate", bitmapSourceChain, "d", "basic");
+     TEST_BACKUP_BITMAP_CALCULATE("basic-deep", bitmapSourceChain, "a", "basic");
+ 
++    TEST_BACKUP_BITMAP_CALCULATE("snapshots-flat", bitmapSourceChain, "current", "snapshots");
++    TEST_BACKUP_BITMAP_CALCULATE("snapshots-intermediate", bitmapSourceChain, "d", "snapshots");
++    TEST_BACKUP_BITMAP_CALCULATE("snapshots-deep", bitmapSourceChain, "a", "snapshots");
++
+ #define TEST_CHECKPOINT_DELETE(testname, delbmp, named) \
+     do { \
+         checkpointdeletedata.name = testname; \
+diff --git a/tests/qemublocktestdata/backupmerge/snapshots-deep-out.json b/tests/qemublocktestdata/backupmerge/snapshots-deep-out.json
+new file mode 100644
+index 0000000000..d678507b85
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/snapshots-deep-out.json
+@@ -0,0 +1,41 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "target_node",
++      "name": "target-bitmap-name",
++      "persistent": false,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "target_node",
++      "target": "target-bitmap-name",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "a"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/backupmerge/snapshots-flat-out.json b/tests/qemublocktestdata/backupmerge/snapshots-flat-out.json
+new file mode 100644
+index 0000000000..4637bbc377
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/snapshots-flat-out.json
+@@ -0,0 +1,25 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "target_node",
++      "name": "target-bitmap-name",
++      "persistent": false,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "target_node",
++      "target": "target-bitmap-name",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/backupmerge/snapshots-intermediate-out.json b/tests/qemublocktestdata/backupmerge/snapshots-intermediate-out.json
+new file mode 100644
+index 0000000000..30d8bcd8b7
+--- /dev/null
++++ b/tests/qemublocktestdata/backupmerge/snapshots-intermediate-out.json
+@@ -0,0 +1,29 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "target_node",
++      "name": "target-bitmap-name",
++      "persistent": false,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "target_node",
++      "target": "target-bitmap-name",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-block-commit-bitmap-handling.patch b/SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-block-commit-bitmap-handling.patch
new file mode 100644
index 0000000..9b0852e
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-snapshots-tests-for-block-commit-bitmap-handling.patch
@@ -0,0 +1,1105 @@
+From 59a754b5c95a4795178d2a117abb7f7145c830a4 Mon Sep 17 00:00:00 2001
+Message-Id: <59a754b5c95a4795178d2a117abb7f7145c830a4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:02 +0200
+Subject: [PATCH] qemublocktest: Add 'snapshots' tests for block commit bitmap
+ handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Simulate commit between all the combinations of layers in the
+'snapshots' case to see whether the code merges the correct bitmaps with
+the correct depth of temporary bitmaps.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit b5eaabfbf892c8d4a30b2822325959a6ecb93cb6)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <e2a3ce231bab06d274039daf7cdebd086b2a5691.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  14 ++
+ .../bitmapblockcommit/snapshots-1-2           | 105 +++++++++++
+ .../bitmapblockcommit/snapshots-1-3           | 131 ++++++++++++++
+ .../bitmapblockcommit/snapshots-1-4           | 163 +++++++++++++++++
+ .../bitmapblockcommit/snapshots-1-5           | 167 ++++++++++++++++++
+ .../bitmapblockcommit/snapshots-2-3           |  65 +++++++
+ .../bitmapblockcommit/snapshots-2-4           |  97 ++++++++++
+ .../bitmapblockcommit/snapshots-2-5           | 101 +++++++++++
+ .../bitmapblockcommit/snapshots-3-4           |  62 +++++++
+ .../bitmapblockcommit/snapshots-3-5           |  66 +++++++
+ .../bitmapblockcommit/snapshots-4-5           |  16 ++
+ 11 files changed, 987 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 43abc49534..e1468f13fa 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1361,6 +1361,20 @@ mymain(void)
+     TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
+     TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
+ 
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-2", 1, 2, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-3", 1, 3, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-4", 1, 4, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-5", 1, 5, "snapshots");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-3", 2, 3, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-4", 2, 4, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-5", 2, 5, "snapshots");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-3-4", 3, 4, "snapshots");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-3-5", 3, 5, "snapshots");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
++
+  cleanup:
+     qemuTestDriverFree(&driver);
+     VIR_FREE(capslatest_x86_64);
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+new file mode 100644
+index 0000000000..7d5b0a4402
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+@@ -0,0 +1,105 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+new file mode 100644
+index 0000000000..17a020ba20
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+@@ -0,0 +1,131 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+new file mode 100644
+index 0000000000..972d30b2e1
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+@@ -0,0 +1,163 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+new file mode 100644
+index 0000000000..3cda5b4132
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+@@ -0,0 +1,167 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+new file mode 100644
+index 0000000000..cb952eeb06
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+@@ -0,0 +1,65 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+new file mode 100644
+index 0000000000..a540ca42e3
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+@@ -0,0 +1,97 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+new file mode 100644
+index 0000000000..8ea6036a33
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+@@ -0,0 +1,101 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+new file mode 100644
+index 0000000000..736d4fd9df
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+@@ -0,0 +1,62 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+new file mode 100644
+index 0000000000..207d82e6b6
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+@@ -0,0 +1,66 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+new file mode 100644
+index 0000000000..4a8e6c5cff
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+@@ -0,0 +1,16 @@
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        }
++      ]
++    }
++  }
++]
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-test-cases-for-handling-bitmaps-during-block-copy.patch b/SOURCES/libvirt-qemublocktest-Add-test-cases-for-handling-bitmaps-during-block-copy.patch
new file mode 100644
index 0000000..ad3e573
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-test-cases-for-handling-bitmaps-during-block-copy.patch
@@ -0,0 +1,685 @@
+From 98ac7cbfb11dd6e5eadc88698f762cd9a48b4789 Mon Sep 17 00:00:00 2001
+Message-Id: <98ac7cbfb11dd6e5eadc88698f762cd9a48b4789@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:24:05 +0200
+Subject: [PATCH] qemublocktest: Add test cases for handling bitmaps during
+ block-copy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Test both 'basic' and 'snapshots' cases on shallow and deep copy modes.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 5f2fdcc867a08baa3d931cde895761bcbb45b7f6)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <1f77aeac4a968c1115893226589b8d97f8a90838.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |   5 +
+ .../bitmapblockcopy/basic-deep-out.json       | 144 ++++++++++++++
+ .../bitmapblockcopy/basic-shallow-out.json    | 144 ++++++++++++++
+ .../bitmapblockcopy/snapshots-deep-out.json   | 180 ++++++++++++++++++
+ .../snapshots-shallow-out.json                | 144 ++++++++++++++
+ 5 files changed, 617 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 193b4aaed0..758a7c1db0 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1345,6 +1345,11 @@ mymain(void)
+     TEST_BITMAP_BLOCKCOPY("empty-shallow", true, "empty");
+     TEST_BITMAP_BLOCKCOPY("empty-deep", false, "empty");
+ 
++    TEST_BITMAP_BLOCKCOPY("basic-shallow", true, "basic");
++    TEST_BITMAP_BLOCKCOPY("basic-deep", false, "basic");
++
++    TEST_BITMAP_BLOCKCOPY("snapshots-shallow", true, "snapshots");
++    TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
+ 
+ #define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
+     do {\
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+new file mode 100644
+index 0000000000..a8c2749879
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+@@ -0,0 +1,144 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+new file mode 100644
+index 0000000000..a8c2749879
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+@@ -0,0 +1,144 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+new file mode 100644
+index 0000000000..ac2ffb4ce2
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+@@ -0,0 +1,180 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "b"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "a"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+new file mode 100644
+index 0000000000..3a9942569a
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+@@ -0,0 +1,144 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "mirror-format-node",
++          "name": "libvirt-tmp-activewrite"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "libvirt-tmp-activewrite"
++    }
++  }
++]
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-tests-for-handling-of-bitmaps-during-block-commit.patch b/SOURCES/libvirt-qemublocktest-Add-tests-for-handling-of-bitmaps-during-block-commit.patch
new file mode 100644
index 0000000..ce9eb4c
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-tests-for-handling-of-bitmaps-during-block-commit.patch
@@ -0,0 +1,418 @@
+From ff6e22d991a2681488c3c52b00dcf5289bf97bd3 Mon Sep 17 00:00:00 2001
+Message-Id: <ff6e22d991a2681488c3c52b00dcf5289bf97bd3@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:25 +0100
+Subject: [PATCH] qemublocktest: Add tests for handling of bitmaps during
+ block-commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add code for testing the two necessary steps of handling bitmaps during
+block commit and exercise the code on the test data which we have for
+bitmap handling.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 77b9d574b41e79bbeb87ee0443dd60c4fde8a79a)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <551872a6e70f8136c2bd8e9f7be194b8f7091046.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  95 ++++++++++++++
+ .../bitmapblockcommit/basic-1-2               | 119 ++++++++++++++++++
+ .../bitmapblockcommit/basic-1-3               | 119 ++++++++++++++++++
+ .../bitmapblockcommit/basic-2-3               |   2 +
+ 4 files changed, 335 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 6ccc2328b3..63ac80b584 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -665,6 +665,21 @@ testQemuBackupIncrementalBitmapCalculateGetFakeChain(void)
+ }
+ 
+ 
++static virStorageSourcePtr
++testQemuBitmapGetFakeChainEntry(virStorageSourcePtr src,
++                                size_t idx)
++{
++    virStorageSourcePtr n;
++
++    for (n = src; n; n = n->backingStore) {
++        if (n->id == idx)
++            return n;
++    }
++
++    return NULL;
++}
++
++
+ typedef virDomainMomentDefPtr testMomentList;
+ 
+ static void
+@@ -919,6 +934,68 @@ testQemuBlockBitmapBlockcopy(const void *opaque)
+     return virTestCompareToFile(actual, expectpath);
+ }
+ 
++static const char *blockcommitPrefix = "qemublocktestdata/bitmapblockcommit/";
++
++struct testQemuBlockBitmapBlockcommitData {
++    const char *name;
++    virStorageSourcePtr top;
++    virStorageSourcePtr base;
++    virStorageSourcePtr chain;
++    const char *nodedatafile;
++};
++
++
++static int
++testQemuBlockBitmapBlockcommit(const void *opaque)
++{
++    const struct testQemuBlockBitmapBlockcommitData *data = opaque;
++
++    g_autofree char *actual = NULL;
++    g_autofree char *expectpath = NULL;
++    g_autoptr(virJSONValue) actionsDisable = NULL;
++    g_autoptr(virJSONValue) actionsMerge = NULL;
++    g_autoptr(virJSONValue) nodedatajson = NULL;
++    g_autoptr(virHashTable) nodedata = NULL;
++    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
++    VIR_AUTOSTRINGLIST bitmapsDisable = NULL;
++
++    expectpath = g_strdup_printf("%s/%s%s", abs_srcdir,
++                                 blockcommitPrefix, data->name);
++
++    if (!(nodedatajson = virTestLoadFileJSON(bitmapDetectPrefix, data->nodedatafile,
++                                             ".json", NULL)))
++        return -1;
++
++    if (!(nodedata = qemuMonitorJSONBlockGetNamedNodeDataJSON(nodedatajson))) {
++        VIR_TEST_VERBOSE("failed to load nodedata JSON\n");
++        return -1;
++    }
++
++    if (qemuBlockBitmapsHandleCommitStart(data->top, data->base, nodedata,
++                                          &actionsDisable, &bitmapsDisable) < 0)
++        return -1;
++
++    virBufferAddLit(&buf, "pre job bitmap disable:\n");
++
++    if (actionsDisable &&
++        virJSONValueToBuffer(actionsDisable, &buf, true) < 0)
++        return -1;
++
++    virBufferAddLit(&buf, "merge bitmpas:\n");
++
++    if (qemuBlockBitmapsHandleCommitFinish(data->top, data->base, nodedata,
++                                           &actionsMerge, bitmapsDisable) < 0)
++        return -1;
++
++    if (actionsMerge &&
++        virJSONValueToBuffer(actionsMerge, &buf, true) < 0)
++        return -1;
++
++    actual = virBufferContentAndReset(&buf);
++
++    return virTestCompareToFile(actual, expectpath);
++}
++
+ 
+ static int
+ mymain(void)
+@@ -933,6 +1010,7 @@ mymain(void)
+     struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
+     struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
+     struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
++    struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata;
+     char *capslatest_x86_64 = NULL;
+     virQEMUCapsPtr caps_x86_64 = NULL;
+     g_autoptr(virHashTable) qmp_schema_x86_64 = NULL;
+@@ -1297,6 +1375,23 @@ mymain(void)
+     TEST_BITMAP_BLOCKCOPY("snapshots-shallow", true, "snapshots");
+     TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
+ 
++
++#define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
++    do {\
++        blockbitmapblockcommitdata.name = testname; \
++        blockbitmapblockcommitdata.top = testQemuBitmapGetFakeChainEntry(bitmapSourceChain, topimg); \
++        blockbitmapblockcommitdata.base = testQemuBitmapGetFakeChainEntry(bitmapSourceChain, baseimg); \
++        blockbitmapblockcommitdata.nodedatafile = ndf; \
++        if (virTestRun("bitmap block commit " testname, \
++                       testQemuBlockBitmapBlockcommit, \
++                       &blockbitmapblockcommitdata) < 0) \
++        ret = -1; \
++    } while (0)
++
++    TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
++    TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
++    TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
++
+  cleanup:
+     qemuTestDriverFree(&driver);
+     VIR_FREE(capslatest_x86_64);
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+new file mode 100644
+index 0000000000..8eeb4c3a11
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+@@ -0,0 +1,119 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "a",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+new file mode 100644
+index 0000000000..71b48e31a5
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+@@ -0,0 +1,119 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "a",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+new file mode 100644
+index 0000000000..bfc58f994e
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+@@ -0,0 +1,2 @@
++pre job bitmap disable:
++merge bitmpas:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-tests-for-re-enabling-of-bitmaps-after-commit.patch b/SOURCES/libvirt-qemublocktest-Add-tests-for-re-enabling-of-bitmaps-after-commit.patch
new file mode 100644
index 0000000..5f312be
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-tests-for-re-enabling-of-bitmaps-after-commit.patch
@@ -0,0 +1,460 @@
+From 0dc8024eae1f56e02228171feb824becf21ee697 Mon Sep 17 00:00:00 2001
+Message-Id: <0dc8024eae1f56e02228171feb824becf21ee697@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 17 Mar 2020 17:12:46 +0100
+Subject: [PATCH] qemublocktest: Add tests for re-enabling of bitmaps after
+ commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some branches were not covered and thus we didn't catch that the bitmaps
+are not re-enabled if nothing is merged into them. Two bitmaps are
+necessary to reliably test the case due to hash table ordering.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Tested-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit cab3622119a73a54e62e5f2d7b4257da00bd4ac8)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <fc3f48f6a5233fce3148fc21a63c4e0255b2e466.1584461519.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ .../bitmap/snapshots-synthetic-broken.json    | 18 ++++++++
+ .../bitmap/snapshots-synthetic-broken.out     |  2 +
+ .../snapshots-synthetic-broken-1-2            | 30 ++++++++++++
+ .../snapshots-synthetic-broken-1-3            | 46 +++++++++++++++++++
+ .../snapshots-synthetic-broken-1-4            | 46 +++++++++++++++++++
+ .../snapshots-synthetic-broken-1-5            | 46 +++++++++++++++++++
+ .../snapshots-synthetic-broken-2-3            | 46 +++++++++++++++++++
+ .../snapshots-synthetic-broken-2-4            | 46 +++++++++++++++++++
+ .../snapshots-synthetic-broken-2-5            | 46 +++++++++++++++++++
+ 9 files changed, 326 insertions(+)
+
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+index bf4963494f..8cf14d4baa 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
++++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+@@ -398,6 +398,24 @@
+                 "granularity": 65536,
+                 "count": 0
+             },
++            {
++                "name": "oa",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "ob",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            },
+             {
+                 "name": "d",
+                 "recording": true,
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+index 022630bd76..ad24a580f1 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
++++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+@@ -3,6 +3,8 @@ libvirt-1-format:
+   current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+ libvirt-2-format:
+         c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++       oa: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++       ob: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+         d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
+ libvirt-3-format:
+         a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+index d413fbe723..463120d442 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+@@ -1,4 +1,20 @@
+ pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "oa"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "ob"
++    }
++  }
++]
+ merge bitmpas:
+ [
+   {
+@@ -23,5 +39,19 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "oa"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "ob"
++    }
+   }
+ ]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+index 6eb14f927a..fec6f95dd1 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+@@ -62,5 +62,51 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "oa",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "oa",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "oa"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "ob",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "ob",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "ob"
++        }
++      ]
++    }
+   }
+ ]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+index f4d9b72576..697230f67b 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+@@ -69,5 +69,51 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "oa",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "oa",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "oa"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "ob",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "ob",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "ob"
++        }
++      ]
++    }
+   }
+ ]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+index a8e575c2d9..6bf1f0da64 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+@@ -69,5 +69,51 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "oa",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "oa",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "oa"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "ob",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "ob",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "ob"
++        }
++      ]
++    }
+   }
+ ]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+index d468e2b9d8..f202bb94b1 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+@@ -39,5 +39,51 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "oa",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "oa",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "oa"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "ob",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "ob",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "ob"
++        }
++      ]
++    }
+   }
+ ]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+index 2a9986bac6..864cc9041b 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+@@ -46,5 +46,51 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "oa",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "oa",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "oa"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "ob",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "ob",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "ob"
++        }
++      ]
++    }
+   }
+ ]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+index 47d9f6e17a..4c5d8dbe80 100644
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+@@ -46,5 +46,51 @@ merge bitmpas:
+         }
+       ]
+     }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "oa",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "oa",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "oa"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "ob",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "ob",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "ob"
++        }
++      ]
++    }
+   }
+ ]
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Add-tests-of-broken-bitmap-chain-handling-during-block-commit.patch b/SOURCES/libvirt-qemublocktest-Add-tests-of-broken-bitmap-chain-handling-during-block-commit.patch
new file mode 100644
index 0000000..9e491d9
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Add-tests-of-broken-bitmap-chain-handling-during-block-commit.patch
@@ -0,0 +1,585 @@
+From 60a2b7411580b4df7a1f9b6f2706fc666d12b170 Mon Sep 17 00:00:00 2001
+Message-Id: <60a2b7411580b4df7a1f9b6f2706fc666d12b170@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:27 +0100
+Subject: [PATCH] qemublocktest: Add tests of broken bitmap chain handling
+ during block-commit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the 'snapshots-synthetic-broken' test data for block-commit.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 4e9bb10cf3f3d2c2b13a6e889209e2fac88e1ea7)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <45e2c5f391fdbf458ffabba516f93d0eb279cd97.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         | 13 ++++
+ .../snapshots-synthetic-broken-1-2            | 27 +++++++
+ .../snapshots-synthetic-broken-1-3            | 66 +++++++++++++++++
+ .../snapshots-synthetic-broken-1-4            | 73 +++++++++++++++++++
+ .../snapshots-synthetic-broken-1-5            | 73 +++++++++++++++++++
+ .../snapshots-synthetic-broken-2-3            | 43 +++++++++++
+ .../snapshots-synthetic-broken-2-4            | 50 +++++++++++++
+ .../snapshots-synthetic-broken-2-5            | 50 +++++++++++++
+ .../snapshots-synthetic-broken-3-4            | 27 +++++++
+ .../snapshots-synthetic-broken-3-5            | 27 +++++++
+ .../snapshots-synthetic-broken-4-5            | 20 +++++
+ 11 files changed, 469 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
+ create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index ad68b37c80..c8428921fe 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1406,6 +1406,19 @@ mymain(void)
+ 
+     TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
+ 
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-2", 1, 2, "snapshots-synthetic-broken");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-3", 1, 3, "snapshots-synthetic-broken");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-4", 1, 4, "snapshots-synthetic-broken");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-5", 1, 5, "snapshots-synthetic-broken");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-3", 2, 3, "snapshots-synthetic-broken");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-4", 2, 4, "snapshots-synthetic-broken");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-5", 2, 5, "snapshots-synthetic-broken");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-4", 3, 4, "snapshots-synthetic-broken");
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-5", 3, 5, "snapshots-synthetic-broken");
++
++    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-4-5", 4, 5, "snapshots-synthetic-broken");
+ 
+  cleanup:
+     qemuTestDriverFree(&driver);
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+new file mode 100644
+index 0000000000..d413fbe723
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+@@ -0,0 +1,27 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+new file mode 100644
+index 0000000000..6eb14f927a
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+@@ -0,0 +1,66 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+new file mode 100644
+index 0000000000..f4d9b72576
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+@@ -0,0 +1,73 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+new file mode 100644
+index 0000000000..a8e575c2d9
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+@@ -0,0 +1,73 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+new file mode 100644
+index 0000000000..d468e2b9d8
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+@@ -0,0 +1,43 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+new file mode 100644
+index 0000000000..2a9986bac6
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+@@ -0,0 +1,50 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+new file mode 100644
+index 0000000000..47d9f6e17a
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+@@ -0,0 +1,50 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
+new file mode 100644
+index 0000000000..367a930a74
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
+@@ -0,0 +1,27 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-4-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
+new file mode 100644
+index 0000000000..0062ec140c
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
+@@ -0,0 +1,27 @@
++pre job bitmap disable:
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-5-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
+new file mode 100644
+index 0000000000..b1f10a8a24
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
+@@ -0,0 +1,20 @@
++pre job bitmap disable:
++[
++  {
++    "type": "block-dirty-bitmap-disable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++merge bitmpas:
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Backport-cleanups-for-testQemuDiskXMLToProps-from-dd94f36ffbe.patch b/SOURCES/libvirt-qemublocktest-Backport-cleanups-for-testQemuDiskXMLToProps-from-dd94f36ffbe.patch
new file mode 100644
index 0000000..46867d8
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Backport-cleanups-for-testQemuDiskXMLToProps-from-dd94f36ffbe.patch
@@ -0,0 +1,60 @@
+From ec4851ad003ae1e28bd43f3d76af9bc05537a97f Mon Sep 17 00:00:00 2001
+Message-Id: <ec4851ad003ae1e28bd43f3d76af9bc05537a97f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:25:54 +0100
+Subject: [PATCH] qemublocktest: Backport cleanups for testQemuDiskXMLToProps
+ from dd94f36ffbe
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RHEL-only subset changes from dd94f36ffbe
+
+dd94f36ffbe is too invasive to backport but makes changes to
+testQemuDiskXMLToProps which make it hard to backport other patches.
+
+Filter out the relevant changes for a clean backport.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Message-Id: <af87b1b8a1e1343a339fcc308e74bc4d08a96103.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index c8428921fe..cd7ea6bb2b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -256,6 +256,7 @@ static int
+ testQemuDiskXMLToProps(const void *opaque)
+ {
+     struct testQemuDiskXMLToJSONData *data = (void *) opaque;
++    g_autoptr(virDomainDef) vmdef = NULL;
+     virDomainDiskDefPtr disk = NULL;
+     virStorageSourcePtr n;
+     virJSONValuePtr formatProps = NULL;
+@@ -275,6 +276,10 @@ testQemuDiskXMLToProps(const void *opaque)
+                                        VIR_DOMAIN_DEF_PARSE_STATUS)))
+         goto cleanup;
+ 
++    if (!(vmdef = virDomainDefNew()) ||
++        virDomainDiskInsert(vmdef, disk) < 0)
++        goto cleanup;
++
+     if (qemuCheckDiskConfig(disk, data->qemuCaps) < 0 ||
+         qemuDomainDeviceDefValidateDisk(disk, data->qemuCaps) < 0) {
+         VIR_TEST_VERBOSE("invalid configuration for disk");
+@@ -313,7 +318,6 @@ testQemuDiskXMLToProps(const void *opaque)
+  cleanup:
+     virJSONValueFree(formatProps);
+     virJSONValueFree(storageProps);
+-    virDomainDiskDefFree(disk);
+     VIR_FREE(xmlpath);
+     VIR_FREE(xmlstr);
+     return ret;
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Delete-synthetic-bitmap-test-cases.patch b/SOURCES/libvirt-qemublocktest-Delete-synthetic-bitmap-test-cases.patch
new file mode 100644
index 0000000..45ae66e
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Delete-synthetic-bitmap-test-cases.patch
@@ -0,0 +1,1903 @@
+From 54d676350560f8eedf9dc2140f2eb879725e65b4 Mon Sep 17 00:00:00 2001
+Message-Id: <54d676350560f8eedf9dc2140f2eb879725e65b4@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:45 +0200
+Subject: [PATCH] qemublocktest: Delete 'synthetic' bitmap test cases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+They will be replaced by a different set which will test scenarios
+relevant for the new semantics.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 5aa423c52d784896675ce55c86ba662dbfc3ee95)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <7373e6767b3f2572dd5437e29fa31c14aff5bc52.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |   3 -
+ .../bitmap/snapshots-synthetic-broken.json    | 837 ------------------
+ .../bitmap/snapshots-synthetic-broken.out     |  14 -
+ .../snapshots-synthetic-checkpoint.json       | 827 -----------------
+ .../bitmap/snapshots-synthetic-checkpoint.out |  13 -
+ tests/qemublocktestdata/bitmap/synthetic.json | 118 ---
+ tests/qemublocktestdata/bitmap/synthetic.out  |   6 -
+ 7 files changed, 1818 deletions(-)
+ delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+ delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+ delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
+ delete mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
+ delete mode 100644 tests/qemublocktestdata/bitmap/synthetic.json
+ delete mode 100644 tests/qemublocktestdata/bitmap/synthetic.out
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 239b2ef9df..75527ca64b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1292,10 +1292,7 @@ mymain(void)
+     TEST_BITMAP_DETECT("empty");
+ 
+     TEST_BITMAP_DETECT("basic");
+-    TEST_BITMAP_DETECT("synthetic");
+     TEST_BITMAP_DETECT("snapshots");
+-    TEST_BITMAP_DETECT("snapshots-synthetic-checkpoint");
+-    TEST_BITMAP_DETECT("snapshots-synthetic-broken");
+ 
+ #define TEST_BACKUP_BITMAP_CALCULATE(testname, source, incrbackup, named) \
+     do { \
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+deleted file mode 100644
+index 8cf14d4baa..0000000000
+--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
++++ /dev/null
+@@ -1,837 +0,0 @@
+-[
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "backing-image": {
+-                        "backing-image": {
+-                            "virtual-size": 10485760,
+-                            "filename": "/tmp/pull4.qcow2",
+-                            "cluster-size": 65536,
+-                            "format": "qcow2",
+-                            "actual-size": 208896,
+-                            "format-specific": {
+-                                "type": "qcow2",
+-                                "data": {
+-                                    "compat": "1.1",
+-                                    "lazy-refcounts": false,
+-                                    "bitmaps": [
+-                                        {
+-                                            "flags": [
+-                                                "auto"
+-                                            ],
+-                                            "name": "a",
+-                                            "granularity": 65536
+-                                        }
+-                                    ],
+-                                    "refcount-bits": 16,
+-                                    "corrupt": false
+-                                }
+-                            },
+-                            "dirty-flag": false
+-                        },
+-                        "backing-filename-format": "qcow2",
+-                        "virtual-size": 10485760,
+-                        "filename": "/tmp/pull4.1575911522",
+-                        "cluster-size": 65536,
+-                        "format": "qcow2",
+-                        "actual-size": 208896,
+-                        "format-specific": {
+-                            "type": "qcow2",
+-                            "data": {
+-                                "compat": "1.1",
+-                                "lazy-refcounts": false,
+-                                "bitmaps": [
+-                                    {
+-                                        "flags": [
+-                                            "auto"
+-                                        ],
+-                                        "name": "a",
+-                                        "granularity": 65536
+-                                    }
+-                                ],
+-                                "refcount-bits": 16,
+-                                "corrupt": false
+-                            }
+-                        },
+-                        "full-backing-filename": "/tmp/pull4.qcow2",
+-                        "backing-filename": "/tmp/pull4.qcow2",
+-                        "dirty-flag": false
+-                    },
+-                    "backing-filename-format": "qcow2",
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.1575911527",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 217088,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "c",
+-                                    "granularity": 65536
+-                                },
+-                                {
+-                                    "flags": [
+-
+-                                    ],
+-                                    "name": "b",
+-                                    "granularity": 65536
+-                                },
+-                                {
+-                                    "flags": [
+-
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "full-backing-filename": "/tmp/pull4.1575911522",
+-                    "backing-filename": "/tmp/pull4.1575911522",
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911540",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 212992,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "d",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "c",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.1575911527",
+-                "backing-filename": "/tmp/pull4.1575911527",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911550",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 212992,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "in-use",
+-                                "auto"
+-                            ],
+-                            "name": "current",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-                                "in-use"
+-                            ],
+-                            "name": "d",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911540",
+-            "backing-filename": "/tmp/pull4.1575911540",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-format",
+-        "backing_file_depth": 4,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911540",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "d",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "current",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911550",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 393728,
+-            "filename": "/tmp/pull4.1575911550",
+-            "format": "file",
+-            "actual-size": 212992,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911550",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "backing-image": {
+-                        "virtual-size": 10485760,
+-                        "filename": "/tmp/pull4.qcow2",
+-                        "cluster-size": 65536,
+-                        "format": "qcow2",
+-                        "actual-size": 208896,
+-                        "format-specific": {
+-                            "type": "qcow2",
+-                            "data": {
+-                                "compat": "1.1",
+-                                "lazy-refcounts": false,
+-                                "bitmaps": [
+-                                    {
+-                                        "flags": [
+-                                            "auto"
+-                                        ],
+-                                        "name": "a",
+-                                        "granularity": 65536
+-                                    }
+-                                ],
+-                                "refcount-bits": 16,
+-                                "corrupt": false
+-                            }
+-                        },
+-                        "dirty-flag": false
+-                    },
+-                    "backing-filename-format": "qcow2",
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.1575911522",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 208896,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "full-backing-filename": "/tmp/pull4.qcow2",
+-                    "backing-filename": "/tmp/pull4.qcow2",
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911527",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 217088,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "c",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "b",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.1575911522",
+-                "backing-filename": "/tmp/pull4.1575911522",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911540",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 212992,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "d",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "c",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911527",
+-            "backing-filename": "/tmp/pull4.1575911527",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-2-format",
+-        "backing_file_depth": 3,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911527",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "c",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "oa",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "ob",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "d",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "inconsistent": true,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911540",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 393728,
+-            "filename": "/tmp/pull4.1575911540",
+-            "format": "file",
+-            "actual-size": 212992,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-2-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911540",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.qcow2",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 208896,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911522",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 208896,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.qcow2",
+-                "backing-filename": "/tmp/pull4.qcow2",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911527",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 217088,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "c",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "b",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911522",
+-            "backing-filename": "/tmp/pull4.1575911522",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-3-format",
+-        "backing_file_depth": 2,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911522",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "a",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "b",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911527",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 459264,
+-            "filename": "/tmp/pull4.1575911527",
+-            "format": "file",
+-            "actual-size": 217088,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-3-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911527",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.qcow2",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 208896,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911522",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 208896,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.qcow2",
+-            "backing-filename": "/tmp/pull4.qcow2",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-4-format",
+-        "backing_file_depth": 1,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.qcow2",
+-        "dirty-bitmaps": [
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911522",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 328192,
+-            "filename": "/tmp/pull4.1575911522",
+-            "format": "file",
+-            "actual-size": 208896,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-4-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911522",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.qcow2",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 208896,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-5-format",
+-        "backing_file_depth": 0,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "dirty-bitmaps": [
+-            {
+-                "name": "a",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 328192,
+-            "filename": "/tmp/pull4.qcow2",
+-            "format": "file",
+-            "actual-size": 208896,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-5-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    }
+-]
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+deleted file mode 100644
+index ad24a580f1..0000000000
+--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
++++ /dev/null
+@@ -1,14 +0,0 @@
+-libvirt-1-format:
+-        d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-  current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-libvirt-2-format:
+-        c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-       oa: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-       ob: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
+-libvirt-3-format:
+-        a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-libvirt-4-format:
+-libvirt-5-format:
+-        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
+deleted file mode 100644
+index 25cc150d67..0000000000
+--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
++++ /dev/null
+@@ -1,827 +0,0 @@
+-[
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "backing-image": {
+-                        "backing-image": {
+-                            "virtual-size": 10485760,
+-                            "filename": "/tmp/pull4.qcow2",
+-                            "cluster-size": 65536,
+-                            "format": "qcow2",
+-                            "actual-size": 208896,
+-                            "format-specific": {
+-                                "type": "qcow2",
+-                                "data": {
+-                                    "compat": "1.1",
+-                                    "lazy-refcounts": false,
+-                                    "bitmaps": [
+-                                        {
+-                                            "flags": [
+-                                                "auto"
+-                                            ],
+-                                            "name": "a",
+-                                            "granularity": 65536
+-                                        }
+-                                    ],
+-                                    "refcount-bits": 16,
+-                                    "corrupt": false
+-                                }
+-                            },
+-                            "dirty-flag": false
+-                        },
+-                        "backing-filename-format": "qcow2",
+-                        "virtual-size": 10485760,
+-                        "filename": "/tmp/pull4.1575911522",
+-                        "cluster-size": 65536,
+-                        "format": "qcow2",
+-                        "actual-size": 208896,
+-                        "format-specific": {
+-                            "type": "qcow2",
+-                            "data": {
+-                                "compat": "1.1",
+-                                "lazy-refcounts": false,
+-                                "bitmaps": [
+-                                    {
+-                                        "flags": [
+-                                            "auto"
+-                                        ],
+-                                        "name": "a",
+-                                        "granularity": 65536
+-                                    }
+-                                ],
+-                                "refcount-bits": 16,
+-                                "corrupt": false
+-                            }
+-                        },
+-                        "full-backing-filename": "/tmp/pull4.qcow2",
+-                        "backing-filename": "/tmp/pull4.qcow2",
+-                        "dirty-flag": false
+-                    },
+-                    "backing-filename-format": "qcow2",
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.1575911527",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 217088,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "c",
+-                                    "granularity": 65536
+-                                },
+-                                {
+-                                    "flags": [
+-
+-                                    ],
+-                                    "name": "b",
+-                                    "granularity": 65536
+-                                },
+-                                {
+-                                    "flags": [
+-
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "full-backing-filename": "/tmp/pull4.1575911522",
+-                    "backing-filename": "/tmp/pull4.1575911522",
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911540",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 212992,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "d",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "c",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.1575911527",
+-                "backing-filename": "/tmp/pull4.1575911527",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911550",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 212992,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "in-use",
+-                                "auto"
+-                            ],
+-                            "name": "current",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-                                "in-use"
+-                            ],
+-                            "name": "d",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911540",
+-            "backing-filename": "/tmp/pull4.1575911540",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-format",
+-        "backing_file_depth": 4,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911540",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "d",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "current",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911550",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 393728,
+-            "filename": "/tmp/pull4.1575911550",
+-            "format": "file",
+-            "actual-size": 212992,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911550",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "backing-image": {
+-                        "virtual-size": 10485760,
+-                        "filename": "/tmp/pull4.qcow2",
+-                        "cluster-size": 65536,
+-                        "format": "qcow2",
+-                        "actual-size": 208896,
+-                        "format-specific": {
+-                            "type": "qcow2",
+-                            "data": {
+-                                "compat": "1.1",
+-                                "lazy-refcounts": false,
+-                                "bitmaps": [
+-                                    {
+-                                        "flags": [
+-                                            "auto"
+-                                        ],
+-                                        "name": "a",
+-                                        "granularity": 65536
+-                                    }
+-                                ],
+-                                "refcount-bits": 16,
+-                                "corrupt": false
+-                            }
+-                        },
+-                        "dirty-flag": false
+-                    },
+-                    "backing-filename-format": "qcow2",
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.1575911522",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 208896,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "full-backing-filename": "/tmp/pull4.qcow2",
+-                    "backing-filename": "/tmp/pull4.qcow2",
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911527",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 217088,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "c",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "b",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.1575911522",
+-                "backing-filename": "/tmp/pull4.1575911522",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911540",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 212992,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "d",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "c",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911527",
+-            "backing-filename": "/tmp/pull4.1575911527",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-2-format",
+-        "backing_file_depth": 3,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911527",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "c",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "d",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911540",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 393728,
+-            "filename": "/tmp/pull4.1575911540",
+-            "format": "file",
+-            "actual-size": 212992,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-2-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911540",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.qcow2",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 208896,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911522",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 208896,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.qcow2",
+-                "backing-filename": "/tmp/pull4.qcow2",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911527",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 217088,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "c",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "b",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911522",
+-            "backing-filename": "/tmp/pull4.1575911522",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-3-format",
+-        "backing_file_depth": 2,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911522",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "a",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "b",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911527",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 459264,
+-            "filename": "/tmp/pull4.1575911527",
+-            "format": "file",
+-            "actual-size": 217088,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-3-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911527",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.qcow2",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 208896,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911522",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 208896,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.qcow2",
+-            "backing-filename": "/tmp/pull4.qcow2",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-4-format",
+-        "backing_file_depth": 1,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.qcow2",
+-        "dirty-bitmaps": [
+-            {
+-                "name": "a",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911522",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 328192,
+-            "filename": "/tmp/pull4.1575911522",
+-            "format": "file",
+-            "actual-size": 208896,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-4-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911522",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.qcow2",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 208896,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-5-format",
+-        "backing_file_depth": 0,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "dirty-bitmaps": [
+-            {
+-                "name": "a",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 328192,
+-            "filename": "/tmp/pull4.qcow2",
+-            "format": "file",
+-            "actual-size": 208896,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-5-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    }
+-]
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
+deleted file mode 100644
+index 0270657001..0000000000
+--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
++++ /dev/null
+@@ -1,13 +0,0 @@
+-libvirt-1-format:
+-        d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-  current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-libvirt-2-format:
+-        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-format:
+-        a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-libvirt-4-format:
+-        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-libvirt-5-format:
+-        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+diff --git a/tests/qemublocktestdata/bitmap/synthetic.json b/tests/qemublocktestdata/bitmap/synthetic.json
+deleted file mode 100644
+index 56882bd615..0000000000
+--- a/tests/qemublocktestdata/bitmap/synthetic.json
++++ /dev/null
+@@ -1,118 +0,0 @@
+-[
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.qcow2",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 200704,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-format",
+-        "backing_file_depth": 0,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "dirty-bitmaps": [
+-            {
+-                "name": "current",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "d",
+-                "recording": false,
+-                "persistent": false,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "c",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 1234,
+-                "count": 0
+-            },
+-            {
+-                "name": "b",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": true,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 21314
+-            },
+-            {
+-                "name": "a",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "inconsistent": true,
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 197120,
+-            "filename": "/tmp/pull4.qcow2",
+-            "format": "file",
+-            "actual-size": 200704,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    }
+-]
+diff --git a/tests/qemublocktestdata/bitmap/synthetic.out b/tests/qemublocktestdata/bitmap/synthetic.out
+deleted file mode 100644
+index e8041c5b77..0000000000
+--- a/tests/qemublocktestdata/bitmap/synthetic.out
++++ /dev/null
+@@ -1,6 +0,0 @@
+-libvirt-1-format:
+-  current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        d: record:0 busy:0 persist:0 inconsist:0 gran:65536 dirty:0
+-        c: record:0 busy:0 persist:1 inconsist:0 gran:1234 dirty:0
+-        b: record:0 busy:1 persist:1 inconsist:0 gran:65536 dirty:21314
+-        a: record:0 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Disable-testcases-for-all-bitmap-handling.patch b/SOURCES/libvirt-qemublocktest-Disable-testcases-for-all-bitmap-handling.patch
new file mode 100644
index 0000000..d3ff671
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Disable-testcases-for-all-bitmap-handling.patch
@@ -0,0 +1,3366 @@
+From 7bbd4fea7b99290161c740c406aa46665b32be92 Mon Sep 17 00:00:00 2001
+Message-Id: <7bbd4fea7b99290161c740c406aa46665b32be92@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:44 +0200
+Subject: [PATCH] qemublocktest: Disable testcases for all bitmap handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upcoming patches are going to rewrite and semantically modify how
+bitmaps are handled during blockjobs. This is possible as incremental
+backup is not yet fully enabled.
+
+As the changes are going to be incompatible with any current test data
+remove all test cases for bitmap handling during checkpoint deletion,
+incremental backups, block commit, block copy, and bitmap validation
+operations.
+
+The tests will be gradually added back later after the code and
+test-data is refactored.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit e0828604f77b61d8ee41e72758b0c9d712b1e263)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <edef656f39903967dae9e403e8b99f20e807e092.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  94 -------------
+ .../backupmerge/basic-deep-out.json           |  22 ---
+ .../backupmerge/basic-flat-out.json           |   6 -
+ .../backupmerge/basic-intermediate-out.json   |  10 --
+ .../backupmerge/snapshot-deep-out.json        |  38 -----
+ .../backupmerge/snapshot-flat-out.json        |   6 -
+ .../snapshot-intermediate-out.json            |  14 --
+ .../bitmapblockcommit/basic-1-2               | 119 ----------------
+ .../bitmapblockcommit/basic-1-3               | 119 ----------------
+ .../bitmapblockcommit/basic-2-3               |   2 -
+ .../bitmapblockcommit/snapshots-1-2           |  49 -------
+ .../bitmapblockcommit/snapshots-1-3           |  76 ----------
+ .../bitmapblockcommit/snapshots-1-4           | 126 -----------------
+ .../bitmapblockcommit/snapshots-1-5           | 130 -----------------
+ .../bitmapblockcommit/snapshots-2-3           |  49 -------
+ .../bitmapblockcommit/snapshots-2-4           |  99 -------------
+ .../bitmapblockcommit/snapshots-2-5           | 103 --------------
+ .../bitmapblockcommit/snapshots-3-4           |  72 ----------
+ .../bitmapblockcommit/snapshots-3-5           |  76 ----------
+ .../bitmapblockcommit/snapshots-4-5           |  33 -----
+ .../snapshots-synthetic-broken-1-2            |  57 --------
+ .../snapshots-synthetic-broken-1-3            | 112 ---------------
+ .../snapshots-synthetic-broken-1-4            | 119 ----------------
+ .../snapshots-synthetic-broken-1-5            | 119 ----------------
+ .../snapshots-synthetic-broken-2-3            |  89 ------------
+ .../snapshots-synthetic-broken-2-4            |  96 -------------
+ .../snapshots-synthetic-broken-2-5            |  96 -------------
+ .../snapshots-synthetic-broken-3-4            |  27 ----
+ .../snapshots-synthetic-broken-3-5            |  27 ----
+ .../snapshots-synthetic-broken-4-5            |  20 ---
+ .../bitmapblockcopy/basic-deep-out.json       | 117 ---------------
+ .../bitmapblockcopy/basic-shallow-out.json    | 117 ---------------
+ .../bitmapblockcopy/snapshots-deep-out.json   | 133 ------------------
+ .../snapshots-shallow-out.json                |  48 -------
+ .../checkpointdelete/basic-current-out.json   |  29 ----
+ .../basic-intermediate1-out.json              |  22 ---
+ .../basic-intermediate2-out.json              |  22 ---
+ .../basic-intermediate3-out.json              |  22 ---
+ .../checkpointdelete/basic-noparent-out.json  |   9 --
+ .../snapshots-current-out.json                |  29 ----
+ .../snapshots-intermediate1-out.json          |  24 ----
+ .../snapshots-intermediate2-out.json          |  62 --------
+ .../snapshots-intermediate3-out.json          |  61 --------
+ .../snapshots-noparent-out.json               |  27 ----
+ ...hots-synthetic-checkpoint-current-out.json |  29 ----
+ ...ynthetic-checkpoint-intermediate1-out.json |  31 ----
+ ...ynthetic-checkpoint-intermediate2-out.json |  34 -----
+ ...ynthetic-checkpoint-intermediate3-out.json |  61 --------
+ ...ots-synthetic-checkpoint-noparent-out.json |  27 ----
+ 49 files changed, 2909 deletions(-)
+ delete mode 100644 tests/qemublocktestdata/backupmerge/basic-deep-out.json
+ delete mode 100644 tests/qemublocktestdata/backupmerge/basic-flat-out.json
+ delete mode 100644 tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
+ delete mode 100644 tests/qemublocktestdata/backupmerge/snapshot-deep-out.json
+ delete mode 100644 tests/qemublocktestdata/backupmerge/snapshot-flat-out.json
+ delete mode 100644 tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+ delete mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+ delete mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 36e3378f5b..239b2ef9df 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1311,14 +1311,6 @@ mymain(void)
+ 
+     TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
+ 
+-    TEST_BACKUP_BITMAP_CALCULATE("basic-flat", bitmapSourceChain, "current", "basic");
+-    TEST_BACKUP_BITMAP_CALCULATE("basic-intermediate", bitmapSourceChain, "d", "basic");
+-    TEST_BACKUP_BITMAP_CALCULATE("basic-deep", bitmapSourceChain, "a", "basic");
+-
+-    TEST_BACKUP_BITMAP_CALCULATE("snapshot-flat", bitmapSourceChain, "current", "snapshots");
+-    TEST_BACKUP_BITMAP_CALCULATE("snapshot-intermediate", bitmapSourceChain, "d", "snapshots");
+-    TEST_BACKUP_BITMAP_CALCULATE("snapshot-deep", bitmapSourceChain, "a", "snapshots");
+-
+ #define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, parbmp, named) \
+     do { \
+         checkpointdeletedata.name = testname; \
+@@ -1333,24 +1325,6 @@ mymain(void)
+ 
+     TEST_CHECKPOINT_DELETE_MERGE("empty", "a", NULL, "empty");
+ 
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL, "basic");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a", "basic");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b", "basic");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c", "basic");
+-    TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d", "basic");
+-
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-noparent", "a", NULL, "snapshots");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate1", "b", "a", "snapshots");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate2", "c", "b", "snapshots");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate3", "d", "c", "snapshots");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-current", "current", "d", "snapshots");
+-
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-noparent", "a", NULL, "snapshots-synthetic-checkpoint");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate1", "b", "a", "snapshots-synthetic-checkpoint");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate2", "c", "b", "snapshots-synthetic-checkpoint");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate3", "d", "c", "snapshots-synthetic-checkpoint");
+-    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-current", "current", "d", "snapshots-synthetic-checkpoint");
+-
+ #define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
+     do { \
+         blockbitmapvalidatedata.name = testname; \
+@@ -1365,36 +1339,6 @@ mymain(void)
+ 
+     TEST_BITMAP_VALIDATE("empty", "a", false);
+ 
+-    TEST_BITMAP_VALIDATE("basic", "a", true);
+-    TEST_BITMAP_VALIDATE("basic", "b", true);
+-    TEST_BITMAP_VALIDATE("basic", "c", true);
+-    TEST_BITMAP_VALIDATE("basic", "d", true);
+-    TEST_BITMAP_VALIDATE("basic", "current", true);
+-
+-    TEST_BITMAP_VALIDATE("snapshots", "a", true);
+-    TEST_BITMAP_VALIDATE("snapshots", "b", true);
+-    TEST_BITMAP_VALIDATE("snapshots", "c", true);
+-    TEST_BITMAP_VALIDATE("snapshots", "d", true);
+-    TEST_BITMAP_VALIDATE("snapshots", "current", true);
+-
+-    TEST_BITMAP_VALIDATE("synthetic", "a", false);
+-    TEST_BITMAP_VALIDATE("synthetic", "b", true);
+-    TEST_BITMAP_VALIDATE("synthetic", "c", true);
+-    TEST_BITMAP_VALIDATE("synthetic", "d", true);
+-    TEST_BITMAP_VALIDATE("synthetic", "current", true);
+-
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "a", true);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "b", true);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "c", true);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "d", true);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "current", true);
+-
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "a", false);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "b", true);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "c", true);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "d", false);
+-    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "current", true);
+-
+ #define TEST_BITMAP_BLOCKCOPY(testname, shllw, ndf) \
+     do { \
+         blockbitmapblockcopydata.name = testname; \
+@@ -1410,12 +1354,6 @@ mymain(void)
+     TEST_BITMAP_BLOCKCOPY("empty-shallow", true, "empty");
+     TEST_BITMAP_BLOCKCOPY("empty-deep", false, "empty");
+ 
+-    TEST_BITMAP_BLOCKCOPY("basic-shallow", true, "basic");
+-    TEST_BITMAP_BLOCKCOPY("basic-deep", false, "basic");
+-
+-    TEST_BITMAP_BLOCKCOPY("snapshots-shallow", true, "snapshots");
+-    TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
+-
+ 
+ #define TEST_BITMAP_BLOCKCOMMIT(testname, topimg, baseimg, ndf) \
+     do {\
+@@ -1431,38 +1369,6 @@ mymain(void)
+ 
+     TEST_BITMAP_BLOCKCOMMIT("empty", 1, 2, "empty");
+ 
+-    TEST_BITMAP_BLOCKCOMMIT("basic-1-2", 1, 2, "basic");
+-    TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
+-    TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-2", 1, 2, "snapshots");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-3", 1, 3, "snapshots");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-4", 1, 4, "snapshots");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-1-5", 1, 5, "snapshots");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-3", 2, 3, "snapshots");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-4", 2, 4, "snapshots");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-2-5", 2, 5, "snapshots");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-3-4", 3, 4, "snapshots");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-3-5", 3, 5, "snapshots");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-2", 1, 2, "snapshots-synthetic-broken");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-3", 1, 3, "snapshots-synthetic-broken");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-4", 1, 4, "snapshots-synthetic-broken");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-5", 1, 5, "snapshots-synthetic-broken");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-3", 2, 3, "snapshots-synthetic-broken");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-4", 2, 4, "snapshots-synthetic-broken");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-5", 2, 5, "snapshots-synthetic-broken");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-4", 3, 4, "snapshots-synthetic-broken");
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-5", 3, 5, "snapshots-synthetic-broken");
+-
+-    TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-4-5", 4, 5, "snapshots-synthetic-broken");
+-
+  cleanup:
+     qemuTestDriverFree(&driver);
+     VIR_FREE(capslatest_x86_64);
+diff --git a/tests/qemublocktestdata/backupmerge/basic-deep-out.json b/tests/qemublocktestdata/backupmerge/basic-deep-out.json
+deleted file mode 100644
+index 28c3d16259..0000000000
+--- a/tests/qemublocktestdata/backupmerge/basic-deep-out.json
++++ /dev/null
+@@ -1,22 +0,0 @@
+-[
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "current"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "d"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "c"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "b"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "a"
+-  }
+-]
+diff --git a/tests/qemublocktestdata/backupmerge/basic-flat-out.json b/tests/qemublocktestdata/backupmerge/basic-flat-out.json
+deleted file mode 100644
+index b89252e284..0000000000
+--- a/tests/qemublocktestdata/backupmerge/basic-flat-out.json
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "current"
+-  }
+-]
+diff --git a/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json b/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
+deleted file mode 100644
+index 0dffcafd5f..0000000000
+--- a/tests/qemublocktestdata/backupmerge/basic-intermediate-out.json
++++ /dev/null
+@@ -1,10 +0,0 @@
+-[
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "current"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "d"
+-  }
+-]
+diff --git a/tests/qemublocktestdata/backupmerge/snapshot-deep-out.json b/tests/qemublocktestdata/backupmerge/snapshot-deep-out.json
+deleted file mode 100644
+index 526fc8d55b..0000000000
+--- a/tests/qemublocktestdata/backupmerge/snapshot-deep-out.json
++++ /dev/null
+@@ -1,38 +0,0 @@
+-[
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "current"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "d"
+-  },
+-  {
+-    "node": "libvirt-2-format",
+-    "name": "d"
+-  },
+-  {
+-    "node": "libvirt-2-format",
+-    "name": "c"
+-  },
+-  {
+-    "node": "libvirt-3-format",
+-    "name": "c"
+-  },
+-  {
+-    "node": "libvirt-3-format",
+-    "name": "b"
+-  },
+-  {
+-    "node": "libvirt-3-format",
+-    "name": "a"
+-  },
+-  {
+-    "node": "libvirt-4-format",
+-    "name": "a"
+-  },
+-  {
+-    "node": "libvirt-5-format",
+-    "name": "a"
+-  }
+-]
+diff --git a/tests/qemublocktestdata/backupmerge/snapshot-flat-out.json b/tests/qemublocktestdata/backupmerge/snapshot-flat-out.json
+deleted file mode 100644
+index b89252e284..0000000000
+--- a/tests/qemublocktestdata/backupmerge/snapshot-flat-out.json
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "current"
+-  }
+-]
+diff --git a/tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json b/tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json
+deleted file mode 100644
+index 537d776ec6..0000000000
+--- a/tests/qemublocktestdata/backupmerge/snapshot-intermediate-out.json
++++ /dev/null
+@@ -1,14 +0,0 @@
+-[
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "current"
+-  },
+-  {
+-    "node": "libvirt-1-format",
+-    "name": "d"
+-  },
+-  {
+-    "node": "libvirt-2-format",
+-    "name": "d"
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
+deleted file mode 100644
+index 8eeb4c3a11..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/basic-1-2
++++ /dev/null
+@@ -1,119 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "a",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
+deleted file mode 100644
+index 71b48e31a5..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/basic-1-3
++++ /dev/null
+@@ -1,119 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "a",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3 b/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
+deleted file mode 100644
+index bfc58f994e..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/basic-2-3
++++ /dev/null
+@@ -1,2 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
+deleted file mode 100644
+index 0015b9ceb3..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2
++++ /dev/null
+@@ -1,49 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "d"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
+deleted file mode 100644
+index 5691b408aa..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3
++++ /dev/null
+@@ -1,76 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "c"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        },
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
+deleted file mode 100644
+index 454001531a..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4
++++ /dev/null
+@@ -1,126 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        },
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        },
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
+deleted file mode 100644
+index 2fd43d7917..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5
++++ /dev/null
+@@ -1,130 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        },
+-        {
+-          "node": "libvirt-4-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        },
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        },
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
+deleted file mode 100644
+index d719a90bd7..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3
++++ /dev/null
+@@ -1,49 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "c"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
+deleted file mode 100644
+index 9e37962344..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4
++++ /dev/null
+@@ -1,99 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        },
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
+deleted file mode 100644
+index d6b20a5d05..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5
++++ /dev/null
+@@ -1,103 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        },
+-        {
+-          "node": "libvirt-4-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        },
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
+deleted file mode 100644
+index b96e8910d7..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4
++++ /dev/null
+@@ -1,72 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
+deleted file mode 100644
+index 9570c34c40..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5
++++ /dev/null
+@@ -1,76 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        },
+-        {
+-          "node": "libvirt-4-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
+deleted file mode 100644
+index 7e1020d96e..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5
++++ /dev/null
+@@ -1,33 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-4-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
+deleted file mode 100644
+index 463120d442..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
++++ /dev/null
+@@ -1,57 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "oa"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "ob"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "oa"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "ob"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
+deleted file mode 100644
+index fec6f95dd1..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
++++ /dev/null
+@@ -1,112 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "oa",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "oa",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "oa"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "ob",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "ob",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "ob"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
+deleted file mode 100644
+index 697230f67b..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
++++ /dev/null
+@@ -1,119 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "oa",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "oa",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "oa"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "ob",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "ob",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "ob"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
+deleted file mode 100644
+index 6bf1f0da64..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
++++ /dev/null
+@@ -1,119 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "oa",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "oa",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "oa"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "ob",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "ob",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "ob"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
+deleted file mode 100644
+index f202bb94b1..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
++++ /dev/null
+@@ -1,89 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "oa",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "oa",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "oa"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "ob",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "ob",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "ob"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
+deleted file mode 100644
+index 864cc9041b..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
++++ /dev/null
+@@ -1,96 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "oa",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "oa",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "oa"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "ob",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "ob",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "ob"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
+deleted file mode 100644
+index 4c5d8dbe80..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
++++ /dev/null
+@@ -1,96 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "oa",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "oa",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "oa"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "ob",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "ob",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "ob"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
+deleted file mode 100644
+index 367a930a74..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
++++ /dev/null
+@@ -1,27 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
+deleted file mode 100644
+index 0062ec140c..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
++++ /dev/null
+@@ -1,27 +0,0 @@
+-pre job bitmap disable:
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
+deleted file mode 100644
+index b1f10a8a24..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
++++ /dev/null
+@@ -1,20 +0,0 @@
+-pre job bitmap disable:
+-[
+-  {
+-    "type": "block-dirty-bitmap-disable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-merge bitmpas:
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+deleted file mode 100644
+index 4ed2b97e95..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
++++ /dev/null
+@@ -1,117 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "a",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+deleted file mode 100644
+index 4ed2b97e95..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
++++ /dev/null
+@@ -1,117 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "a",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+deleted file mode 100644
+index 5456553d78..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
++++ /dev/null
+@@ -1,133 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "a",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "a"
+-        },
+-        {
+-          "node": "libvirt-4-format",
+-          "name": "a"
+-        },
+-        {
+-          "node": "libvirt-5-format",
+-          "name": "a"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        },
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        },
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+deleted file mode 100644
+index ddd47f7ee1..0000000000
+--- a/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
++++ /dev/null
+@@ -1,48 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "current",
+-      "persistent": true,
+-      "disabled": false,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "current",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "name": "d",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "mirror-format-node",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+deleted file mode 100644
+index 1b607567e8..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
++++ /dev/null
+@@ -1,29 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "d"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "current"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+deleted file mode 100644
+index eccb7ed15f..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
++++ /dev/null
+@@ -1,22 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "b"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+deleted file mode 100644
+index de40e4b5b0..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
++++ /dev/null
+@@ -1,22 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "c"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+deleted file mode 100644
+index b5d85f43f0..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
++++ /dev/null
+@@ -1,22 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "d"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+deleted file mode 100644
+index e87382fdb4..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
++++ /dev/null
+@@ -1,9 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "a"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+deleted file mode 100644
+index 1b607567e8..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
++++ /dev/null
+@@ -1,29 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "d"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "current"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+deleted file mode 100644
+index c9bda3a17a..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
++++ /dev/null
+@@ -1,24 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+deleted file mode 100644
+index 8a0e3f2cff..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
++++ /dev/null
+@@ -1,62 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "c"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "c"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-3-format
+-libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+deleted file mode 100644
+index 211bc40baf..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
++++ /dev/null
+@@ -1,61 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "d"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "c"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "d"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+deleted file mode 100644
+index f750f44da2..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
++++ /dev/null
+@@ -1,27 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "a"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "a"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-5-format
+-libvirt-4-format
+-libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
+deleted file mode 100644
+index 1b607567e8..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
++++ /dev/null
+@@ -1,29 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "d"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "d",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "current"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "current"
+-    }
+-  }
+-]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+deleted file mode 100644
+index d7e6d18637..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
++++ /dev/null
+@@ -1,31 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "a"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "target": "a",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-3-format",
+-          "name": "b"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "b"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+deleted file mode 100644
+index cfbff010c2..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
++++ /dev/null
+@@ -1,34 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "b",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "b",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "c"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "c"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+deleted file mode 100644
+index 211bc40baf..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
++++ /dev/null
+@@ -1,61 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-add",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "c",
+-      "persistent": true,
+-      "disabled": true,
+-      "granularity": 65536
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-1-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-1-format",
+-      "name": "d"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-enable",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "c"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-merge",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "target": "c",
+-      "bitmaps": [
+-        {
+-          "node": "libvirt-2-format",
+-          "name": "d"
+-        }
+-      ]
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-2-format",
+-      "name": "d"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+deleted file mode 100644
+index f750f44da2..0000000000
+--- a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
++++ /dev/null
+@@ -1,27 +0,0 @@
+-[
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-3-format",
+-      "name": "a"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-4-format",
+-      "name": "a"
+-    }
+-  },
+-  {
+-    "type": "block-dirty-bitmap-remove",
+-    "data": {
+-      "node": "libvirt-5-format",
+-      "name": "a"
+-    }
+-  }
+-]
+-reopen nodes:
+-libvirt-5-format
+-libvirt-4-format
+-libvirt-3-format
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Extract-printing-of-nodename-list.patch b/SOURCES/libvirt-qemublocktest-Extract-printing-of-nodename-list.patch
new file mode 100644
index 0000000..d957b5c
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Extract-printing-of-nodename-list.patch
@@ -0,0 +1,78 @@
+From 25790c1e38a02e16182bb8c708af656f82db950a Mon Sep 17 00:00:00 2001
+Message-Id: <25790c1e38a02e16182bb8c708af656f82db950a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:46 +0200
+Subject: [PATCH] qemublocktest: Extract printing of nodename list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There will be multiple places where we'll need to print nodenames from a
+GSList of virStorageSource for testing purposes. Extract the code into a
+function.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 69cacbe5061a82d3207df113d5c845f38f3decca)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <6f3b4a3424a76d6fe788545b0ddffd3cbb372623.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 75527ca64b..9d6d871be8 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -647,6 +647,23 @@ testQemuDetectBitmaps(const void *opaque)
+ }
+ 
+ 
++static void
++testQemuBitmapListPrint(const char *title,
++                        GSList *next,
++                        virBufferPtr buf)
++{
++    if (!next)
++        return;
++
++    virBufferAsprintf(buf, "%s\n", title);
++
++    for (; next; next = next->next) {
++        virStorageSourcePtr src = next->data;
++        virBufferAsprintf(buf, "%s\n", src->nodeformat);
++    }
++}
++
++
+ static virStorageSourcePtr
+ testQemuBackupIncrementalBitmapCalculateGetFakeImage(size_t idx)
+ {
+@@ -829,7 +846,6 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+     g_autoptr(virHashTable) nodedata = NULL;
+     g_autoptr(GSList) reopenimages = NULL;
+     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+-    GSList *tmp;
+ 
+     expectpath = g_strdup_printf("%s/%s%s-out.json", abs_srcdir,
+                                  checkpointDeletePrefix, data->name);
+@@ -858,14 +874,7 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+         virBufferAddLit(&buf, "NULL\n");
+     }
+ 
+-    if (reopenimages) {
+-        virBufferAddLit(&buf, "reopen nodes:\n");
+-
+-        for (tmp = reopenimages; tmp; tmp = tmp->next) {
+-            virStorageSourcePtr src = tmp->data;
+-            virBufferAsprintf(&buf, "%s\n", src->nodeformat);
+-        }
+-    }
++    testQemuBitmapListPrint("reopen nodes:", reopenimages, &buf);
+ 
+     actual = virBufferContentAndReset(&buf);
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Extract-schema-root-for-blockdev-add-validation.patch b/SOURCES/libvirt-qemublocktest-Extract-schema-root-for-blockdev-add-validation.patch
new file mode 100644
index 0000000..04d9fc9
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Extract-schema-root-for-blockdev-add-validation.patch
@@ -0,0 +1,71 @@
+From fbeabd58626de924d59891338dade4f56044a3cc Mon Sep 17 00:00:00 2001
+Message-Id: <fbeabd58626de924d59891338dade4f56044a3cc@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:10 +0100
+Subject: [PATCH] qemublocktest: Extract schema root for blockdev-add
+ validation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move lookup of the schema root earlier so that multiple functions
+can use it for validation.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 218ce53069b730daa508a4a67d8640b415d69b4e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <9f33cec13b55e431b1144042ddcbeb7afefcf969.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index f805265c93..94f20eeb47 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -864,6 +864,7 @@ mymain(void)
+     char *capslatest_x86_64 = NULL;
+     virQEMUCapsPtr caps_x86_64 = NULL;
+     g_autoptr(virHashTable) qmp_schema_x86_64 = NULL;
++    virJSONValuePtr qmp_schemaroot_x86_64_blockdev_add = NULL;
+     g_autoptr(virStorageSource) bitmapSourceChain = NULL;
+ 
+     if (qemuTestDriverInit(&driver) < 0)
+@@ -891,6 +892,15 @@ mymain(void)
+         goto cleanup;
+     }
+ 
++    if (virQEMUQAPISchemaPathGet("blockdev-add/arg-type",
++                                 qmp_schema_x86_64,
++                                 &qmp_schemaroot_x86_64_blockdev_add) < 0 ||
++        !qmp_schemaroot_x86_64_blockdev_add) {
++        VIR_TEST_VERBOSE("failed to find schema entry for blockdev-add");
++        ret = -1;
++        goto cleanup;
++    }
++
+     virTestCounterReset("qemu storage source xml->json->xml ");
+ 
+ #define TEST_JSON_FORMAT(tpe, xmlstr) \
+@@ -990,15 +1000,7 @@ mymain(void)
+ #define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false)
+ 
+     diskxmljsondata.schema = qmp_schema_x86_64;
+-
+-    if (virQEMUQAPISchemaPathGet("blockdev-add/arg-type",
+-                                 diskxmljsondata.schema,
+-                                 &diskxmljsondata.schemaroot) < 0 ||
+-        !diskxmljsondata.schemaroot) {
+-        VIR_TEST_VERBOSE("failed to find schema entry for blockdev-add");
+-        ret = -1;
+-        goto cleanup;
+-    }
++    diskxmljsondata.schemaroot = qmp_schemaroot_x86_64_blockdev_add;
+ 
+     TEST_DISK_TO_JSON_FULL("nodename-long-format", true);
+     TEST_DISK_TO_JSON_FULL("nodename-long-protocol", true);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Fix-and-optimize-fake-image-chain.patch b/SOURCES/libvirt-qemublocktest-Fix-and-optimize-fake-image-chain.patch
new file mode 100644
index 0000000..270afad
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Fix-and-optimize-fake-image-chain.patch
@@ -0,0 +1,47 @@
+From a0a2e4eaa6ab0b6435286f9af6e7026f0000b9e5 Mon Sep 17 00:00:00 2001
+Message-Id: <a0a2e4eaa6ab0b6435286f9af6e7026f0000b9e5@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:23 +0100
+Subject: [PATCH] qemublocktest: Fix and optimize fake image chain
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Set the 'id' field of the backing chain properly so that we can look
+up images, and initialize 6 images instead of 10 as we don't use more
+currently.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit f8389505aae66e705046f5cbd9fe4ac10f1dee2e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <c45885fd70242874545a5c8129bcb52022014112.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index f48875e16d..6ccc2328b3 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -636,6 +636,7 @@ testQemuBackupIncrementalBitmapCalculateGetFakeImage(size_t idx)
+    if (!(ret = virStorageSourceNew()))
+        abort();
+ 
++   ret->id = idx;
+    ret->type = VIR_STORAGE_TYPE_FILE;
+    ret->format = VIR_STORAGE_FILE_QCOW2;
+    ret->path = g_strdup_printf("/image%zu", idx);
+@@ -655,7 +656,7 @@ testQemuBackupIncrementalBitmapCalculateGetFakeChain(void)
+ 
+     n = ret = testQemuBackupIncrementalBitmapCalculateGetFakeImage(1);
+ 
+-    for (i = 2; i < 10; i++) {
++    for (i = 2; i < 6; i++) {
+         n->backingStore = testQemuBackupIncrementalBitmapCalculateGetFakeImage(i);
+         n = n->backingStore;
+     }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Load-QMP-schema-earlier.patch b/SOURCES/libvirt-qemublocktest-Load-QMP-schema-earlier.patch
new file mode 100644
index 0000000..23c260e
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Load-QMP-schema-earlier.patch
@@ -0,0 +1,85 @@
+From e0454c4801452c031856681c68bf5d154440bbb0 Mon Sep 17 00:00:00 2001
+Message-Id: <e0454c4801452c031856681c68bf5d154440bbb0@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:09 +0100
+Subject: [PATCH] qemublocktest: Load QMP schema earlier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Multiple tests require the schema. Extract the loading into a separate
+variable to avoid issues with ownership of the pointer.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 1262cdede447a2566b6e8cb99434b767a4ef67da)
+
+ Conflicts:
+	tests/qemublocktest.c
+        QMP schema loading for non-x86_64 qemus was not backported.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <d8a7b2d9987175b106363d781df23d313a02d870.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 3057db6930..f805265c93 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -863,6 +863,7 @@ mymain(void)
+     struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
+     char *capslatest_x86_64 = NULL;
+     virQEMUCapsPtr caps_x86_64 = NULL;
++    g_autoptr(virHashTable) qmp_schema_x86_64 = NULL;
+     g_autoptr(virStorageSource) bitmapSourceChain = NULL;
+ 
+     if (qemuTestDriverInit(&driver) < 0)
+@@ -885,6 +886,11 @@ mymain(void)
+     diskxmljsondata.qemuCaps = caps_x86_64;
+     imagecreatedata.qemuCaps = caps_x86_64;
+ 
++    if (!(qmp_schema_x86_64 = testQEMUSchemaLoad())) {
++        ret = -1;
++        goto cleanup;
++    }
++
+     virTestCounterReset("qemu storage source xml->json->xml ");
+ 
+ #define TEST_JSON_FORMAT(tpe, xmlstr) \
+@@ -983,10 +989,7 @@ mymain(void)
+ 
+ #define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false)
+ 
+-    if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) {
+-        ret = -1;
+-        goto cleanup;
+-    }
++    diskxmljsondata.schema = qmp_schema_x86_64;
+ 
+     if (virQEMUQAPISchemaPathGet("blockdev-add/arg-type",
+                                  diskxmljsondata.schema,
+@@ -1045,7 +1048,9 @@ mymain(void)
+                        &imagecreatedata) < 0) \
+             ret = -1; \
+     } while (0)
+-    imagecreatedata.schema = diskxmljsondata.schema;
++
++    imagecreatedata.schema = qmp_schema_x86_64;
++
+     if (virQEMUQAPISchemaPathGet("blockdev-create/arg-type/options",
+                                  imagecreatedata.schema,
+                                  &imagecreatedata.schemaroot) < 0 ||
+@@ -1198,7 +1203,6 @@ mymain(void)
+     TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
+ 
+  cleanup:
+-    virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+     VIR_FREE(capslatest_x86_64);
+     virObjectUnref(caps_x86_64);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-Re-add-bitmap-validation-for-basic-and-snapshots-cases.patch b/SOURCES/libvirt-qemublocktest-Re-add-bitmap-validation-for-basic-and-snapshots-cases.patch
new file mode 100644
index 0000000..cd5929e
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Re-add-bitmap-validation-for-basic-and-snapshots-cases.patch
@@ -0,0 +1,49 @@
+From 82ab591e0d4183f9d4d12c8d905f2c0c71795f68 Mon Sep 17 00:00:00 2001
+Message-Id: <82ab591e0d4183f9d4d12c8d905f2c0c71795f68@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:51 +0200
+Subject: [PATCH] qemublocktest: Re-add bitmap validation for 'basic' and
+ 'snapshots' cases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Now that we've updated both the test data and the validator to new
+semantics we can start testing again.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 9c007fd418e7fa7320662347662b926835a20c16)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <ebe9e994fde00010d9a7d809a3c27dc21f6a1bbe.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 9d6d871be8..af81f1b77a 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1345,6 +1345,18 @@ mymain(void)
+ 
+     TEST_BITMAP_VALIDATE("empty", "a", false);
+ 
++    TEST_BITMAP_VALIDATE("basic", "a", true);
++    TEST_BITMAP_VALIDATE("basic", "b", true);
++    TEST_BITMAP_VALIDATE("basic", "c", true);
++    TEST_BITMAP_VALIDATE("basic", "d", true);
++    TEST_BITMAP_VALIDATE("basic", "current", true);
++
++    TEST_BITMAP_VALIDATE("snapshots", "a", true);
++    TEST_BITMAP_VALIDATE("snapshots", "b", true);
++    TEST_BITMAP_VALIDATE("snapshots", "c", true);
++    TEST_BITMAP_VALIDATE("snapshots", "d", true);
++    TEST_BITMAP_VALIDATE("snapshots", "current", true);
++
+ #define TEST_BITMAP_BLOCKCOPY(testname, shllw, ndf) \
+     do { \
+         blockbitmapblockcopydata.name = testname; \
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Re-introduce-testing-of-checkpoint-deletion.patch b/SOURCES/libvirt-qemublocktest-Re-introduce-testing-of-checkpoint-deletion.patch
new file mode 100644
index 0000000..3f40790
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Re-introduce-testing-of-checkpoint-deletion.patch
@@ -0,0 +1,401 @@
+From 4b9cb933c1501309a858130f5465313699840ec1 Mon Sep 17 00:00:00 2001
+Message-Id: <4b9cb933c1501309a858130f5465313699840ec1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:55 +0200
+Subject: [PATCH] qemublocktest: Re-introduce testing of checkpoint deletion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Exercise the now arguably simpler checkpoint deletion code on the
+'basic', 'snapshots', and 'synthetic' test data sets.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 2c5a3da365d9a33ff23458ca2a914f9d35ebd510)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <8df51bc8ee6e86fe36d971670ecdc89ecc989532.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         | 18 ++++++++
+ .../checkpointdelete/basic-current-out.json   |  9 ++++
+ .../basic-intermediate1-out.json              |  9 ++++
+ .../basic-intermediate2-out.json              |  9 ++++
+ .../basic-intermediate3-out.json              |  9 ++++
+ .../checkpointdelete/basic-noparent-out.json  |  9 ++++
+ .../snapshots-current-out.json                |  9 ++++
+ .../snapshots-intermediate1-out.json          | 26 ++++++++++++
+ .../snapshots-intermediate2-out.json          | 26 ++++++++++++
+ .../snapshots-intermediate3-out.json          | 18 ++++++++
+ .../snapshots-noparent-out.json               | 42 +++++++++++++++++++
+ .../synthetic-current-out.json                |  9 ++++
+ .../synthetic-intermediate1-out.json          | 11 +++++
+ .../synthetic-intermediate2-out.json          | 11 +++++
+ .../synthetic-intermediate3-out.json          | 19 +++++++++
+ .../synthetic-noparent-out.json               | 11 +++++
+ 16 files changed, 245 insertions(+)
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 0ec964c2c6..7c8f67dd6b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1329,6 +1329,24 @@ mymain(void)
+ 
+     TEST_CHECKPOINT_DELETE("empty", "a", "empty");
+ 
++    TEST_CHECKPOINT_DELETE("basic-noparent", "a", "basic");
++    TEST_CHECKPOINT_DELETE("basic-intermediate1", "b", "basic");
++    TEST_CHECKPOINT_DELETE("basic-intermediate2", "c", "basic");
++    TEST_CHECKPOINT_DELETE("basic-intermediate3", "d", "basic");
++    TEST_CHECKPOINT_DELETE("basic-current", "current", "basic");
++
++    TEST_CHECKPOINT_DELETE("snapshots-noparent", "a", "snapshots");
++    TEST_CHECKPOINT_DELETE("snapshots-intermediate1", "b", "snapshots");
++    TEST_CHECKPOINT_DELETE("snapshots-intermediate2", "c", "snapshots");
++    TEST_CHECKPOINT_DELETE("snapshots-intermediate3", "d", "snapshots");
++    TEST_CHECKPOINT_DELETE("snapshots-current", "current", "snapshots");
++
++    TEST_CHECKPOINT_DELETE("synthetic-noparent", "a", "synthetic");
++    TEST_CHECKPOINT_DELETE("synthetic-intermediate1", "b", "synthetic");
++    TEST_CHECKPOINT_DELETE("synthetic-intermediate2", "c", "synthetic");
++    TEST_CHECKPOINT_DELETE("synthetic-intermediate3", "d", "synthetic");
++    TEST_CHECKPOINT_DELETE("synthetic-current", "current", "synthetic");
++
+ #define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
+     do { \
+         blockbitmapvalidatedata.name = testname; \
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+new file mode 100644
+index 0000000000..6ed1b63b66
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "current"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+new file mode 100644
+index 0000000000..e1dd4920cd
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "b"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+new file mode 100644
+index 0000000000..5638532d35
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "c"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+new file mode 100644
+index 0000000000..8c56b0e689
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+new file mode 100644
+index 0000000000..e87382fdb4
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "a"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+new file mode 100644
+index 0000000000..6ed1b63b66
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "current"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+new file mode 100644
+index 0000000000..1cde09131e
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+@@ -0,0 +1,26 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "b"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "b"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  }
++]
++reopen nodes:
++libvirt-3-format
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+new file mode 100644
+index 0000000000..6fcd7ee0d1
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+@@ -0,0 +1,26 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "c"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c"
++    }
++  }
++]
++reopen nodes:
++libvirt-3-format
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+new file mode 100644
+index 0000000000..2977dc3042
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+@@ -0,0 +1,18 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d"
++    }
++  }
++]
++reopen nodes:
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+new file mode 100644
+index 0000000000..e4a6a413a3
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+@@ -0,0 +1,42 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++reopen nodes:
++libvirt-5-format
++libvirt-4-format
++libvirt-3-format
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json
+new file mode 100644
+index 0000000000..6ed1b63b66
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/synthetic-current-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "current"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json
+new file mode 100644
+index 0000000000..6eb9716aaa
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate1-out.json
+@@ -0,0 +1,11 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  }
++]
++reopen nodes:
++libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json
+new file mode 100644
+index 0000000000..92b849cfc9
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate2-out.json
+@@ -0,0 +1,11 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c"
++    }
++  }
++]
++reopen nodes:
++libvirt-3-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json
+new file mode 100644
+index 0000000000..466df52007
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/synthetic-intermediate3-out.json
+@@ -0,0 +1,19 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "d"
++    }
++  }
++]
++reopen nodes:
++libvirt-3-format
++libvirt-2-format
+diff --git a/tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json
+new file mode 100644
+index 0000000000..0479815f36
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/synthetic-noparent-out.json
+@@ -0,0 +1,11 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
++reopen nodes:
++libvirt-5-format
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Rename-TEST_CHECKPOINT_DELETE_MERGE-to-TEST_CHECKPOINT_DELETE.patch b/SOURCES/libvirt-qemublocktest-Rename-TEST_CHECKPOINT_DELETE_MERGE-to-TEST_CHECKPOINT_DELETE.patch
new file mode 100644
index 0000000..2caebb2
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Rename-TEST_CHECKPOINT_DELETE_MERGE-to-TEST_CHECKPOINT_DELETE.patch
@@ -0,0 +1,81 @@
+From a97672d9aa9be91ddb2fee0e592e0e137ecca20f Mon Sep 17 00:00:00 2001
+Message-Id: <a97672d9aa9be91ddb2fee0e592e0e137ecca20f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:54 +0200
+Subject: [PATCH] qemublocktest: Rename TEST_CHECKPOINT_DELETE_MERGE to
+ TEST_CHECKPOINT_DELETE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Also rename the helper struct and function.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 520d139b9c3bbf6cc6453044fa6304e1429b7f11)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <cd907a614df510e759d085739ff0523a1ae7b7cc.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 201e5df6b4..0ec964c2c6 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -826,7 +826,7 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
+ 
+ static const char *checkpointDeletePrefix = "qemublocktestdata/checkpointdelete/";
+ 
+-struct testQemuCheckpointDeleteMergeData {
++struct testQemuCheckpointDeleteData {
+     const char *name;
+     virStorageSourcePtr chain;
+     const char *deletebitmap;
+@@ -835,9 +835,9 @@ struct testQemuCheckpointDeleteMergeData {
+ 
+ 
+ static int
+-testQemuCheckpointDeleteMerge(const void *opaque)
++testQemuCheckpointDelete(const void *opaque)
+ {
+-    const struct testQemuCheckpointDeleteMergeData *data = opaque;
++    const struct testQemuCheckpointDeleteData *data = opaque;
+     g_autofree char *actual = NULL;
+     g_autofree char *expectpath = NULL;
+     g_autoptr(virJSONValue) actions = NULL;
+@@ -1037,7 +1037,7 @@ mymain(void)
+     struct testJSONtoJSONData jsontojsondata;
+     struct testQemuImageCreateData imagecreatedata;
+     struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
+-    struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
++    struct testQemuCheckpointDeleteData checkpointdeletedata;
+     struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
+     struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
+     struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata;
+@@ -1316,18 +1316,18 @@ mymain(void)
+ 
+     TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
+ 
+-#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, named) \
++#define TEST_CHECKPOINT_DELETE(testname, delbmp, named) \
+     do { \
+         checkpointdeletedata.name = testname; \
+         checkpointdeletedata.chain = bitmapSourceChain; \
+         checkpointdeletedata.deletebitmap = delbmp; \
+         checkpointdeletedata.nodedatafile = named; \
+         if (virTestRun("checkpoint delete " testname, \
+-                       testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \
++                       testQemuCheckpointDelete, &checkpointdeletedata) < 0) \
+         ret = -1; \
+     } while (0)
+ 
+-    TEST_CHECKPOINT_DELETE_MERGE("empty", "a", "empty");
++    TEST_CHECKPOINT_DELETE("empty", "a", "empty");
+ 
+ #define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
+     do { \
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Replace-basic-bitmap-detection-test-case-data.patch b/SOURCES/libvirt-qemublocktest-Replace-basic-bitmap-detection-test-case-data.patch
new file mode 100644
index 0000000..a3263a1
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Replace-basic-bitmap-detection-test-case-data.patch
@@ -0,0 +1,282 @@
+From 79ee60c0e547a9023eeb7912b10fe363645f5d5a Mon Sep 17 00:00:00 2001
+Message-Id: <79ee60c0e547a9023eeb7912b10fe363645f5d5a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:48 +0200
+Subject: [PATCH] qemublocktest: Replace 'basic' bitmap detection test case
+ data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use test data which conforms to the new semantics which changed in the
+previous patch.
+
+The test data was created by the same set of commands as originally in
+commit 9aac9d5bdab039a50de2d8c627b3a1f1578ed471
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit de32397007d5d2a9ca57791ec159f72f7666322b)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <f0985f5309514919dab4baedb04e4b3c214ae407.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktestdata/bitmap/basic.json | 229 +++++++++++-----------
+ tests/qemublocktestdata/bitmap/basic.out  |   8 +-
+ 2 files changed, 119 insertions(+), 118 deletions(-)
+
+diff --git a/tests/qemublocktestdata/bitmap/basic.json b/tests/qemublocktestdata/bitmap/basic.json
+index 9d418b1a37..718106bf99 100644
+--- a/tests/qemublocktestdata/bitmap/basic.json
++++ b/tests/qemublocktestdata/bitmap/basic.json
+@@ -1,117 +1,118 @@
+ [
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.qcow2",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 200704,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-format",
+-        "backing_file_depth": 0,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "dirty-bitmaps": [
+-            {
+-                "name": "current",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "d",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "c",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "b",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            },
+-            {
+-                "name": "a",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
+-            }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 10485760,
++      "filename": "/tmp/bitmaps.qcow2",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 200704,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "dirty-flag": false
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 197120,
+-            "filename": "/tmp/pull4.qcow2",
+-            "format": "file",
+-            "actual-size": 200704,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    }
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-1-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "dirty-bitmaps": [
++      {
++        "name": "current",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "d",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "c",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "b",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.qcow2",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 197120,
++      "filename": "/tmp/bitmaps.qcow2",
++      "format": "file",
++      "actual-size": 200704,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-1-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.qcow2",
++    "encryption_key_missing": false
++  }
+ ]
+diff --git a/tests/qemublocktestdata/bitmap/basic.out b/tests/qemublocktestdata/bitmap/basic.out
+index 539f7d9bad..5c4c35b3f0 100644
+--- a/tests/qemublocktestdata/bitmap/basic.out
++++ b/tests/qemublocktestdata/bitmap/basic.out
+@@ -1,6 +1,6 @@
+ libvirt-1-format:
+   current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        b: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        a: 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
++        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
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Replace-snapshots-bitmap-detection-test-case-data.patch b/SOURCES/libvirt-qemublocktest-Replace-snapshots-bitmap-detection-test-case-data.patch
new file mode 100644
index 0000000..a3d14ec
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Replace-snapshots-bitmap-detection-test-case-data.patch
@@ -0,0 +1,1476 @@
+From 31106cd65ee58f168769bb91eab8a0e5116b7a97 Mon Sep 17 00:00:00 2001
+Message-Id: <31106cd65ee58f168769bb91eab8a0e5116b7a97@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 23 Jun 2020 12:23:49 +0200
+Subject: [PATCH] qemublocktest: Replace 'snapshots' bitmap detection test case
+ data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use test data which conforms to the new semantics which changed in the
+previous patch.
+
+The test data was created by the same set of commands as originally in
+commit 0b27b655b1bac480186ce80457113cd5dc34e6a1
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit ff00fa228d66b47e1b24c4a8cccf845af1d9385c)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804593
+Message-Id: <f38005bfc322242472a18e1c05a4a44ddc4780a6.1592906423.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktestdata/bitmap/snapshots.json | 1382 +++++++----------
+ tests/qemublocktestdata/bitmap/snapshots.out  |   13 +-
+ 2 files changed, 588 insertions(+), 807 deletions(-)
+
+diff --git a/tests/qemublocktestdata/bitmap/snapshots.json b/tests/qemublocktestdata/bitmap/snapshots.json
+index 87e77ad408..2a20aea812 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots.json
++++ b/tests/qemublocktestdata/bitmap/snapshots.json
+@@ -1,836 +1,612 @@
+ [
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "backing-image": {
+-                        "backing-image": {
+-                            "virtual-size": 10485760,
+-                            "filename": "/tmp/pull4.qcow2",
+-                            "cluster-size": 65536,
+-                            "format": "qcow2",
+-                            "actual-size": 208896,
+-                            "format-specific": {
+-                                "type": "qcow2",
+-                                "data": {
+-                                    "compat": "1.1",
+-                                    "lazy-refcounts": false,
+-                                    "bitmaps": [
+-                                        {
+-                                            "flags": [
+-                                                "auto"
+-                                            ],
+-                                            "name": "a",
+-                                            "granularity": 65536
+-                                        }
+-                                    ],
+-                                    "refcount-bits": 16,
+-                                    "corrupt": false
+-                                }
+-                            },
+-                            "dirty-flag": false
+-                        },
+-                        "backing-filename-format": "qcow2",
+-                        "virtual-size": 10485760,
+-                        "filename": "/tmp/pull4.1575911522",
+-                        "cluster-size": 65536,
+-                        "format": "qcow2",
+-                        "actual-size": 208896,
+-                        "format-specific": {
+-                            "type": "qcow2",
+-                            "data": {
+-                                "compat": "1.1",
+-                                "lazy-refcounts": false,
+-                                "bitmaps": [
+-                                    {
+-                                        "flags": [
+-                                            "auto"
+-                                        ],
+-                                        "name": "a",
+-                                        "granularity": 65536
+-                                    }
+-                                ],
+-                                "refcount-bits": 16,
+-                                "corrupt": false
+-                            }
+-                        },
+-                        "full-backing-filename": "/tmp/pull4.qcow2",
+-                        "backing-filename": "/tmp/pull4.qcow2",
+-                        "dirty-flag": false
+-                    },
+-                    "backing-filename-format": "qcow2",
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.1575911527",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 217088,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "c",
+-                                    "granularity": 65536
+-                                },
+-                                {
+-                                    "flags": [
+-
+-                                    ],
+-                                    "name": "b",
+-                                    "granularity": 65536
+-                                },
+-                                {
+-                                    "flags": [
+-
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "full-backing-filename": "/tmp/pull4.1575911522",
+-                    "backing-filename": "/tmp/pull4.1575911522",
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911540",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 212992,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "d",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "c",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.1575911527",
+-                "backing-filename": "/tmp/pull4.1575911527",
+-                "dirty-flag": false
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 104857600,
++      "filename": "/tmp/bitmaps.1591792950",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 225280,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
++            {
++              "flags": [
++                "in-use",
++                "auto"
++              ],
++              "name": "current",
++              "granularity": 65536
++            },
++            {
++              "flags": [
++                "in-use",
++                "auto"
++              ],
++              "name": "c",
++              "granularity": 65536
+             },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911550",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 212992,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "in-use",
+-                                "auto"
+-                            ],
+-                            "name": "current",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-                                "in-use"
+-                            ],
+-                            "name": "d",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
++            {
++              "flags": [
++                "in-use",
++                "auto"
++              ],
++              "name": "b",
++              "granularity": 65536
+             },
+-            "full-backing-filename": "/tmp/pull4.1575911540",
+-            "backing-filename": "/tmp/pull4.1575911540",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-format",
+-        "backing_file_depth": 4,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911540",
+-        "dirty-bitmaps": [
+             {
+-                "name": "d",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "in-use",
++                "auto"
++              ],
++              "name": "a",
++              "granularity": 65536
+             },
+             {
+-                "name": "current",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "in-use",
++                "auto"
++              ],
++              "name": "d",
++              "granularity": 65536
+             }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911550",
+-        "encryption_key_missing": false
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.1591792938",
++      "backing-filename": "/tmp/bitmaps.1591792938",
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-1-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.1591792938",
++    "dirty-bitmaps": [
++      {
++        "name": "d",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "b",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "c",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "current",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1591792950",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 590336,
++      "filename": "/tmp/bitmaps.1591792950",
++      "format": "file",
++      "actual-size": 225280,
++      "dirty-flag": false
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 393728,
+-            "filename": "/tmp/pull4.1575911550",
+-            "format": "file",
+-            "actual-size": 212992,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-1-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911550",
+-        "encryption_key_missing": false
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-1-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "backing-image": {
+-                        "virtual-size": 10485760,
+-                        "filename": "/tmp/pull4.qcow2",
+-                        "cluster-size": 65536,
+-                        "format": "qcow2",
+-                        "actual-size": 208896,
+-                        "format-specific": {
+-                            "type": "qcow2",
+-                            "data": {
+-                                "compat": "1.1",
+-                                "lazy-refcounts": false,
+-                                "bitmaps": [
+-                                    {
+-                                        "flags": [
+-                                            "auto"
+-                                        ],
+-                                        "name": "a",
+-                                        "granularity": 65536
+-                                    }
+-                                ],
+-                                "refcount-bits": 16,
+-                                "corrupt": false
+-                            }
+-                        },
+-                        "dirty-flag": false
+-                    },
+-                    "backing-filename-format": "qcow2",
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.1575911522",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 208896,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "full-backing-filename": "/tmp/pull4.qcow2",
+-                    "backing-filename": "/tmp/pull4.qcow2",
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911527",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 217088,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "c",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "b",
+-                                "granularity": 65536
+-                            },
+-                            {
+-                                "flags": [
+-
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.1575911522",
+-                "backing-filename": "/tmp/pull4.1575911522",
+-                "dirty-flag": false
++    "file": "/tmp/bitmaps.1591792950",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 104857600,
++      "filename": "/tmp/bitmaps.1591792938",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 221184,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
++            {
++              "flags": [
++                "auto"
++              ],
++              "name": "d",
++              "granularity": 65536
+             },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911540",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 212992,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "d",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "c",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
++            {
++              "flags": [
++                "auto"
++              ],
++              "name": "a",
++              "granularity": 65536
+             },
+-            "full-backing-filename": "/tmp/pull4.1575911527",
+-            "backing-filename": "/tmp/pull4.1575911527",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-2-format",
+-        "backing_file_depth": 3,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911527",
+-        "dirty-bitmaps": [
+             {
+-                "name": "c",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "b",
++              "granularity": 65536
+             },
+             {
+-                "name": "d",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "c",
++              "granularity": 65536
+             }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911540",
+-        "encryption_key_missing": false
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.1591792930",
++      "backing-filename": "/tmp/bitmaps.1591792930",
++      "dirty-flag": false
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 393728,
+-            "filename": "/tmp/pull4.1575911540",
+-            "format": "file",
+-            "actual-size": 212992,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-2-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911540",
+-        "encryption_key_missing": false
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-2-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.1591792930",
++    "dirty-bitmaps": [
++      {
++        "name": "c",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "b",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "d",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "backing-image": {
+-                    "virtual-size": 10485760,
+-                    "filename": "/tmp/pull4.qcow2",
+-                    "cluster-size": 65536,
+-                    "format": "qcow2",
+-                    "actual-size": 208896,
+-                    "format-specific": {
+-                        "type": "qcow2",
+-                        "data": {
+-                            "compat": "1.1",
+-                            "lazy-refcounts": false,
+-                            "bitmaps": [
+-                                {
+-                                    "flags": [
+-                                        "auto"
+-                                    ],
+-                                    "name": "a",
+-                                    "granularity": 65536
+-                                }
+-                            ],
+-                            "refcount-bits": 16,
+-                            "corrupt": false
+-                        }
+-                    },
+-                    "dirty-flag": false
+-                },
+-                "backing-filename-format": "qcow2",
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.1575911522",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 208896,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "full-backing-filename": "/tmp/pull4.qcow2",
+-                "backing-filename": "/tmp/pull4.qcow2",
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911527",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 217088,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "c",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "b",
+-                            "granularity": 65536
+-                        },
+-                        {
+-                            "flags": [
+-
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.1575911522",
+-            "backing-filename": "/tmp/pull4.1575911522",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-3-format",
+-        "backing_file_depth": 2,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.1575911522",
+-        "dirty-bitmaps": [
++    "file": "/tmp/bitmaps.1591792938",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 524800,
++      "filename": "/tmp/bitmaps.1591792938",
++      "format": "file",
++      "actual-size": 221184,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-2-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1591792938",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 104857600,
++      "filename": "/tmp/bitmaps.1591792930",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 217088,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
+             {
+-                "name": "a",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "c",
++              "granularity": 65536
+             },
+             {
+-                "name": "b",
+-                "recording": false,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "disabled",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "b",
++              "granularity": 65536
+             },
+             {
+-                "name": "c",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "a",
++              "granularity": 65536
+             }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911527",
+-        "encryption_key_missing": false
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.1591792925",
++      "backing-filename": "/tmp/bitmaps.1591792925",
++      "dirty-flag": false
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 459264,
+-            "filename": "/tmp/pull4.1575911527",
+-            "format": "file",
+-            "actual-size": 217088,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-3-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911527",
+-        "encryption_key_missing": false
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-3-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.1591792925",
++    "dirty-bitmaps": [
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "b",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      },
++      {
++        "name": "c",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "backing-image": {
+-                "virtual-size": 10485760,
+-                "filename": "/tmp/pull4.qcow2",
+-                "cluster-size": 65536,
+-                "format": "qcow2",
+-                "actual-size": 208896,
+-                "format-specific": {
+-                    "type": "qcow2",
+-                    "data": {
+-                        "compat": "1.1",
+-                        "lazy-refcounts": false,
+-                        "bitmaps": [
+-                            {
+-                                "flags": [
+-                                    "auto"
+-                                ],
+-                                "name": "a",
+-                                "granularity": 65536
+-                            }
+-                        ],
+-                        "refcount-bits": 16,
+-                        "corrupt": false
+-                    }
+-                },
+-                "dirty-flag": false
+-            },
+-            "backing-filename-format": "qcow2",
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.1575911522",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 208896,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "full-backing-filename": "/tmp/pull4.qcow2",
+-            "backing-filename": "/tmp/pull4.qcow2",
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-4-format",
+-        "backing_file_depth": 1,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "backing_file": "/tmp/pull4.qcow2",
+-        "dirty-bitmaps": [
++    "file": "/tmp/bitmaps.1591792930",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 459264,
++      "filename": "/tmp/bitmaps.1591792930",
++      "format": "file",
++      "actual-size": 217088,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-3-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1591792930",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "backing-filename-format": "qcow2",
++      "virtual-size": 104857600,
++      "filename": "/tmp/bitmaps.1591792925",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 208896,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
+             {
+-                "name": "a",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "a",
++              "granularity": 65536
+             }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911522",
+-        "encryption_key_missing": false
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "full-backing-filename": "/tmp/bitmaps.qcow2",
++      "backing-filename": "/tmp/bitmaps.qcow2",
++      "dirty-flag": false
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 328192,
+-            "filename": "/tmp/pull4.1575911522",
+-            "format": "file",
+-            "actual-size": 208896,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-4-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.1575911522",
+-        "encryption_key_missing": false
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-4-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "backing_file": "/tmp/bitmaps.qcow2",
++    "dirty-bitmaps": [
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 10485760,
+-            "filename": "/tmp/pull4.qcow2",
+-            "cluster-size": 65536,
+-            "format": "qcow2",
+-            "actual-size": 208896,
+-            "format-specific": {
+-                "type": "qcow2",
+-                "data": {
+-                    "compat": "1.1",
+-                    "lazy-refcounts": false,
+-                    "bitmaps": [
+-                        {
+-                            "flags": [
+-                                "auto"
+-                            ],
+-                            "name": "a",
+-                            "granularity": 65536
+-                        }
+-                    ],
+-                    "refcount-bits": 16,
+-                    "corrupt": false
+-                }
+-            },
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": true,
+-        "node-name": "libvirt-5-format",
+-        "backing_file_depth": 0,
+-        "drv": "qcow2",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "dirty-bitmaps": [
++    "file": "/tmp/bitmaps.1591792925",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 328192,
++      "filename": "/tmp/bitmaps.1591792925",
++      "format": "file",
++      "actual-size": 208896,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-4-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.1591792925",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 104857600,
++      "filename": "/tmp/bitmaps.qcow2",
++      "cluster-size": 65536,
++      "format": "qcow2",
++      "actual-size": 208896,
++      "format-specific": {
++        "type": "qcow2",
++        "data": {
++          "compat": "1.1",
++          "compression-type": "zlib",
++          "lazy-refcounts": false,
++          "bitmaps": [
+             {
+-                "name": "a",
+-                "recording": true,
+-                "persistent": true,
+-                "busy": false,
+-                "status": "active",
+-                "granularity": 65536,
+-                "count": 0
++              "flags": [
++                "auto"
++              ],
++              "name": "a",
++              "granularity": 65536
+             }
+-        ],
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
++          ],
++          "refcount-bits": 16,
++          "corrupt": false
++        }
++      },
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": true,
++    "node-name": "libvirt-5-format",
++    "backing_file_depth": 0,
++    "drv": "qcow2",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "dirty-bitmaps": [
++      {
++        "name": "a",
++        "recording": true,
++        "persistent": true,
++        "busy": false,
++        "status": "active",
++        "granularity": 65536,
++        "count": 0
++      }
++    ],
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
++    },
++    "file": "/tmp/bitmaps.qcow2",
++    "encryption_key_missing": false
++  },
++  {
++    "iops_rd": 0,
++    "detect_zeroes": "off",
++    "image": {
++      "virtual-size": 328192,
++      "filename": "/tmp/bitmaps.qcow2",
++      "format": "file",
++      "actual-size": 208896,
++      "dirty-flag": false
++    },
++    "iops_wr": 0,
++    "ro": false,
++    "node-name": "libvirt-5-storage",
++    "backing_file_depth": 0,
++    "drv": "file",
++    "iops": 0,
++    "bps_wr": 0,
++    "write_threshold": 0,
++    "encrypted": false,
++    "bps": 0,
++    "bps_rd": 0,
++    "cache": {
++      "no-flush": false,
++      "direct": false,
++      "writeback": true
+     },
+-    {
+-        "iops_rd": 0,
+-        "detect_zeroes": "off",
+-        "image": {
+-            "virtual-size": 328192,
+-            "filename": "/tmp/pull4.qcow2",
+-            "format": "file",
+-            "actual-size": 208896,
+-            "dirty-flag": false
+-        },
+-        "iops_wr": 0,
+-        "ro": false,
+-        "node-name": "libvirt-5-storage",
+-        "backing_file_depth": 0,
+-        "drv": "file",
+-        "iops": 0,
+-        "bps_wr": 0,
+-        "write_threshold": 0,
+-        "encrypted": false,
+-        "bps": 0,
+-        "bps_rd": 0,
+-        "cache": {
+-            "no-flush": false,
+-            "direct": false,
+-            "writeback": true
+-        },
+-        "file": "/tmp/pull4.qcow2",
+-        "encryption_key_missing": false
+-    }
++    "file": "/tmp/bitmaps.qcow2",
++    "encryption_key_missing": false
++  }
+ ]
+diff --git a/tests/qemublocktestdata/bitmap/snapshots.out b/tests/qemublocktestdata/bitmap/snapshots.out
+index 5dafe946cf..24ca27e4d8 100644
+--- a/tests/qemublocktestdata/bitmap/snapshots.out
++++ b/tests/qemublocktestdata/bitmap/snapshots.out
+@@ -1,12 +1,17 @@
+ libvirt-1-format:
+-        d: 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
++        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
+   current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+ libvirt-2-format:
+-        c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++        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-3-format:
+-        a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-        b: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++        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-4-format:
+         a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-qemublocktest-Test-backing-store-strings.patch b/SOURCES/libvirt-qemublocktest-Test-backing-store-strings.patch
new file mode 100644
index 0000000..97827fd
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-Test-backing-store-strings.patch
@@ -0,0 +1,1587 @@
+From 0d41c52b4ccd749e2c2c33bfe20c2f01d319a962 Mon Sep 17 00:00:00 2001
+Message-Id: <0d41c52b4ccd749e2c2c33bfe20c2f01d319a962@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:02 +0100
+Subject: [PATCH] qemublocktest: Test backing store strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With -blockdev libvirt provides the string which is recorded  as
+'backing store' property of an image to qemu. Add testing for
+qemuBlockGetBackingStoreString which generates these strings as there's
+logic which determines which format to use.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 5f3b4a37275a4079949bb3428149ab310c6c4e2e)
+
+ Conflicts: tests/qemublocktest.c: virBufferTrim changes not backported
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <398610db4cddda5d1ec6dc3b67b2d4c68afbf32c.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  20 ++-
+ .../xml2json/block-raw-noopts-srconly.json    |  13 +-
+ .../block-raw-reservations-srconly.json       |  13 +-
+ .../xml2json/dir-fat-cache-srconly.json       |  15 +-
+ .../xml2json/dir-fat-floppy-srconly.json      |  15 +-
+ .../xml2json/dir-fat-readonly-srconly.json    |  15 +-
+ ...ile-backing_basic-aio_threads-srconly.json |  68 +++++----
+ ...acking_basic-cache-directsync-srconly.json |  68 +++++----
+ ...file-backing_basic-cache-none-srconly.json |  68 +++++----
+ ...le-backing_basic-cache-unsafe-srconly.json |  68 +++++----
+ ...backing_basic-cache-writeback-srconly.json |  68 +++++----
+ ...king_basic-cache-writethrough-srconly.json |  68 +++++----
+ .../file-backing_basic-detect-srconly.json    |  68 +++++----
+ .../file-backing_basic-noopts-srconly.json    |  52 ++++---
+ ...le-backing_basic-unmap-detect-srconly.json |  68 +++++----
+ ...le-backing_basic-unmap-ignore-srconly.json |  68 +++++----
+ .../file-backing_basic-unmap-srconly.json     |  68 +++++----
+ .../xml2json/file-bochs-noopts-srconly.json   |  13 +-
+ .../xml2json/file-cloop-noopts-srconly.json   |  13 +-
+ .../xml2json/file-dmg-noopts-srconly.json     |  13 +-
+ .../xml2json/file-ploop-noopts-srconly.json   |  13 +-
+ ...cow2-backing-chain-encryption-srconly.json |  26 ++--
+ ...le-qcow2-backing-chain-noopts-srconly.json | 130 ++++++++++++------
+ ...w2-backing-chain-unterminated-srconly.json |  26 ++--
+ .../xml2json/file-raw-aio_native-srconly.json |  13 +-
+ .../xml2json/file-raw-luks-srconly.json       |  13 +-
+ .../xml2json/file-raw-noopts-srconly.json     |  13 +-
+ .../xml2json/file-vdi-noopts-srconly.json     |  13 +-
+ .../xml2json/file-vhd-noopts-srconly.json     |  13 +-
+ .../xml2json/file-vpc-noopts-srconly.json     |  13 +-
+ .../xml2json/network-nbd-tls-srconly.json     |  19 ++-
+ ...w2-backing-chain-cache-unsafe-srconly.json |  68 ++++++---
+ ...backing-chain-encryption_auth-srconly.json |  68 ++++++---
+ .../xml2json/nvme-raw-noopts-srconly.json     |  19 ++-
+ 34 files changed, 876 insertions(+), 433 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index c009db7996..cf56c8a983 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -184,6 +184,7 @@ struct testQemuDiskXMLToJSONImageData {
+     virJSONValuePtr formatprops;
+     virJSONValuePtr storageprops;
+     virJSONValuePtr storagepropssrc;
++    char *backingstore;
+ };
+ 
+ 
+@@ -210,6 +211,7 @@ testQemuDiskXMLToPropsClear(struct testQemuDiskXMLToJSONData *data)
+         virJSONValueFree(data->images[i].formatprops);
+         virJSONValueFree(data->images[i].storageprops);
+         virJSONValueFree(data->images[i].storagepropssrc);
++        g_free(data->images[i].backingstore);
+     }
+     data->nimages = 0;
+     VIR_FREE(data->images);
+@@ -287,6 +289,7 @@ testQemuDiskXMLToProps(const void *opaque)
+     }
+ 
+     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
++        g_autofree char *backingstore = NULL;
+ 
+         if (testQemuDiskXMLToJSONFakeSecrets(n) < 0)
+             return -1;
+@@ -298,7 +301,8 @@ testQemuDiskXMLToProps(const void *opaque)
+ 
+         if (!(formatProps = qemuBlockStorageSourceGetBlockdevProps(n, n->backingStore)) ||
+             !(storageSrcOnlyProps = qemuBlockStorageSourceGetBackendProps(n, false, true, true)) ||
+-            !(storageProps = qemuBlockStorageSourceGetBackendProps(n, false, false, true))) {
++            !(storageProps = qemuBlockStorageSourceGetBackendProps(n, false, false, true)) ||
++            !(backingstore = qemuBlockGetBackingStoreString(n, true))) {
+             if (!data->fail) {
+                 VIR_TEST_VERBOSE("failed to generate qemu blockdev props");
+                 return -1;
+@@ -314,6 +318,7 @@ testQemuDiskXMLToProps(const void *opaque)
+         data->images[data->nimages].formatprops = g_steal_pointer(&formatProps);
+         data->images[data->nimages].storageprops = g_steal_pointer(&storageProps);
+         data->images[data->nimages].storagepropssrc = g_steal_pointer(&storageSrcOnlyProps);
++        data->images[data->nimages].backingstore = g_steal_pointer(&backingstore);
+ 
+         data->nimages++;
+     }
+@@ -425,10 +430,21 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque)
+     for (i = 0; i < data->nimages; i++) {
+         g_autofree char *jsonstr = NULL;
+ 
++        virBufferAddLit(&buf, "(\n");
++        virBufferAdjustIndent(&buf, 2);
++        virBufferAddLit(&buf, "source only properties:\n");
++
+         if (!(jsonstr = virJSONValueToString(data->images[i].storagepropssrc, true)))
+             return -1;
+ 
+-        virBufferAdd(&buf, jsonstr, -1);
++        virBufferAddStr(&buf, jsonstr);
++
++        virBufferAddLit(&buf, "backing store string:\n");
++        virBufferAddStr(&buf, data->images[i].backingstore);
++
++        virBufferTrim(&buf, "\n", -1);
++        virBufferAdjustIndent(&buf, -2);
++        virBufferAddLit(&buf, "\n)\n");
+     }
+ 
+     actual = virBufferContentAndReset(&buf);
+diff --git a/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json b/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json
+index 72f9067353..07f7390433 100644
+--- a/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/block-raw-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "host_device",
+-  "filename": "/dev/blah"
+-}
++(
++  source only properties:
++  {
++    "driver": "host_device",
++    "filename": "/dev/blah"
++  }
++  backing store string:
++  /dev/blah
++)
+diff --git a/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.json b/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.json
+index 72f9067353..07f7390433 100644
+--- a/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.json
++++ b/tests/qemublocktestdata/xml2json/block-raw-reservations-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "host_device",
+-  "filename": "/dev/blah"
+-}
++(
++  source only properties:
++  {
++    "driver": "host_device",
++    "filename": "/dev/blah"
++  }
++  backing store string:
++  /dev/blah
++)
+diff --git a/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json b/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json
+index 6ec4f78d7b..8bc58fa033 100644
+--- a/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json
++++ b/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json
+@@ -1,5 +1,10 @@
+-{
+-  "driver": "vvfat",
+-  "dir": "/var/somefiles",
+-  "floppy": false
+-}
++(
++  source only properties:
++  {
++    "driver": "vvfat",
++    "dir": "/var/somefiles",
++    "floppy": false
++  }
++  backing store string:
++  /var/somefiles
++)
+diff --git a/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json b/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json
+index 6b0388bc18..043b796435 100644
+--- a/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json
++++ b/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json
+@@ -1,5 +1,10 @@
+-{
+-  "driver": "vvfat",
+-  "dir": "/var/somefiles",
+-  "floppy": true
+-}
++(
++  source only properties:
++  {
++    "driver": "vvfat",
++    "dir": "/var/somefiles",
++    "floppy": true
++  }
++  backing store string:
++  /var/somefiles
++)
+diff --git a/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json b/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json
+index 6ec4f78d7b..8bc58fa033 100644
+--- a/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json
++++ b/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json
+@@ -1,5 +1,10 @@
+-{
+-  "driver": "vvfat",
+-  "dir": "/var/somefiles",
+-  "floppy": false
+-}
++(
++  source only properties:
++  {
++    "driver": "vvfat",
++    "dir": "/var/somefiles",
++    "floppy": false
++  }
++  backing store string:
++  /var/somefiles
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srconly.json
+index dbdf6e563b..35a8c3af37 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts-srconly.json
+@@ -1,16 +1,36 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/c"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/c"
++  }
++  backing store string:
++  /var/lib/libvirt/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
+index ea490b0034..65a3773b97 100644
+--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
+@@ -1,24 +1,44 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
+-{
+-  "driver": "gluster",
+-  "volume": "images",
+-  "path": "c",
+-  "server": [
+-    {
+-      "type": "inet",
+-      "host": "test.org",
+-      "port": "24007"
+-    }
+-  ]
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/d"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
++(
++  source only properties:
++  {
++    "driver": "gluster",
++    "volume": "images",
++    "path": "c",
++    "server": [
++      {
++        "type": "inet",
++        "host": "test.org",
++        "port": "24007"
++      }
++    ]
++  }
++  backing store string:
++  gluster://test.org:24007/images/c
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/d"
++  }
++  backing store string:
++  /var/lib/libvirt/images/d
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-bochs-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-cloop-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-dmg-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-ploop-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption-srconly.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption-srconly.json
+index 316dbc9df2..29644f8c0f 100644
+--- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption-srconly.json
+@@ -1,8 +1,18 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/a"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/b"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/a"
++  }
++  backing store string:
++  /var/lib/libvirt/images/a
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/b"
++  }
++  backing store string:
++  /var/lib/libvirt/images/b
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts-srconly.json
+index d998acc194..7691609577 100644
+--- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts-srconly.json
+@@ -1,40 +1,90 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1507297895"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1484071872"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483615252"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483605924"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483605920"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483546244"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483545901"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483545313"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1483536402"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.qcow2"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1507297895"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1507297895
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1484071872"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1484071872
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483615252"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483615252
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483605924"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483605924
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483605920"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483605920
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483546244"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483546244
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483545901"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483545901
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483545313"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483545313
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1483536402"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1483536402
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.qcow2"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.qcow2
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated-srconly.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated-srconly.json
+index e0bce3bcd2..f2fd81184b 100644
+--- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated-srconly.json
+@@ -1,8 +1,18 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1507297895"
+-}
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/rhel7.3.1484071872"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1507297895"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1507297895
++)
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/rhel7.3.1484071872"
++  }
++  backing store string:
++  /var/lib/libvirt/images/rhel7.3.1484071872
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json b/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-raw-aio_native-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json b/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json
+index 6d7088211f..c065e3fab0 100644
+--- a/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-raw-luks-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/luks.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/luks.img"
++  }
++  backing store string:
++  /path/luks.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json
+index bb3e8af9eb..a2b32b09e0 100644
+--- a/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-raw-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/var/lib/libvirt/images/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/var/lib/libvirt/images/i.img"
++  }
++  backing store string:
++  /var/lib/libvirt/images/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-vdi-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-vhd-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json b/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json
+index c50fa903f5..58dd7e1c34 100644
+--- a/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/file-vpc-noopts-srconly.json
+@@ -1,4 +1,9 @@
+-{
+-  "driver": "file",
+-  "filename": "/path/to/i.img"
+-}
++(
++  source only properties:
++  {
++    "driver": "file",
++    "filename": "/path/to/i.img"
++  }
++  backing store string:
++  /path/to/i.img
++)
+diff --git a/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json b/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json
+index 455f4e5140..606e68713a 100644
+--- a/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json
++++ b/tests/qemublocktestdata/xml2json/network-nbd-tls-srconly.json
+@@ -1,8 +1,13 @@
+-{
+-  "driver": "nbd",
+-  "server": {
+-    "type": "inet",
+-    "host": "host1.example.com",
+-    "port": "10809"
++(
++  source only properties:
++  {
++    "driver": "nbd",
++    "server": {
++      "type": "inet",
++      "host": "host1.example.com",
++      "port": "10809"
++    }
+   }
+-}
++  backing store string:
++  nbd://host1.example.com:10809
++)
+diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json
+index 69ca9caf88..2d7eeb3bca 100644
+--- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json
++++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe-srconly.json
+@@ -1,22 +1,46 @@
+-{
+-  "driver": "rbd",
+-  "pool": "rbdpool",
+-  "image": "rbdimg",
+-  "server": [
+-    {
+-      "host": "host1.example.com",
+-      "port": "0"
+-    },
+-    {
+-      "host": "host2.example.com",
+-      "port": "0"
+-    }
+-  ]
+-}
+-{
+-  "driver": "iscsi",
+-  "portal": "example.org:3260",
+-  "target": "iscsitarget",
+-  "lun": 1,
+-  "transport": "tcp"
+-}
++(
++  source only properties:
++  {
++    "driver": "rbd",
++    "pool": "rbdpool",
++    "image": "rbdimg",
++    "server": [
++      {
++        "host": "host1.example.com",
++        "port": "0"
++      },
++      {
++        "host": "host2.example.com",
++        "port": "0"
++      }
++    ]
++  }
++  backing store string:
++  json:{
++    "driver": "rbd",
++    "pool": "rbdpool",
++    "image": "rbdimg",
++    "server": [
++      {
++        "host": "host1.example.com",
++        "port": "0"
++      },
++      {
++        "host": "host2.example.com",
++        "port": "0"
++      }
++    ]
++  }
++)
++(
++  source only properties:
++  {
++    "driver": "iscsi",
++    "portal": "example.org:3260",
++    "target": "iscsitarget",
++    "lun": 1,
++    "transport": "tcp"
++  }
++  backing store string:
++  iscsi://example.org:3260/iscsitarget/1
++)
+diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json
+index 6298329812..5679318fbe 100644
+--- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json
++++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth-srconly.json
+@@ -1,22 +1,46 @@
+-{
+-  "driver": "rbd",
+-  "pool": "rbdpool",
+-  "image": "rbdimg",
+-  "server": [
+-    {
+-      "host": "host1.example.com",
+-      "port": "0"
+-    },
+-    {
+-      "host": "host2.example.com",
+-      "port": "0"
+-    }
+-  ]
+-}
+-{
+-  "driver": "iscsi",
+-  "portal": "example.org:3260",
+-  "target": "iqn.2016-09.com.example:iscsitarget",
+-  "lun": 1,
+-  "transport": "tcp"
+-}
++(
++  source only properties:
++  {
++    "driver": "rbd",
++    "pool": "rbdpool",
++    "image": "rbdimg",
++    "server": [
++      {
++        "host": "host1.example.com",
++        "port": "0"
++      },
++      {
++        "host": "host2.example.com",
++        "port": "0"
++      }
++    ]
++  }
++  backing store string:
++  json:{
++    "driver": "rbd",
++    "pool": "rbdpool",
++    "image": "rbdimg",
++    "server": [
++      {
++        "host": "host1.example.com",
++        "port": "0"
++      },
++      {
++        "host": "host2.example.com",
++        "port": "0"
++      }
++    ]
++  }
++)
++(
++  source only properties:
++  {
++    "driver": "iscsi",
++    "portal": "example.org:3260",
++    "target": "iqn.2016-09.com.example:iscsitarget",
++    "lun": 1,
++    "transport": "tcp"
++  }
++  backing store string:
++  iscsi://example.org:3260/iqn.2016-09.com.example%3Aiscsitarget/1
++)
+diff --git a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+index ed55c08cbf..970e1bb8af 100644
+--- a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
++++ b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+@@ -1,5 +1,14 @@
+-{
+-  "driver": "nvme",
+-  "device": "0000:01:00.0",
+-  "namespace": 1
+-}
++(
++  source only properties:
++  {
++    "driver": "nvme",
++    "device": "0000:01:00.0",
++    "namespace": 1
++  }
++  backing store string:
++  json:{
++    "driver": "nvme",
++    "device": "0000:01:00.0",
++    "namespace": 1
++  }
++)
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemublocktest-XMLjsonXML-Test-formatting-parsing-of-modern-JSON.patch b/SOURCES/libvirt-qemublocktest-XMLjsonXML-Test-formatting-parsing-of-modern-JSON.patch
new file mode 100644
index 0000000..45c09be
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-XMLjsonXML-Test-formatting-parsing-of-modern-JSON.patch
@@ -0,0 +1,103 @@
+From 6b38c75d24769798a6152ebf69ec71a24a4a2e50 Mon Sep 17 00:00:00 2001
+Message-Id: <6b38c75d24769798a6152ebf69ec71a24a4a2e50@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:11 +0100
+Subject: [PATCH] qemublocktest: XMLjsonXML: Test formatting/parsing of modern
+ JSON
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The test was invoking the JSON formatter with the 'legacy' flag thus
+formatting bunch of obsolete JSON blockdev definitions. We also should
+test the modern ones. Add a boolean and re-run all the tests in both
+cases.
+
+Additionally for any modern invocation we should also validate that the
+output conforms to the QAPI schema.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 7f8d0ca56a8335b29f3973e5490815c7cfbeac13)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <df8b109c41f11362999ffb84b9d1cf477a89c8f4.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 28 +++++++++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 94f20eeb47..d2ba85c5e5 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -41,6 +41,9 @@ VIR_LOG_INIT("tests.storagetest");
+ struct testBackingXMLjsonXMLdata {
+     int type;
+     const char *xml;
++    bool legacy;
++    virHashTablePtr schema;
++    virJSONValuePtr schemaroot;
+ };
+ 
+ static int
+@@ -57,6 +60,7 @@ testBackingXMLjsonXML(const void *args)
+     g_autofree char *actualxml = NULL;
+     g_autoptr(virStorageSource) xmlsrc = NULL;
+     g_autoptr(virStorageSource) jsonsrc = NULL;
++    g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
+ 
+     if (!(xmlsrc = virStorageSourceNew()))
+         return -1;
+@@ -71,12 +75,27 @@ testBackingXMLjsonXML(const void *args)
+         return -1;
+     }
+ 
+-    if (!(backendprops = qemuBlockStorageSourceGetBackendProps(xmlsrc, true, false,
++    if (!(backendprops = qemuBlockStorageSourceGetBackendProps(xmlsrc,
++                                                               data->legacy,
++                                                               false,
+                                                                false))) {
+         fprintf(stderr, "failed to format disk source json\n");
+         return -1;
+     }
+ 
++    if (!data->legacy) {
++        if (testQEMUSchemaValidate(backendprops, data->schemaroot,
++                                   data->schema, &debug) < 0) {
++            g_autofree char *debugmsg = virBufferContentAndReset(&debug);
++            g_autofree char *debugprops = virJSONValueToString(backendprops, true);
++
++            VIR_TEST_VERBOSE("json does not conform to QAPI schema");
++            VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
++                           debugprops, NULLSTR(debugmsg));
++            return -1;
++        }
++    }
++
+     if (virJSONValueObjectCreate(&wrapper, "a:file", &backendprops, NULL) < 0)
+         return -1;
+ 
+@@ -907,6 +926,10 @@ mymain(void)
+     do { \
+         xmljsonxmldata.type = tpe; \
+         xmljsonxmldata.xml = xmlstr; \
++        xmljsonxmldata.legacy = true; \
++        if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, \
++                       &xmljsonxmldata) < 0) \
++        xmljsonxmldata.legacy = false; \
+         if (virTestRun(virTestCounterNext(), testBackingXMLjsonXML, \
+                        &xmljsonxmldata) < 0) \
+             ret = -1; \
+@@ -915,6 +938,9 @@ mymain(void)
+ #define TEST_JSON_FORMAT_NET(xmlstr) \
+     TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NETWORK, xmlstr)
+ 
++    xmljsonxmldata.schema = qmp_schema_x86_64;
++    xmljsonxmldata.schemaroot = qmp_schemaroot_x86_64_blockdev_add;
++
+     TEST_JSON_FORMAT(VIR_STORAGE_TYPE_FILE, "<source file='/path/to/file'/>\n");
+ 
+     /* type VIR_STORAGE_TYPE_BLOCK is not tested since it parses back to 'file' */
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemublocktest-xml-json-Add-test-for-NVMe.patch b/SOURCES/libvirt-qemublocktest-xml-json-Add-test-for-NVMe.patch
new file mode 100644
index 0000000..f1f7077
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-xml-json-Add-test-for-NVMe.patch
@@ -0,0 +1,94 @@
+From 9fac737d1a60821d00d5c0352ee8c6b01f56d15c Mon Sep 17 00:00:00 2001
+Message-Id: <9fac737d1a60821d00d5c0352ee8c6b01f56d15c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:25:56 +0100
+Subject: [PATCH] qemublocktest: xml->json: Add test for NVMe
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Based on the configuration from the only qemuxml2argv test.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 2337dbfdd1271891e3aa56c3d01389030ca10741)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <3b5eb8505338de198ce8c783bffaecf2ee0127a3.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                              |  2 ++
+ .../xml2json/nvme-raw-noopts-srconly.json          |  5 +++++
+ .../xml2json/nvme-raw-noopts.json                  | 14 ++++++++++++++
+ .../qemublocktestdata/xml2json/nvme-raw-noopts.xml | 13 +++++++++++++
+ 4 files changed, 34 insertions(+)
+ create mode 100644 tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+ create mode 100644 tests/qemublocktestdata/xml2json/nvme-raw-noopts.json
+ create mode 100644 tests/qemublocktestdata/xml2json/nvme-raw-noopts.xml
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index cd7ea6bb2b..189e95f46a 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1203,6 +1203,8 @@ mymain(void)
+     TEST_DISK_TO_JSON("block-raw-noopts");
+     TEST_DISK_TO_JSON("block-raw-reservations");
+ 
++    TEST_DISK_TO_JSON("nvme-raw-noopts");
++
+ #define TEST_JSON_TO_JSON(nme) \
+     do { \
+         jsontojsondata.name = nme; \
+diff --git a/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+new file mode 100644
+index 0000000000..ed55c08cbf
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/nvme-raw-noopts-srconly.json
+@@ -0,0 +1,5 @@
++{
++  "driver": "nvme",
++  "device": "0000:01:00.0",
++  "namespace": 1
++}
+diff --git a/tests/qemublocktestdata/xml2json/nvme-raw-noopts.json b/tests/qemublocktestdata/xml2json/nvme-raw-noopts.json
+new file mode 100644
+index 0000000000..e18e96099c
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/nvme-raw-noopts.json
+@@ -0,0 +1,14 @@
++{
++  "node-name": "0123456789ABCDEF0123456789ABCDE",
++  "read-only": false,
++  "driver": "raw",
++  "file": "0123456789ABCDEF0123456789ABCDE"
++}
++{
++  "driver": "nvme",
++  "device": "0000:01:00.0",
++  "namespace": 1,
++  "node-name": "0123456789ABCDEF0123456789ABCDE",
++  "auto-read-only": true,
++  "discard": "unmap"
++}
+diff --git a/tests/qemublocktestdata/xml2json/nvme-raw-noopts.xml b/tests/qemublocktestdata/xml2json/nvme-raw-noopts.xml
+new file mode 100644
+index 0000000000..1e4dbd6e56
+--- /dev/null
++++ b/tests/qemublocktestdata/xml2json/nvme-raw-noopts.xml
+@@ -0,0 +1,13 @@
++<disk type='nvme' device='disk'>
++  <driver name='qemu' type='raw'/>
++  <source type='pci' managed='yes' namespace='1'>
++    <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
++    <privateData>
++      <nodenames>
++        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
++        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
++      </nodenames>
++    </privateData>
++  </source>
++  <target dev='vda' bus='virtio'/>
++</disk>
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemublocktest-xml-json-Refactor-cleanup-in-test-case-functions.patch b/SOURCES/libvirt-qemublocktest-xml-json-Refactor-cleanup-in-test-case-functions.patch
new file mode 100644
index 0000000..98a1655
--- /dev/null
+++ b/SOURCES/libvirt-qemublocktest-xml-json-Refactor-cleanup-in-test-case-functions.patch
@@ -0,0 +1,208 @@
+From 4adce466baf293c7b6c8751f3c295faef85b402e Mon Sep 17 00:00:00 2001
+Message-Id: <4adce466baf293c7b6c8751f3c295faef85b402e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:25:58 +0100
+Subject: [PATCH] qemublocktest: xml->json: Refactor cleanup in test case
+ functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use automatic variable clearing and remove the cleanup sections of
+testQemuDiskXMLToProps, testQemuDiskXMLToPropsValidateSchema and
+testQemuDiskXMLToPropsValidateFile.
+
+testQemuDiskXMLToPropsValidateFileSrcOnly already uses new helpers.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 4a9f355535f6af92731cd6e8afaf6cfde2751bf1)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <6f11c48265348f2fa72c51f637bb1339dd9d64ee.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 76 +++++++++++++++----------------------------
+ 1 file changed, 27 insertions(+), 49 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 189e95f46a..40aa1e2825 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -259,39 +259,38 @@ testQemuDiskXMLToProps(const void *opaque)
+     g_autoptr(virDomainDef) vmdef = NULL;
+     virDomainDiskDefPtr disk = NULL;
+     virStorageSourcePtr n;
+-    virJSONValuePtr formatProps = NULL;
+-    virJSONValuePtr storageProps = NULL;
++    g_autoptr(virJSONValue) formatProps = NULL;
++    g_autoptr(virJSONValue) storageProps = NULL;
+     g_autoptr(virJSONValue) storageSrcOnlyProps = NULL;
+-    char *xmlpath = NULL;
+-    char *xmlstr = NULL;
+-    int ret = -1;
++    g_autofree char *xmlpath = NULL;
++    g_autofree char *xmlstr = NULL;
+ 
+     xmlpath = g_strdup_printf("%s%s.xml", testQemuDiskXMLToJSONPath, data->name);
+ 
+     if (virTestLoadFile(xmlpath, &xmlstr) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     /* qemu stores node names in the status XML portion */
+     if (!(disk = virDomainDiskDefParse(xmlstr, data->driver->xmlopt,
+                                        VIR_DOMAIN_DEF_PARSE_STATUS)))
+-        goto cleanup;
++        return -1;
+ 
+     if (!(vmdef = virDomainDefNew()) ||
+         virDomainDiskInsert(vmdef, disk) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (qemuCheckDiskConfig(disk, data->qemuCaps) < 0 ||
+         qemuDomainDeviceDefValidateDisk(disk, data->qemuCaps) < 0) {
+         VIR_TEST_VERBOSE("invalid configuration for disk");
+-        goto cleanup;
++        return -1;
+     }
+ 
+     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
+         if (testQemuDiskXMLToJSONFakeSecrets(n) < 0)
+-            goto cleanup;
++            return -1;
+ 
+         if (qemuDomainValidateStorageSource(n, data->qemuCaps) < 0)
+-            goto cleanup;
++            return -1;
+ 
+         qemuDomainPrepareDiskSourceData(disk, n);
+ 
+@@ -300,27 +299,20 @@ testQemuDiskXMLToProps(const void *opaque)
+             !(storageProps = qemuBlockStorageSourceGetBackendProps(n, false, false, true))) {
+             if (!data->fail) {
+                 VIR_TEST_VERBOSE("failed to generate qemu blockdev props");
+-                goto cleanup;
++                return -1;
+             }
+         } else if (data->fail) {
+             VIR_TEST_VERBOSE("qemu blockdev props should have failed");
+-            goto cleanup;
++            return -1;
+         }
+ 
+         if (VIR_APPEND_ELEMENT(data->props, data->nprops, formatProps) < 0 ||
+             VIR_APPEND_ELEMENT(data->props, data->nprops, storageProps) < 0 ||
+             VIR_APPEND_ELEMENT(data->propssrc, data->npropssrc, storageSrcOnlyProps) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    virJSONValueFree(formatProps);
+-    virJSONValueFree(storageProps);
+-    VIR_FREE(xmlpath);
+-    VIR_FREE(xmlstr);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+@@ -328,9 +320,6 @@ static int
+ testQemuDiskXMLToPropsValidateSchema(const void *opaque)
+ {
+     struct testQemuDiskXMLToJSONData *data = (void *) opaque;
+-    virBuffer debug = VIR_BUFFER_INITIALIZER;
+-    char *propsstr = NULL;
+-    char *debugmsg = NULL;
+     int ret = 0;
+     size_t i;
+ 
+@@ -338,35 +327,31 @@ testQemuDiskXMLToPropsValidateSchema(const void *opaque)
+         return EXIT_AM_SKIP;
+ 
+     for (i = 0; i < data->nprops; i++) {
++        g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
++
+         if (testQEMUSchemaValidate(data->props[i], data->schemaroot,
+                                    data->schema, &debug) < 0) {
+-            debugmsg = virBufferContentAndReset(&debug);
+-            propsstr = virJSONValueToString(data->props[i], true);
++            g_autofree char *debugmsg = virBufferContentAndReset(&debug);
++            g_autofree char *propsstr = virJSONValueToString(data->props[i], true);
+             VIR_TEST_VERBOSE("json does not conform to QAPI schema");
+             VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
+                            propsstr, NULLSTR(debugmsg));
+-            VIR_FREE(debugmsg);
+-            VIR_FREE(propsstr);
+             ret = -1;
+         }
+-
+-        virBufferFreeAndReset(&debug);
+     }
+ 
+     for (i = 0; i < data->npropssrc; i++) {
++        g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
++
+         if (testQEMUSchemaValidate(data->propssrc[i], data->schemaroot,
+                                    data->schema, &debug) < 0) {
+-            debugmsg = virBufferContentAndReset(&debug);
+-            propsstr = virJSONValueToString(data->propssrc[i], true);
++            g_autofree char *debugmsg = virBufferContentAndReset(&debug);
++            g_autofree char *propsstr = virJSONValueToString(data->propssrc[i], true);
+             VIR_TEST_VERBOSE("json does not conform to QAPI schema");
+             VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
+                            propsstr, NULLSTR(debugmsg));
+-            VIR_FREE(debugmsg);
+-            VIR_FREE(propsstr);
+             ret = -1;
+         }
+-
+-        virBufferFreeAndReset(&debug);
+     }
+ 
+     return ret;
+@@ -378,9 +363,8 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque)
+ {
+     struct testQemuDiskXMLToJSONData *data = (void *) opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    char *jsonpath = NULL;
+-    char *actual = NULL;
+-    int ret = -1;
++    g_autofree char *jsonpath = NULL;
++    g_autofree char *actual = NULL;
+     size_t i;
+ 
+     if (data->fail)
+@@ -389,23 +373,17 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque)
+     jsonpath = g_strdup_printf("%s%s.json", testQemuDiskXMLToJSONPath, data->name);
+ 
+     for (i = 0; i < data->nprops; i++) {
+-        char *jsonstr;
++        g_autofree char *jsonstr = NULL;
+ 
+         if (!(jsonstr = virJSONValueToString(data->props[i], true)))
+-            goto cleanup;
++            return -1;
+ 
+         virBufferAdd(&buf, jsonstr, -1);
+-        VIR_FREE(jsonstr);
+     }
+ 
+     actual = virBufferContentAndReset(&buf);
+ 
+-    ret = virTestCompareToFile(actual, jsonpath);
+-
+- cleanup:
+-    VIR_FREE(jsonpath);
+-    VIR_FREE(actual);
+-    return ret;
++    return virTestCompareToFile(actual, jsonpath);
+ }
+ 
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuhotplugtest-Don-t-plug-a-SCSI-disk-at-unit-7.patch b/SOURCES/libvirt-qemuhotplugtest-Don-t-plug-a-SCSI-disk-at-unit-7.patch
deleted file mode 100644
index ec69f83..0000000
--- a/SOURCES/libvirt-qemuhotplugtest-Don-t-plug-a-SCSI-disk-at-unit-7.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 310eeaa9bedbbe58a6cdbdbc2e057fc6d6c66586 Mon Sep 17 00:00:00 2001
-Message-Id: <310eeaa9bedbbe58a6cdbdbc2e057fc6d6c66586@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 18 Apr 2019 19:36:32 +0200
-Subject: [PATCH] qemuhotplugtest: Don't plug a SCSI disk at unit 7
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1692296
-RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1692354
-
-Unit number 7 is kind of special. It's reserved for SCSI
-controller. The comment in virDomainSCSIDriveAddressIsUsed()
-summarizes that pretty nicely. Libvirt would never generate
-such address.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-(cherry picked from commit ee2c5ef39fd91345893904433c6f458685543af5)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <cd6f1b6289c9a00a4094540bb3656446b8d4cc1e.1555608962.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/qemuhotplugtest.c                                       | 2 +-
- tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml      | 2 +-
- ...uhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
-index 663e33ed00..8e0086a269 100644
---- a/tests/qemuhotplugtest.c
-+++ b/tests/qemuhotplugtest.c
-@@ -761,7 +761,7 @@ mymain(void)
-                    "device_del", QMP_OK,
-                    "human-monitor-command", HMP(""));
-     DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false,
--                   "device_del", QMP_DEVICE_DELETED("scsi3-0-5-7") QMP_OK,
-+                   "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
-                    "human-monitor-command", HMP(""));
- 
-     DO_TEST_ATTACH("base-live", "qemu-agent", false, true,
-diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
-index 3a847fbda6..876afb182f 100644
---- a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
-+++ b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
-@@ -2,7 +2,7 @@
-   <driver name='qemu' type='raw' cache='none'/>
-   <source file='/dev/null'/>
-   <target dev='sdf' bus='scsi'/>
--  <address type='drive' controller='3' bus='0' target='5' unit='7'/>
-+  <address type='drive' controller='3' bus='0' target='5' unit='6'/>
-   <readonly/>
-   <shareable/>
- </disk>
-diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
-index d35fea6f5f..72b5174825 100644
---- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
-+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
-@@ -26,8 +26,8 @@
-       <target dev='sdf' bus='scsi'/>
-       <readonly/>
-       <shareable/>
--      <alias name='scsi3-0-5-7'/>
--      <address type='drive' controller='3' bus='0' target='5' unit='7'/>
-+      <alias name='scsi3-0-5-6'/>
-+      <address type='drive' controller='3' bus='0' target='5' unit='6'/>
-     </disk>
-     <controller type='usb' index='0'>
-       <alias name='usb'/>
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-qemuhotplugtest-Test-guestfwd-attach-and-detach.patch b/SOURCES/libvirt-qemuhotplugtest-Test-guestfwd-attach-and-detach.patch
deleted file mode 100644
index 291a266..0000000
--- a/SOURCES/libvirt-qemuhotplugtest-Test-guestfwd-attach-and-detach.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 37dbf9fd0da8345ad03948543b9ae64954d219e1 Mon Sep 17 00:00:00 2001
-Message-Id: <37dbf9fd0da8345ad03948543b9ae64954d219e1@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 14:44:48 +0200
-Subject: [PATCH] qemuhotplugtest: Test guestfwd attach and detach
-
-Previous two commits demonstrate a hole in our test scenario.
-Fix that.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 17ddfd420a0dbcdd3f76fbecf7428acb301db188)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1624204
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <08fcf2bbdefa193065ecb3c28f8d5a5a61cfeb69.1561639408.git.mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/qemuhotplugtest.c                       |  6 ++
- .../qemuhotplug-guestfwd.xml                  |  4 ++
- .../qemuhotplug-base-live+guestfwd.xml        | 55 +++++++++++++++++++
- 3 files changed, 65 insertions(+)
- create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-guestfwd.xml
- create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml
-
-diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
-index 8e0086a269..aaa3492d4c 100644
---- a/tests/qemuhotplugtest.c
-+++ b/tests/qemuhotplugtest.c
-@@ -836,6 +836,12 @@ mymain(void)
-     DO_TEST_DETACH("base-live", "watchdog-user-alias-full", false, false,
-                    "device_del", QMP_OK);
- 
-+    DO_TEST_ATTACH("base-live", "guestfwd", false, true,
-+                   "chardev-add", QMP_OK,
-+                   "netdev_add", QMP_OK);
-+    DO_TEST_DETACH("base-live", "guestfwd", false, false,
-+                   "netdev_del", QMP_OK);
-+
- #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \
-     do { \
-         cpudata.test = prefix; \
-diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-guestfwd.xml b/tests/qemuhotplugtestdevices/qemuhotplug-guestfwd.xml
-new file mode 100644
-index 0000000000..c67dbdb8df
---- /dev/null
-+++ b/tests/qemuhotplugtestdevices/qemuhotplug-guestfwd.xml
-@@ -0,0 +1,4 @@
-+<channel type='unix'>
-+  <source mode='bind' path='/tmp/guestfwd'/>
-+  <target type='guestfwd' address='10.0.2.1' port='4600'/>
-+</channel>
-diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml
-new file mode 100644
-index 0000000000..8d7294123b
---- /dev/null
-+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml
-@@ -0,0 +1,55 @@
-+<domain type='kvm' id='7'>
-+  <name>hotplug</name>
-+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-+  <memory unit='KiB'>4194304</memory>
-+  <currentMemory unit='KiB'>4194304</currentMemory>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <features>
-+    <acpi/>
-+    <apic/>
-+    <pae/>
-+  </features>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>restart</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <controller type='usb' index='0'>
-+      <alias name='usb'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <controller type='ide' index='0'>
-+      <alias name='ide'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-+    <controller type='scsi' index='0' model='virtio-scsi'>
-+      <alias name='scsi0'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'>
-+      <alias name='pci'/>
-+    </controller>
-+    <controller type='virtio-serial' index='0'>
-+      <alias name='virtio-serial0'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-+    </controller>
-+    <channel type='unix'>
-+      <source mode='bind' path='/tmp/guestfwd'/>
-+      <target type='guestfwd' address='10.0.2.1' port='4600'/>
-+      <alias name='channel0'/>
-+    </channel>
-+    <input type='mouse' bus='ps2'>
-+      <alias name='input0'/>
-+    </input>
-+    <input type='keyboard' bus='ps2'>
-+      <alias name='input1'/>
-+    </input>
-+    <memballoon model='none'/>
-+  </devices>
-+  <seclabel type='none' model='none'/>
-+</domain>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemumonitorjsontest-AddNetdev-Use-real-variant.patch b/SOURCES/libvirt-qemumonitorjsontest-AddNetdev-Use-real-variant.patch
new file mode 100644
index 0000000..dc5c9dd
--- /dev/null
+++ b/SOURCES/libvirt-qemumonitorjsontest-AddNetdev-Use-real-variant.patch
@@ -0,0 +1,43 @@
+From d2d22773873d6386f30f88a2d477c23a2fd534e2 Mon Sep 17 00:00:00 2001
+Message-Id: <d2d22773873d6386f30f88a2d477c23a2fd534e2@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Sun, 26 Apr 2020 13:04:05 -0400
+Subject: [PATCH] qemumonitorjsontest: AddNetdev: Use real variant
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QEMU now formalized the arguments of netdev-add in the schema, so we
+must use a real type to pass the schema validation once the schema is
+updated.
+
+The 'user' variant doesn't have any other mandatory fields.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+
+Required on 8.2.1 branch due to adding caps_5.0.0.x86_64.replies
+Prerequisite for https://bugzilla.redhat.com/1802592
+Signed-off-by: Laine Stump <laine@redhat.com>
+Message-Id: <20200426170415.18328-3-laine@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tests/qemumonitorjsontest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
+index 2c696a2e8b..2fb72b827d 100644
+--- a/tests/qemumonitorjsontest.c
++++ b/tests/qemumonitorjsontest.c
+@@ -1308,7 +1308,7 @@ GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "elf",
+               true)
+ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
+               "localhost", 12345, 12346, "certsubjectval")
+-GEN_TEST_FUNC(qemuMonitorJSONAddNetdev, "id=net0,type=test")
++GEN_TEST_FUNC(qemuMonitorJSONAddNetdev, "id=net0,type=user")
+ GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
+ GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
+ GEN_TEST_FUNC(qemuMonitorJSONAddDevice, "some_dummy_devicestr")
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-qemuxml2-test-Add-tests-for-Icelake-Server-pconfig.patch b/SOURCES/libvirt-qemuxml2-test-Add-tests-for-Icelake-Server-pconfig.patch
deleted file mode 100644
index d8cf4ef..0000000
--- a/SOURCES/libvirt-qemuxml2-test-Add-tests-for-Icelake-Server-pconfig.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 7e23f06327869c9dad50ae98da10292356eb5f0f Mon Sep 17 00:00:00 2001
-Message-Id: <7e23f06327869c9dad50ae98da10292356eb5f0f@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Nov 2019 17:52:33 +0100
-Subject: [PATCH] qemuxml2*test: Add tests for Icelake-Server, -pconfig
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit ae793ecbcbd17b118ef3a876d247abb49574ab0e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1749672
-https://bugzilla.redhat.com/show_bug.cgi?id=1756156
-https://bugzilla.redhat.com/show_bug.cgi?id=1721608
-
-Conflicts:
-	tests/qemuxml2argvtest.c
-            - several new tests upstream
-            - test case for QEMU 3.1.0 dropped; caps data are missing
-              downstream and the case is not important here
-
-	tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
-            - test case for QEMU 3.1.0 dropped; caps data are missing
-              downstream and the case is not important here
-
-	tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-            - downstream generates slightly different command line
-
-	tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
-	tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
-	tests/qemuxml2xmltest.c
-            - missing DO_TEST_CAPS_* macros; the change to this test was
-              dropped as it is not as important as the xml2argv test
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <8cbd8a44446d77a2699ca267b696cfbd05dc8bc3.1573836581.git.jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- ...-Icelake-Server-pconfig.x86_64-latest.args | 31 +++++++++++++++++++
- .../cpu-Icelake-Server-pconfig.xml            | 22 +++++++++++++
- tests/qemuxml2argvtest.c                      |  2 ++
- 3 files changed, 55 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml
-
-diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-new file mode 100644
-index 0000000000..664db44e7b
---- /dev/null
-+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-@@ -0,0 +1,31 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-x86_64 \
-+-name guest=test,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-test/master-key.aes \
-+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-cpu Icelake-Server,pconfig=off \
-+-m 214 \
-+-realtime mlock=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,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-device 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/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml
-new file mode 100644
-index 0000000000..ec64e1ee51
---- /dev/null
-+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml
-@@ -0,0 +1,22 @@
-+<domain type='kvm'>
-+  <name>test</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='pc'>hvm</type>
-+    <boot dev='network'/>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>Icelake-Server</model>
-+    <feature name='pconfig' policy='disable'/>
-+  </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>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 03d6a60736..5aff9b6e37 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -3000,6 +3000,8 @@ mymain(void)
- 
-     DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
- 
-+    DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig");
-+
-     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
-         virFileDeleteTree(fakerootdir);
- 
--- 
-2.24.0
-
diff --git a/SOURCES/libvirt-qemuxml2argvtest-Add-test-case-for-disks-with-http-s-source.patch b/SOURCES/libvirt-qemuxml2argvtest-Add-test-case-for-disks-with-http-s-source.patch
new file mode 100644
index 0000000..55b7842
--- /dev/null
+++ b/SOURCES/libvirt-qemuxml2argvtest-Add-test-case-for-disks-with-http-s-source.patch
@@ -0,0 +1,166 @@
+From 566b77b94d498426062dfddaf5a8c77250ba0857 Mon Sep 17 00:00:00 2001
+Message-Id: <566b77b94d498426062dfddaf5a8c77250ba0857@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:00 +0100
+Subject: [PATCH] qemuxml2argvtest: Add test case for disks with http(s) source
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upcoming patches will implement the support for sslverify, cookies,
+readahead, and timeout properties. Add a test file which will collect
+the cases.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3dd7952f6f996d13a0a685e1300c178fd9be6658)
+
+ Conflicts:
+  tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args:
+  Test output differs on the '-cpu qemu64' line due to previous fixes
+  to the testsuite not being backported
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <4ff67b442d284d3e8cdc9564b9378990b57fa3c0.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ .../disk-network-http.x86_64-latest.args      | 56 +++++++++++++++++++
+ tests/qemuxml2argvdata/disk-network-http.xml  | 50 +++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  1 +
+ 3 files changed, 107 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+ create mode 100644 tests/qemuxml2argvdata/disk-network-http.xml
+
+diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+new file mode 100644
+index 0000000000..d39f357072
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+@@ -0,0 +1,56 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-x86_64 \
++-name guest=QEMUGuest1,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
++-machine pc,accel=kvm,usb=off,dump-guest-core=off \
++-m 214 \
++-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,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-boot strict=on \
++-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
++-blockdev '{"driver":"http","url":"http://example.org:80/test.img",\
++"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
++"file":"libvirt-4-storage"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
++id=virtio-disk0,bootindex=1 \
++-blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\
++"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
++"file":"libvirt-3-storage"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
++id=virtio-disk1 \
++-blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\
++"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
++"file":"libvirt-2-storage"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
++id=virtio-disk2 \
++-blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
++"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
++"file":"libvirt-1-storage"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-1-format,\
++id=virtio-disk3 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
+new file mode 100644
+index 0000000000..83a9865c83
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-network-http.xml
+@@ -0,0 +1,50 @@
++<domain type='kvm'>
++  <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>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='http' name='test.img'>
++        <host name='example.org'/>
++      </source>
++      <target dev='vda' bus='virtio'/>
++    </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='https' name='test2.img'>
++        <host name='example.org'/>
++      </source>
++      <target dev='vdb' bus='virtio'/>
++    </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='http' name='test3.img'>
++        <host name='example.org' port='1234'/>
++      </source>
++      <target dev='vdc' bus='virtio'/>
++    </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='https' name='test4.img'>
++        <host name='example.org' port='1234'/>
++      </source>
++      <target dev='vdd' bus='virtio'/>
++    </disk>
++    <controller type='usb' 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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 265ffce465..7bc01d55d5 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1089,6 +1089,7 @@ mymain(void)
+             QEMU_CAPS_OBJECT_TLS_CREDS_X509, QEMU_CAPS_NBD_TLS);
+     DO_TEST_CAPS_VER("disk-network-tlsx509", "2.12.0");
+     DO_TEST_CAPS_LATEST("disk-network-tlsx509");
++    DO_TEST_CAPS_LATEST("disk-network-http");
+     driver.config->vxhsTLS = 0;
+     VIR_FREE(driver.config->vxhsTLSx509certdir);
+     DO_TEST("disk-no-boot", NONE);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-qemuxml2argvtest-Add-test-for-CPU-features-translation.patch b/SOURCES/libvirt-qemuxml2argvtest-Add-test-for-CPU-features-translation.patch
deleted file mode 100644
index de15331..0000000
--- a/SOURCES/libvirt-qemuxml2argvtest-Add-test-for-CPU-features-translation.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 3ddc4c63f770fa6e2b2e37915c3f70598aa59d97 Mon Sep 17 00:00:00 2001
-Message-Id: <3ddc4c63f770fa6e2b2e37915c3f70598aa59d97@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:50 +0200
-Subject: [PATCH] qemuxml2argvtest: Add test for CPU features translation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This should cover all CPU features for which QEMU prefers spelling that
-differs from the one used by libvirt.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 24aa210d90770a6ea2313ebf2047c0a802932dca)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-            - old command line
-            - downstream patch to add rtm=on and hle=on for Haswell
-
-	tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
-            - dropped as there are no 4.0.0 capabilities downstream
-
-	tests/qemuxml2argvtest.c
-            - dropped cpu-translation test with QEMU 4.0.0
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <6ce0d74bdf9a66c0908fd8162902b1f75870189b.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../cpu-translation.x86_64-latest.args        | 33 ++++++++++++++++++
- tests/qemuxml2argvdata/cpu-translation.xml    | 34 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  1 +
- 3 files changed, 68 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/cpu-translation.xml
-
-diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-new file mode 100644
-index 0000000000..898b987086
---- /dev/null
-+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-@@ -0,0 +1,33 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-x86_64 \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-cpu Haswell,pclmuldq=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,rtm=on,hle=on,\
-+kvm_pv_eoi=on,kvm_pv_unhalt=on \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-fade-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-device 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/qemuxml2argvdata/cpu-translation.xml b/tests/qemuxml2argvdata/cpu-translation.xml
-new file mode 100644
-index 0000000000..4054f3d3be
---- /dev/null
-+++ b/tests/qemuxml2argvdata/cpu-translation.xml
-@@ -0,0 +1,34 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-fade-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='pc'>hvm</type>
-+    <boot dev='network'/>
-+  </os>
-+  <features>
-+    <apic eoi='on'/>
-+    <pvspinlock state='on'/>
-+  </features>
-+  <cpu mode='custom'>
-+    <model fallback='forbid'>Haswell</model>
-+    <feature name='pclmuldq' policy='require'/>
-+    <feature name='ds_cpl' policy='require'/>
-+    <feature name='tsc_adjust' policy='require'/>
-+    <feature name='fxsr_opt' policy='require'/>
-+    <feature name='lahf_lm' policy='require'/>
-+    <feature name='cmp_legacy' policy='require'/>
-+    <feature name='nodeid_msr' policy='require'/>
-+    <feature name='perfctr_core' policy='require'/>
-+    <feature name='perfctr_nb' policy='require'/>
-+  </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>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 9de0cbf7e9..03d6a60736 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1741,6 +1741,7 @@ mymain(void)
-     DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
-     DO_TEST("cpu-host-model-cmt", NONE);
-     DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
-+    DO_TEST_CAPS_LATEST("cpu-translation");
-     qemuTestSetHostCPU(driver.caps, NULL);
- 
-     DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS, QEMU_CAPS_OBJECT_SECRET);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-qemuxml2xmltest-Add-case-for-host-model-vendor_id.patch b/SOURCES/libvirt-qemuxml2xmltest-Add-case-for-host-model-vendor_id.patch
new file mode 100644
index 0000000..55abb7a
--- /dev/null
+++ b/SOURCES/libvirt-qemuxml2xmltest-Add-case-for-host-model-vendor_id.patch
@@ -0,0 +1,79 @@
+From a620d42d440828f1f978a75c01a9515d0c131721 Mon Sep 17 00:00:00 2001
+Message-Id: <a620d42d440828f1f978a75c01a9515d0c131721@dist-git>
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 20 Feb 2020 09:08:04 +0100
+Subject: [PATCH] qemuxml2xmltest: Add case for host-model vendor_id
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch shows a bug in our code: the
+
+    <model vendor_id="Libvirt QEMU"/>
+
+element present in the source XML is lost when the parsed CPU definition
+is formatted back to XML.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804549
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 1939fbef989e6990cb5dd2d2d7ff8ea002c517c2)
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <cef7f3e28619a9fc306f17eddaa6d81df5ce21c2.1582186015.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ .../cpu-host-model-vendor.xml                 | 28 +++++++++++++++++++
+ tests/qemuxml2xmltest.c                       |  1 +
+ 2 files changed, 29 insertions(+)
+ create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+
+diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+new file mode 100644
+index 0000000000..d2447ccd10
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+@@ -0,0 +1,28 @@
++<domain type='qemu'>
++  <name>QEMUGuest1</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory unit='KiB'>219100</memory>
++  <currentMemory unit='KiB'>219100</currentMemory>
++  <vcpu placement='static'>6</vcpu>
++  <os>
++    <type arch='x86_64' machine='pc'>hvm</type>
++    <boot dev='network'/>
++  </os>
++  <cpu mode='host-model' check='partial'/>
++  <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'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
++    </controller>
++    <controller type='pci' index='0' model='pci-root'/>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='virtio'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </memballoon>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index a3c7f8fd47..7c105e5207 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -266,6 +266,7 @@ mymain(void)
+     DO_TEST("cpu-host-kvmclock", NONE);
+     DO_TEST("cpu-host-passthrough-features", NONE);
+     DO_TEST("cpu-host-model-features", NONE);
++    DO_TEST("cpu-host-model-vendor", NONE);
+     DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
+     DO_TEST("kvmclock", NONE);
+     DO_TEST("clock-timer-hyperv-rtc", NONE);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-qemuxml2xmltest-Wire-up-disk-network-http-case.patch b/SOURCES/libvirt-qemuxml2xmltest-Wire-up-disk-network-http-case.patch
new file mode 100644
index 0000000..38d79bc
--- /dev/null
+++ b/SOURCES/libvirt-qemuxml2xmltest-Wire-up-disk-network-http-case.patch
@@ -0,0 +1,115 @@
+From eae7db4b5daa44a6bf83e2d57601d108d3b93beb Mon Sep 17 00:00:00 2001
+Message-Id: <eae7db4b5daa44a6bf83e2d57601d108d3b93beb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:39 +0200
+Subject: [PATCH] qemuxml2xmltest: Wire up 'disk-network-http' case
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c34ec56abad4b2286ef82a0a3ab9deb4d807a9bf)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+
+Conflicts: The XML output file differs in the <cpu> element as changes
+           in default cpu handling were not backported.
+Message-Id: <dd5d567d2c6f0a0e50f9184360265fc0aff78296.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ .../disk-network-http.x86_64-latest.xml       | 68 +++++++++++++++++++
+ tests/qemuxml2xmltest.c                       |  2 +
+ 2 files changed, 70 insertions(+)
+ create mode 100644 tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+
+diff --git a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+new file mode 100644
+index 0000000000..238a5fef58
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+@@ -0,0 +1,68 @@
++<domain type='kvm'>
++  <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='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='http' name='test.img'>
++        <host name='example.org' port='80'/>
++        <timeout seconds='1234'/>
++      </source>
++      <target dev='vda' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
++    </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='https' name='test2.img'>
++        <host name='example.org' port='443'/>
++        <readahead size='1024'/>
++      </source>
++      <target dev='vdb' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='http' name='test3.img'>
++        <host name='example.org' port='1234'/>
++        <cookies>
++          <cookie name='test'>testcookievalue</cookie>
++          <cookie name='test2'>blurb</cookie>
++        </cookies>
++      </source>
++      <target dev='vdc' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
++    </disk>
++    <disk type='network' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source protocol='https' name='test4.img'>
++        <host name='example.org' port='1234'/>
++        <ssl verify='no'/>
++        <cookies>
++          <cookie name='test'>testcookievalue</cookie>
++          <cookie name='test2'>blurb</cookie>
++        </cookies>
++      </source>
++      <target dev='vdd' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
++    </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'/>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index f77f59fa3c..15110dd104 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -1089,6 +1089,8 @@ mymain(void)
+     DO_TEST("disk-backing-chains-index", NONE);
+     DO_TEST("disk-backing-chains-noindex", NONE);
+ 
++    DO_TEST_CAPS_LATEST("disk-network-http");
++
+     DO_TEST("chardev-label",
+             QEMU_CAPS_DEVICE_VIRTIO_RNG);
+ 
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-qemuxml2xmltest-set-driver-as-privileged.patch b/SOURCES/libvirt-qemuxml2xmltest-set-driver-as-privileged.patch
new file mode 100644
index 0000000..51a7908
--- /dev/null
+++ b/SOURCES/libvirt-qemuxml2xmltest-set-driver-as-privileged.patch
@@ -0,0 +1,38 @@
+From dc5c05491ab6e66cb2ce411530cb24a2cd76763b Mon Sep 17 00:00:00 2001
+Message-Id: <dc5c05491ab6e66cb2ce411530cb24a2cd76763b@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:38 +0100
+Subject: [PATCH] qemuxml2xmltest: set driver as privileged
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some validation check might reject unprivileged drivers in the future.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 99dc98db3d3e2381f322120bf00c25ba0501b092)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <e97eb61c987fdb72ced457131c6c86260dd449a0.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tests/qemuxml2xmltest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index 7c105e5207..d58259587b 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -162,6 +162,7 @@ mymain(void)
+         return EXIT_FAILURE;
+ 
+     cfg = virQEMUDriverGetConfig(&driver);
++    driver.privileged = true;
+ 
+ # define DO_TEST_INTERNAL(_name, suffix, when, ...) \
+     do { \
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-rhel-Enable-usage-of-x-blockdev-reopen.patch b/SOURCES/libvirt-rhel-Enable-usage-of-x-blockdev-reopen.patch
new file mode 100644
index 0000000..94c53cd
--- /dev/null
+++ b/SOURCES/libvirt-rhel-Enable-usage-of-x-blockdev-reopen.patch
@@ -0,0 +1,186 @@
+From 0ca4a633af46f2e06d3ef831919ca75387f42103 Mon Sep 17 00:00:00 2001
+Message-Id: <0ca4a633af46f2e06d3ef831919ca75387f42103@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:34 +0100
+Subject: [PATCH] rhel: Enable usage of x-blockdev-reopen
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RHEL-only
+
+Introduce a new capability QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API
+based on the presence of '__com.redhat_rhel-av-8_2_0-api' feature for
+'x-blockdev-reopen' which states that reopen works for what libvirt
+is going to use it and wire up code to call the x- prefixed command.
+
+This implementation will become dormant once qemu starts supporting
+upstream-stable blockdev-reopen.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1799013
+Message-Id: <098dc0e73e1b561af991f2a9ecf13436dde3b33d.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c        |  3 ++-
+ src/qemu/qemu_capabilities.c | 13 +++++++++++++
+ src/qemu/qemu_capabilities.h |  3 +++
+ src/qemu/qemu_monitor.c      |  5 +++--
+ src/qemu/qemu_monitor.h      |  3 ++-
+ src/qemu/qemu_monitor_json.c | 12 +++++++++---
+ src/qemu/qemu_monitor_json.h |  3 ++-
+ 7 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 21c1ad9618..099ceeb802 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -3225,6 +3225,7 @@ qemuBlockReopenFormat(virDomainObjPtr vm,
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     virQEMUDriverPtr driver = priv->driver;
+     g_autoptr(virJSONValue) reopenprops = NULL;
++    bool downstream = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API);
+     int rc;
+ 
+     /* If we are lacking the object here, qemu might have opened an image with
+@@ -3241,7 +3242,7 @@ qemuBlockReopenFormat(virDomainObjPtr vm,
+     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
+         return -1;
+ 
+-    rc = qemuMonitorBlockdevReopen(priv->mon, &reopenprops);
++    rc = qemuMonitorBlockdevReopen(priv->mon, &reopenprops, downstream);
+ 
+     if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
+         return -1;
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index a4046b09d6..0b4ed4253c 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -561,6 +561,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               "vhost-user-fs",
+               "blockdev-snapshot.allow-write-only-overlay",
+               "blockdev-reopen",
++
++              /* 355 */
++              "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api"
+     );
+ 
+ 
+@@ -1419,6 +1422,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsNVDIMM[] = {
+ 
+ /* see documentation for virQEMUQAPISchemaPathGet for the query format */
+ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
++    { "x-blockdev-reopen/$__com.redhat_rhel-av-8_2_0-api", QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API },
+     { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
+     { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
+     { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
+@@ -4861,6 +4865,15 @@ virQEMUCapsInitProcessCaps(virQEMUCapsPtr qemuCaps)
+         virQEMUCapsGet(qemuCaps, QEMU_CAPS_SAVEVM_MONITOR_NODES))
+         virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV);
+ 
++    /* RHEL-only:
++     * - if upstream blockdev-reopen is enabled, clear the downstream flag
++     * - if the downstream flag is present but not the upstream, assert the upstream flag too
++     */
++    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN))
++        virQEMUCapsClear(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API);
++    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API))
++        virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN);
++
+     virQEMUCapsInitProcessCapsInterlock(qemuCaps);
+ }
+ 
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 8fdbe05638..0f7c586703 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -543,6 +543,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
+     QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
+ 
++    /* 355 */
++    QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
++
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+ 
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index c4202d59af..5915035589 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -4409,14 +4409,15 @@ qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
+ 
+ int
+ qemuMonitorBlockdevReopen(qemuMonitorPtr mon,
+-                          virJSONValuePtr *props)
++                          virJSONValuePtr *props,
++                          bool downstream)
+ {
+     VIR_DEBUG("props=%p (node-name=%s)", *props,
+               NULLSTR(virJSONValueObjectGetString(*props, "node-name")));
+ 
+     QEMU_CHECK_MONITOR(mon);
+ 
+-    return qemuMonitorJSONBlockdevReopen(mon, props);
++    return qemuMonitorJSONBlockdevReopen(mon, props, downstream);
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index 481fc8e12e..ca975d084c 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -1326,7 +1326,8 @@ int qemuMonitorBlockdevAdd(qemuMonitorPtr mon,
+                            virJSONValuePtr *props);
+ 
+ int qemuMonitorBlockdevReopen(qemuMonitorPtr mon,
+-                              virJSONValuePtr *props);
++                              virJSONValuePtr *props,
++                              bool downstream);
+ 
+ int qemuMonitorBlockdevDel(qemuMonitorPtr mon,
+                            const char *nodename);
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 0122b77259..92d7317a82 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -8832,14 +8832,20 @@ qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+ 
+ int
+ qemuMonitorJSONBlockdevReopen(qemuMonitorPtr mon,
+-                              virJSONValuePtr *props)
++                              virJSONValuePtr *props,
++                              bool downstream)
+ {
+     g_autoptr(virJSONValue) cmd = NULL;
+     g_autoptr(virJSONValue) reply = NULL;
+     virJSONValuePtr pr = g_steal_pointer(props);
+ 
+-    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", pr)))
+-        return -1;
++    if (downstream) {
++        if (!(cmd = qemuMonitorJSONMakeCommandInternal("x-blockdev-reopen", pr)))
++            return -1;
++    } else {
++        if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", pr)))
++            return -1;
++    }
+ 
+     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+         return -1;
+diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
+index 801babef97..38c61a5661 100644
+--- a/src/qemu/qemu_monitor_json.h
++++ b/src/qemu/qemu_monitor_json.h
+@@ -601,7 +601,8 @@ int qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+ 
+ int qemuMonitorJSONBlockdevReopen(qemuMonitorPtr mon,
+-                                  virJSONValuePtr *props)
++                                  virJSONValuePtr *props,
++                                  bool downstream)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+ 
+ int qemuMonitorJSONBlockdevDel(qemuMonitorPtr mon,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-rpc-virnetlibsshsession-update-deprecated-functions.patch b/SOURCES/libvirt-rpc-virnetlibsshsession-update-deprecated-functions.patch
deleted file mode 100644
index a846323..0000000
--- a/SOURCES/libvirt-rpc-virnetlibsshsession-update-deprecated-functions.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From aa46a438d03839963badb7bdd2904a71f0662942 Mon Sep 17 00:00:00 2001
-Message-Id: <aa46a438d03839963badb7bdd2904a71f0662942@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Fri, 21 Jun 2019 09:30:36 +0200
-Subject: [PATCH] rpc: virnetlibsshsession: update deprecated functions
-
-In libssh 0.9.0 functions ssh_is_server_known and ssh_write_knownhost
-are marked as deprecated.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1722735
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e6b648f51b2d3a2714d7e28249dd390f707994b1.1561102197.git.phrdina@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- m4/virt-libssh.m4             | 8 ++++++++
- src/rpc/virnetlibsshsession.c | 4 ++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4
-index 01c3b75c72..132447da16 100644
---- a/m4/virt-libssh.m4
-+++ b/m4/virt-libssh.m4
-@@ -33,6 +33,14 @@ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
-       [],
-       [AC_DEFINE_UNQUOTED([ssh_get_server_publickey], [ssh_get_publickey],
-             [ssh_get_publickey is deprecated and replaced by ssh_get_server_publickey.])])
-+    AC_CHECK_FUNC([ssh_session_is_known_server],
-+      [],
-+      [AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_known],
-+            [ssh_is_server_known is deprecated and replaced by ssh_session_is_known_server.])])
-+    AC_CHECK_FUNC([ssh_session_update_known_hosts],
-+      [],
-+      [AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_knownhost],
-+            [ssh_write_knownhost is deprecated and replaced by ssh_session_update_known_hosts.])])
-     CFLAGS="$old_CFLAGS"
-     LIBS="$old_LIBS"
-   fi
-diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
-index df819f6169..7bc2bd33ee 100644
---- a/src/rpc/virnetlibsshsession.c
-+++ b/src/rpc/virnetlibsshsession.c
-@@ -287,7 +287,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess)
-     if (sess->hostKeyVerify == VIR_NET_LIBSSH_HOSTKEY_VERIFY_IGNORE)
-         return 0;
- 
--    state = ssh_is_server_known(sess->session);
-+    state = ssh_session_is_known_server(sess->session);
- 
-     switch (state) {
-     case SSH_SERVER_KNOWN_OK:
-@@ -381,7 +381,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess)
- 
-         /* write the host key file, if specified */
-         if (sess->knownHostsFile) {
--            if (ssh_write_knownhost(sess->session) < 0) {
-+            if (ssh_session_update_known_hosts(sess->session) < 0) {
-                 errmsg = ssh_get_error(sess->session);
-                 virReportError(VIR_ERR_LIBSSH,
-                                _("failed to write known_host file '%s': %s"),
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-schema-wrap-fsDriver-in-a-choice-group.patch b/SOURCES/libvirt-schema-wrap-fsDriver-in-a-choice-group.patch
new file mode 100644
index 0000000..d8bfa52
--- /dev/null
+++ b/SOURCES/libvirt-schema-wrap-fsDriver-in-a-choice-group.patch
@@ -0,0 +1,89 @@
+From f37eb0d50ba30f036e08e8144bd52b3ebc1751e1 Mon Sep 17 00:00:00 2001
+Message-Id: <f37eb0d50ba30f036e08e8144bd52b3ebc1751e1@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:35 +0100
+Subject: [PATCH] schema: wrap fsDriver in a choice group
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow adding new groups without changing indentation.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Tested-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 3913abd476cfe663db978d9110daa8bdc6d4e5b6)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <a802f84a40623bf55d9c1b1307a117b6e133daad.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ docs/schemas/domaincommon.rng | 50 +++++++++++++++++++----------------
+ 1 file changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 38aef19e89..bfd8786ea8 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -2620,29 +2620,33 @@
+            for this kind of info, and 'type' for the
+            storage format. We need the latter too, so
+            had to invent a new attribute name -->
+-      <optional>
+-        <attribute name="type">
+-          <choice>
+-            <value>path</value>
+-            <value>handle</value>
+-            <value>loop</value>
+-            <value>nbd</value>
+-            <value>ploop</value>
+-          </choice>
+-        </attribute>
+-      </optional>
+-      <optional>
+-        <attribute name="format">
+-          <ref name="storageFormat"/>
+-        </attribute>
+-      </optional>
+-      <optional>
+-        <attribute name="wrpolicy">
+-          <value>immediate</value>
+-        </attribute>
+-      </optional>
+-      <ref name='virtioOptions'/>
+-      <empty/>
++      <choice>
++        <group>
++          <optional>
++            <attribute name="type">
++              <choice>
++                <value>path</value>
++                <value>handle</value>
++                <value>loop</value>
++                <value>nbd</value>
++                <value>ploop</value>
++              </choice>
++            </attribute>
++          </optional>
++          <optional>
++            <attribute name="format">
++              <ref name="storageFormat"/>
++            </attribute>
++          </optional>
++          <optional>
++            <attribute name="wrpolicy">
++              <value>immediate</value>
++            </attribute>
++          </optional>
++          <ref name='virtioOptions'/>
++        </group>
++        <empty/>
++      </choice>
+     </element>
+   </define>
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-schemas-rng-Use-interleave-in-the-disk-source-element.patch b/SOURCES/libvirt-schemas-rng-Use-interleave-in-the-disk-source-element.patch
new file mode 100644
index 0000000..ba85b9f
--- /dev/null
+++ b/SOURCES/libvirt-schemas-rng-Use-interleave-in-the-disk-source-element.patch
@@ -0,0 +1,497 @@
+From d7aeea8dfb78168ae305252bf581d46766496e24 Mon Sep 17 00:00:00 2001
+Message-Id: <d7aeea8dfb78168ae305252bf581d46766496e24@dist-git>
+From: Han Han <hhan@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:44 +0200
+Subject: [PATCH] schemas: rng: Use interleave in the disk source element
+
+Signed-off-by: Han Han <hhan@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 8b41b21aee4fb3b0f5fed1ecc73c5a7fd6879a93)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <79373ae94fb73576d1433b22545327a4afca2d99.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/schemas/domaincommon.rng | 398 ++++++++++++++++++----------------
+ 1 file changed, 211 insertions(+), 187 deletions(-)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index ac6f180382..e17f7ff8c0 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1642,21 +1642,23 @@
+     </optional>
+     <optional>
+       <element name="source">
+-        <optional>
+-          <attribute name="file">
+-            <ref name="absFilePath"/>
+-          </attribute>
+-        </optional>
+-        <ref name="diskSourceCommon"/>
+-        <optional>
+-          <ref name="storageStartupPolicy"/>
+-        </optional>
+-        <optional>
+-          <ref name="encryption"/>
+-        </optional>
+-        <zeroOrMore>
+-          <ref name='devSeclabel'/>
+-        </zeroOrMore>
++        <interleave>
++          <optional>
++            <attribute name="file">
++              <ref name="absFilePath"/>
++            </attribute>
++          </optional>
++          <ref name="diskSourceCommon"/>
++          <optional>
++            <ref name="storageStartupPolicy"/>
++          </optional>
++          <optional>
++            <ref name="encryption"/>
++          </optional>
++          <zeroOrMore>
++            <ref name='devSeclabel'/>
++          </zeroOrMore>
++        </interleave>
+       </element>
+     </optional>
+   </define>
+@@ -1667,24 +1669,26 @@
+     </attribute>
+     <optional>
+       <element name="source">
+-        <optional>
+-          <attribute name="dev">
+-            <ref name="absFilePath"/>
+-          </attribute>
+-        </optional>
+-        <ref name="diskSourceCommon"/>
+-        <optional>
+-          <ref name="storageStartupPolicy"/>
+-        </optional>
+-        <optional>
+-          <ref name="encryption"/>
+-        </optional>
+-        <optional>
+-          <ref name="reservations"/>
+-        </optional>
+-        <zeroOrMore>
+-          <ref name='devSeclabel'/>
+-        </zeroOrMore>
++        <interleave>
++          <optional>
++            <attribute name="dev">
++              <ref name="absFilePath"/>
++            </attribute>
++          </optional>
++          <ref name="diskSourceCommon"/>
++          <optional>
++            <ref name="storageStartupPolicy"/>
++          </optional>
++          <optional>
++            <ref name="encryption"/>
++          </optional>
++          <optional>
++            <ref name="reservations"/>
++          </optional>
++          <zeroOrMore>
++            <ref name='devSeclabel'/>
++          </zeroOrMore>
++        </interleave>
+       </element>
+     </optional>
+   </define>
+@@ -1695,17 +1699,19 @@
+     </attribute>
+     <optional>
+       <element name="source">
+-        <attribute name="dir">
+-          <ref name="absFilePath"/>
+-        </attribute>
+-        <ref name="diskSourceCommon"/>
+-        <optional>
+-          <ref name="storageStartupPolicy"/>
+-        </optional>
+-        <optional>
+-          <ref name="encryption"/>
+-        </optional>
+-        <empty/>
++        <interleave>
++          <attribute name="dir">
++            <ref name="absFilePath"/>
++          </attribute>
++          <ref name="diskSourceCommon"/>
++          <optional>
++            <ref name="storageStartupPolicy"/>
++          </optional>
++          <optional>
++            <ref name="encryption"/>
++          </optional>
++          <empty/>
++        </interleave>
+       </element>
+     </optional>
+   </define>
+@@ -1856,138 +1862,152 @@
+ 
+   <define name="diskSourceNetworkProtocolHTTPS">
+     <element name="source">
+-      <attribute name="protocol">
+-        <choice>
+-          <value>https</value>
+-        </choice>
+-      </attribute>
+-      <attribute name="name"/>
+-      <ref name="diskSourceCommon"/>
+-      <ref name="diskSourceNetworkHost"/>
+-      <optional>
+-        <ref name="encryption"/>
+-      </optional>
+-      <optional>
+-        <ref name="diskSourceNetworkProtocolSSLVerify"/>
+-      </optional>
+-      <optional>
+-        <ref name="diskSourceNetworkProtocolHTTPCookies"/>
+-      </optional>
+-      <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      <interleave>
++        <attribute name="protocol">
++          <choice>
++            <value>https</value>
++          </choice>
++        </attribute>
++        <attribute name="name"/>
++        <ref name="diskSourceCommon"/>
++        <ref name="diskSourceNetworkHost"/>
++        <optional>
++          <ref name="encryption"/>
++        </optional>
++        <optional>
++          <ref name="diskSourceNetworkProtocolSSLVerify"/>
++        </optional>
++        <optional>
++          <ref name="diskSourceNetworkProtocolHTTPCookies"/>
++        </optional>
++        <ref name="diskSourceNetworkProtocolPropsCommon"/>
++        </interleave>
+     </element>
+   </define>
+ 
+   <define name="diskSourceNetworkProtocolHTTP">
+     <element name="source">
+-      <attribute name="protocol">
+-        <choice>
+-          <value>http</value>
+-        </choice>
+-      </attribute>
+-      <attribute name="name"/>
+-      <ref name="diskSourceCommon"/>
+-      <ref name="diskSourceNetworkHost"/>
+-      <optional>
+-        <ref name="encryption"/>
+-      </optional>
+-      <optional>
+-        <ref name="diskSourceNetworkProtocolHTTPCookies"/>
+-      </optional>
+-      <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      <interleave>
++        <attribute name="protocol">
++          <choice>
++            <value>http</value>
++          </choice>
++        </attribute>
++        <attribute name="name"/>
++        <ref name="diskSourceCommon"/>
++        <ref name="diskSourceNetworkHost"/>
++        <optional>
++          <ref name="encryption"/>
++        </optional>
++        <optional>
++          <ref name="diskSourceNetworkProtocolHTTPCookies"/>
++        </optional>
++        <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      </interleave>
+     </element>
+   </define>
+ 
+   <define name="diskSourceNetworkProtocolFTPS">
+     <element name="source">
+-      <attribute name="protocol">
+-        <choice>
+-          <value>ftps</value>
+-        </choice>
+-      </attribute>
+-      <attribute name="name"/>
+-      <ref name="diskSourceCommon"/>
+-      <ref name="diskSourceNetworkHost"/>
+-      <optional>
+-        <ref name="encryption"/>
+-      </optional>
+-      <optional>
+-        <ref name="diskSourceNetworkProtocolSSLVerify"/>
+-      </optional>
+-      <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      <interleave>
++        <attribute name="protocol">
++          <choice>
++            <value>ftps</value>
++          </choice>
++        </attribute>
++        <attribute name="name"/>
++        <ref name="diskSourceCommon"/>
++        <ref name="diskSourceNetworkHost"/>
++        <optional>
++          <ref name="encryption"/>
++        </optional>
++        <optional>
++          <ref name="diskSourceNetworkProtocolSSLVerify"/>
++        </optional>
++        <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      </interleave>
+     </element>
+   </define>
+ 
+   <define name="diskSourceNetworkProtocolSimple">
+     <element name="source">
+-      <attribute name="protocol">
+-        <choice>
+-          <value>sheepdog</value>
+-          <value>ftp</value>
+-          <value>tftp</value>
+-        </choice>
+-      </attribute>
+-      <attribute name="name"/>
+-      <ref name="diskSourceCommon"/>
+-      <ref name="diskSourceNetworkHost"/>
+-      <optional>
+-        <ref name="encryption"/>
+-      </optional>
+-      <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      <interleave>
++        <attribute name="protocol">
++          <choice>
++            <value>sheepdog</value>
++            <value>ftp</value>
++            <value>tftp</value>
++          </choice>
++        </attribute>
++        <attribute name="name"/>
++        <ref name="diskSourceCommon"/>
++        <ref name="diskSourceNetworkHost"/>
++        <optional>
++          <ref name="encryption"/>
++        </optional>
++        <ref name="diskSourceNetworkProtocolPropsCommon"/>
++      </interleave>
+     </element>
+   </define>
+ 
+   <define name="diskSourceNetworkProtocolNBD">
+     <element name="source">
+-      <attribute name="protocol">
+-        <value>nbd</value>
+-      </attribute>
+-      <optional>
+-        <attribute name="name"/>
+-      </optional>
+-      <optional>
+-        <attribute name="tls">
+-          <ref name="virYesNo"/>
++      <interleave>
++        <attribute name="protocol">
++          <value>nbd</value>
+         </attribute>
+-      </optional>
+-      <ref name="diskSourceCommon"/>
+-      <ref name="diskSourceNetworkHost"/>
+-      <optional>
+-        <ref name="encryption"/>
+-      </optional>
++        <optional>
++          <attribute name="name"/>
++        </optional>
++        <optional>
++          <attribute name="tls">
++            <ref name="virYesNo"/>
++          </attribute>
++        </optional>
++        <ref name="diskSourceCommon"/>
++        <ref name="diskSourceNetworkHost"/>
++        <optional>
++          <ref name="encryption"/>
++        </optional>
++      </interleave>
+     </element>
+   </define>
+ 
+   <define name="diskSourceNetworkProtocolGluster">
+     <element name="source">
+-      <attribute name="protocol">
+-        <value>gluster</value>
+-      </attribute>
+-      <attribute name="name"/>
+-      <ref name="diskSourceCommon"/>
+-      <oneOrMore>
+-        <ref name="diskSourceNetworkHost"/>
+-      </oneOrMore>
+-      <optional>
+-        <ref name="encryption"/>
+-      </optional>
++      <interleave>
++        <attribute name="protocol">
++          <value>gluster</value>
++        </attribute>
++        <attribute name="name"/>
++        <ref name="diskSourceCommon"/>
++        <oneOrMore>
++          <ref name="diskSourceNetworkHost"/>
++        </oneOrMore>
++        <optional>
++          <ref name="encryption"/>
++        </optional>
++      </interleave>
+     </element>
+   </define>
+ 
+   <define name="diskSourceNetworkProtocolVxHS">
+     <element name="source">
+-      <attribute name="protocol">
+-        <choice>
+-          <value>vxhs</value>
+-        </choice>
+-      </attribute>
+-      <attribute name="name"/>
+-      <ref name="diskSourceCommon"/>
+-      <optional>
+-        <attribute name="tls">
+-          <ref name="virYesNo"/>
++      <interleave>
++        <attribute name="protocol">
++          <choice>
++            <value>vxhs</value>
++          </choice>
+         </attribute>
+-      </optional>
+-      <ref name="diskSourceNetworkHost"/>
++        <attribute name="name"/>
++        <ref name="diskSourceCommon"/>
++        <optional>
++          <attribute name="tls">
++            <ref name="virYesNo"/>
++          </attribute>
++        </optional>
++        <ref name="diskSourceNetworkHost"/>
++      </interleave>
+     </element>
+   </define>
+ 
+@@ -2014,30 +2034,32 @@
+     </attribute>
+     <optional>
+       <element name="source">
+-        <attribute name="pool">
+-          <ref name="poolName"/>
+-        </attribute>
+-        <attribute name="volume">
+-          <ref name="volName"/>
+-        </attribute>
+-        <optional>
+-          <attribute name="mode">
+-            <choice>
+-              <value>host</value>
+-              <value>direct</value>
+-            </choice>
++        <interleave>
++          <attribute name="pool">
++            <ref name="poolName"/>
+           </attribute>
+-        </optional>
+-        <ref name="diskSourceCommon"/>
+-        <optional>
+-          <ref name="storageStartupPolicy"/>
+-        </optional>
+-        <optional>
+-          <ref name="encryption"/>
+-        </optional>
+-        <zeroOrMore>
+-          <ref name='devSeclabel'/>
+-        </zeroOrMore>
++          <attribute name="volume">
++            <ref name="volName"/>
++          </attribute>
++          <optional>
++            <attribute name="mode">
++              <choice>
++                <value>host</value>
++                <value>direct</value>
++              </choice>
++            </attribute>
++          </optional>
++          <ref name="diskSourceCommon"/>
++          <optional>
++            <ref name="storageStartupPolicy"/>
++          </optional>
++          <optional>
++            <ref name="encryption"/>
++          </optional>
++          <zeroOrMore>
++            <ref name='devSeclabel'/>
++          </zeroOrMore>
++        </interleave>
+       </element>
+     </optional>
+   </define>
+@@ -2048,27 +2070,29 @@
+     </attribute>
+     <optional>
+       <element name="source">
+-        <attribute name="type">
+-          <value>pci</value>
+-        </attribute>
+-        <attribute name="namespace">
+-          <ref name="uint32"/>
+-        </attribute>
+-        <optional>
+-          <attribute name="managed">
+-            <ref name="virYesNo"/>
++        <interleave>
++          <attribute name="type">
++            <value>pci</value>
+           </attribute>
+-        </optional>
+-        <element name="address">
+-          <ref name="pciaddress"/>
+-        </element>
+-        <ref name="diskSourceCommon"/>
+-        <optional>
+-          <ref name="storageStartupPolicy"/>
+-        </optional>
+-        <optional>
+-          <ref name="encryption"/>
+-        </optional>
++          <attribute name="namespace">
++            <ref name="uint32"/>
++          </attribute>
++          <optional>
++            <attribute name="managed">
++              <ref name="virYesNo"/>
++            </attribute>
++          </optional>
++          <element name="address">
++            <ref name="pciaddress"/>
++          </element>
++          <ref name="diskSourceCommon"/>
++          <optional>
++            <ref name="storageStartupPolicy"/>
++          </optional>
++          <optional>
++            <ref name="encryption"/>
++          </optional>
++        </interleave>
+       </element>
+     </optional>
+   </define>
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-secret-Add-check-validation-for-correct-usage-when-LookupByUUID.patch b/SOURCES/libvirt-secret-Add-check-validation-for-correct-usage-when-LookupByUUID.patch
deleted file mode 100644
index 9707f9d..0000000
--- a/SOURCES/libvirt-secret-Add-check-validation-for-correct-usage-when-LookupByUUID.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 44b8a63a2e0bcd5740db4c9f49d635ab1d5b9b25 Mon Sep 17 00:00:00 2001
-Message-Id: <44b8a63a2e0bcd5740db4c9f49d635ab1d5b9b25@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Thu, 13 Dec 2018 10:26:46 -0500
-Subject: [PATCH] secret: Add check/validation for correct usage when
- LookupByUUID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1656255
-
-If virSecretGetSecretString is using by secretLookupByUUID,
-then it's possible the found sec->usageType doesn't match the
-desired @secretUsageType. If this occurs for the encrypted
-volume creation processing and a subsequent pool refresh is
-executed, then the secret used to create the volume will not
-be found by the storageBackendLoadDefaultSecrets which expects
-to find secrets by VIR_SECRET_USAGE_TYPE_VOLUME.
-
-Add a check to virSecretGetSecretString to avoid the possibility
-along with an error indicating the incorrect matched types.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit e0eb8a8a696ee334fa33281b880e480e76348052)
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/secret/secret_util.c | 17 +++++++++++++++++
- tests/qemuxml2argvtest.c |  4 +++-
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/secret/secret_util.c b/src/secret/secret_util.c
-index 16e43ab2cc..27e164a425 100644
---- a/src/secret/secret_util.c
-+++ b/src/secret/secret_util.c
-@@ -71,6 +71,23 @@ virSecretGetSecretString(virConnectPtr conn,
-     if (!sec)
-         goto cleanup;
- 
-+    /* NB: NONE is a byproduct of the qemuxml2argvtest test mocking
-+     * for UUID lookups. Normal secret XML processing would fail if
-+     * the usage type was NONE and since we have no way to set the
-+     * expected usage in that environment, let's just accept NONE */
-+    if (sec->usageType != VIR_SECRET_USAGE_TYPE_NONE &&
-+        sec->usageType != secretUsageType) {
-+        char uuidstr[VIR_UUID_STRING_BUFLEN];
-+
-+        virUUIDFormat(seclookupdef->u.uuid, uuidstr);
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("secret with uuid %s is of type '%s' not "
-+                         "expected '%s' type"),
-+                       uuidstr, virSecretUsageTypeToString(sec->usageType),
-+                       virSecretUsageTypeToString(secretUsageType));
-+        goto cleanup;
-+    }
-+
-     *secret = conn->secretDriver->secretGetValue(sec, secret_size, 0,
-                                                  VIR_SECRET_GET_VALUE_INTERNAL_CALL);
- 
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 0908bc5d08..bd4aa1266d 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -80,7 +80,9 @@ static virSecretPtr
- fakeSecretLookupByUUID(virConnectPtr conn,
-                        const unsigned char *uuid)
- {
--    return virGetSecret(conn, uuid, 0, "");
-+    /* NB: This mocked value could be "tls" or "volume" depending on
-+     * which test is being run, we'll leave at NONE (or 0) */
-+    return virGetSecret(conn, uuid, VIR_SECRET_USAGE_TYPE_NONE, "");
- }
- 
- static virSecretDriver fakeSecretDriver = {
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-security-Don-t-fail-if-locking-a-file-on-NFS-mount-fails.patch b/SOURCES/libvirt-security-Don-t-fail-if-locking-a-file-on-NFS-mount-fails.patch
new file mode 100644
index 0000000..0c4c782
--- /dev/null
+++ b/SOURCES/libvirt-security-Don-t-fail-if-locking-a-file-on-NFS-mount-fails.patch
@@ -0,0 +1,45 @@
+From 4f9e2b4b36fda208d25acf4126abbf4fee37f0b5 Mon Sep 17 00:00:00 2001
+Message-Id: <4f9e2b4b36fda208d25acf4126abbf4fee37f0b5@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Feb 2020 11:24:52 +0100
+Subject: [PATCH] security: Don't fail if locking a file on NFS mount fails
+
+The way that our file locking works is that we open() the file we
+want to lock and then use fcntl(fd, F_SETLKW, ...) to lock it.
+The problem is, we are doing all of these as root which doesn't
+work if the file lives on root squashed NFS, because if it does
+then the open() fails. The way to resolve this is to make this a
+non fatal error and leave callers deal with this (i.e. disable
+remembering) - implemented in the previous commit.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804672
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit f16663d58f7aab6bf800fcffd34f83f522927897)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <d3cb3d3214cf3e67bd357fa9781ce55f8dc8c751.1582626185.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/security/security_manager.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/security/security_manager.c b/src/security/security_manager.c
+index 9d06316a99..23ed6a127c 100644
+--- a/src/security/security_manager.c
++++ b/src/security/security_manager.c
+@@ -1343,6 +1343,11 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
+                 continue;
+             }
+ 
++            if (virFileIsSharedFS(p)) {
++                /* Probably a root squashed NFS. */
++                continue;
++            }
++
+             virReportSystemError(errno,
+                                  _("unable to open %s"),
+                                  p);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-security-Don-t-remember-seclabel-for-paths-we-haven-t-locked-successfully.patch b/SOURCES/libvirt-security-Don-t-remember-seclabel-for-paths-we-haven-t-locked-successfully.patch
new file mode 100644
index 0000000..69cd76d
--- /dev/null
+++ b/SOURCES/libvirt-security-Don-t-remember-seclabel-for-paths-we-haven-t-locked-successfully.patch
@@ -0,0 +1,117 @@
+From f08dc7e622b398b00d6916ead44a8c9058b5a17e Mon Sep 17 00:00:00 2001
+Message-Id: <f08dc7e622b398b00d6916ead44a8c9058b5a17e@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Feb 2020 11:24:51 +0100
+Subject: [PATCH] security: Don't remember seclabel for paths we haven't locked
+ successfully
+
+There are some cases where we want to remember the original owner
+of a file but we fail to lock it for XATTR change (e.g. root
+squashed NFS). If that is the case we error out and refuse to
+start a domain. Well, we can do better if we disable remembering
+for paths we haven't locked successfully.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 5fddf61351f44e4186c0313d81907024c574201b)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1804672
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <4c2586a6da3b01adce09573a6123a15b3aea5ae6.1582626185.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/security/security_dac.c     | 14 ++++++++++++++
+ src/security/security_manager.c |  7 -------
+ src/security/security_manager.h |  6 ++++++
+ src/security/security_selinux.c | 14 ++++++++++++++
+ 4 files changed, 34 insertions(+), 7 deletions(-)
+
+diff --git a/src/security/security_dac.c b/src/security/security_dac.c
+index 2561ee440e..0cfe3626d4 100644
+--- a/src/security/security_dac.c
++++ b/src/security/security_dac.c
+@@ -240,6 +240,20 @@ virSecurityDACTransactionRun(pid_t pid G_GNUC_UNUSED,
+ 
+         if (!(state = virSecurityManagerMetadataLock(list->manager, paths, npaths)))
+             goto cleanup;
++
++        for (i = 0; i < list->nItems; i++) {
++            virSecurityDACChownItemPtr item = list->items[i];
++            size_t j;
++
++            for (j = 0; j < state->nfds; j++) {
++                if (STREQ_NULLABLE(item->path, state->paths[j]))
++                    break;
++            }
++
++            /* If path wasn't locked, don't try to remember its label. */
++            if (j == state->nfds)
++                item->remember = false;
++        }
+     }
+ 
+     for (i = 0; i < list->nItems; i++) {
+diff --git a/src/security/security_manager.c b/src/security/security_manager.c
+index 05d20e36af..9d06316a99 100644
+--- a/src/security/security_manager.c
++++ b/src/security/security_manager.c
+@@ -1245,13 +1245,6 @@ virSecurityManagerRestoreTPMLabels(virSecurityManagerPtr mgr,
+ }
+ 
+ 
+-struct _virSecurityManagerMetadataLockState {
+-    size_t nfds; /* Captures size of both @fds and @paths */
+-    int *fds;
+-    const char **paths;
+-};
+-
+-
+ static int
+ cmpstringp(const void *p1, const void *p2)
+ {
+diff --git a/src/security/security_manager.h b/src/security/security_manager.h
+index f835356b7e..b92ea5dc87 100644
+--- a/src/security/security_manager.h
++++ b/src/security/security_manager.h
+@@ -203,6 +203,12 @@ int virSecurityManagerRestoreTPMLabels(virSecurityManagerPtr mgr,
+ 
+ typedef struct _virSecurityManagerMetadataLockState virSecurityManagerMetadataLockState;
+ typedef virSecurityManagerMetadataLockState *virSecurityManagerMetadataLockStatePtr;
++struct _virSecurityManagerMetadataLockState {
++    size_t nfds; /* Captures size of both @fds and @paths */
++    int *fds;
++    const char **paths;
++};
++
+ 
+ virSecurityManagerMetadataLockStatePtr
+ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr,
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index 21279e7622..d7362327e6 100644
+--- a/src/security/security_selinux.c
++++ b/src/security/security_selinux.c
+@@ -271,6 +271,20 @@ virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSED,
+ 
+         if (!(state = virSecurityManagerMetadataLock(list->manager, paths, npaths)))
+             goto cleanup;
++
++        for (i = 0; i < list->nItems; i++) {
++            virSecuritySELinuxContextItemPtr item = list->items[i];
++            size_t j;
++
++            for (j = 0; j < state->nfds; j++) {
++                if (STREQ_NULLABLE(item->path, state->paths[j]))
++                    break;
++            }
++
++            /* If path wasn't locked, don't try to remember its label. */
++            if (j == state->nfds)
++                item->remember = false;
++        }
+     }
+ 
+     rv = 0;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-security-Introduce-VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP-flag.patch b/SOURCES/libvirt-security-Introduce-VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP-flag.patch
new file mode 100644
index 0000000..0aad95b
--- /dev/null
+++ b/SOURCES/libvirt-security-Introduce-VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP-flag.patch
@@ -0,0 +1,182 @@
+From 04b7241a14015f67b68d9779be71f9e8f91791c3 Mon Sep 17 00:00:00 2001
+Message-Id: <04b7241a14015f67b68d9779be71f9e8f91791c3@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 9 Mar 2020 14:58:56 +0100
+Subject: [PATCH] security: Introduce
+ VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP flag
+
+Our decision whether to remember seclabel for a disk image
+depends on a few factors. If the image is readonly or shared or
+not the chain top the remembering is suppressed for the image.
+However, the virSecurityManagerSetImageLabel() is too low level
+to determine whether passed @src is chain top or not. Even though
+the function has the @parent argument it does not necessarily
+reflect the chain top - it only points to the top level image in
+the chain we want to relabel and not to the topmost image of the
+whole chain. And this can't be derived from the passed domain
+definition reliably neither - in some cases (like snapshots or
+block copy) the @src is added to the definition only after the
+operation succeeded. Therefore, introduce a flag which callers
+can use to help us with the decision.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 62f3d8adbc0381223499ff2bef45b23e7dca401d)
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803551
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <bd4b1cca6feabd0c6d421603abe38397090c5394.1583760062.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/security/security_dac.c     | 15 ++++++++++-----
+ src/security/security_manager.h |  4 ++++
+ src/security/security_selinux.c | 17 +++++++++++------
+ 3 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/src/security/security_dac.c b/src/security/security_dac.c
+index 0cfe3626d4..66906245eb 100644
+--- a/src/security/security_dac.c
++++ b/src/security/security_dac.c
+@@ -885,14 +885,14 @@ static int
+ virSecurityDACSetImageLabelInternal(virSecurityManagerPtr mgr,
+                                     virDomainDefPtr def,
+                                     virStorageSourcePtr src,
+-                                    virStorageSourcePtr parent)
++                                    virStorageSourcePtr parent,
++                                    bool isChainTop)
+ {
+     virSecurityLabelDefPtr secdef;
+     virSecurityDeviceLabelDefPtr disk_seclabel;
+     virSecurityDeviceLabelDefPtr parent_seclabel = NULL;
+     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
+     bool remember;
+-    bool is_toplevel = parent == src || parent->externalDataStore == src;
+     uid_t user;
+     gid_t group;
+ 
+@@ -950,7 +950,7 @@ virSecurityDACSetImageLabelInternal(virSecurityManagerPtr mgr,
+      * but the top layer, or read only image, or disk explicitly
+      * marked as shared.
+      */
+-    remember = is_toplevel && !src->readonly && !src->shared;
++    remember = isChainTop && !src->readonly && !src->shared;
+ 
+     return virSecurityDACSetOwnership(mgr, src, NULL, user, group, remember);
+ }
+@@ -966,7 +966,9 @@ virSecurityDACSetImageLabelRelative(virSecurityManagerPtr mgr,
+     virStorageSourcePtr n;
+ 
+     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
+-        if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent) < 0)
++        const bool isChainTop = flags & VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP;
++
++        if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
+             return -1;
+ 
+         if (n->externalDataStore &&
+@@ -979,6 +981,8 @@ virSecurityDACSetImageLabelRelative(virSecurityManagerPtr mgr,
+ 
+         if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
+             break;
++
++        flags &= ~VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP;
+     }
+ 
+     return 0;
+@@ -2106,7 +2110,8 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
+         if (virDomainDiskGetType(def->disks[i]) == VIR_STORAGE_TYPE_DIR)
+             continue;
+         if (virSecurityDACSetImageLabel(mgr, def, def->disks[i]->src,
+-                                        VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN) < 0)
++                                        VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN |
++                                        VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP) < 0)
+             return -1;
+     }
+ 
+diff --git a/src/security/security_manager.h b/src/security/security_manager.h
+index b92ea5dc87..7699bcbc6f 100644
+--- a/src/security/security_manager.h
++++ b/src/security/security_manager.h
+@@ -151,6 +151,10 @@ virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr);
+ 
+ typedef enum {
+     VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN = 1 << 0,
++    /* The VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP should be set if the
++     * image passed to virSecurityManagerSetImageLabel() is the top parent of
++     * the whole backing chain. */
++    VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP = 1 << 1,
+ } virSecurityDomainImageLabelFlags;
+ 
+ int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr,
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index d7362327e6..985c7eda1a 100644
+--- a/src/security/security_selinux.c
++++ b/src/security/security_selinux.c
+@@ -1824,7 +1824,8 @@ static int
+ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
+                                         virDomainDefPtr def,
+                                         virStorageSourcePtr src,
+-                                        virStorageSourcePtr parent)
++                                        virStorageSourcePtr parent,
++                                        bool isChainTop)
+ {
+     virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
+     virSecurityLabelDefPtr secdef;
+@@ -1832,7 +1833,6 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
+     virSecurityDeviceLabelDefPtr parent_seclabel = NULL;
+     char *use_label = NULL;
+     bool remember;
+-    bool is_toplevel = parent == src || parent->externalDataStore == src;
+     g_autofree char *vfioGroupDev = NULL;
+     const char *path = src->path;
+     int ret;
+@@ -1856,7 +1856,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
+      * but the top layer, or read only image, or disk explicitly
+      * marked as shared.
+      */
+-    remember = is_toplevel && !src->readonly && !src->shared;
++    remember = isChainTop && !src->readonly && !src->shared;
+ 
+     disk_seclabel = virStorageSourceGetSecurityLabelDef(src,
+                                                         SECURITY_SELINUX_NAME);
+@@ -1873,7 +1873,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr,
+             return 0;
+ 
+         use_label = parent_seclabel->label;
+-    } else if (is_toplevel) {
++    } else if (parent == src || parent->externalDataStore == src) {
+         if (src->shared) {
+             use_label = data->file_context;
+         } else if (src->readonly) {
+@@ -1930,7 +1930,9 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityManagerPtr mgr,
+     virStorageSourcePtr n;
+ 
+     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
+-        if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent) < 0)
++        const bool isChainTop = flags & VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP;
++
++        if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent, isChainTop) < 0)
+             return -1;
+ 
+         if (n->externalDataStore &&
+@@ -1943,6 +1945,8 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityManagerPtr mgr,
+ 
+         if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN))
+             break;
++
++        flags &= ~VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP;
+     }
+ 
+     return 0;
+@@ -3142,7 +3146,8 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr mgr,
+             continue;
+         }
+         if (virSecuritySELinuxSetImageLabel(mgr, def, def->disks[i]->src,
+-                                            VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN) < 0)
++                                            VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN |
++                                            VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP) < 0)
+             return -1;
+     }
+     /* XXX fixme process  def->fss if relabel == true */
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-security-dac-Relabel-dev-sev-in-the-namespace.patch b/SOURCES/libvirt-security-dac-Relabel-dev-sev-in-the-namespace.patch
deleted file mode 100644
index 455b247..0000000
--- a/SOURCES/libvirt-security-dac-Relabel-dev-sev-in-the-namespace.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From a95511a2d1f6be0e63af0dc001a92bcb7869d3f8 Mon Sep 17 00:00:00 2001
-Message-Id: <a95511a2d1f6be0e63af0dc001a92bcb7869d3f8@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 1 Feb 2019 17:21:57 +0100
-Subject: [PATCH] security: dac: Relabel /dev/sev in the namespace
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The default permissions (0600 root:root) are of no use to the qemu
-process so we need to change the owner to qemu iff running with
-namespaces.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 17f6a257f1ea484489277f4da38be914b246a30b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1665400
-
- Conflicts:
-        - virSecurityDACSetOwnership's signature had to be adjusted to
-          match the signature of its counterpart in libvirt 4.5.0.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/security/security_dac.c | 51 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
-
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 74c70dd092..cc86060e3f 100644
---- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -47,6 +47,7 @@
- VIR_LOG_INIT("security.security_dac");
- 
- #define SECURITY_DAC_NAME "dac"
-+#define DEV_SEV "/dev/sev"
- 
- typedef struct _virSecurityDACData virSecurityDACData;
- typedef virSecurityDACData *virSecurityDACDataPtr;
-@@ -1545,6 +1546,16 @@ virSecurityDACRestoreMemoryLabel(virSecurityManagerPtr mgr,
- }
- 
- 
-+static int
-+virSecurityDACRestoreSEVLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
-+                              virDomainDefPtr def ATTRIBUTE_UNUSED)
-+{
-+    /* we only label /dev/sev when running with namespaces, so we don't need to
-+     * restore anything */
-+    return 0;
-+}
-+
-+
- static int
- virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
-                               virDomainDefPtr def,
-@@ -1615,6 +1626,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
-             rc = -1;
-     }
- 
-+    if (def->sev) {
-+        if (virSecurityDACRestoreSEVLabel(mgr, def) < 0)
-+            rc = -1;
-+    }
-+
-     if (def->os.loader && def->os.loader->nvram &&
-         virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0)
-         rc = -1;
-@@ -1670,6 +1686,36 @@ virSecurityDACSetMemoryLabel(virSecurityManagerPtr mgr,
- }
- 
- 
-+static int
-+virSecurityDACSetSEVLabel(virSecurityManagerPtr mgr,
-+                          virDomainDefPtr def)
-+{
-+    virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-+    virSecurityLabelDefPtr seclabel;
-+    uid_t user;
-+    gid_t group;
-+
-+    /* Skip chowning /dev/sev if namespaces are disabled as we'd significantly
-+     * increase the chance of a DOS attack on SEV
-+     */
-+    if (!priv->mountNamespace)
-+        return 0;
-+
-+    seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
-+    if (seclabel && !seclabel->relabel)
-+        return 0;
-+
-+    if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0)
-+        return -1;
-+
-+    if (virSecurityDACSetOwnership(priv, NULL, DEV_SEV,
-+                                   user, group) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- static int
- virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
-                           virDomainDefPtr def,
-@@ -1740,6 +1786,11 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
-             return -1;
-     }
- 
-+    if (def->sev) {
-+        if (virSecurityDACSetSEVLabel(mgr, def) < 0)
-+            return -1;
-+    }
-+
-     if (virSecurityDACGetImageIds(secdef, priv, &user, &group))
-         return -1;
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-security-dac-also-label-listen-UNIX-sockets.patch b/SOURCES/libvirt-security-dac-also-label-listen-UNIX-sockets.patch
deleted file mode 100644
index ba1e312..0000000
--- a/SOURCES/libvirt-security-dac-also-label-listen-UNIX-sockets.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d81bacdc16215d7cf0d175187f1d342e1081cf33 Mon Sep 17 00:00:00 2001
-Message-Id: <d81bacdc16215d7cf0d175187f1d342e1081cf33@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 2 Oct 2018 14:00:41 +0200
-Subject: [PATCH] security: dac: also label listen UNIX sockets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We switched to opening mode='bind' sockets ourselves:
-commit 30fb2276d88b275dc2aad6ddd28c100d944b59a5
-    qemu: support passing pre-opened UNIX socket listen FD
-in v4.5.0-rc1~251
-
-Then fixed qemuBuildChrChardevStr to change libvirtd's label
-while creating the socket:
-commit b0c6300fc42bbc3e5eb0b236392f7344581c5810
-    qemu: ensure FDs passed to QEMU for chardevs have correct SELinux labels
-v4.5.0-rc1~52
-
-Also add labeling of these sockets to the DAC driver.
-Instead of duplicating the logic which decides whether libvirt should
-pre-create the socket, assume an existing path meaning that it was created
-by libvirt.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1633389
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d6b8838dd83697f721fe0706068df765148154de)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-RHEL 8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634775
-
-Conflicts: src/security/security_dac.c
-    commit 3ac7793ad1ae0f4dc7b7ddbcfd182d5ff0b45538
-      security_dac: Pass virSecurityManagerPtr to virSecurityDACSetOwnership
-    is not backported
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/security/security_dac.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 4b623dcf39..74c70dd092 100644
---- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -1248,7 +1248,12 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr,
-         break;
- 
-     case VIR_DOMAIN_CHR_TYPE_UNIX:
--        if (!dev_source->data.nix.listen) {
-+        if (!dev_source->data.nix.listen ||
-+            (dev_source->data.nix.path &&
-+             virFileExists(dev_source->data.nix.path))) {
-+            /* Also label mode='bind' sockets if they exist,
-+             * e.g. because they were created by libvirt
-+             * and passed via FD */
-             if (virSecurityDACSetOwnership(priv, NULL,
-                                            dev_source->data.nix.path,
-                                            user, group) < 0)
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-selinux-Do-not-report-an-error-when-not-returning-1.patch b/SOURCES/libvirt-selinux-Do-not-report-an-error-when-not-returning-1.patch
deleted file mode 100644
index daaa0db..0000000
--- a/SOURCES/libvirt-selinux-Do-not-report-an-error-when-not-returning-1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 36d6dd80a2b3840e471add391e8b71556904fa60 Mon Sep 17 00:00:00 2001
-Message-Id: <36d6dd80a2b3840e471add391e8b71556904fa60@dist-git>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Mon, 20 Jan 2020 12:55:56 +0100
-Subject: [PATCH] selinux: Do not report an error when not returning -1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I guess the reason for that was the automatic interpretation/stringification of
-setfilecon_errno, but the code was not nice to read and it was a bit confusing.
-Also, the logs and error states get cleaner this way.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 86289374ef85f673677881ef863ae6b6ce7e88a2)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1788096
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Message-Id: <20200120115556.138061-2-fidencio@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/security/security_selinux.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 96944d0202..0238f31e84 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -1177,14 +1177,18 @@ virSecuritySELinuxSetFileconHelper(const char *path, const char *tcon,
-         if (setfilecon_errno != EOPNOTSUPP && setfilecon_errno != ENOTSUP &&
-             setfilecon_errno != EROFS) {
-         VIR_WARNINGS_RESET
--            virReportSystemError(setfilecon_errno,
--                                 _("unable to set security context '%s' on '%s'"),
--                                 tcon, path);
-             /* However, don't claim error if SELinux is in Enforcing mode and
-              * we are running as unprivileged user and we really did see EPERM.
-              * Otherwise we want to return error if SELinux is Enforcing. */
--            if (security_getenforce() == 1 && (setfilecon_errno != EPERM || privileged))
-+            if (security_getenforce() == 1 &&
-+                (setfilecon_errno != EPERM || privileged)) {
-+                virReportSystemError(setfilecon_errno,
-+                                     _("unable to set security context '%s' on '%s'"),
-+                                     tcon, path);
-                 return -1;
-+            }
-+            VIR_WARN("unable to set security context '%s' on '%s' (errno %d)",
-+                     tcon, path, setfilecon_errno);
-         } else {
-             const char *msg;
-             if (virFileIsSharedFSType(path, VIR_FILE_SHFS_NFS) == 1 &&
--- 
-2.25.0
-
diff --git a/SOURCES/libvirt-src-Fix-memory-leak-in-virNWFilterBindingDispose.patch b/SOURCES/libvirt-src-Fix-memory-leak-in-virNWFilterBindingDispose.patch
deleted file mode 100644
index 8c4740c..0000000
--- a/SOURCES/libvirt-src-Fix-memory-leak-in-virNWFilterBindingDispose.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a9c5b686c6eeb63ad98603dc99ee95bb0dafda62 Mon Sep 17 00:00:00 2001
-Message-Id: <a9c5b686c6eeb63ad98603dc99ee95bb0dafda62@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Sat, 21 Jul 2018 09:34:12 -0400
-Subject: [PATCH] src: Fix memory leak in virNWFilterBindingDispose
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1603025
-
-Commit b57a9aec neglected to VIR_FREE(binding->filtername) as seen
-in the following valgrind report
-
-==6423== 17,328 bytes in 1,083 blocks are definitely lost in loss record 2,275 of 2,297
-==6423==    at 0x4C29BC3: malloc (vg_replace_malloc.c:299)
-==6423==    by 0x83B20C9: strdup (in /usr/lib64/libc-2.17.so)
-==6423==    by 0x533C144: virStrdup (virstring.c:977)
-==6423==    by 0x54BDD53: virGetNWFilterBinding (datatypes.c:865)
-==6423==    by 0x318D633C: nwfilterBindingCreateXML (nwfilter_driver.c:767)
-==6423==    by 0x54F3FC5: virNWFilterBindingCreateXML (libvirt-nwfilter.c:701)
-==6423==    by 0x539CE29: virDomainConfNWFilterInstantiate (domain_nwfilter.c:116)
-==6423==    by 0x31E516C2: qemuInterfaceBridgeConnect (qemu_interface.c:589)
-==6423==    by 0x31D98B56: qemuBuildInterfaceCommandLine (qemu_command.c:8418)
-==6423==    by 0x31D9F783: qemuBuildNetCommandLine (qemu_command.c:8673)
-==6423==    by 0x31D9F783: qemuBuildCommandLine (qemu_command.c:10354)
-==6423==    by 0x31DE355F: qemuProcessLaunch (qemu_process.c:6292)
-==6423==    by 0x31DE7881: qemuProcessStart (qemu_process.c:6686)
-
-and
-
-==6423== 17,328 bytes in 1,083 blocks are definitely lost in loss record 2,276 of 2,297
-==6423==    at 0x4C29BC3: malloc (vg_replace_malloc.c:299)
-==6423==    by 0x83B20C9: strdup (in /usr/lib64/libc-2.17.so)
-==6423==    by 0x533C144: virStrdup (virstring.c:977)
-==6423==    by 0x54BDD53: virGetNWFilterBinding (datatypes.c:865)
-==6423==    by 0x318D641F: nwfilterBindingLookupByPortDev (nwfilter_driver.c:678)
-==6423==    by 0x54F3B63: virNWFilterBindingLookupByPortDev (libvirt-nwfilter.c:593)
-==6423==    by 0x539CBC5: virDomainConfNWFilterTeardownImpl.isra.0 (domain_nwfilter.c:136)
-==6423==    by 0x539CFA5: virDomainConfVMNWFilterTeardown (domain_nwfilter.c:170)
-==6423==    by 0x31DE5651: qemuProcessStop (qemu_process.c:6912)
-==6423==    by 0x31E37974: qemuDomainDestroyFlags (qemu_driver.c:2229)
-==6423==    by 0x54C24BB: virDomainDestroy (libvirt-domain.c:475)
-==6423==    by 0x1589A2: remoteDispatchDomainDestroy (remote_daemon_dispatch_stubs.h:4827)
-==6423==    by 0x1589A2: remoteDispatchDomainDestroyHelper (remote_daemon_dispatch_stubs.h:4803)
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 329f2347d2215edb3925ec21c73bb52b7b5aa310)
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/datatypes.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/datatypes.c b/src/datatypes.c
-index 878a1c5b5f..caf035f178 100644
---- a/src/datatypes.c
-+++ b/src/datatypes.c
-@@ -893,6 +893,7 @@ virNWFilterBindingDispose(void *obj)
-     VIR_DEBUG("release binding %p %s", binding, binding->portdev);
- 
-     VIR_FREE(binding->portdev);
-+    VIR_FREE(binding->filtername);
-     virObjectUnref(binding->conn);
- }
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-src-Mention-DEVICE_REMOVAL_FAILED-event-in-virDomainDetachDeviceAlias-docs.patch b/SOURCES/libvirt-src-Mention-DEVICE_REMOVAL_FAILED-event-in-virDomainDetachDeviceAlias-docs.patch
deleted file mode 100644
index 5fd3c45..0000000
--- a/SOURCES/libvirt-src-Mention-DEVICE_REMOVAL_FAILED-event-in-virDomainDetachDeviceAlias-docs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3b6518493a141a524853595e8400087069f4600e Mon Sep 17 00:00:00 2001
-Message-Id: <3b6518493a141a524853595e8400087069f4600e@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 4 Jul 2018 14:51:18 +0200
-Subject: [PATCH] src: Mention DEVICE_REMOVAL_FAILED event in
- virDomainDetachDeviceAlias docs
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598087
-
-We are mentioning the positive outcome of the function and not
-the case when live detaching a device is denied and event is
-issued.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 7152b12c45f69861f41f87916e4b950d2c1ff9fd)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/libvirt-domain.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index c71f2e6877..ab7266dc19 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -8365,7 +8365,9 @@ virDomainUpdateDeviceFlags(virDomainPtr domain,
-  * asynchronous - it returns immediately after sending the detach
-  * request to the hypervisor. It's caller's responsibility to
-  * wait for VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED event to signal
-- * actual device removal.
-+ * actual device removal or for
-+ * VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED to signal rejected
-+ * device removal.
-  *
-  * Returns 0 in case of success, -1 in case of failure.
-  */
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-src-assume-sys-sysmacros.h-always-exists-on-Linux.patch b/SOURCES/libvirt-src-assume-sys-sysmacros.h-always-exists-on-Linux.patch
new file mode 100644
index 0000000..dc51d5e
--- /dev/null
+++ b/SOURCES/libvirt-src-assume-sys-sysmacros.h-always-exists-on-Linux.patch
@@ -0,0 +1,168 @@
+From 06e0a9d40c52736919f32578f926bf4d829e77ec Mon Sep 17 00:00:00 2001
+Message-Id: <06e0a9d40c52736919f32578f926bf4d829e77ec@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 27 Jul 2020 12:36:49 +0200
+Subject: [PATCH] src: assume sys/sysmacros.h always exists on Linux
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+All our supported Linux distros now have this header.
+It has never existed on FreeBSD / macOS / Mingw.
+
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 03c532cf9711dd6ad35380455a77141ef7d492ab)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Conflicts:
+- src/util/virutil.c - context, because
+  db72866310d1e520efa8ed2d4589bdb5e76a1c95 (util: add API for
+  reading password from the console) isn't backported.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <ec98419d1aaa478bd3ac7a41aa9cb8b316695ef9.1595846084.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/conf/domain_audit.c  | 4 +---
+ src/lxc/lxc_controller.c | 4 +---
+ src/lxc/lxc_driver.c     | 4 +---
+ src/qemu/qemu_domain.c   | 4 +---
+ src/util/vircgroup.c     | 8 +-------
+ src/util/virdevmapper.c  | 4 +---
+ src/util/virutil.c       | 4 +---
+ tests/vircgroupmock.c    | 8 +-------
+ 8 files changed, 8 insertions(+), 32 deletions(-)
+
+diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
+index fdccc585fb..6d3579e0f6 100644
+--- a/src/conf/domain_audit.c
++++ b/src/conf/domain_audit.c
+@@ -23,9 +23,7 @@
+ 
+ #include <sys/stat.h>
+ 
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#elif MAJOR_IN_SYSMACROS
++#ifdef __linux__
+ # include <sys/sysmacros.h>
+ #endif
+ 
+diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
+index 42c631ed0b..0da89dba89 100644
+--- a/src/lxc/lxc_controller.c
++++ b/src/lxc/lxc_controller.c
+@@ -25,9 +25,7 @@
+ #include <sys/wait.h>
+ #include <sys/socket.h>
+ 
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#elif MAJOR_IN_SYSMACROS
++#ifdef __linux__
+ # include <sys/sysmacros.h>
+ #endif
+ 
+diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
+index 780c6ed4a2..a8c93dd228 100644
+--- a/src/lxc/lxc_driver.c
++++ b/src/lxc/lxc_driver.c
+@@ -25,9 +25,7 @@
+ #include <sched.h>
+ #include <sys/utsname.h>
+ 
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#elif MAJOR_IN_SYSMACROS
++#ifdef __linux__
+ # include <sys/sysmacros.h>
+ #endif
+ 
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 1e968368ae..ffe88ff027 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -64,9 +64,7 @@
+ #include "backup_conf.h"
+ #include "virdevmapper.h"
+ 
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#elif MAJOR_IN_SYSMACROS
++#ifdef __linux__
+ # include <sys/sysmacros.h>
+ #endif
+ #include <sys/time.h>
+diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
+index dff2f6fd3a..a45c2e7f2f 100644
+--- a/src/util/vircgroup.c
++++ b/src/util/vircgroup.c
+@@ -25,13 +25,7 @@
+ # include <sys/mount.h>
+ # include <fcntl.h>
+ # include <sys/stat.h>
+-
+-# ifdef MAJOR_IN_MKDEV
+-#  include <sys/mkdev.h>
+-# elif MAJOR_IN_SYSMACROS
+-#  include <sys/sysmacros.h>
+-# endif
+-
++# include <sys/sysmacros.h>
+ # include <sys/types.h>
+ # include <signal.h>
+ # include <dirent.h>
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index c346432d86..40a82285f9 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -20,9 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#elif MAJOR_IN_SYSMACROS
++#ifdef __linux__
+ # include <sys/sysmacros.h>
+ #endif
+ 
+diff --git a/src/util/virutil.c b/src/util/virutil.c
+index 17fd06dbb2..5e6bbb37c0 100644
+--- a/src/util/virutil.c
++++ b/src/util/virutil.c
+@@ -28,9 +28,7 @@
+ #include <poll.h>
+ #include <sys/stat.h>
+ 
+-#ifdef MAJOR_IN_MKDEV
+-# include <sys/mkdev.h>
+-#elif MAJOR_IN_SYSMACROS
++#ifdef __linux__
+ # include <sys/sysmacros.h>
+ #endif
+ 
+diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
+index 9ec3b576d2..66b8c01852 100644
+--- a/tests/vircgroupmock.c
++++ b/tests/vircgroupmock.c
+@@ -23,13 +23,7 @@
+ # include <unistd.h>
+ # include <fcntl.h>
+ # include <sys/stat.h>
+-
+-# ifdef MAJOR_IN_MKDEV
+-#  include <sys/mkdev.h>
+-# elif MAJOR_IN_SYSMACROS
+-#  include <sys/sysmacros.h>
+-# endif
+-
++# include <sys/sysmacros.h>
+ # include <stdarg.h>
+ # include "testutilslxc.h"
+ # include "virstring.h"
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-storage-Add-shrink-to-qemu-img-command-when-shrinking-vol.patch b/SOURCES/libvirt-storage-Add-shrink-to-qemu-img-command-when-shrinking-vol.patch
deleted file mode 100644
index 59e5ef3..0000000
--- a/SOURCES/libvirt-storage-Add-shrink-to-qemu-img-command-when-shrinking-vol.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 62e80840d9e18319b080e183201d509a2b78b40f Mon Sep 17 00:00:00 2001
-Message-Id: <62e80840d9e18319b080e183201d509a2b78b40f@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 27 Aug 2018 08:23:52 -0400
-Subject: [PATCH] storage: Add --shrink to qemu-img command when shrinking vol
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1613746
-
-When shrinking the capacity of a qcow2 or luks volume using
-the qemu-img program, the --shrink qualifier must be added.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit b04d1b6a35f9fb826f7bb83fdac364a127ec75ca)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1622534
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/storage/storage_util.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index a701a75702..5dc22d3182 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -2287,12 +2287,12 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool,
-      * a multiple of 512 */
-     capacity = VIR_ROUND_UP(capacity, 512);
- 
--    cmd = virCommandNew(img_tool);
-+    cmd = virCommandNewArgList(img_tool, "resize", NULL);
-+    if (capacity < vol->target.capacity)
-+        virCommandAddArg(cmd, "--shrink");
-     if (!vol->target.encryption) {
--        virCommandAddArgList(cmd, "resize", vol->target.path, NULL);
-+        virCommandAddArg(cmd, vol->target.path);
-     } else {
--        virCommandAddArg(cmd, "resize");
--
-         if (storageBackendCreateQemuImgSecretObject(cmd, secretPath,
-                                                     secretAlias) < 0)
-             goto cleanup;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-storage-Allow-for-inputvol-to-have-any-format-for-encryption.patch b/SOURCES/libvirt-storage-Allow-for-inputvol-to-have-any-format-for-encryption.patch
deleted file mode 100644
index 9ca6a51..0000000
--- a/SOURCES/libvirt-storage-Allow-for-inputvol-to-have-any-format-for-encryption.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From fdbb929cb1f83931378f9910a2922bf9d68f0c04 Mon Sep 17 00:00:00 2001
-Message-Id: <fdbb929cb1f83931378f9910a2922bf9d68f0c04@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 2 Nov 2018 16:57:11 +0100
-Subject: [PATCH] storage: Allow for inputvol to have any format for encryption
-
-Commit 39cef12a9 altered/fixed the inputvol processing to create
-a multistep process when using an inputvol to create an encrypted
-output volume; however, it unnecessarily assumed/restricted the
-inputvol to be of 'raw' format only.
-
-Modify the processing code to allow the inputvol format to be checked
-and used in order to create the encrypted volume.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 80414718587ab8dd97025ec9145f30fa1a3654ed)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1645459
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/storage/storage_util.c                    | 14 ++++++++++++-
- .../luks-convert-qcow2.argv                   |  9 ++++++++
- tests/storagevolxml2argvtest.c                |  4 ++++
- tests/storagevolxml2xmlin/vol-file-qcow2.xml  | 21 +++++++++++++++++++
- 4 files changed, 47 insertions(+), 1 deletion(-)
- create mode 100644 tests/storagevolxml2argvdata/luks-convert-qcow2.argv
- create mode 100644 tests/storagevolxml2xmlin/vol-file-qcow2.xml
-
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index 19e58714ca..c5e773ab6d 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -692,6 +692,7 @@ storagePloopResize(virStorageVolDefPtr vol,
- struct _virStorageBackendQemuImgInfo {
-     int format;
-     const char *type;
-+    const char *inputType;
-     const char *path;
-     unsigned long long size_arg;
-     unsigned long long allocation;
-@@ -1014,6 +1015,15 @@ virStorageBackendCreateQemuImgSetInfo(virStoragePoolObjPtr pool,
-         return -1;
-     }
- 
-+    if (inputvol &&
-+        !(info->inputType =
-+          virStorageFileFormatTypeToString(inputvol->target.format))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("unknown inputvol storage vol type %d"),
-+                       inputvol->target.format);
-+        return -1;
-+    }
-+
-     if (info->preallocate && info->format != VIR_STORAGE_FILE_QCOW2) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("metadata preallocation only available with qcow2"));
-@@ -1073,6 +1083,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-     struct _virStorageBackendQemuImgInfo info = {
-         .format = vol->target.format,
-         .type = NULL,
-+        .inputType = NULL,
-         .path = vol->target.path,
-         .allocation = vol->target.allocation,
-         .encryption = !!vol->target.encryption,
-@@ -1145,7 +1156,8 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-             virCommandAddArgFormat(cmd, "%lluK", info.size_arg);
-     } else {
-         /* source */
--        virCommandAddArgFormat(cmd, "driver=raw,file.filename=%s",
-+        virCommandAddArgFormat(cmd, "driver=%s,file.filename=%s",
-+                               info.inputType ? info.inputType : "raw",
-                                info.inputPath);
- 
-         /* dest */
-diff --git a/tests/storagevolxml2argvdata/luks-convert-qcow2.argv b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
-new file mode 100644
-index 0000000000..9124f5f27c
---- /dev/null
-+++ b/tests/storagevolxml2argvdata/luks-convert-qcow2.argv
-@@ -0,0 +1,9 @@
-+qemu-img create -f luks \
-+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
-+-o key-secret=OtherDemo.img_encrypt0 \
-+/var/lib/libvirt/images/OtherDemo.img 5242880K
-+qemu-img convert --image-opts -n --target-image-opts \
-+--object secret,id=OtherDemo.img_encrypt0,file=/path/to/secretFile \
-+driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img \
-+driver=luks,file.filename=/var/lib/libvirt/images/OtherDemo.img,\
-+key-secret=OtherDemo.img_encrypt0
-diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
-index b795f83aee..6a9a080dd1 100644
---- a/tests/storagevolxml2argvtest.c
-+++ b/tests/storagevolxml2argvtest.c
-@@ -284,6 +284,10 @@ mymain(void)
-             "pool-dir", "vol-file",
-             "luks-convert", 0);
- 
-+    DO_TEST("pool-dir", "vol-luks-convert",
-+            "pool-dir", "vol-file-qcow2",
-+            "luks-convert-qcow2", 0);
-+
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
- 
-diff --git a/tests/storagevolxml2xmlin/vol-file-qcow2.xml b/tests/storagevolxml2xmlin/vol-file-qcow2.xml
-new file mode 100644
-index 0000000000..025e7e0239
---- /dev/null
-+++ b/tests/storagevolxml2xmlin/vol-file-qcow2.xml
-@@ -0,0 +1,21 @@
-+<volume>
-+  <name>sparse-qcow2.img</name>
-+  <source/>
-+  <capacity unit="TiB">1</capacity>
-+  <allocation unit="bytes">0</allocation>
-+  <target>
-+    <path>/var/lib/libvirt/images/sparse-qcow2.img</path>
-+    <format type="qcow2"/>
-+    <permissions>
-+      <mode>0</mode>
-+      <owner>0744</owner>
-+      <group>0</group>
-+      <label>virt_image_t</label>
-+    </permissions>
-+    <timestamps>
-+      <atime>1341933637.273190990</atime>
-+      <mtime>1341930622.047245868</mtime>
-+      <ctime>1341930622.047245868</ctime>
-+    </timestamps>
-+  </target>
-+</volume>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-storage-Allow-inputvol-to-be-encrypted.patch b/SOURCES/libvirt-storage-Allow-inputvol-to-be-encrypted.patch
deleted file mode 100644
index dcba08c..0000000
--- a/SOURCES/libvirt-storage-Allow-inputvol-to-be-encrypted.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-From a882d10a1eaa02210e048f4a00917c8b30b0c4e6 Mon Sep 17 00:00:00 2001
-Message-Id: <a882d10a1eaa02210e048f4a00917c8b30b0c4e6@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 2 Nov 2018 16:57:12 +0100
-Subject: [PATCH] storage: Allow inputvol to be encrypted
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1613737
-
-When processing the inputvol for encryption, we need to handle
-the case where the inputvol is encrypted. This then allows for
-the encrypted inputvol to be used either for an output encrypted
-volume or an output volume of some XML provided type.
-
-Add tests to show the various conversion options when either input
-or output is encrypted. This includes when both are encrypted.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit b975afc72504e636ec538ea119bee9a0cd7b63d8)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1645459
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/storage/storage_util.c                    | 64 ++++++++++++++++---
- src/storage/storage_util.h                    |  1 +
- .../luks-convert-encrypt.argv                 | 11 ++++
- .../luks-convert-encrypt2fileqcow2.argv       |  7 ++
- .../luks-convert-encrypt2fileraw.argv         |  7 ++
- tests/storagevolxml2argvtest.c                | 15 ++++-
- tests/storagevolxml2xmlin/vol-encrypt1.xml    | 21 ++++++
- tests/storagevolxml2xmlin/vol-encrypt2.xml    | 21 ++++++
- 8 files changed, 138 insertions(+), 9 deletions(-)
- create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt.argv
- create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
- create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
- create mode 100644 tests/storagevolxml2xmlin/vol-encrypt1.xml
- create mode 100644 tests/storagevolxml2xmlin/vol-encrypt2.xml
-
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index c5e773ab6d..90a02d19df 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -1077,6 +1077,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-                                          unsigned int flags,
-                                          const char *create_tool,
-                                          const char *secretPath,
-+                                         const char *inputSecretPath,
-                                          virStorageVolEncryptConvertStep convertStep)
- {
-     virCommandPtr cmd = NULL;
-@@ -1094,6 +1095,8 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-         .secretAlias = NULL,
-     };
-     virStorageEncryptionPtr enc = vol->target.encryption;
-+    char *inputSecretAlias = NULL;
-+    virStorageEncryptionPtr inputenc = inputvol ? inputvol->target.encryption : NULL;
-     virStorageEncryptionInfoDefPtr encinfo = NULL;
- 
-     virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL);
-@@ -1107,6 +1110,12 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-         goto error;
-     }
- 
-+    if (inputenc && inputenc->format != VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("encryption format of inputvol must be LUKS"));
-+        goto error;
-+    }
-+
-     if (virStorageBackendCreateQemuImgSetInfo(pool, vol, inputvol,
-                                               convertStep, &info) < 0)
-         goto error;
-@@ -1146,6 +1155,20 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-         encinfo = &enc->encinfo;
-     }
- 
-+    if (inputenc && convertStep == VIR_STORAGE_VOL_ENCRYPT_CONVERT) {
-+        if (!inputSecretPath) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("path to inputvol secret data file is required"));
-+            goto error;
-+        }
-+        if (virAsprintf(&inputSecretAlias, "%s_encrypt0",
-+                        inputvol->name) < 0)
-+            goto error;
-+        if (storageBackendCreateQemuImgSecretObject(cmd, inputSecretPath,
-+                                                    inputSecretAlias) < 0)
-+            goto error;
-+    }
-+
-     if (convertStep != VIR_STORAGE_VOL_ENCRYPT_CONVERT) {
-         if (storageBackendCreateQemuImgSetOptions(cmd, encinfo, info) < 0)
-             goto error;
-@@ -1156,20 +1179,33 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-             virCommandAddArgFormat(cmd, "%lluK", info.size_arg);
-     } else {
-         /* source */
--        virCommandAddArgFormat(cmd, "driver=%s,file.filename=%s",
--                               info.inputType ? info.inputType : "raw",
--                               info.inputPath);
-+        if (inputenc)
-+            virCommandAddArgFormat(cmd,
-+                                   "driver=luks,file.filename=%s,key-secret=%s",
-+                                   info.inputPath, inputSecretAlias);
-+        else
-+            virCommandAddArgFormat(cmd, "driver=%s,file.filename=%s",
-+                                   info.inputType ? info.inputType : "raw",
-+                                   info.inputPath);
- 
-         /* dest */
--        virCommandAddArgFormat(cmd, "driver=%s,file.filename=%s,key-secret=%s",
--                               info.type, info.path, info.secretAlias);
-+        if (enc)
-+            virCommandAddArgFormat(cmd,
-+                                   "driver=%s,file.filename=%s,key-secret=%s",
-+                                   info.type, info.path, info.secretAlias);
-+        else
-+            virCommandAddArgFormat(cmd, "driver=%s,file.filename=%s",
-+                                   info.type, info.path);
-+
-     }
-     VIR_FREE(info.secretAlias);
-+    VIR_FREE(inputSecretAlias);
- 
-     return cmd;
- 
-  error:
-     VIR_FREE(info.secretAlias);
-+    VIR_FREE(inputSecretAlias);
-     virCommandFree(cmd);
-     return NULL;
- }
-@@ -1255,6 +1291,7 @@ storageBackendDoCreateQemuImg(virStoragePoolObjPtr pool,
-                               unsigned int flags,
-                               const char *create_tool,
-                               const char *secretPath,
-+                              const char *inputSecretPath,
-                               virStorageVolEncryptConvertStep convertStep)
- {
-     int ret;
-@@ -1262,7 +1299,8 @@ storageBackendDoCreateQemuImg(virStoragePoolObjPtr pool,
- 
-     cmd = virStorageBackendCreateQemuImgCmdFromVol(pool, vol, inputvol,
-                                                    flags, create_tool,
--                                                   secretPath, convertStep);
-+                                                   secretPath, inputSecretPath,
-+                                                   convertStep);
-     if (!cmd)
-         return -1;
- 
-@@ -1283,6 +1321,7 @@ storageBackendCreateQemuImg(virStoragePoolObjPtr pool,
-     int ret = -1;
-     char *create_tool;
-     char *secretPath = NULL;
-+    char *inputSecretPath = NULL;
-     virStorageVolEncryptConvertStep convertStep = VIR_STORAGE_VOL_ENCRYPT_NONE;
- 
-     virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1);
-@@ -1299,16 +1338,21 @@ storageBackendCreateQemuImg(virStoragePoolObjPtr pool,
-         !(secretPath = storageBackendCreateQemuImgSecretPath(pool, vol)))
-         goto cleanup;
- 
-+    if (inputvol && inputvol->target.encryption &&
-+        !(inputSecretPath = storageBackendCreateQemuImgSecretPath(pool,
-+                                                                  inputvol)))
-+        goto cleanup;
-+
-     /* Using an input file for encryption requires a multi-step process
-      * to create an image of the same size as the inputvol and then to
-      * convert the inputvol afterwards. */
--    if (secretPath && inputvol)
-+    if ((secretPath || inputSecretPath) && inputvol)
-         convertStep = VIR_STORAGE_VOL_ENCRYPT_CREATE;
- 
-     do {
-         ret = storageBackendDoCreateQemuImg(pool, vol, inputvol, flags,
-                                             create_tool, secretPath,
--                                            convertStep);
-+                                            inputSecretPath, convertStep);
- 
-         /* Failure to convert, attempt to delete what we created */
-         if (ret < 0 && convertStep == VIR_STORAGE_VOL_ENCRYPT_CONVERT)
-@@ -1330,6 +1374,10 @@ storageBackendCreateQemuImg(virStoragePoolObjPtr pool,
-         unlink(secretPath);
-         VIR_FREE(secretPath);
-     }
-+    if (inputSecretPath) {
-+        unlink(inputSecretPath);
-+        VIR_FREE(inputSecretPath);
-+    }
-     VIR_FREE(create_tool);
-     return ret;
- }
-diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h
-index 6fc8e8972c..58b991c772 100644
---- a/src/storage/storage_util.h
-+++ b/src/storage/storage_util.h
-@@ -167,6 +167,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-                                          unsigned int flags,
-                                          const char *create_tool,
-                                          const char *secretPath,
-+                                         const char *inputSecretPath,
-                                          virStorageVolEncryptConvertStep convertStep);
- 
- int virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
-diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
-new file mode 100644
-index 0000000000..b2ad16b7cb
---- /dev/null
-+++ b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv
-@@ -0,0 +1,11 @@
-+qemu-img create -f luks \
-+--object secret,id=encrypt2.img_encrypt0,file=/path/to/secretFile \
-+-o key-secret=encrypt2.img_encrypt0 \
-+/var/lib/libvirt/images/encrypt2.img 5242880K
-+qemu-img convert --image-opts -n --target-image-opts \
-+--object secret,id=encrypt2.img_encrypt0,file=/path/to/secretFile \
-+--object secret,id=encrypt1.img_encrypt0,file=/path/to/inputSecretFile \
-+driver=luks,file.filename=/var/lib/libvirt/images/encrypt1.img,\
-+key-secret=encrypt1.img_encrypt0 \
-+driver=luks,file.filename=/var/lib/libvirt/images/encrypt2.img,\
-+key-secret=encrypt2.img_encrypt0
-diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
-new file mode 100644
-index 0000000000..82cb364b61
---- /dev/null
-+++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv
-@@ -0,0 +1,7 @@
-+qemu-img create -f qcow2 \
-+-o compat=0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K
-+qemu-img convert --image-opts -n --target-image-opts \
-+--object secret,id=encrypt2.img_encrypt0,file=/path/to/inputSecretFile \
-+driver=luks,file.filename=/var/lib/libvirt/images/encrypt2.img,\
-+key-secret=encrypt2.img_encrypt0 \
-+driver=qcow2,file.filename=/var/lib/libvirt/images/sparse-qcow2.img
-diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
-new file mode 100644
-index 0000000000..2661c345a8
---- /dev/null
-+++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv
-@@ -0,0 +1,7 @@
-+qemu-img create -f raw \
-+/var/lib/libvirt/images/sparse.img 1073741824K
-+qemu-img convert --image-opts -n --target-image-opts \
-+--object secret,id=encrypt2.img_encrypt0,file=/path/to/inputSecretFile \
-+driver=luks,file.filename=/var/lib/libvirt/images/encrypt2.img,\
-+key-secret=encrypt2.img_encrypt0 \
-+driver=raw,file.filename=/var/lib/libvirt/images/sparse.img
-diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
-index 6a9a080dd1..105705f348 100644
---- a/tests/storagevolxml2argvtest.c
-+++ b/tests/storagevolxml2argvtest.c
-@@ -85,7 +85,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
-      * convert the inputvol afterwards. Since we only care about the
-      * command line we have to copy code from storageBackendCreateQemuImg
-      * and adjust it for the test needs. */
--    if (inputvol && vol->target.encryption)
-+    if (inputvol && (vol->target.encryption || inputvol->target.encryption))
-         convertStep = VIR_STORAGE_VOL_ENCRYPT_CREATE;
- 
-     do {
-@@ -93,6 +93,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
-                                                        inputvol, flags,
-                                                        create_tool,
-                                                        "/path/to/secretFile",
-+                                                       "/path/to/inputSecretFile",
-                                                        convertStep);
-         if (!cmd) {
-             if (shouldFail) {
-@@ -288,6 +289,18 @@ mymain(void)
-             "pool-dir", "vol-file-qcow2",
-             "luks-convert-qcow2", 0);
- 
-+    DO_TEST("pool-dir", "vol-encrypt2",
-+            "pool-dir", "vol-encrypt1",
-+            "luks-convert-encrypt", 0);
-+
-+    DO_TEST("pool-dir", "vol-file",
-+            "pool-dir", "vol-encrypt2",
-+            "luks-convert-encrypt2fileraw", 0);
-+
-+    DO_TEST("pool-dir", "vol-file-qcow2",
-+            "pool-dir", "vol-encrypt2",
-+            "luks-convert-encrypt2fileqcow2", 0);
-+
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
- 
-diff --git a/tests/storagevolxml2xmlin/vol-encrypt1.xml b/tests/storagevolxml2xmlin/vol-encrypt1.xml
-new file mode 100644
-index 0000000000..681734dc7b
---- /dev/null
-+++ b/tests/storagevolxml2xmlin/vol-encrypt1.xml
-@@ -0,0 +1,21 @@
-+<volume>
-+  <name>encrypt1.img</name>
-+  <key>/var/lib/libvirt/images/encrypt1.img</key>
-+  <source>
-+  </source>
-+  <capacity unit="G">5</capacity>
-+  <allocation>294912</allocation>
-+  <target>
-+    <path>/var/lib/libvirt/images/encrypt1.img</path>
-+    <format type='raw'/>
-+    <permissions>
-+      <mode>0644</mode>
-+      <owner>0</owner>
-+      <group>0</group>
-+      <label>unconfined_u:object_r:virt_image_t:s0</label>
-+    </permissions>
-+    <encryption format='luks'>
-+      <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/>
-+    </encryption>
-+  </target>
-+</volume>
-diff --git a/tests/storagevolxml2xmlin/vol-encrypt2.xml b/tests/storagevolxml2xmlin/vol-encrypt2.xml
-new file mode 100644
-index 0000000000..0507d3b9e6
---- /dev/null
-+++ b/tests/storagevolxml2xmlin/vol-encrypt2.xml
-@@ -0,0 +1,21 @@
-+<volume>
-+  <name>encrypt2.img</name>
-+  <key>/var/lib/libvirt/images/encrypt2.img</key>
-+  <source>
-+  </source>
-+  <capacity unit="G">5</capacity>
-+  <allocation>294912</allocation>
-+  <target>
-+    <path>/var/lib/libvirt/images/encrypt2.img</path>
-+    <format type='raw'/>
-+    <permissions>
-+      <mode>0644</mode>
-+      <owner>0</owner>
-+      <group>0</group>
-+      <label>unconfined_u:object_r:virt_image_t:s0</label>
-+    </permissions>
-+    <encryption format='luks'>
-+      <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709af480'/>
-+    </encryption>
-+  </target>
-+</volume>
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-storage-Implement-backing-store-support-for-fat-prefix.patch b/SOURCES/libvirt-storage-Implement-backing-store-support-for-fat-prefix.patch
new file mode 100644
index 0000000..7bce538
--- /dev/null
+++ b/SOURCES/libvirt-storage-Implement-backing-store-support-for-fat-prefix.patch
@@ -0,0 +1,123 @@
+From 32163ac7b599b20c09458170e626784c0c9b4d9c Mon Sep 17 00:00:00 2001
+Message-Id: <32163ac7b599b20c09458170e626784c0c9b4d9c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:04 +0100
+Subject: [PATCH] storage: Implement backing store support for "fat:" prefix
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+qemublocktest showed that we don't add the "fat:" prefix for directory
+storage when formatting the backing store string. While it's unlikely to
+be used it's simple enough to actually implement the support rather than
+trying to forbid it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 5a70f1048fb60b72d5a715d93e963ba07e041e23)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <52a96160554678625eea409b7c816de12eeace1a.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_block.c                                    | 7 ++++++-
+ src/util/virstoragefile.c                                | 9 +++++++++
+ .../xml2json/dir-fat-cache-srconly.json                  | 2 +-
+ .../xml2json/dir-fat-floppy-srconly.json                 | 2 +-
+ .../xml2json/dir-fat-readonly-srconly.json               | 2 +-
+ tests/virstoragetest.c                                   | 1 +
+ 6 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 20579ec7b3..5a7364576a 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -2032,8 +2032,13 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr src,
+     g_autofree char *backingJSON = NULL;
+ 
+     if (!src->sliceStorage) {
+-        if (virStorageSourceIsLocalStorage(src))
++        if (virStorageSourceIsLocalStorage(src)) {
++            if (src->type == VIR_STORAGE_TYPE_DIR &&
++                src->format == VIR_STORAGE_FILE_FAT)
++                return g_strdup_printf("fat:%s", src->path);
++
+             return g_strdup(src->path);
++        }
+ 
+         /* generate simplified URIs for the easy cases */
+         if (actualType == VIR_STORAGE_TYPE_NETWORK &&
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 2e54620139..5423f0b955 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3922,6 +3922,7 @@ virStorageSourceNewFromBackingAbsolute(const char *path,
+                                        virStorageSourcePtr *src)
+ {
+     const char *json;
++    const char *dirpath;
+     int rc = 0;
+     g_autoptr(virStorageSource) def = NULL;
+ 
+@@ -3935,6 +3936,14 @@ virStorageSourceNewFromBackingAbsolute(const char *path,
+ 
+         def->path = g_strdup(path);
+     } else {
++        if ((dirpath = STRSKIP(path, "fat:"))) {
++            def->type = VIR_STORAGE_TYPE_DIR;
++            def->format = VIR_STORAGE_FILE_FAT;
++            def->path = g_strdup(dirpath);
++            *src = g_steal_pointer(&def);
++            return 0;
++        }
++
+         def->type = VIR_STORAGE_TYPE_NETWORK;
+ 
+         VIR_DEBUG("parsing backing store string: '%s'", path);
+diff --git a/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json b/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json
+index 8bc58fa033..80f866f08b 100644
+--- a/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json
++++ b/tests/qemublocktestdata/xml2json/dir-fat-cache-srconly.json
+@@ -6,5 +6,5 @@
+     "floppy": false
+   }
+   backing store string:
+-  /var/somefiles
++  fat:/var/somefiles
+ )
+diff --git a/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json b/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json
+index 043b796435..6c86f1da06 100644
+--- a/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json
++++ b/tests/qemublocktestdata/xml2json/dir-fat-floppy-srconly.json
+@@ -6,5 +6,5 @@
+     "floppy": true
+   }
+   backing store string:
+-  /var/somefiles
++  fat:/var/somefiles
+ )
+diff --git a/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json b/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json
+index 8bc58fa033..80f866f08b 100644
+--- a/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json
++++ b/tests/qemublocktestdata/xml2json/dir-fat-readonly-srconly.json
+@@ -6,5 +6,5 @@
+     "floppy": false
+   }
+   backing store string:
+-  /var/somefiles
++  fat:/var/somefiles
+ )
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index ca428f5ca7..a61522965b 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1225,6 +1225,7 @@ mymain(void)
+     TEST_BACKING_PARSE_FULL(bck, xml, 0)
+ 
+     TEST_BACKING_PARSE("path", "<source file='path'/>\n");
++    TEST_BACKING_PARSE("fat:/somedir", "<source dir='/somedir'/>\n");
+     TEST_BACKING_PARSE("://", NULL);
+     TEST_BACKING_PARSE("http://example.com",
+                        "<source protocol='http' name=''>\n"
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-storage-Parse-nvme-disk-source-properties-from-json-pseudo-uri.patch b/SOURCES/libvirt-storage-Parse-nvme-disk-source-properties-from-json-pseudo-uri.patch
new file mode 100644
index 0000000..92fd51d
--- /dev/null
+++ b/SOURCES/libvirt-storage-Parse-nvme-disk-source-properties-from-json-pseudo-uri.patch
@@ -0,0 +1,115 @@
+From 52f32252c985693be402c5a1fba79d21807a53cb Mon Sep 17 00:00:00 2001
+Message-Id: <52f32252c985693be402c5a1fba79d21807a53cb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:08 +0100
+Subject: [PATCH] storage: Parse 'nvme' disk source properties from json:{}
+ pseudo-uri
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Our code allows snapshots of NVMe based disks which means we create
+overlay file with a 'json:{}' pseudo-uri refering to the NVME device.
+Our parser code doesn't handle them though. Add the parser and test it
+via the XML->json->XML round-trip and reference data.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 1b84dd190c16695710a714305517ed24afdd4573)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <8460aa915dbc8b4030aacf31cc39fbb7aee07d87.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 30 ++++++++++++++++++++++++++++++
+ tests/qemublocktest.c     |  5 +++++
+ tests/virstoragetest.c    |  9 +++++++++
+ 3 files changed, 44 insertions(+)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 5423f0b955..3eb32edc2a 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3806,6 +3806,35 @@ virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr src,
+ }
+ 
+ 
++static int
++virStorageSourceParseBackingJSONNVMe(virStorageSourcePtr src,
++                                     virJSONValuePtr json,
++                                     const char *jsonstr G_GNUC_UNUSED,
++                                     int opaque G_GNUC_UNUSED)
++{
++    g_autoptr(virStorageSourceNVMeDef) nvme = g_new0(virStorageSourceNVMeDef, 1);
++    const char *device = virJSONValueObjectGetString(json, "device");
++
++    if (!device || virPCIDeviceAddressParse((char *) device, &nvme->pciAddr) < 0) {
++        virReportError(VIR_ERR_INVALID_ARG, "%s",
++                       _("missing or malformed 'device' field of 'nvme' storage"));
++        return -1;
++    }
++
++    if (virJSONValueObjectGetNumberUlong(json, "namespace", &nvme->namespc) < 0 ||
++        nvme->namespc == 0) {
++        virReportError(VIR_ERR_INVALID_ARG, "%s",
++                       _("missing or malformed 'namespace' field of 'nvme' storage"));
++        return -1;
++    }
++
++    src->type = VIR_STORAGE_TYPE_NVME;
++    src->nvme = g_steal_pointer(&nvme);
++
++    return 0;
++}
++
++
+ struct virStorageSourceJSONDriverParser {
+     const char *drvname;
+     bool formatdriver;
+@@ -3837,6 +3866,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
+     {"rbd", false, virStorageSourceParseBackingJSONRBD, 0},
+     {"raw", true, virStorageSourceParseBackingJSONRaw, 0},
+     {"vxhs", false, virStorageSourceParseBackingJSONVxHS, 0},
++    {"nvme", false, virStorageSourceParseBackingJSONNVMe, 0},
+ };
+ 
+ 
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 8b7a50712d..e461b3a23d 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1096,6 +1096,11 @@ mymain(void)
+     /* type VIR_STORAGE_TYPE_BLOCK is not tested since it parses back to 'file' */
+     /* type VIR_STORAGE_TYPE_DIR it is a 'format' driver in qemu */
+ 
++    TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NVME,
++                     "<source type='pci' namespace='1'>\n"
++                     "  <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>\n"
++                     "</source>\n");
++
+     TEST_JSON_FORMAT_NET("<source protocol='http' name=''>\n"
+                          "  <host name='example.com' port='80'/>\n"
+                          "</source>\n");
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index a61522965b..d9244fdfe8 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1637,6 +1637,15 @@ mymain(void)
+                            "  <timeout seconds='2000'/>\n"
+                            "</source>\n", 0);
+ 
++    TEST_BACKING_PARSE("json:{\"file\":{\"driver\": \"nvme\","
++                                       "\"device\": \"0000:01:00.0\","
++                                       "\"namespace\": 1"
++                                      "}"
++                            "}",
++                        "<source type='pci' namespace='1'>\n"
++                        "  <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>\n"
++                        "</source>\n");
++
+ #endif /* WITH_YAJL */
+ 
+  cleanup:
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-storage-Remove-secretPath-from-_virStorageBackendQemuImgInfo.patch b/SOURCES/libvirt-storage-Remove-secretPath-from-_virStorageBackendQemuImgInfo.patch
deleted file mode 100644
index 335a415..0000000
--- a/SOURCES/libvirt-storage-Remove-secretPath-from-_virStorageBackendQemuImgInfo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6146c60df8ac981e06828ca13d1f935af866028a Mon Sep 17 00:00:00 2001
-Message-Id: <6146c60df8ac981e06828ca13d1f935af866028a@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 2 Nov 2018 16:57:10 +0100
-Subject: [PATCH] storage: Remove secretPath from _virStorageBackendQemuImgInfo
-
-There's really no need for it to be there since it's only ever
-used inside virStorageBackendCreateQemuImgCmdFromVol
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit f6aa977fab1108e652ab8c360a651045c727d02e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1645459
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/storage/storage_util.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index 5dc22d3182..19e58714ca 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -709,7 +709,6 @@ struct _virStorageBackendQemuImgInfo {
-     int inputFormat;
- 
-     char *secretAlias;
--    const char *secretPath;
- };
- 
- 
-@@ -1081,7 +1080,6 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-         .compat = vol->target.compat,
-         .features = vol->target.features,
-         .nocow = vol->target.nocow,
--        .secretPath = secretPath,
-         .secretAlias = NULL,
-     };
-     virStorageEncryptionPtr enc = vol->target.encryption;
-@@ -1124,14 +1122,14 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-         virCommandAddArgList(cmd, "-b", info.backingPath, NULL);
- 
-     if (enc) {
--        if (!info.secretPath) {
-+        if (!secretPath) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("path to secret data file is required"));
-             goto error;
-         }
-         if (virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name) < 0)
-             goto error;
--        if (storageBackendCreateQemuImgSecretObject(cmd, info.secretPath,
-+        if (storageBackendCreateQemuImgSecretObject(cmd, secretPath,
-                                                     info.secretAlias) < 0)
-             goto error;
-         encinfo = &enc->encinfo;
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-storage_file-create-Create-new-images-with-write-permission-bit.patch b/SOURCES/libvirt-storage_file-create-Create-new-images-with-write-permission-bit.patch
new file mode 100644
index 0000000..bb28a75
--- /dev/null
+++ b/SOURCES/libvirt-storage_file-create-Create-new-images-with-write-permission-bit.patch
@@ -0,0 +1,69 @@
+From 1624090a014019ac1b61dc62557b829426068835 Mon Sep 17 00:00:00 2001
+Message-Id: <1624090a014019ac1b61dc62557b829426068835@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 12 May 2020 17:24:08 +0200
+Subject: [PATCH] storage_file: create: Create new images with write permission
+ bit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The 'Create' API of the two storage file backends is used only on
+code-paths where we need to format the image after creating an empty
+file. Since the DAC security driver only modifies the owner of the file
+and not the mode we need to create all files which are going to be
+formatted with the write bit set for the user.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 20939b037c37789ddca54c18862fb45b4b41740f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1832204
+Message-Id: <647821632e4b2822eceb81590459aafa2f88b6fb.1589296861.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/storage/storage_file_fs.c      | 6 +-----
+ src/storage/storage_file_gluster.c | 6 +-----
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c
+index 8817970f44..1629c3d877 100644
+--- a/src/storage/storage_file_fs.c
++++ b/src/storage/storage_file_fs.c
+@@ -83,13 +83,9 @@ virStorageFileBackendFileInit(virStorageSourcePtr src)
+ static int
+ virStorageFileBackendFileCreate(virStorageSourcePtr src)
+ {
+-    mode_t mode = S_IRUSR;
+     VIR_AUTOCLOSE fd = -1;
+ 
+-    if (!src->readonly)
+-        mode |= S_IWUSR;
+-
+-    if ((fd = virFileOpenAs(src->path, O_WRONLY | O_TRUNC | O_CREAT, mode,
++    if ((fd = virFileOpenAs(src->path, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR,
+                             src->drv->uid, src->drv->gid, 0)) < 0) {
+         errno = -fd;
+         return -1;
+diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_gluster.c
+index f389a94437..608f93d2f6 100644
+--- a/src/storage/storage_file_gluster.c
++++ b/src/storage/storage_file_gluster.c
+@@ -152,13 +152,9 @@ virStorageFileBackendGlusterCreate(virStorageSourcePtr src)
+ {
+     virStorageFileBackendGlusterPrivPtr priv = src->drv->priv;
+     glfs_fd_t *fd = NULL;
+-    mode_t mode = S_IRUSR;
+-
+-    if (!src->readonly)
+-        mode |= S_IWUSR;
+ 
+     if (!(fd = glfs_creat(priv->vol, src->path,
+-                          O_CREAT | O_TRUNC | O_WRONLY, mode)))
++                          O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)))
+         return -1;
+ 
+     ignore_value(glfs_close(fd));
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-test-Introduce-virnetdevopenvswitchtest.patch b/SOURCES/libvirt-test-Introduce-virnetdevopenvswitchtest.patch
deleted file mode 100644
index b270449..0000000
--- a/SOURCES/libvirt-test-Introduce-virnetdevopenvswitchtest.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From e1699c1bb0cbf20ea24db8607492a8f418ee8f95 Mon Sep 17 00:00:00 2001
-Message-Id: <e1699c1bb0cbf20ea24db8607492a8f418ee8f95@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 30 Jul 2019 15:30:52 +0200
-Subject: [PATCH] test: Introduce virnetdevopenvswitchtest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Test if our parsing of interface stats as returned by ovs-vsctl
-works as expected. To achieve this without having to mock
-virCommand* I'm separating parsing of stats into a separate
-function.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit cc34260f5a8715d208ee45a6ebaa79e5264cbe68)
-
-Conflicts:
-- src/libvirt_private.syms: Context, no
-    virNetDevOpenvswitchInterfaceGetMaster()
-- src/util/virnetdevopenvswitch.c: Unknown, conflict in a
-    comment, the diff looks the same to me.
-- tests/Makefile.am: Context, no virnetworkportxml2xmldata in
-    EXTRA_DIST
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <a46322e55761cff95f64c7ee023e95abed9a375a.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms                   |   1 +
- src/util/virnetdevopenvswitch.c            |  93 ++++++++++++-------
- src/util/virnetdevopenvswitch.h            |   4 +
- tests/Makefile.am                          |  13 ++-
- tests/virnetdevopenvswitchdata/stats1.json |   1 +
- tests/virnetdevopenvswitchdata/stats2.json |   1 +
- tests/virnetdevopenvswitchtest.c           | 101 +++++++++++++++++++++
- 7 files changed, 177 insertions(+), 37 deletions(-)
- create mode 100644 tests/virnetdevopenvswitchdata/stats1.json
- create mode 100644 tests/virnetdevopenvswitchdata/stats2.json
- create mode 100644 tests/virnetdevopenvswitchtest.c
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 8132f9664b..f4b54cee0b 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2422,6 +2422,7 @@ virNetDevMidonetUnbindPort;
- virNetDevOpenvswitchAddPort;
- virNetDevOpenvswitchGetMigrateData;
- virNetDevOpenvswitchGetVhostuserIfname;
-+virNetDevOpenvswitchInterfaceParseStats;
- virNetDevOpenvswitchInterfaceStats;
- virNetDevOpenvswitchRemovePort;
- virNetDevOpenvswitchSetMigrateData;
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index dbd832053b..ac8ec09b65 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -306,49 +306,30 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
-     return 0;
- }
- 
-+
- /**
-- * virNetDevOpenvswitchInterfaceStats:
-- * @ifname: the name of the interface
-- * @stats: the retreived domain interface stat
-+ * virNetDevOpenvswitchInterfaceParseStats:
-+ * @json: Input string in JSON format
-+ * @stats: parsed stats
-  *
-- * Retrieves the OVS interfaces stats
-+ * For given input string @json parse interface statistics and store them into
-+ * @stats.
-  *
-- * Returns 0 in case of success or -1 in case of failure
-+ * Returns: 0 on success,
-+ *         -1 otherwise (with error reported).
-  */
- int
--virNetDevOpenvswitchInterfaceStats(const char *ifname,
--                                   virDomainInterfaceStatsPtr stats)
-+virNetDevOpenvswitchInterfaceParseStats(const char *json,
-+                                        virDomainInterfaceStatsPtr stats)
- {
--    VIR_AUTOPTR(virCommand) cmd = NULL;
--    VIR_AUTOFREE(char *) output = NULL;
-     VIR_AUTOPTR(virJSONValue) jsonStats = NULL;
-     virJSONValuePtr jsonMap = NULL;
-     size_t i;
- 
--    cmd = virCommandNew(OVSVSCTL);
--    virNetDevOpenvswitchAddTimeout(cmd);
--    virCommandAddArgList(cmd, "--if-exists", "--format=list", "--data=json",
--                         "--no-headings", "--columns=statistics", "list",
--                         "Interface", ifname, NULL);
--    virCommandSetOutputBuffer(cmd, &output);
-+    stats->rx_bytes = stats->rx_packets = stats->rx_errs = stats->rx_drop = -1;
-+    stats->tx_bytes = stats->tx_packets = stats->tx_errs = stats->tx_drop = -1;
- 
--    /* The above command returns either:
--     * 1) empty string if @ifname doesn't exist, or
--     * 2) a JSON array, for instance:
--     *    ["map",[["collisions",0],["rx_bytes",0],["rx_crc_err",0],["rx_dropped",0],
--     *    ["rx_errors",0],["rx_frame_err",0],["rx_over_err",0],["rx_packets",0],
--     *    ["tx_bytes",12406],["tx_dropped",0],["tx_errors",0],["tx_packets",173]]]
--     */
--
--    if (virCommandRun(cmd, NULL) < 0 ||
--        STREQ_NULLABLE(output, "")) {
--        /* no ovs-vsctl or interface 'ifname' doesn't exists in ovs */
--        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                       _("Interface not found"));
--        return -1;
--    }
--
--    if (!(jsonStats = virJSONValueFromString(output)) ||
-+    if (!(jsonStats = virJSONValueFromString(json)) ||
-         !virJSONValueIsArray(jsonStats) ||
-         !(jsonMap = virJSONValueArrayGet(jsonStats, 1))) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -356,9 +337,6 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-         return -1;
-     }
- 
--    stats->rx_bytes = stats->rx_packets = stats->rx_errs = stats->rx_drop = -1;
--    stats->tx_bytes = stats->tx_packets = stats->tx_errs = stats->tx_drop = -1;
--
-     for (i = 0; i < virJSONValueArraySize(jsonMap); i++) {
-         virJSONValuePtr item = virJSONValueArrayGet(jsonMap, i);
-         virJSONValuePtr jsonKey;
-@@ -399,6 +377,51 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-         }
-     }
- 
-+    return 0;
-+}
-+
-+/**
-+ * virNetDevOpenvswitchInterfaceStats:
-+ * @ifname: the name of the interface
-+ * @stats: the retrieved domain interface stat
-+ *
-+ * Retrieves the OVS interfaces stats
-+ *
-+ * Returns 0 in case of success or -1 in case of failure
-+ */
-+int
-+virNetDevOpenvswitchInterfaceStats(const char *ifname,
-+                                   virDomainInterfaceStatsPtr stats)
-+{
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
-+    VIR_AUTOFREE(char *) output = NULL;
-+
-+    cmd = virCommandNew(OVSVSCTL);
-+    virNetDevOpenvswitchAddTimeout(cmd);
-+    virCommandAddArgList(cmd, "--if-exists", "--format=list", "--data=json",
-+                         "--no-headings", "--columns=statistics", "list",
-+                         "Interface", ifname, NULL);
-+    virCommandSetOutputBuffer(cmd, &output);
-+
-+    /* The above command returns either:
-+     * 1) empty string if @ifname doesn't exist, or
-+     * 2) a JSON array, for instance:
-+     *    ["map",[["collisions",0],["rx_bytes",0],["rx_crc_err",0],["rx_dropped",0],
-+     *    ["rx_errors",0],["rx_frame_err",0],["rx_over_err",0],["rx_packets",0],
-+     *    ["tx_bytes",12406],["tx_dropped",0],["tx_errors",0],["tx_packets",173]]]
-+     */
-+
-+    if (virCommandRun(cmd, NULL) < 0 ||
-+        STREQ_NULLABLE(output, "")) {
-+        /* no ovs-vsctl or interface 'ifname' doesn't exists in ovs */
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Interface not found"));
-+        return -1;
-+    }
-+
-+    if (virNetDevOpenvswitchInterfaceParseStats(output, stats) < 0)
-+        return -1;
-+
-     if (stats->rx_bytes == -1 &&
-         stats->rx_packets == -1 &&
-         stats->rx_errs == -1 &&
-diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
-index 6f6e620c22..c1a211dec1 100644
---- a/src/util/virnetdevopenvswitch.h
-+++ b/src/util/virnetdevopenvswitch.h
-@@ -53,6 +53,10 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
- int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
-     ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
- 
-+int virNetDevOpenvswitchInterfaceParseStats(const char *json,
-+                                            virDomainInterfaceStatsPtr stats)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
-+
- int virNetDevOpenvswitchInterfaceStats(const char *ifname,
-                                        virDomainInterfaceStatsPtr stats)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index c0337ea10c..201de1d37d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -157,6 +157,7 @@ EXTRA_DIST = \
- 	virmock.h \
- 	virnetdaemondata \
- 	virnetdevtestdata \
-+	virnetdevopenvswitchdata \
- 	virnwfilterbindingxml2xmldata \
- 	virpcitestdata \
- 	virscsidata \
-@@ -1230,9 +1231,17 @@ virmacmaptest_SOURCES = \
- 	virmacmaptest.c testutils.h testutils.c
- virmacmaptest_LDADD = $(LDADDS)
- 
--test_programs += virmacmaptest
-+virnetdevopenvswitchtest_SOURCES = \
-+	virnetdevopenvswitchtest.c testutils.h testutils.c
-+virnetdevopenvswitchtest_LDADD = $(LDADDS)
-+
-+test_programs += \
-+	virmacmaptest \
-+	virnetdevopenvswitchtest
- else ! WITH_YAJL
--EXTRA_DIST +=  virmacmaptest.c
-+EXTRA_DIST += \
-+	virmacmaptest.c \
-+	virnetdevopenvswitchtest.c
- endif ! WITH_YAJL
- 
- virnetdevtest_SOURCES = \
-diff --git a/tests/virnetdevopenvswitchdata/stats1.json b/tests/virnetdevopenvswitchdata/stats1.json
-new file mode 100644
-index 0000000000..1138c6271e
---- /dev/null
-+++ b/tests/virnetdevopenvswitchdata/stats1.json
-@@ -0,0 +1 @@
-+["map",[["collisions",1],["rx_bytes",2],["rx_crc_err",3],["rx_dropped",4],["rx_errors",5],["rx_frame_err",6],["rx_over_err",7],["rx_packets",8],["tx_bytes",9],["tx_dropped",10],["tx_errors",11],["tx_packets",12]]]
-diff --git a/tests/virnetdevopenvswitchdata/stats2.json b/tests/virnetdevopenvswitchdata/stats2.json
-new file mode 100644
-index 0000000000..d84be7e011
---- /dev/null
-+++ b/tests/virnetdevopenvswitchdata/stats2.json
-@@ -0,0 +1 @@
-+["map",[["collisions",0],["rx_bytes",0],["rx_crc_err",0],["rx_dropped",0],["rx_errors",0],["rx_frame_err",0],["rx_over_err",0],["rx_packets",0],["tx_bytes",12406],["tx_dropped",0],["tx_errors",0],["tx_packets",173]]]
-diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitchtest.c
-new file mode 100644
-index 0000000000..f01e77cbba
---- /dev/null
-+++ b/tests/virnetdevopenvswitchtest.c
-@@ -0,0 +1,101 @@
-+/*
-+ * Copyright (C) 2019 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 "testutils.h"
-+#include "virnetdevopenvswitch.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_NONE
-+
-+typedef struct _InterfaceParseStatsData InterfaceParseStatsData;
-+struct _InterfaceParseStatsData {
-+    const char *filename;
-+    const virDomainInterfaceStatsStruct stats;
-+};
-+
-+
-+static int
-+testInterfaceParseStats(const void *opaque)
-+{
-+    const InterfaceParseStatsData *data = opaque;
-+    VIR_AUTOFREE(char *) filename = NULL;
-+    VIR_AUTOFREE(char *) buf = NULL;
-+    virDomainInterfaceStatsStruct actual;
-+
-+    if (virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s",
-+                    abs_srcdir, data->filename) < 0)
-+        return -1;
-+
-+    if (virFileReadAll(filename, 1024, &buf) < 0)
-+        return -1;
-+
-+    if (virNetDevOpenvswitchInterfaceParseStats(buf, &actual) < 0)
-+        return -1;
-+
-+    if (memcmp(&actual, &data->stats, sizeof(actual)) != 0) {
-+        fprintf(stderr,
-+                "Expected stats: %lld %lld %lld %lld %lld %lld %lld %lld\n"
-+                "Actual stats: %lld %lld %lld %lld %lld %lld %lld %lld",
-+                data->stats.rx_bytes,
-+                data->stats.rx_packets,
-+                data->stats.rx_errs,
-+                data->stats.rx_drop,
-+                data->stats.tx_bytes,
-+                data->stats.tx_packets,
-+                data->stats.tx_errs,
-+                data->stats.tx_drop,
-+                actual.rx_bytes,
-+                actual.rx_packets,
-+                actual.rx_errs,
-+                actual.rx_drop,
-+                actual.tx_bytes,
-+                actual.tx_packets,
-+                actual.tx_errs,
-+                actual.tx_drop);
-+
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+mymain(void)
-+{
-+    int ret = 0;
-+
-+#define TEST_INTERFACE_STATS(file, \
-+                             rxBytes, rxPackets, rxErrs, rxDrop, \
-+                             txBytes, txPackets, txErrs, txDrop) \
-+    do { \
-+        const InterfaceParseStatsData data = {.filename = file, .stats = { \
-+                             rxBytes, rxPackets, rxErrs, rxDrop, \
-+                             txBytes, txPackets, txErrs, txDrop}}; \
-+        if (virTestRun("Interface stats " file, testInterfaceParseStats, &data) < 0) \
-+            ret = -1; \
-+    } while (0)
-+
-+    TEST_INTERFACE_STATS("stats1.json", 9, 12, 11, 10, 2, 8, 5, 4);
-+    TEST_INTERFACE_STATS("stats2.json", 12406, 173, 0, 0, 0, 0, 0, 0);
-+
-+    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-+}
-+
-+VIR_TEST_MAIN(mymain);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-testQemuDiskXMLToProps-Store-all-per-image-data-in-one-structure.patch b/SOURCES/libvirt-testQemuDiskXMLToProps-Store-all-per-image-data-in-one-structure.patch
new file mode 100644
index 0000000..a96e307
--- /dev/null
+++ b/SOURCES/libvirt-testQemuDiskXMLToProps-Store-all-per-image-data-in-one-structure.patch
@@ -0,0 +1,205 @@
+From bafa6f68029a497c78b3823694b6a2149622bc9e Mon Sep 17 00:00:00 2001
+Message-Id: <bafa6f68029a497c78b3823694b6a2149622bc9e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:26:01 +0100
+Subject: [PATCH] testQemuDiskXMLToProps: Store all per-image data in one
+ structure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We had two non-syncrhonized arrays holding the individual data. This was
+a lazy way to do it when I was adding new tests recently. Since it's
+hard to extend with new data to test refactor the storage of test data
+to use a new struct where all per-image data are kept and can be
+extended easily.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 93171b63c3a28dad06c3af6d2483d953a6f79ad2)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <b8cad280efeab0fe40e4d426167d3095b8419d3a.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 90 ++++++++++++++++++++++++++-----------------
+ 1 file changed, 54 insertions(+), 36 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 14c80960b1..c009db7996 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -180,6 +180,13 @@ testJSONtoJSON(const void *args)
+ }
+ 
+ 
++struct testQemuDiskXMLToJSONImageData {
++    virJSONValuePtr formatprops;
++    virJSONValuePtr storageprops;
++    virJSONValuePtr storagepropssrc;
++};
++
++
+ struct testQemuDiskXMLToJSONData {
+     virQEMUDriverPtr driver;
+     virHashTablePtr schema;
+@@ -187,11 +194,8 @@ struct testQemuDiskXMLToJSONData {
+     const char *name;
+     bool fail;
+ 
+-    virJSONValuePtr *props;
+-    size_t nprops;
+-
+-    virJSONValuePtr *propssrc;
+-    size_t npropssrc;
++    struct testQemuDiskXMLToJSONImageData *images;
++    size_t nimages;
+ 
+     virQEMUCapsPtr qemuCaps;
+ };
+@@ -202,16 +206,13 @@ testQemuDiskXMLToPropsClear(struct testQemuDiskXMLToJSONData *data)
+ {
+     size_t i;
+ 
+-    for (i = 0; i < data->nprops; i++)
+-        virJSONValueFree(data->props[i]);
+-
+-    for (i = 0; i < data->npropssrc; i++)
+-        virJSONValueFree(data->propssrc[i]);
+-
+-    data->nprops = 0;
+-    VIR_FREE(data->props);
+-    data->npropssrc = 0;
+-    VIR_FREE(data->propssrc);
++    for (i = 0; i < data->nimages; i++) {
++        virJSONValueFree(data->images[i].formatprops);
++        virJSONValueFree(data->images[i].storageprops);
++        virJSONValueFree(data->images[i].storagepropssrc);
++    }
++    data->nimages = 0;
++    VIR_FREE(data->images);
+ }
+ 
+ 
+@@ -286,6 +287,7 @@ testQemuDiskXMLToProps(const void *opaque)
+     }
+ 
+     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
++
+         if (testQemuDiskXMLToJSONFakeSecrets(n) < 0)
+             return -1;
+ 
+@@ -306,10 +308,14 @@ testQemuDiskXMLToProps(const void *opaque)
+             return -1;
+         }
+ 
+-        if (VIR_APPEND_ELEMENT(data->props, data->nprops, formatProps) < 0 ||
+-            VIR_APPEND_ELEMENT(data->props, data->nprops, storageProps) < 0 ||
+-            VIR_APPEND_ELEMENT(data->propssrc, data->npropssrc, storageSrcOnlyProps) < 0)
++        if (VIR_REALLOC_N(data->images, data->nimages + 1) < 0)
+             return -1;
++
++        data->images[data->nimages].formatprops = g_steal_pointer(&formatProps);
++        data->images[data->nimages].storageprops = g_steal_pointer(&storageProps);
++        data->images[data->nimages].storagepropssrc = g_steal_pointer(&storageSrcOnlyProps);
++
++        data->nimages++;
+     }
+ 
+     return 0;
+@@ -326,27 +332,37 @@ testQemuDiskXMLToPropsValidateSchema(const void *opaque)
+     if (data->fail)
+         return EXIT_AM_SKIP;
+ 
+-    for (i = 0; i < data->nprops; i++) {
++    for (i = 0; i < data->nimages; i++) {
+         g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
+ 
+-        if (testQEMUSchemaValidate(data->props[i], data->schemaroot,
++        if (testQEMUSchemaValidate(data->images[i].formatprops, data->schemaroot,
+                                    data->schema, &debug) < 0) {
+             g_autofree char *debugmsg = virBufferContentAndReset(&debug);
+-            g_autofree char *propsstr = virJSONValueToString(data->props[i], true);
++            g_autofree char *propsstr = virJSONValueToString(data->images[i].formatprops, true);
+             VIR_TEST_VERBOSE("json does not conform to QAPI schema");
+             VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
+                            propsstr, NULLSTR(debugmsg));
+             ret = -1;
+         }
+-    }
+ 
+-    for (i = 0; i < data->npropssrc; i++) {
+-        g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
++        virBufferFreeAndReset(&debug);
+ 
+-        if (testQEMUSchemaValidate(data->propssrc[i], data->schemaroot,
++        if (testQEMUSchemaValidate(data->images[i].storageprops, data->schemaroot,
+                                    data->schema, &debug) < 0) {
+             g_autofree char *debugmsg = virBufferContentAndReset(&debug);
+-            g_autofree char *propsstr = virJSONValueToString(data->propssrc[i], true);
++            g_autofree char *propsstr = virJSONValueToString(data->images[i].storageprops, true);
++            VIR_TEST_VERBOSE("json does not conform to QAPI schema");
++            VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
++                           propsstr, NULLSTR(debugmsg));
++            ret = -1;
++        }
++
++        virBufferFreeAndReset(&debug);
++
++        if (testQEMUSchemaValidate(data->images[i].storagepropssrc, data->schemaroot,
++                                   data->schema, &debug) < 0) {
++            g_autofree char *debugmsg = virBufferContentAndReset(&debug);
++            g_autofree char *propsstr = virJSONValueToString(data->images[i].storagepropssrc, true);
+             VIR_TEST_VERBOSE("json does not conform to QAPI schema");
+             VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output:\n %s",
+                            propsstr, NULLSTR(debugmsg));
+@@ -372,13 +388,17 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque)
+ 
+     jsonpath = g_strdup_printf("%s%s.json", testQemuDiskXMLToJSONPath, data->name);
+ 
+-    for (i = 0; i < data->nprops; i++) {
+-        g_autofree char *jsonstr = NULL;
++    for (i = 0; i < data->nimages; i++) {
++        g_autofree char *formatprops = NULL;
++        g_autofree char *storageprops = NULL;
+ 
+-        if (!(jsonstr = virJSONValueToString(data->props[i], true)))
++        if (!(formatprops = virJSONValueToString(data->images[i].formatprops, true)))
+             return -1;
+ 
+-        virBufferAdd(&buf, jsonstr, -1);
++        if (!(storageprops = virJSONValueToString(data->images[i].storageprops, true)))
++            return -1;
++
++        virBufferStrcat(&buf, formatprops, storageprops, NULL);
+     }
+ 
+     actual = virBufferContentAndReset(&buf);
+@@ -402,10 +422,10 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque)
+     jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath,
+                                data->name);
+ 
+-    for (i = 0; i < data->npropssrc; i++) {
++    for (i = 0; i < data->nimages; i++) {
+         g_autofree char *jsonstr = NULL;
+ 
+-        if (!(jsonstr = virJSONValueToString(data->propssrc[i], true)))
++        if (!(jsonstr = virJSONValueToString(data->images[i].storagepropssrc, true)))
+             return -1;
+ 
+         virBufferAdd(&buf, jsonstr, -1);
+@@ -1117,10 +1137,8 @@ mymain(void)
+ #define TEST_DISK_TO_JSON_FULL(nme, fl) \
+     do { \
+         diskxmljsondata.name = nme; \
+-        diskxmljsondata.props = NULL; \
+-        diskxmljsondata.nprops = 0; \
+-        diskxmljsondata.propssrc = NULL; \
+-        diskxmljsondata.npropssrc = 0; \
++        diskxmljsondata.images = NULL; \
++        diskxmljsondata.nimages = 0; \
+         diskxmljsondata.fail = fl; \
+         if (virTestRun("disk xml to props " nme, testQemuDiskXMLToProps, \
+                        &diskxmljsondata) < 0) \
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-testQemuDiskXMLToPropsValidateFileSrcOnly-Move-together-with-rest-of-xml-json-code.patch b/SOURCES/libvirt-testQemuDiskXMLToPropsValidateFileSrcOnly-Move-together-with-rest-of-xml-json-code.patch
new file mode 100644
index 0000000..29a34cd
--- /dev/null
+++ b/SOURCES/libvirt-testQemuDiskXMLToPropsValidateFileSrcOnly-Move-together-with-rest-of-xml-json-code.patch
@@ -0,0 +1,106 @@
+From 067d165d1ffd968d07ff54c07ccd3bb529d0c130 Mon Sep 17 00:00:00 2001
+Message-Id: <067d165d1ffd968d07ff54c07ccd3bb529d0c130@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:25:59 +0100
+Subject: [PATCH] testQemuDiskXMLToPropsValidateFileSrcOnly: Move together with
+ rest of xml->json code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function was misplaced. Group it together with other helper
+functions for testing disk XML to qemu JSON props conversion.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit fed97cb435092d9de6f3c862ef297e722f0c0263)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <8e84dfd63f90b8b0bf10fe72bb3dcf07af9f6e96.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c | 61 ++++++++++++++++++++++---------------------
+ 1 file changed, 31 insertions(+), 30 deletions(-)
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 40aa1e2825..14c80960b1 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -387,6 +387,37 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque)
+ }
+ 
+ 
++static int
++testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque)
++{
++    struct testQemuDiskXMLToJSONData *data = (void *) opaque;
++    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
++    g_autofree char *jsonpath = NULL;
++    g_autofree char *actual = NULL;
++    size_t i;
++
++    if (data->fail)
++        return EXIT_AM_SKIP;
++
++    jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath,
++                               data->name);
++
++    for (i = 0; i < data->npropssrc; i++) {
++        g_autofree char *jsonstr = NULL;
++
++        if (!(jsonstr = virJSONValueToString(data->propssrc[i], true)))
++            return -1;
++
++        virBufferAdd(&buf, jsonstr, -1);
++    }
++
++    actual = virBufferContentAndReset(&buf);
++
++    return virTestCompareToFile(actual, jsonpath);
++}
++
++
++
+ struct testQemuImageCreateData {
+     const char *name;
+     const char *backingname;
+@@ -515,36 +546,6 @@ testQemuImageCreate(const void *opaque)
+ }
+ 
+ 
+-static int
+-testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque)
+-{
+-    struct testQemuDiskXMLToJSONData *data = (void *) opaque;
+-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+-    g_autofree char *jsonpath = NULL;
+-    g_autofree char *actual = NULL;
+-    size_t i;
+-
+-    if (data->fail)
+-        return EXIT_AM_SKIP;
+-
+-    jsonpath = g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSONPath,
+-                               data->name);
+-
+-    for (i = 0; i < data->npropssrc; i++) {
+-        g_autofree char *jsonstr = NULL;
+-
+-        if (!(jsonstr = virJSONValueToString(data->propssrc[i], true)))
+-            return -1;
+-
+-        virBufferAdd(&buf, jsonstr, -1);
+-    }
+-
+-    actual = virBufferContentAndReset(&buf);
+-
+-    return virTestCompareToFile(actual, jsonpath);
+-}
+-
+-
+ static const char *bitmapDetectPrefix = "qemublocktestdata/bitmap/";
+ 
+ static void
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-2.11-x86_64.patch b/SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-2.11-x86_64.patch
deleted file mode 100644
index cf56716..0000000
--- a/SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-2.11-x86_64.patch
+++ /dev/null
@@ -1,20429 +0,0 @@
-From fcfd7a32b97c091512ce170556497f593e3a40e2 Mon Sep 17 00:00:00 2001
-Message-Id: <fcfd7a32b97c091512ce170556497f593e3a40e2@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:54 +0200
-Subject: [PATCH] tests: Add capabilities data for QEMU 2.11 x86_64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We were missing these for x86_64 arch, so this is just for completeness.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit fa39de4f866dfb4adfa30e807eacfc1e618ad7d5)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../caps_2.11.0.x86_64.replies                | 19416 ++++++++++++++++
- .../caps_2.11.0.x86_64.xml                    |   961 +
- tests/qemucapabilitiestest.c                  |     1 +
- 3 files changed, 20378 insertions(+)
- create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
- create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
-new file mode 100644
-index 0000000000..bfa7adc988
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
-@@ -0,0 +1,19416 @@
-+{
-+  "execute": "qmp_capabilities",
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "return": {
-+  },
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "execute": "query-version",
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "return": {
-+    "qemu": {
-+      "micro": 0,
-+      "minor": 11,
-+      "major": 2
-+    },
-+    "package": " (v2.11.0)"
-+  },
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-target",
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "arch": "x86_64"
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-commands",
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "netdev_add"
-+    },
-+    {
-+      "name": "device_add"
-+    },
-+    {
-+      "name": "query-qmp-schema"
-+    },
-+    {
-+      "name": "xen-set-replication"
-+    },
-+    {
-+      "name": "xen-set-global-dirty-log"
-+    },
-+    {
-+      "name": "xen-save-devices-state"
-+    },
-+    {
-+      "name": "xen-load-devices-state"
-+    },
-+    {
-+      "name": "xen-colo-do-checkpoint"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256"
-+    },
-+    {
-+      "name": "x-colo-lost-heartbeat"
-+    },
-+    {
-+      "name": "x-blockdev-remove-medium"
-+    },
-+    {
-+      "name": "x-blockdev-insert-medium"
-+    },
-+    {
-+      "name": "x-blockdev-change"
-+    },
-+    {
-+      "name": "watchdog-set-action"
-+    },
-+    {
-+      "name": "transaction"
-+    },
-+    {
-+      "name": "trace-event-set-state"
-+    },
-+    {
-+      "name": "trace-event-get-state"
-+    },
-+    {
-+      "name": "system_wakeup"
-+    },
-+    {
-+      "name": "system_reset"
-+    },
-+    {
-+      "name": "system_powerdown"
-+    },
-+    {
-+      "name": "stop"
-+    },
-+    {
-+      "name": "set_password"
-+    },
-+    {
-+      "name": "set_link"
-+    },
-+    {
-+      "name": "send-key"
-+    },
-+    {
-+      "name": "screendump"
-+    },
-+    {
-+      "name": "rtc-reset-reinjection"
-+    },
-+    {
-+      "name": "ringbuf-write"
-+    },
-+    {
-+      "name": "ringbuf-read"
-+    },
-+    {
-+      "name": "remove-fd"
-+    },
-+    {
-+      "name": "quit"
-+    },
-+    {
-+      "name": "query-xen-replication-status"
-+    },
-+    {
-+      "name": "query-vnc-servers"
-+    },
-+    {
-+      "name": "query-vnc"
-+    },
-+    {
-+      "name": "query-vm-generation-id"
-+    },
-+    {
-+      "name": "query-version"
-+    },
-+    {
-+      "name": "query-uuid"
-+    },
-+    {
-+      "name": "query-tpm-types"
-+    },
-+    {
-+      "name": "query-tpm-models"
-+    },
-+    {
-+      "name": "query-tpm"
-+    },
-+    {
-+      "name": "query-target"
-+    },
-+    {
-+      "name": "query-status"
-+    },
-+    {
-+      "name": "query-spice"
-+    },
-+    {
-+      "name": "query-rx-filter"
-+    },
-+    {
-+      "name": "query-rocker-ports"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-groups"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-flows"
-+    },
-+    {
-+      "name": "query-rocker"
-+    },
-+    {
-+      "name": "query-pci"
-+    },
-+    {
-+      "name": "query-named-block-nodes"
-+    },
-+    {
-+      "name": "query-name"
-+    },
-+    {
-+      "name": "query-migrate-parameters"
-+    },
-+    {
-+      "name": "query-migrate-capabilities"
-+    },
-+    {
-+      "name": "query-migrate-cache-size"
-+    },
-+    {
-+      "name": "query-migrate"
-+    },
-+    {
-+      "name": "query-mice"
-+    },
-+    {
-+      "name": "query-memory-size-summary"
-+    },
-+    {
-+      "name": "query-memory-devices"
-+    },
-+    {
-+      "name": "query-memdev"
-+    },
-+    {
-+      "name": "query-machines"
-+    },
-+    {
-+      "name": "query-kvm"
-+    },
-+    {
-+      "name": "query-iothreads"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus"
-+    },
-+    {
-+      "name": "query-fdsets"
-+    },
-+    {
-+      "name": "query-events"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability"
-+    },
-+    {
-+      "name": "query-dump"
-+    },
-+    {
-+      "name": "query-cpus"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion"
-+    },
-+    {
-+      "name": "query-cpu-definitions"
-+    },
-+    {
-+      "name": "query-commands"
-+    },
-+    {
-+      "name": "query-command-line-options"
-+    },
-+    {
-+      "name": "query-chardev-backends"
-+    },
-+    {
-+      "name": "query-chardev"
-+    },
-+    {
-+      "name": "query-blockstats"
-+    },
-+    {
-+      "name": "query-block-jobs"
-+    },
-+    {
-+      "name": "query-block"
-+    },
-+    {
-+      "name": "query-balloon"
-+    },
-+    {
-+      "name": "query-acpi-ospm-status"
-+    },
-+    {
-+      "name": "qom-set"
-+    },
-+    {
-+      "name": "qom-list-types"
-+    },
-+    {
-+      "name": "qom-list"
-+    },
-+    {
-+      "name": "qom-get"
-+    },
-+    {
-+      "name": "qmp_capabilities"
-+    },
-+    {
-+      "name": "pmemsave"
-+    },
-+    {
-+      "name": "object-del"
-+    },
-+    {
-+      "name": "object-add"
-+    },
-+    {
-+      "name": "netdev_del"
-+    },
-+    {
-+      "name": "nbd-server-stop"
-+    },
-+    {
-+      "name": "nbd-server-start"
-+    },
-+    {
-+      "name": "nbd-server-add"
-+    },
-+    {
-+      "name": "migrate_set_speed"
-+    },
-+    {
-+      "name": "migrate_set_downtime"
-+    },
-+    {
-+      "name": "migrate_cancel"
-+    },
-+    {
-+      "name": "migrate-start-postcopy"
-+    },
-+    {
-+      "name": "migrate-set-parameters"
-+    },
-+    {
-+      "name": "migrate-set-capabilities"
-+    },
-+    {
-+      "name": "migrate-set-cache-size"
-+    },
-+    {
-+      "name": "migrate-incoming"
-+    },
-+    {
-+      "name": "migrate-continue"
-+    },
-+    {
-+      "name": "migrate"
-+    },
-+    {
-+      "name": "memsave"
-+    },
-+    {
-+      "name": "input-send-event"
-+    },
-+    {
-+      "name": "inject-nmi"
-+    },
-+    {
-+      "name": "human-monitor-command"
-+    },
-+    {
-+      "name": "getfd"
-+    },
-+    {
-+      "name": "expire_password"
-+    },
-+    {
-+      "name": "eject"
-+    },
-+    {
-+      "name": "dump-guest-memory"
-+    },
-+    {
-+      "name": "drive-mirror"
-+    },
-+    {
-+      "name": "drive-backup"
-+    },
-+    {
-+      "name": "device_del"
-+    },
-+    {
-+      "name": "device-list-properties"
-+    },
-+    {
-+      "name": "cpu-add"
-+    },
-+    {
-+      "name": "cpu"
-+    },
-+    {
-+      "name": "cont"
-+    },
-+    {
-+      "name": "closefd"
-+    },
-+    {
-+      "name": "client_migrate_info"
-+    },
-+    {
-+      "name": "chardev-send-break"
-+    },
-+    {
-+      "name": "chardev-remove"
-+    },
-+    {
-+      "name": "chardev-change"
-+    },
-+    {
-+      "name": "chardev-add"
-+    },
-+    {
-+      "name": "change-vnc-password"
-+    },
-+    {
-+      "name": "change-backing-file"
-+    },
-+    {
-+      "name": "change"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync"
-+    },
-+    {
-+      "name": "blockdev-snapshot"
-+    },
-+    {
-+      "name": "blockdev-open-tray"
-+    },
-+    {
-+      "name": "blockdev-mirror"
-+    },
-+    {
-+      "name": "blockdev-del"
-+    },
-+    {
-+      "name": "blockdev-close-tray"
-+    },
-+    {
-+      "name": "blockdev-change-medium"
-+    },
-+    {
-+      "name": "blockdev-backup"
-+    },
-+    {
-+      "name": "blockdev-add"
-+    },
-+    {
-+      "name": "block_set_io_throttle"
-+    },
-+    {
-+      "name": "block_resize"
-+    },
-+    {
-+      "name": "block_passwd"
-+    },
-+    {
-+      "name": "block-stream"
-+    },
-+    {
-+      "name": "block-set-write-threshold"
-+    },
-+    {
-+      "name": "block-job-set-speed"
-+    },
-+    {
-+      "name": "block-job-resume"
-+    },
-+    {
-+      "name": "block-job-pause"
-+    },
-+    {
-+      "name": "block-job-complete"
-+    },
-+    {
-+      "name": "block-job-cancel"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add"
-+    },
-+    {
-+      "name": "block-commit"
-+    },
-+    {
-+      "name": "balloon"
-+    },
-+    {
-+      "name": "add_client"
-+    },
-+    {
-+      "name": "add-fd"
-+    }
-+  ],
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "add-fd",
-+  "arguments": {
-+    "fdset-id": 0,
-+    "opaque": "/dev/null"
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "fd": 15,
-+    "fdset-id": 0
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "block-commit",
-+  "arguments": {
-+    "device": "bogus"
-+  },
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "id": "libvirt-6",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'bogus' not found"
-+  }
-+}
-+
-+{
-+  "execute": "query-kvm",
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "return": {
-+    "enabled": true,
-+    "present": true
-+  },
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "execute": "query-events",
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "WATCHDOG"
-+    },
-+    {
-+      "name": "WAKEUP"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED"
-+    },
-+    {
-+      "name": "VNC_CONNECTED"
-+    },
-+    {
-+      "name": "SUSPEND_DISK"
-+    },
-+    {
-+      "name": "SUSPEND"
-+    },
-+    {
-+      "name": "STOP"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED"
-+    },
-+    {
-+      "name": "SHUTDOWN"
-+    },
-+    {
-+      "name": "RTC_CHANGE"
-+    },
-+    {
-+      "name": "RESUME"
-+    },
-+    {
-+      "name": "RESET"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD"
-+    },
-+    {
-+      "name": "QUORUM_FAILURE"
-+    },
-+    {
-+      "name": "POWERDOWN"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED"
-+    },
-+    {
-+      "name": "MIGRATION_PASS"
-+    },
-+    {
-+      "name": "MIGRATION"
-+    },
-+    {
-+      "name": "MEM_UNPLUG_ERROR"
-+    },
-+    {
-+      "name": "GUEST_PANICKED"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED"
-+    },
-+    {
-+      "name": "DEVICE_DELETED"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST"
-+    }
-+  ],
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "execute": "qom-list-types",
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "vhost-vsock-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "pc-q35-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "generic-sdhci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pc-0.13-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "cfi.pflash01",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "i82551",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82550",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Westmere-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-serial-4x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cryptodev-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "Penryn-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Haswell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "iothread",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pc-q35-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Skylake-Client-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-gpu-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "Opteron_G3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "floppy-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "e1000e",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Broadwell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "piix3-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "secret",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "amd-iommu-iommu-memory-region",
-+      "parent": "qemu:iommu-memory-region"
-+    },
-+    {
-+      "name": "base-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "isa-parallel",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "megasas",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "i2c-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "pc-q35-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-vsock-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "usb-braille",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "mptsas1068",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-udp",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "vmware-svga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qio-channel-tls",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "chardev-file",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "filter-buffer",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "PIIX3-xen",
-+      "parent": "pci-piix3"
-+    },
-+    {
-+      "name": "ccid-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "scsi-cd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "pc-i440fx-2.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isa-serial",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "usb-ehci",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qio-channel-rdma",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "chardev-null",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "host-x86_64-cpu",
-+      "parent": "max-x86_64-cpu"
-+    },
-+    {
-+      "name": "qemu64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-serial-2x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-mouse-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "piix4-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "scsi-generic",
-+      "parent": "scsi-device"
-+    },
-+    {
-+      "name": "isa-ipmi-bt",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-1.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-net-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "hyperv-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-dimm",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pc-q35-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "Haswell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-2.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ich9-usb-ehci1",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "virtio-mouse-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "isa-debugcon",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "throttle-group",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "intel-iommu-iommu-memory-region",
-+      "parent": "qemu:iommu-memory-region"
-+    },
-+    {
-+      "name": "AMDVI-PCI",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ide-hd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "virtio-vga",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "rng-egd",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "isa-pcspk",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "isa-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "pc-1.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ich9-usb-ehci2",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "pxb-host",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "pc-q35-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "intel-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "irq",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "chardev-vc",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "ipmi-bmc-sim",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "cirrus-vga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtconsole",
-+      "parent": "virtserialport"
-+    },
-+    {
-+      "name": "chardev-socket",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-rng-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "PCIE",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "qio-channel-buffer",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "chardev-pty",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pentium3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qxl-vga",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "qio-dns-resolver",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "kvm-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "chardev-memory",
-+      "parent": "chardev-ringbuf"
-+    },
-+    {
-+      "name": "pc-i440fx-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "filter-rewriter",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "pcie-root-port",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "chardev-serial",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "vhost-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "usb-host",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "usb-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Skylake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-1.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "usb-kbd",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "486-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ES1370",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "gus",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "input-linux",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "PIIX3",
-+      "parent": "pci-piix3"
-+    },
-+    {
-+      "name": "isa-applesmc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "migration",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "i82559er",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "q35-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "usb-bt-dongle",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "e1000-82545em",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "e1000-82544gc",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "i6300esb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-i440fx-1.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "or-irq",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pc-0.14-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "mc146818rtc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "AC97",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "PIIX4_PM",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "piix4-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "sysbus-ahci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "virtio-tablet-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "filter-redirector",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "kvm-ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "chardev-pipe",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "unimplemented-device",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pvpanic",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "core2duo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qio-channel-command",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "tls-creds-x509",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "virtio-9p-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "scsi-disk",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "vfio-pci-igd-lpc-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sb16",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "virtio-serial-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "qemu-console",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pc-0.15-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-ringbuf",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-blk-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "usb-mouse",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "filter-dump",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "virtio-keyboard-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "chardev-stdio",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "piix3-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "virtio-scsi-device",
-+      "parent": "virtio-scsi-common"
-+    },
-+    {
-+      "name": "virtio-9p-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "hda-output",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "pc-q35-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SUNW,fdtwo",
-+      "parent": "base-sysbus-fdc"
-+    },
-+    {
-+      "name": "tpci200",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i8257",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "filter-mirror",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "Opteron_G4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "virtio-mmio",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isa-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "System",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "pvscsi",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "amd-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "virtio-net-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "colo-compare",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "sd-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "vmcoreinfo",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "qio-channel-file",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "usb-hub",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "chardev-testdev",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "IvyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "hda-duplex",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "igd-passthrough-i440FX",
-+      "parent": "i440FX"
-+    },
-+    {
-+      "name": "ccid-card-passthru",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "chardev-hci",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "igd-passthrough-isa-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "rocker",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "nec-usb-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "megasas-gen2",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "pci-ohci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ib700",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "xio3130-downstream",
-+      "parent": "pcie-slot"
-+    },
-+    {
-+      "name": "chardev-mux",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "isapc-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ipoctal232",
-+      "parent": "ipack-device"
-+    },
-+    {
-+      "name": "ide-cd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "tls-creds-anon",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "pc-i440fx-2.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isabus-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isa-ipmi-kcs",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "memory-backend-file",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "virtio-crypto-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "qemu:memory-region",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "isa-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "isa-ide",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "virtio-keyboard-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "ipmi-bmc-extern",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "rng-random",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "kvm-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "i440FX-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "sga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "tpm-tis",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "tpm-passthrough",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "pc-1.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "isa-debug-exit",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "filter-replay",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "pc-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "Opteron_G1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-0.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-2.3-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "qemu32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pcnet",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "ivshmem",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "hpet",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "adlib",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "chardev-gdb",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-pci-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "lsi53c895a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-audio",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "pr-manager-helper",
-+      "parent": "pr-manager"
-+    },
-+    {
-+      "name": "usb-tablet",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "pxb-bus",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "dc390",
-+      "parent": "am53c974"
-+    },
-+    {
-+      "name": "usb-wacom-tablet",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-mmio-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "pc-0.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "kvm-apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "phenom-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-ccid",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "fw_cfg_io",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "usb-net",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ioh3420",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "virtio-crypto-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "cs4231a",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "chardev-braille",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "nvme",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-wctablet",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "i82801b11-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "kvmvapic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "sdhci-bus",
-+      "parent": "sd-bus"
-+    },
-+    {
-+      "name": "pc-i440fx-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "edu",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pci-bridge-seat",
-+      "parent": "pci-bridge"
-+    },
-+    {
-+      "name": "mch",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "virtio-balloon-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "tcg-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "mmio_interface",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "usb-bot",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "isa-cirrus-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "esp",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "ICH9-LPC",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "accel",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pc-i440fx-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pxb-pcie-bus",
-+      "parent": "PCIE"
-+    },
-+    {
-+      "name": "pc-i440fx-1.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "lsi53c810",
-+      "parent": "lsi53c895a"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "loader",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci6",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pc-i440fx-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ich9-usb-uhci4",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "virtio-serial-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "nvdimm",
-+      "parent": "pc-dimm"
-+    },
-+    {
-+      "name": "tpm-emulator",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "SandyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-spiceport",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "virtio-balloon-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "qxl",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "chardev-spicevmc",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "pc-i440fx-1.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "max-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-serial-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci3",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "ICH9 SMB",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci5",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pxb-pcie",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "piix3-ide-xen",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "virtio-input-host-device",
-+      "parent": "virtio-input-device"
-+    },
-+    {
-+      "name": "vmxnet3",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "IDE",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "VGA",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "pci-testdev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci2",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "ich9-usb-uhci1",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "x3130-upstream",
-+      "parent": "pcie-port"
-+    },
-+    {
-+      "name": "SCSI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "none-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "sysbus-fdc",
-+      "parent": "base-sysbus-fdc"
-+    },
-+    {
-+      "name": "n270-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-serial",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "athlon-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-rng-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "ccid-card-emulated",
-+      "parent": "ccid-card"
-+    },
-+    {
-+      "name": "ISA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "i8042",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "kvm-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "i82559c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "floppy",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "i82559b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82559a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "scsi-hd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "qtest-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "virtio-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "hda-micro",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "scsi-block",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "rtl8139",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmmouse",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "ich9-intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "pc-q35-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "usb-mtp",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ide-drive",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "qio-channel-websock",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "fw_cfg_mem",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "PCI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Opteron_G5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vmport",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "coreduo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-redir",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "usb-storage",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "am53c974",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-input-host-pci",
-+      "parent": "virtio-input-pci"
-+    },
-+    {
-+      "name": "pentium2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82558b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cryptodev-backend-builtin",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "i82558a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qemu,register",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "ne2k_isa",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "sdhci-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-parallel",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "qemu-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "pxb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "port92",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "e1000",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "Conroe-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvm64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82801",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vt82c686b-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "HDA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "vmgenid",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pc-1.3-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "usb-serial",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "pc-i440fx-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "sysbus-ohci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "chardev-msmouse",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "EPYC-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82557b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-uas",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82557c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Nehalem-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "memory-backend-ram",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "i82557a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtserialport",
-+      "parent": "virtio-serial-port"
-+    },
-+    {
-+      "name": "i440FX",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ne2k_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "smbus-eeprom",
-+      "parent": "smbus-device"
-+    },
-+    {
-+      "name": "i82562",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ich9-ahci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "isa-fdc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "sd-card",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pc-0.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "kvm32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Opteron_G2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vfio-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "IndustryPack",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "virtio-gpu-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "ivshmem-plain",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "secondary-vga",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "qio-channel-socket",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "ivshmem-doorbell",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "pcie-pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "pentium-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-blk-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-tablet-pci",
-+      "parent": "virtio-input-hid-pci"
-+    }
-+  ],
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-blk-pci"
-+  },
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "scsi",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-pci"
-+  },
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "ctrl_mac_addr",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vlan",
-+      "description": "Integer VLAN id to connect to",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_guest_offloads",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mac",
-+      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
-+      "type": "str"
-+    },
-+    {
-+      "name": "tx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "tx",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-mtu-bypass-backend",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "netdev",
-+      "description": "ID of a netdev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rx_queue_size",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-pci"
-+  },
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "param_change",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-scsi-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-ccw"
-+  },
-+  "id": "libvirt-13"
-+}
-+
-+{
-+  "id": "libvirt-13",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-net-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-ccw"
-+  },
-+  "id": "libvirt-14"
-+}
-+
-+{
-+  "id": "libvirt-14",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-scsi-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-s390"
-+  },
-+  "id": "libvirt-15"
-+}
-+
-+{
-+  "id": "libvirt-15",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-net-s390' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "pci-assign"
-+  },
-+  "id": "libvirt-16"
-+}
-+
-+{
-+  "id": "libvirt-16",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "kvm-pci-assign"
-+  },
-+  "id": "libvirt-17"
-+}
-+
-+{
-+  "id": "libvirt-17",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'kvm-pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vfio-pci"
-+  },
-+  "id": "libvirt-18"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "x-pci-sub-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-kvm-msi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-igd-opregion",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-vga",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pci-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-req",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-igd-gms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-no-kvm-intx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pci-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "host",
-+      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-no-kvm-msix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-intx-mmap-timeout-ms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "x-pci-sub-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-nv-gpudirect-clique",
-+      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
-+      "type": "uint4"
-+    },
-+    {
-+      "name": "sysfsdev",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-no-mmap",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-18"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-disk"
-+  },
-+  "id": "libvirt-19"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "port_index",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "dpofua",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "max_unmap_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "port_wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "product",
-+      "type": "str"
-+    },
-+    {
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "str"
-+    },
-+    {
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "max_io_size",
-+      "type": "uint64"
-+    }
-+  ],
-+  "id": "libvirt-19"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ide-drive"
-+  },
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "unit",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "model",
-+      "type": "str"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "PIIX4_PM"
-+  },
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi-pci-hotplug-with-bridge-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "smb_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-redir"
-+  },
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "filter",
-+      "type": "str"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "debug",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "streams",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "chardev",
-+      "description": "ID of a chardev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-host"
-+  },
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "isobufs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostaddr",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "productid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "isobsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vendorid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pipeline",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hostport",
-+      "type": "str"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "loglevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostbus",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-generic"
-+  },
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "i440FX-pcihost"
-+  },
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "short_root_bus",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pci-conf-idx[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-end",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole-end",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pci-hole-start",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pci-hole64-start",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole64-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "pci-conf-data[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "x-pci-hole64-fix",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "q35-pcihost"
-+  },
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "short_root_bus",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "system-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-conf-idx[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pcie-mmcfg-mmio[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-start",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "io-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-end",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole-end",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "above-4g-mem-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "below-4g-mem-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "ram-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole-start",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "MCFG",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "mch",
-+      "type": "child<mch>"
-+    },
-+    {
-+      "name": "pci-hole64-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "pci-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-conf-data[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "x-pci-hole64-fix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mcfg_size",
-+      "type": "uint64"
-+    }
-+  ],
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-storage"
-+  },
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "kvm-pit"
-+  },
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "iobase",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lost_tick_policy",
-+      "type": "LostTickPolicy"
-+    }
-+  ],
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "VGA"
-+  },
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmio",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "qemu-extended-regs",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "big-endian-framebuffer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vmware-svga"
-+  },
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "qxl"
-+  },
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "debug",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ram_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram64_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "guestdebug",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "surfaces",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cmdlog",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-pci"
-+  },
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-gpu-device>"
-+    },
-+    {
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virgl",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-device"
-+  },
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "stats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virgl",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_hostmem",
-+      "type": "size"
-+    }
-+  ],
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ICH9-LPC"
-+  },
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "sci_int",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gpe0_blk_len",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pm_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "noreboot",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cpu-hotplug-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi_disable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-smi-broadcast",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "acpi_enable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "enable_tco",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gpe0_blk",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-pci"
-+  },
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-balloon-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-ccw"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "id": "libvirt-36",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-balloon-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-device"
-+  },
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "nec-usb-xhci"
-+  },
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "intrs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msix",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msi",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "superspeed-ports-first",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "streams",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "force-pcie-endcap",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "p3",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "p2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "slots",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "intel-iommu"
-+  },
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "eim",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "caching-mode",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-buggy-eim",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "intremap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "version",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "device-iotlb",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "mch"
-+  },
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "extended-tseg-mbytes",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.12",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.3",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.8",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.11",
-+      "is-default": true,
-+      "cpu-max": 255,
-+      "alias": "pc"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.10",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.11",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.3",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.10",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.2",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.2",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "isapc",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.15",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.14",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.9",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.1",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.1",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.8",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.9",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.11",
-+      "cpu-max": 288,
-+      "alias": "q35"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.13",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.10",
-+      "cpu-max": 288
-+    }
-+  ],
-+  "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
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "libvirt-42"
-+}
-+
-+{
-+  "execute": "query-tpm-models",
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "return": [
-+    "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": "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": "non-adaptive",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "lossy",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "acl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "x509verify",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "sasl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "key-delay-ms",
-+          "type": "number"
-+        },
-+        {
-+          "name": "lock-key-sync",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reverse",
-+          "type": "boolean"
-+        },
-+        {
-+          "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": "x509",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "vnc",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "vnc"
-+    },
-+    {
-+      "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",
-+          "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": [
-+      ],
-+      "option": "smbios"
-+    },
-+    {
-+      "parameters": [
-+      ],
-+      "option": "acpi"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "dmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sock_fd",
-+          "type": "number"
-+        },
-+        {
-+          "name": "socket",
-+          "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": "readonly",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "writeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "security_model",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fsdriver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "fsdev"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "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\nthe 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": [
-+        {
-+          "name": "arg",
-+          "type": "string"
-+        },
-+        {
-+          "name": "target",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "semihosting-config"
-+    },
-+    {
-+      "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": "timestamp",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "msg"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "mlock",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "realtime"
-+    },
-+    {
-+      "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": "resourcecontrol",
-+          "type": "string"
-+        },
-+        {
-+          "name": "spawn",
-+          "type": "string"
-+        },
-+        {
-+          "name": "elevateprivileges",
-+          "type": "string"
-+        },
-+        {
-+          "name": "obsolete",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "sandbox"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "strict",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reboot-timeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "splash-time",
-+          "type": "string"
-+        },
-+        {
-+          "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": "sockets",
-+          "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": [
-+        {
-+          "name": "thread",
-+          "help": "Enable/disable multi-threaded TCG",
-+          "type": "string"
-+        },
-+        {
-+          "name": "accel",
-+          "help": "Select the type of accelerator",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "accel"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "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": "dea-key-wrap",
-+          "help": "enable/disable DEA key wrapping using the CPACF wrapping key",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "aes-key-wrap",
-+          "help": "enable/disable AES key wrapping using the CPACF wrapping key",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "suppress-vmdesc",
-+          "help": "Set on to disable self-describing migration",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "iommu",
-+          "help": "Set on/off to enable/disable Intel IOMMU (VT-d)",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "firmware",
-+          "help": "firmware image",
-+          "type": "string"
-+        },
-+        {
-+          "name": "usb",
-+          "help": "Set on/off to enable/disable usb",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mem-merge",
-+          "help": "enable/disable memory merge support",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dump-guest-core",
-+          "help": "Include guest memory in  a core dump",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dt_compatible",
-+          "help": "Overrides the \"compatible\" property of the dt root node",
-+          "type": "string"
-+        },
-+        {
-+          "name": "phandle_start",
-+          "help": "The first phandle ID we may generate dynamically",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dumpdtb",
-+          "help": "Dump current dtb to a file and quit",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dtb",
-+          "help": "Linux kernel device tree file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "append",
-+          "help": "Linux kernel command line",
-+          "type": "string"
-+        },
-+        {
-+          "name": "initrd",
-+          "help": "Linux initial ramdisk file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "kernel",
-+          "help": "Linux kernel image file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "kvm_shadow_mem",
-+          "help": "KVM shadow MMU size",
-+          "type": "size"
-+        },
-+        {
-+          "name": "kernel_irqchip",
-+          "help": "use KVM in-kernel irqchip",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "accel",
-+          "help": "accelerator list",
-+          "type": "string"
-+        },
-+        {
-+          "name": "type",
-+          "help": "emulated machine",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "machine"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "romfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "bootindex",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "option-rom"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "events",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "trace"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "pretty",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "default",
-+          "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": "netdev"
-+    },
-+    {
-+      "parameters": [
-+      ],
-+      "option": "device"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "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": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tn3270",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "telnet",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reconnect",
-+          "type": "number"
-+        },
-+        {
-+          "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": "port",
-+          "type": "string"
-+        },
-+        {
-+          "name": "host",
-+          "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": "serial",
-+          "help": "disk serial number",
-+          "type": "string"
-+        },
-+        {
-+          "name": "addr",
-+          "help": "pci address (virtio only)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "boot",
-+          "help": "(deprecated, ignored)",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "trans",
-+          "help": "chs translation (auto, lba, none)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "secs",
-+          "help": "number of sectors (ide disk geometry)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "heads",
-+          "help": "number of heads (ide disk geometry)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cyls",
-+          "help": "number of cylinders (ide disk geometry)",
-+          "type": "number"
-+        },
-+        {
-+          "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)",
-+          "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": "read-only",
-+          "help": "Node is opened in read-only mode",
-+          "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": "compress"
-+    },
-+    {
-+      "state": false,
-+      "capability": "events"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-colo"
-+    },
-+    {
-+      "state": false,
-+      "capability": "release-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "block"
-+    },
-+    {
-+      "state": false,
-+      "capability": "return-path"
-+    },
-+    {
-+      "state": false,
-+      "capability": "pause-before-switchover"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-multifd"
-+    }
-+  ],
-+  "id": "libvirt-46"
-+}
-+
-+{
-+  "execute": "query-qmp-schema",
-+  "id": "libvirt-47"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "ACPI_DEVICE_OST",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "1"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED",
-+      "meta-type": "event",
-+      "arg-type": "2"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "3"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED",
-+      "meta-type": "event",
-+      "arg-type": "4"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "5"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "6"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY",
-+      "meta-type": "event",
-+      "arg-type": "7"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD",
-+      "meta-type": "event",
-+      "arg-type": "8"
-+    },
-+    {
-+      "name": "DEVICE_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "9"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED",
-+      "meta-type": "event",
-+      "arg-type": "10"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "11"
-+    },
-+    {
-+      "name": "GUEST_PANICKED",
-+      "meta-type": "event",
-+      "arg-type": "12"
-+    },
-+    {
-+      "name": "MEM_UNPLUG_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "13"
-+    },
-+    {
-+      "name": "MIGRATION",
-+      "meta-type": "event",
-+      "arg-type": "14"
-+    },
-+    {
-+      "name": "MIGRATION_PASS",
-+      "meta-type": "event",
-+      "arg-type": "15"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "16"
-+    },
-+    {
-+      "name": "POWERDOWN",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "QUORUM_FAILURE",
-+      "meta-type": "event",
-+      "arg-type": "18"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD",
-+      "meta-type": "event",
-+      "arg-type": "19"
-+    },
-+    {
-+      "name": "RESET",
-+      "meta-type": "event",
-+      "arg-type": "20"
-+    },
-+    {
-+      "name": "RESUME",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "RTC_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "21"
-+    },
-+    {
-+      "name": "SHUTDOWN",
-+      "meta-type": "event",
-+      "arg-type": "22"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "23"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "24"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "25"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "STOP",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "SUSPEND",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "SUSPEND_DISK",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "VNC_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "26"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "27"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "28"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "29"
-+    },
-+    {
-+      "name": "WAKEUP",
-+      "meta-type": "event",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "WATCHDOG",
-+      "meta-type": "event",
-+      "arg-type": "30"
-+    },
-+    {
-+      "name": "add-fd",
-+      "ret-type": "32",
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "add_client",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "33"
-+    },
-+    {
-+      "name": "balloon",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "34"
-+    },
-+    {
-+      "name": "block-commit",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "35"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "36"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "block-job-cancel",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "38"
-+    },
-+    {
-+      "name": "block-job-complete",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "39"
-+    },
-+    {
-+      "name": "block-job-pause",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "40"
-+    },
-+    {
-+      "name": "block-job-resume",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "41"
-+    },
-+    {
-+      "name": "block-job-set-speed",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "42"
-+    },
-+    {
-+      "name": "block-set-write-threshold",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "43"
-+    },
-+    {
-+      "name": "block-stream",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "44"
-+    },
-+    {
-+      "name": "block_passwd",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "block_resize",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "46"
-+    },
-+    {
-+      "name": "block_set_io_throttle",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "47"
-+    },
-+    {
-+      "name": "blockdev-add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "48"
-+    },
-+    {
-+      "name": "blockdev-backup",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "49"
-+    },
-+    {
-+      "name": "blockdev-change-medium",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "50"
-+    },
-+    {
-+      "name": "blockdev-close-tray",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "51"
-+    },
-+    {
-+      "name": "blockdev-del",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "52"
-+    },
-+    {
-+      "name": "blockdev-mirror",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "53"
-+    },
-+    {
-+      "name": "blockdev-open-tray",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "54"
-+    },
-+    {
-+      "name": "blockdev-snapshot",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "55"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync",
-+      "ret-type": "57",
-+      "meta-type": "command",
-+      "arg-type": "56"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "58"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "59"
-+    },
-+    {
-+      "name": "change",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "60"
-+    },
-+    {
-+      "name": "change-backing-file",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "61"
-+    },
-+    {
-+      "name": "change-vnc-password",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "62"
-+    },
-+    {
-+      "name": "chardev-add",
-+      "ret-type": "64",
-+      "meta-type": "command",
-+      "arg-type": "63"
-+    },
-+    {
-+      "name": "chardev-change",
-+      "ret-type": "64",
-+      "meta-type": "command",
-+      "arg-type": "65"
-+    },
-+    {
-+      "name": "chardev-remove",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "66"
-+    },
-+    {
-+      "name": "chardev-send-break",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "67"
-+    },
-+    {
-+      "name": "client_migrate_info",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "68"
-+    },
-+    {
-+      "name": "closefd",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "69"
-+    },
-+    {
-+      "name": "cont",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "cpu",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "70"
-+    },
-+    {
-+      "name": "cpu-add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "71"
-+    },
-+    {
-+      "name": "device-list-properties",
-+      "ret-type": "[73]",
-+      "meta-type": "command",
-+      "arg-type": "72"
-+    },
-+    {
-+      "name": "device_add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "74"
-+    },
-+    {
-+      "name": "device_del",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "75"
-+    },
-+    {
-+      "name": "drive-backup",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "76"
-+    },
-+    {
-+      "name": "drive-mirror",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "77"
-+    },
-+    {
-+      "name": "dump-guest-memory",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "78"
-+    },
-+    {
-+      "name": "dump-skeys",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "79"
-+    },
-+    {
-+      "name": "eject",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "80"
-+    },
-+    {
-+      "name": "expire_password",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "81"
-+    },
-+    {
-+      "name": "getfd",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "82"
-+    },
-+    {
-+      "name": "human-monitor-command",
-+      "ret-type": "str",
-+      "meta-type": "command",
-+      "arg-type": "83"
-+    },
-+    {
-+      "name": "inject-nmi",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "input-send-event",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "84"
-+    },
-+    {
-+      "name": "memsave",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "85"
-+    },
-+    {
-+      "name": "migrate",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "86"
-+    },
-+    {
-+      "name": "migrate-continue",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "87"
-+    },
-+    {
-+      "name": "migrate-incoming",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "88"
-+    },
-+    {
-+      "name": "migrate-set-cache-size",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "89"
-+    },
-+    {
-+      "name": "migrate-set-capabilities",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "90"
-+    },
-+    {
-+      "name": "migrate-set-parameters",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "91"
-+    },
-+    {
-+      "name": "migrate-start-postcopy",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "migrate_cancel",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "migrate_set_downtime",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "92"
-+    },
-+    {
-+      "name": "migrate_set_speed",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "93"
-+    },
-+    {
-+      "name": "nbd-server-add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "94"
-+    },
-+    {
-+      "name": "nbd-server-start",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "95"
-+    },
-+    {
-+      "name": "nbd-server-stop",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "netdev_add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "96"
-+    },
-+    {
-+      "name": "netdev_del",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "97"
-+    },
-+    {
-+      "name": "object-add",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "98"
-+    },
-+    {
-+      "name": "object-del",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "99"
-+    },
-+    {
-+      "name": "pmemsave",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "100"
-+    },
-+    {
-+      "name": "qmp_capabilities",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "qom-get",
-+      "ret-type": "any",
-+      "meta-type": "command",
-+      "arg-type": "101"
-+    },
-+    {
-+      "name": "qom-list",
-+      "ret-type": "[103]",
-+      "meta-type": "command",
-+      "arg-type": "102"
-+    },
-+    {
-+      "name": "qom-list-types",
-+      "ret-type": "[105]",
-+      "meta-type": "command",
-+      "arg-type": "104"
-+    },
-+    {
-+      "name": "qom-set",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "106"
-+    },
-+    {
-+      "name": "query-acpi-ospm-status",
-+      "ret-type": "[107]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-balloon",
-+      "ret-type": "108",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-block",
-+      "ret-type": "[109]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-block-jobs",
-+      "ret-type": "[110]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-blockstats",
-+      "ret-type": "[112]",
-+      "meta-type": "command",
-+      "arg-type": "111"
-+    },
-+    {
-+      "name": "query-chardev",
-+      "ret-type": "[113]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-chardev-backends",
-+      "ret-type": "[114]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-command-line-options",
-+      "ret-type": "[116]",
-+      "meta-type": "command",
-+      "arg-type": "115"
-+    },
-+    {
-+      "name": "query-commands",
-+      "ret-type": "[117]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-cpu-definitions",
-+      "ret-type": "[118]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-cpu-model-baseline",
-+      "ret-type": "120",
-+      "meta-type": "command",
-+      "arg-type": "119"
-+    },
-+    {
-+      "name": "query-cpu-model-comparison",
-+      "ret-type": "122",
-+      "meta-type": "command",
-+      "arg-type": "121"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion",
-+      "ret-type": "124",
-+      "meta-type": "command",
-+      "arg-type": "123"
-+    },
-+    {
-+      "name": "query-cpus",
-+      "ret-type": "[125]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-dump",
-+      "ret-type": "126",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability",
-+      "ret-type": "127",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-events",
-+      "ret-type": "[128]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-fdsets",
-+      "ret-type": "[129]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-gic-capabilities",
-+      "ret-type": "[130]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus",
-+      "ret-type": "[131]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-iothreads",
-+      "ret-type": "[132]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-kvm",
-+      "ret-type": "133",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-machines",
-+      "ret-type": "[134]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-memdev",
-+      "ret-type": "[135]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-memory-devices",
-+      "ret-type": "[136]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-memory-size-summary",
-+      "ret-type": "137",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-mice",
-+      "ret-type": "[138]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-migrate",
-+      "ret-type": "139",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-migrate-cache-size",
-+      "ret-type": "int",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-migrate-capabilities",
-+      "ret-type": "[140]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-migrate-parameters",
-+      "ret-type": "141",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-name",
-+      "ret-type": "142",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-named-block-nodes",
-+      "ret-type": "[143]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-pci",
-+      "ret-type": "[144]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-qmp-schema",
-+      "ret-type": "[145]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-rocker",
-+      "ret-type": "147",
-+      "meta-type": "command",
-+      "arg-type": "146"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-flows",
-+      "ret-type": "[149]",
-+      "meta-type": "command",
-+      "arg-type": "148"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-groups",
-+      "ret-type": "[151]",
-+      "meta-type": "command",
-+      "arg-type": "150"
-+    },
-+    {
-+      "name": "query-rocker-ports",
-+      "ret-type": "[153]",
-+      "meta-type": "command",
-+      "arg-type": "152"
-+    },
-+    {
-+      "name": "query-rx-filter",
-+      "ret-type": "[155]",
-+      "meta-type": "command",
-+      "arg-type": "154"
-+    },
-+    {
-+      "name": "query-spice",
-+      "ret-type": "156",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-status",
-+      "ret-type": "157",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-target",
-+      "ret-type": "158",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-tpm",
-+      "ret-type": "[159]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-tpm-models",
-+      "ret-type": "[160]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-tpm-types",
-+      "ret-type": "[161]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-uuid",
-+      "ret-type": "162",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-version",
-+      "ret-type": "163",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-vm-generation-id",
-+      "ret-type": "164",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-vnc",
-+      "ret-type": "165",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-vnc-servers",
-+      "ret-type": "[166]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-xen-replication-status",
-+      "ret-type": "167",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "quit",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "remove-fd",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "168"
-+    },
-+    {
-+      "name": "ringbuf-read",
-+      "ret-type": "str",
-+      "meta-type": "command",
-+      "arg-type": "169"
-+    },
-+    {
-+      "name": "ringbuf-write",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "170"
-+    },
-+    {
-+      "name": "rtc-reset-reinjection",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "screendump",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "171"
-+    },
-+    {
-+      "name": "send-key",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "172"
-+    },
-+    {
-+      "name": "set_link",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "173"
-+    },
-+    {
-+      "name": "set_password",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "174"
-+    },
-+    {
-+      "name": "stop",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "system_powerdown",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "system_reset",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "system_wakeup",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "trace-event-get-state",
-+      "ret-type": "[176]",
-+      "meta-type": "command",
-+      "arg-type": "175"
-+    },
-+    {
-+      "name": "trace-event-set-state",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "177"
-+    },
-+    {
-+      "name": "transaction",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "178"
-+    },
-+    {
-+      "name": "watchdog-set-action",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "179"
-+    },
-+    {
-+      "name": "x-blockdev-change",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "180"
-+    },
-+    {
-+      "name": "x-blockdev-insert-medium",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "181"
-+    },
-+    {
-+      "name": "x-blockdev-remove-medium",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "182"
-+    },
-+    {
-+      "name": "x-colo-lost-heartbeat",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256",
-+      "ret-type": "183",
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "xen-colo-do-checkpoint",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "xen-load-devices-state",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "184"
-+    },
-+    {
-+      "name": "xen-save-devices-state",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "185"
-+    },
-+    {
-+      "name": "xen-set-global-dirty-log",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "186"
-+    },
-+    {
-+      "name": "xen-set-replication",
-+      "ret-type": "17",
-+      "meta-type": "command",
-+      "arg-type": "187"
-+    },
-+    {
-+      "name": "0",
-+      "members": [
-+        {
-+          "name": "info",
-+          "type": "107"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "1",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "2",
-+      "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": "3",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "188"
-+        },
-+        {
-+          "name": "action",
-+          "type": "189"
-+        },
-+        {
-+          "name": "nospace",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "4",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "190"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "5",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "190"
-+        },
-+        {
-+          "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": "6",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "188"
-+        },
-+        {
-+          "name": "action",
-+          "type": "189"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "7",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "190"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "8",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "amount-exceeded",
-+          "type": "int"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "9",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "10",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tray-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "11",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "126"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "12",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "191"
-+        },
-+        {
-+          "name": "info",
-+          "default": null,
-+          "type": "192"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "13",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "msg",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "14",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "193"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "15",
-+      "members": [
-+        {
-+          "name": "pass",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "16",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "17",
-+      "members": [
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "18",
-+      "members": [
-+        {
-+          "name": "reference",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "19",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "194"
-+        },
-+        {
-+          "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": "20",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "21",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "22",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "23",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "195"
-+        },
-+        {
-+          "name": "client",
-+          "type": "195"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "24",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "195"
-+        },
-+        {
-+          "name": "client",
-+          "type": "195"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "25",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "196"
-+        },
-+        {
-+          "name": "client",
-+          "type": "197"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "26",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "198"
-+        },
-+        {
-+          "name": "client",
-+          "type": "199"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "27",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "198"
-+        },
-+        {
-+          "name": "client",
-+          "type": "200"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "28",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "198"
-+        },
-+        {
-+          "name": "client",
-+          "type": "200"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "29",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "30",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "201"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "31",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "32",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "33",
-+      "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": "34",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "35",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "top",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "36",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "persistent",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "autoload",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "37",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "38",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "39",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "40",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "41",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "42",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "43",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "44",
-+      "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": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-error",
-+          "default": null,
-+          "type": "202"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "45",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "46",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "47",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "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": "48",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "blkdebug",
-+          "type": "207"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "208"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "209"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "209"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "209"
-+        },
-+        {
-+          "case": "file",
-+          "type": "210"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "211"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "212"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "213"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "210"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "210"
-+        },
-+        {
-+          "case": "http",
-+          "type": "214"
-+        },
-+        {
-+          "case": "https",
-+          "type": "215"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "216"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "217"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "218"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "219"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "220"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "220"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "209"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "221"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "222"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "223"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "224"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "225"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "226"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "227"
-+        },
-+        {
-+          "case": "sheepdog",
-+          "type": "228"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "229"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "230"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "209"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "209"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "223"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "209"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "231"
-+        },
-+        {
-+          "case": "vxhs",
-+          "type": "232"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "203"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard",
-+          "default": null,
-+          "type": "204"
-+        },
-+        {
-+          "name": "cache",
-+          "default": null,
-+          "type": "205"
-+        },
-+        {
-+          "name": "read-only",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "force-share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect-zeroes",
-+          "default": null,
-+          "type": "206"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "49",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "233"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "202"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "202"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "50",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "read-only-mode",
-+          "default": null,
-+          "type": "234"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "51",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "52",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "53",
-+      "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": "233"
-+        },
-+        {
-+          "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": "202"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "202"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "54",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "55",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "overlay",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "56",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "57",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "58",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "59",
-+      "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": "235"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "60",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "arg",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "61",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "image-node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "62",
-+      "members": [
-+        {
-+          "name": "password",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "63",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "236"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "64",
-+      "members": [
-+        {
-+          "name": "pty",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "65",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "236"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "66",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "67",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "68",
-+      "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": "69",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "70",
-+      "members": [
-+        {
-+          "name": "index",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "71",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "72",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[73]",
-+      "element-type": "73",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "73",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "74",
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bus",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "75",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "76",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "233"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "235"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "202"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "202"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "77",
-+      "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": "233"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "235"
-+        },
-+        {
-+          "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": "202"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "202"
-+        },
-+        {
-+          "name": "unmap",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "78",
-+      "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": "237"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "79",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "80",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "81",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "time",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "82",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "83",
-+      "members": [
-+        {
-+          "name": "command-line",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "str",
-+      "json-type": "string",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "84",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "events",
-+          "type": "[238]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "85",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "86",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        },
-+        {
-+          "name": "blk",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detach",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "87",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "193"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "88",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "89",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "90",
-+      "members": [
-+        {
-+          "name": "capabilities",
-+          "type": "[140]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "91",
-+      "members": [
-+        {
-+          "name": "compress-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "decompress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "239"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "239"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-incremental",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-multifd-page-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "92",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "number"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "93",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "94",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "95",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "240"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "96",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "97",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "98",
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "99",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "100",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "101",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "any",
-+      "json-type": "value",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "102",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[103]",
-+      "element-type": "103",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "103",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "104",
-+      "members": [
-+        {
-+          "name": "implements",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[105]",
-+      "element-type": "105",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "105",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "106",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[107]",
-+      "element-type": "107",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "107",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot-type",
-+          "type": "241"
-+        },
-+        {
-+          "name": "source",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "108",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[109]",
-+      "element-type": "109",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "109",
-+      "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": "143"
-+        },
-+        {
-+          "name": "tray_open",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "io-status",
-+          "default": null,
-+          "type": "242"
-+        },
-+        {
-+          "name": "dirty-bitmaps",
-+          "default": null,
-+          "type": "[243]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[110]",
-+      "element-type": "110",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "110",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "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": "242"
-+        },
-+        {
-+          "name": "ready",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "111",
-+      "members": [
-+        {
-+          "name": "query-nodes",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[112]",
-+      "element-type": "112",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "112",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "244"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "112"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "112"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[113]",
-+      "element-type": "113",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "113",
-+      "members": [
-+        {
-+          "name": "label",
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "frontend-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[114]",
-+      "element-type": "114",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "114",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "115",
-+      "members": [
-+        {
-+          "name": "option",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[116]",
-+      "element-type": "116",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "116",
-+      "members": [
-+        {
-+          "name": "option",
-+          "type": "str"
-+        },
-+        {
-+          "name": "parameters",
-+          "type": "[245]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[117]",
-+      "element-type": "117",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "117",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[118]",
-+      "element-type": "118",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "118",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "119",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "246"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "246"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "120",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "246"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "121",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "246"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "246"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "122",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "247"
-+        },
-+        {
-+          "name": "responsible-properties",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "123",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "248"
-+        },
-+        {
-+          "name": "model",
-+          "type": "246"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "124",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "246"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[125]",
-+      "element-type": "125",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "125",
-+      "tag": "arch",
-+      "variants": [
-+        {
-+          "case": "x86",
-+          "type": "251"
-+        },
-+        {
-+          "case": "sparc",
-+          "type": "252"
-+        },
-+        {
-+          "case": "ppc",
-+          "type": "253"
-+        },
-+        {
-+          "case": "mips",
-+          "type": "254"
-+        },
-+        {
-+          "case": "tricore",
-+          "type": "255"
-+        },
-+        {
-+          "case": "other",
-+          "type": "256"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "CPU",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "halted",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "qom_path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread_id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "249"
-+        },
-+        {
-+          "name": "arch",
-+          "type": "250"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "126",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "257"
-+        },
-+        {
-+          "name": "completed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "127",
-+      "members": [
-+        {
-+          "name": "formats",
-+          "type": "[237]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[128]",
-+      "element-type": "128",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "128",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[129]",
-+      "element-type": "129",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "129",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fds",
-+          "type": "[258]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[130]",
-+      "element-type": "130",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "130",
-+      "members": [
-+        {
-+          "name": "version",
-+          "type": "int"
-+        },
-+        {
-+          "name": "emulated",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "kernel",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[131]",
-+      "element-type": "131",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "131",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpus-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "type": "249"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[132]",
-+      "element-type": "132",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "132",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "133",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "present",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[134]",
-+      "element-type": "134",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "134",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[135]",
-+      "element-type": "135",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "135",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "merge",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dump",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "259"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[136]",
-+      "element-type": "136",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "136",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "dimm",
-+          "type": "261"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "260"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "137",
-+      "members": [
-+        {
-+          "name": "base-memory",
-+          "type": "int"
-+        },
-+        {
-+          "name": "plugged-memory",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[138]",
-+      "element-type": "138",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "138",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "absolute",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "139",
-+      "members": [
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "193"
-+        },
-+        {
-+          "name": "ram",
-+          "default": null,
-+          "type": "262"
-+        },
-+        {
-+          "name": "disk",
-+          "default": null,
-+          "type": "262"
-+        },
-+        {
-+          "name": "xbzrle-cache",
-+          "default": null,
-+          "type": "263"
-+        },
-+        {
-+          "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "int",
-+      "json-type": "int",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "[140]",
-+      "element-type": "140",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "140",
-+      "members": [
-+        {
-+          "name": "capability",
-+          "type": "264"
-+        },
-+        {
-+          "name": "state",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "141",
-+      "members": [
-+        {
-+          "name": "compress-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "decompress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-incremental",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-multifd-page-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "142",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[143]",
-+      "element-type": "143",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "143",
-+      "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": "encryption_key_missing",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect_zeroes",
-+          "type": "206"
-+        },
-+        {
-+          "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": "265"
-+        },
-+        {
-+          "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": "266"
-+        },
-+        {
-+          "name": "write_threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[144]",
-+      "element-type": "144",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "144",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[267]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[145]",
-+      "element-type": "145",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "145",
-+      "tag": "meta-type",
-+      "variants": [
-+        {
-+          "case": "builtin",
-+          "type": "269"
-+        },
-+        {
-+          "case": "enum",
-+          "type": "270"
-+        },
-+        {
-+          "case": "array",
-+          "type": "271"
-+        },
-+        {
-+          "case": "object",
-+          "type": "272"
-+        },
-+        {
-+          "case": "alternate",
-+          "type": "273"
-+        },
-+        {
-+          "case": "command",
-+          "type": "274"
-+        },
-+        {
-+          "case": "event",
-+          "type": "275"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "meta-type",
-+          "type": "268"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "146",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "147",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "ports",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "148",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tbl-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[149]",
-+      "element-type": "149",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "149",
-+      "members": [
-+        {
-+          "name": "cookie",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "key",
-+          "type": "276"
-+        },
-+        {
-+          "name": "mask",
-+          "type": "277"
-+        },
-+        {
-+          "name": "action",
-+          "type": "278"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "150",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[151]",
-+      "element-type": "151",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "151",
-+      "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": "152",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[153]",
-+      "element-type": "153",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "153",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "link-up",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplex",
-+          "type": "279"
-+        },
-+        {
-+          "name": "autoneg",
-+          "type": "280"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "154",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[155]",
-+      "element-type": "155",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "155",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "promiscuous",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "multicast",
-+          "type": "281"
-+        },
-+        {
-+          "name": "unicast",
-+          "type": "281"
-+        },
-+        {
-+          "name": "vlan",
-+          "type": "281"
-+        },
-+        {
-+          "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": "156",
-+      "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": "282"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[197]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "157",
-+      "members": [
-+        {
-+          "name": "running",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "singlestep",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "283"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "158",
-+      "members": [
-+        {
-+          "name": "arch",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[159]",
-+      "element-type": "159",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "159",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "model",
-+          "type": "160"
-+        },
-+        {
-+          "name": "options",
-+          "type": "284"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[160]",
-+      "element-type": "160",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "160",
-+      "meta-type": "enum",
-+      "values": [
-+        "tpm-tis"
-+      ]
-+    },
-+    {
-+      "name": "[161]",
-+      "element-type": "161",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "161",
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "162",
-+      "members": [
-+        {
-+          "name": "UUID",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "163",
-+      "members": [
-+        {
-+          "name": "qemu",
-+          "type": "285"
-+        },
-+        {
-+          "name": "package",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "164",
-+      "members": [
-+        {
-+          "name": "guid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "165",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "default": null,
-+          "type": "286"
-+        },
-+        {
-+          "name": "service",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "clients",
-+          "default": null,
-+          "type": "[200]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[166]",
-+      "element-type": "166",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "166",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[287]"
-+        },
-+        {
-+          "name": "clients",
-+          "type": "[200]"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "288"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "289"
-+        },
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "167",
-+      "members": [
-+        {
-+          "name": "error",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "168",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "169",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "290"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "170",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "290"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "171",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "172",
-+      "members": [
-+        {
-+          "name": "keys",
-+          "type": "[291]"
-+        },
-+        {
-+          "name": "hold-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "173",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "up",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "174",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "password",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "175",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpu",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[176]",
-+      "element-type": "176",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "176",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "state",
-+          "type": "292"
-+        },
-+        {
-+          "name": "vcpu",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "177",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ignore-unavailable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vcpu",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "178",
-+      "members": [
-+        {
-+          "name": "actions",
-+          "type": "[293]"
-+        },
-+        {
-+          "name": "properties",
-+          "default": null,
-+          "type": "294"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "179",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "201"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "180",
-+      "members": [
-+        {
-+          "name": "parent",
-+          "type": "str"
-+        },
-+        {
-+          "name": "child",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "181",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "182",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "183",
-+      "members": [
-+        {
-+          "name": "sha256",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "184",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "185",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "live",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "186",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "187",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "primary",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "failover",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "bool",
-+      "json-type": "boolean",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "188",
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write"
-+      ]
-+    },
-+    {
-+      "name": "189",
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "report",
-+        "stop"
-+      ]
-+    },
-+    {
-+      "name": "190",
-+      "meta-type": "enum",
-+      "values": [
-+        "commit",
-+        "stream",
-+        "mirror",
-+        "backup"
-+      ]
-+    },
-+    {
-+      "name": "191",
-+      "meta-type": "enum",
-+      "values": [
-+        "pause",
-+        "poweroff"
-+      ]
-+    },
-+    {
-+      "name": "192",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "hyper-v",
-+          "type": "296"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "295"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "193",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "setup",
-+        "cancelling",
-+        "cancelled",
-+        "active",
-+        "postcopy-active",
-+        "completed",
-+        "failed",
-+        "colo",
-+        "pre-switchover",
-+        "device"
-+      ]
-+    },
-+    {
-+      "name": "194",
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "flush"
-+      ]
-+    },
-+    {
-+      "name": "195",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "196",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "197",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        },
-+        {
-+          "name": "connection-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "channel-type",
-+          "type": "int"
-+        },
-+        {
-+          "name": "channel-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "198",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "199",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "200",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x509_dname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sasl_username",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "201",
-+      "meta-type": "enum",
-+      "values": [
-+        "reset",
-+        "shutdown",
-+        "poweroff",
-+        "pause",
-+        "debug",
-+        "none",
-+        "inject-nmi"
-+      ]
-+    },
-+    {
-+      "name": "202",
-+      "meta-type": "enum",
-+      "values": [
-+        "report",
-+        "ignore",
-+        "enospc",
-+        "stop",
-+        "auto"
-+      ]
-+    },
-+    {
-+      "name": "203",
-+      "meta-type": "enum",
-+      "values": [
-+        "blkdebug",
-+        "blkverify",
-+        "bochs",
-+        "cloop",
-+        "dmg",
-+        "file",
-+        "ftp",
-+        "ftps",
-+        "gluster",
-+        "host_cdrom",
-+        "host_device",
-+        "http",
-+        "https",
-+        "iscsi",
-+        "luks",
-+        "nbd",
-+        "nfs",
-+        "null-aio",
-+        "null-co",
-+        "parallels",
-+        "qcow",
-+        "qcow2",
-+        "qed",
-+        "quorum",
-+        "raw",
-+        "rbd",
-+        "replication",
-+        "sheepdog",
-+        "ssh",
-+        "throttle",
-+        "vdi",
-+        "vhdx",
-+        "vmdk",
-+        "vpc",
-+        "vvfat",
-+        "vxhs"
-+      ]
-+    },
-+    {
-+      "name": "204",
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "205",
-+      "members": [
-+        {
-+          "name": "direct",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "206",
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "207",
-+      "members": [
-+        {
-+          "name": "image",
-+          "type": "297"
-+        },
-+        {
-+          "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": "[298]"
-+        },
-+        {
-+          "name": "set-state",
-+          "default": null,
-+          "type": "[299]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "208",
-+      "members": [
-+        {
-+          "name": "test",
-+          "type": "297"
-+        },
-+        {
-+          "name": "raw",
-+          "type": "297"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "209",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "210",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pr-manager",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "locking",
-+          "default": null,
-+          "type": "300"
-+        },
-+        {
-+          "name": "aio",
-+          "default": null,
-+          "type": "301"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "211",
-+      "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": "212",
-+      "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": "213",
-+      "members": [
-+        {
-+          "name": "volume",
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[302]"
-+        },
-+        {
-+          "name": "debug",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "214",
-+      "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": "215",
-+      "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": "216",
-+      "members": [
-+        {
-+          "name": "transport",
-+          "type": "303"
-+        },
-+        {
-+          "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": "304"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "217",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "218",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "302"
-+        },
-+        {
-+          "name": "export",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "219",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "305"
-+        },
-+        {
-+          "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": "220",
-+      "members": [
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "latency-ns",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "221",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "306"
-+        },
-+        {
-+          "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": "overlap-check",
-+          "default": null,
-+          "type": "307"
-+        },
-+        {
-+          "name": "cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "l2-cache-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": "308"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "222",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "306"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "309"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "223",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "306"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "224",
-+      "members": [
-+        {
-+          "name": "blkverify",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "children",
-+          "type": "[297]"
-+        },
-+        {
-+          "name": "vote-threshold",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rewrite-corrupted",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "read-pattern",
-+          "default": null,
-+          "type": "310"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "225",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "226",
-+      "members": [
-+        {
-+          "name": "pool",
-+          "type": "str"
-+        },
-+        {
-+          "name": "image",
-+          "type": "str"
-+        },
-+        {
-+          "name": "conf",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "[311]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "227",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "297"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "312"
-+        },
-+        {
-+          "name": "top-id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "228",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "302"
-+        },
-+        {
-+          "name": "vdi",
-+          "type": "str"
-+        },
-+        {
-+          "name": "snap-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "229",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "313"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "230",
-+      "members": [
-+        {
-+          "name": "throttle-group",
-+          "type": "str"
-+        },
-+        {
-+          "name": "file",
-+          "type": "297"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "231",
-+      "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": "232",
-+      "members": [
-+        {
-+          "name": "vdisk-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "311"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "233",
-+      "meta-type": "enum",
-+      "values": [
-+        "top",
-+        "full",
-+        "none",
-+        "incremental"
-+      ]
-+    },
-+    {
-+      "name": "234",
-+      "meta-type": "enum",
-+      "values": [
-+        "retain",
-+        "read-only",
-+        "read-write"
-+      ]
-+    },
-+    {
-+      "name": "235",
-+      "meta-type": "enum",
-+      "values": [
-+        "existing",
-+        "absolute-paths"
-+      ]
-+    },
-+    {
-+      "name": "236",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "315"
-+        },
-+        {
-+          "case": "serial",
-+          "type": "316"
-+        },
-+        {
-+          "case": "parallel",
-+          "type": "316"
-+        },
-+        {
-+          "case": "pipe",
-+          "type": "316"
-+        },
-+        {
-+          "case": "socket",
-+          "type": "317"
-+        },
-+        {
-+          "case": "udp",
-+          "type": "318"
-+        },
-+        {
-+          "case": "pty",
-+          "type": "319"
-+        },
-+        {
-+          "case": "null",
-+          "type": "319"
-+        },
-+        {
-+          "case": "mux",
-+          "type": "320"
-+        },
-+        {
-+          "case": "msmouse",
-+          "type": "319"
-+        },
-+        {
-+          "case": "wctablet",
-+          "type": "319"
-+        },
-+        {
-+          "case": "braille",
-+          "type": "319"
-+        },
-+        {
-+          "case": "testdev",
-+          "type": "319"
-+        },
-+        {
-+          "case": "stdio",
-+          "type": "321"
-+        },
-+        {
-+          "case": "console",
-+          "type": "319"
-+        },
-+        {
-+          "case": "spicevmc",
-+          "type": "322"
-+        },
-+        {
-+          "case": "spiceport",
-+          "type": "323"
-+        },
-+        {
-+          "case": "vc",
-+          "type": "324"
-+        },
-+        {
-+          "case": "ringbuf",
-+          "type": "325"
-+        },
-+        {
-+          "case": "memory",
-+          "type": "325"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "314"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "237",
-+      "meta-type": "enum",
-+      "values": [
-+        "elf",
-+        "kdump-zlib",
-+        "kdump-lzo",
-+        "kdump-snappy"
-+      ]
-+    },
-+    {
-+      "name": "[238]",
-+      "element-type": "238",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "238",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "key",
-+          "type": "327"
-+        },
-+        {
-+          "case": "btn",
-+          "type": "328"
-+        },
-+        {
-+          "case": "rel",
-+          "type": "329"
-+        },
-+        {
-+          "case": "abs",
-+          "type": "329"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "326"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "239",
-+      "members": [
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "number",
-+      "json-type": "number",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "240",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "331"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "332"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "333"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "334"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "330"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "241",
-+      "meta-type": "enum",
-+      "values": [
-+        "DIMM",
-+        "CPU"
-+      ]
-+    },
-+    {
-+      "name": "242",
-+      "meta-type": "enum",
-+      "values": [
-+        "ok",
-+        "failed",
-+        "nospace"
-+      ]
-+    },
-+    {
-+      "name": "[243]",
-+      "element-type": "243",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "243",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "335"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "244",
-+      "members": [
-+        {
-+          "name": "rd_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_highest_offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_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_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "account_invalid",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "account_failed",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "timed_stats",
-+          "type": "[336]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[245]",
-+      "element-type": "245",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "245",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "337"
-+        },
-+        {
-+          "name": "help",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[str]",
-+      "element-type": "str",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "246",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "247",
-+      "meta-type": "enum",
-+      "values": [
-+        "incompatible",
-+        "identical",
-+        "superset",
-+        "subset"
-+      ]
-+    },
-+    {
-+      "name": "248",
-+      "meta-type": "enum",
-+      "values": [
-+        "static",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "249",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "250",
-+      "meta-type": "enum",
-+      "values": [
-+        "x86",
-+        "sparc",
-+        "ppc",
-+        "mips",
-+        "tricore",
-+        "other"
-+      ]
-+    },
-+    {
-+      "name": "251",
-+      "members": [
-+        {
-+          "name": "pc",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "252",
-+      "members": [
-+        {
-+          "name": "pc",
-+          "type": "int"
-+        },
-+        {
-+          "name": "npc",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "253",
-+      "members": [
-+        {
-+          "name": "nip",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "254",
-+      "members": [
-+        {
-+          "name": "PC",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "255",
-+      "members": [
-+        {
-+          "name": "PC",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "256",
-+      "members": [
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "257",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "active",
-+        "completed",
-+        "failed"
-+      ]
-+    },
-+    {
-+      "name": "[237]",
-+      "element-type": "237",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "[258]",
-+      "element-type": "258",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "258",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[int]",
-+      "element-type": "int",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "259",
-+      "meta-type": "enum",
-+      "values": [
-+        "default",
-+        "preferred",
-+        "bind",
-+        "interleave"
-+      ]
-+    },
-+    {
-+      "name": "260",
-+      "meta-type": "enum",
-+      "values": [
-+        "dimm"
-+      ]
-+    },
-+    {
-+      "name": "261",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "338"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "262",
-+      "members": [
-+        {
-+          "name": "transferred",
-+          "type": "int"
-+        },
-+        {
-+          "name": "remaining",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplicate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "skipped",
-+          "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "263",
-+      "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": "overflow",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "264",
-+      "meta-type": "enum",
-+      "values": [
-+        "xbzrle",
-+        "rdma-pin-all",
-+        "auto-converge",
-+        "zero-blocks",
-+        "compress",
-+        "events",
-+        "postcopy-ram",
-+        "x-colo",
-+        "release-ram",
-+        "block",
-+        "return-path",
-+        "pause-before-switchover",
-+        "x-multifd"
-+      ]
-+    },
-+    {
-+      "name": "265",
-+      "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": "[57]"
-+        },
-+        {
-+          "name": "backing-image",
-+          "default": null,
-+          "type": "265"
-+        },
-+        {
-+          "name": "format-specific",
-+          "default": null,
-+          "type": "339"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "266",
-+      "members": [
-+        {
-+          "name": "writeback",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "direct",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[267]",
-+      "element-type": "267",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "267",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "function",
-+          "type": "int"
-+        },
-+        {
-+          "name": "class_info",
-+          "type": "340"
-+        },
-+        {
-+          "name": "id",
-+          "type": "341"
-+        },
-+        {
-+          "name": "irq",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "qdev_id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pci_bridge",
-+          "default": null,
-+          "type": "342"
-+        },
-+        {
-+          "name": "regions",
-+          "type": "[343]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "268",
-+      "meta-type": "enum",
-+      "values": [
-+        "builtin",
-+        "enum",
-+        "array",
-+        "object",
-+        "alternate",
-+        "command",
-+        "event"
-+      ]
-+    },
-+    {
-+      "name": "269",
-+      "members": [
-+        {
-+          "name": "json-type",
-+          "type": "344"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "270",
-+      "members": [
-+        {
-+          "name": "values",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "271",
-+      "members": [
-+        {
-+          "name": "element-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "272",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[345]"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "variants",
-+          "default": null,
-+          "type": "[346]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "273",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[347]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "274",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "ret-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "275",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "276",
-+      "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": "277",
-+      "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": "278",
-+      "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": "279",
-+      "meta-type": "enum",
-+      "values": [
-+        "half",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "280",
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on"
-+      ]
-+    },
-+    {
-+      "name": "281",
-+      "meta-type": "enum",
-+      "values": [
-+        "normal",
-+        "none",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "282",
-+      "meta-type": "enum",
-+      "values": [
-+        "client",
-+        "server",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[197]",
-+      "element-type": "197",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "283",
-+      "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": "284",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "passthrough",
-+          "type": "349"
-+        },
-+        {
-+          "case": "emulator",
-+          "type": "350"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "348"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "285",
-+      "members": [
-+        {
-+          "name": "major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "micro",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "286",
-+      "meta-type": "enum",
-+      "values": [
-+        "ipv4",
-+        "ipv6",
-+        "unix",
-+        "vsock",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[200]",
-+      "element-type": "200",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "[287]",
-+      "element-type": "287",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "287",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "286"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "288"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "289"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "288",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "vnc",
-+        "ra2",
-+        "ra2ne",
-+        "tight",
-+        "ultra",
-+        "tls",
-+        "vencrypt",
-+        "sasl"
-+      ]
-+    },
-+    {
-+      "name": "289",
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "tls-none",
-+        "x509-none",
-+        "tls-vnc",
-+        "x509-vnc",
-+        "tls-plain",
-+        "x509-plain",
-+        "tls-sasl",
-+        "x509-sasl"
-+      ]
-+    },
-+    {
-+      "name": "290",
-+      "meta-type": "enum",
-+      "values": [
-+        "utf8",
-+        "base64"
-+      ]
-+    },
-+    {
-+      "name": "[291]",
-+      "element-type": "291",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "291",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "number",
-+          "type": "352"
-+        },
-+        {
-+          "case": "qcode",
-+          "type": "353"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "351"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "292",
-+      "meta-type": "enum",
-+      "values": [
-+        "unavailable",
-+        "disabled",
-+        "enabled"
-+      ]
-+    },
-+    {
-+      "name": "[293]",
-+      "element-type": "293",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "293",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "abort",
-+          "type": "355"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-add",
-+          "type": "356"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-clear",
-+          "type": "357"
-+        },
-+        {
-+          "case": "blockdev-backup",
-+          "type": "358"
-+        },
-+        {
-+          "case": "blockdev-snapshot",
-+          "type": "359"
-+        },
-+        {
-+          "case": "blockdev-snapshot-internal-sync",
-+          "type": "360"
-+        },
-+        {
-+          "case": "blockdev-snapshot-sync",
-+          "type": "361"
-+        },
-+        {
-+          "case": "drive-backup",
-+          "type": "362"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "354"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "294",
-+      "members": [
-+        {
-+          "name": "completion-mode",
-+          "default": null,
-+          "type": "363"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "295",
-+      "meta-type": "enum",
-+      "values": [
-+        "hyper-v"
-+      ]
-+    },
-+    {
-+      "name": "296",
-+      "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": "297",
-+      "members": [
-+        {
-+          "type": "48"
-+        },
-+        {
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "[298]",
-+      "element-type": "298",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "298",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "364"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "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": "[299]",
-+      "element-type": "299",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "299",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "364"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "new_state",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "300",
-+      "meta-type": "enum",
-+      "values": [
-+        "auto",
-+        "on",
-+        "off"
-+      ]
-+    },
-+    {
-+      "name": "301",
-+      "meta-type": "enum",
-+      "values": [
-+        "threads",
-+        "native"
-+      ]
-+    },
-+    {
-+      "name": "[302]",
-+      "element-type": "302",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "302",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "313"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "366"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "367"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "368"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "365"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "303",
-+      "meta-type": "enum",
-+      "values": [
-+        "tcp",
-+        "iser"
-+      ]
-+    },
-+    {
-+      "name": "304",
-+      "meta-type": "enum",
-+      "values": [
-+        "crc32c",
-+        "none",
-+        "crc32c-none",
-+        "none-crc32c"
-+      ]
-+    },
-+    {
-+      "name": "305",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "369"
-+        },
-+        {
-+          "name": "host",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "306",
-+      "members": [
-+        {
-+          "type": "48"
-+        },
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "307",
-+      "members": [
-+        {
-+          "type": "370"
-+        },
-+        {
-+          "type": "371"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "308",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "373"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "374"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "372"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "309",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "373"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "375"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[297]",
-+      "element-type": "297",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "310",
-+      "meta-type": "enum",
-+      "values": [
-+        "quorum",
-+        "fifo"
-+      ]
-+    },
-+    {
-+      "name": "[311]",
-+      "element-type": "311",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "311",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "312",
-+      "meta-type": "enum",
-+      "values": [
-+        "primary",
-+        "secondary"
-+      ]
-+    },
-+    {
-+      "name": "313",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "314",
-+      "meta-type": "enum",
-+      "values": [
-+        "file",
-+        "serial",
-+        "parallel",
-+        "pipe",
-+        "socket",
-+        "udp",
-+        "pty",
-+        "null",
-+        "mux",
-+        "msmouse",
-+        "wctablet",
-+        "braille",
-+        "testdev",
-+        "stdio",
-+        "console",
-+        "spicevmc",
-+        "spiceport",
-+        "vc",
-+        "ringbuf",
-+        "memory"
-+      ]
-+    },
-+    {
-+      "name": "315",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "376"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "316",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "377"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "317",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "378"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "318",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "379"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "319",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "380"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "320",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "381"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "321",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "382"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "322",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "383"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "323",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "384"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "324",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "385"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "325",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "386"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "326",
-+      "meta-type": "enum",
-+      "values": [
-+        "key",
-+        "btn",
-+        "rel",
-+        "abs"
-+      ]
-+    },
-+    {
-+      "name": "327",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "387"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "328",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "388"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "329",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "389"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "null",
-+      "json-type": "null",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "330",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "331",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "313"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "332",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "366"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "333",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "367"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "334",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "368"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "335",
-+      "meta-type": "enum",
-+      "values": [
-+        "active",
-+        "disabled",
-+        "frozen"
-+      ]
-+    },
-+    {
-+      "name": "[336]",
-+      "element-type": "336",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "336",
-+      "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_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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "337",
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "boolean",
-+        "number",
-+        "size"
-+      ]
-+    },
-+    {
-+      "name": "338",
-+      "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": "[57]",
-+      "element-type": "57",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "339",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "qcow2",
-+          "type": "391"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "392"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "393"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "390"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "340",
-+      "members": [
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "class",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "341",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vendor",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "342",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "394"
-+        },
-+        {
-+          "name": "devices",
-+          "default": null,
-+          "type": "[267]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[343]",
-+      "element-type": "343",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "343",
-+      "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": "344",
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "number",
-+        "int",
-+        "boolean",
-+        "null",
-+        "object",
-+        "array",
-+        "value"
-+      ]
-+    },
-+    {
-+      "name": "[345]",
-+      "element-type": "345",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "345",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[346]",
-+      "element-type": "346",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "346",
-+      "members": [
-+        {
-+          "name": "case",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[347]",
-+      "element-type": "347",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "347",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "348",
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "349",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "395"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "350",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "396"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "351",
-+      "meta-type": "enum",
-+      "values": [
-+        "number",
-+        "qcode"
-+      ]
-+    },
-+    {
-+      "name": "352",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "353",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "397"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "354",
-+      "meta-type": "enum",
-+      "values": [
-+        "abort",
-+        "block-dirty-bitmap-add",
-+        "block-dirty-bitmap-clear",
-+        "blockdev-backup",
-+        "blockdev-snapshot",
-+        "blockdev-snapshot-internal-sync",
-+        "blockdev-snapshot-sync",
-+        "drive-backup"
-+      ]
-+    },
-+    {
-+      "name": "355",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "398"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "356",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "36"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "357",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "37"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "358",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "49"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "359",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "55"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "360",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "58"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "361",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "59"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "362",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "76"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "363",
-+      "meta-type": "enum",
-+      "values": [
-+        "individual",
-+        "grouped"
-+      ]
-+    },
-+    {
-+      "name": "364",
-+      "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"
-+      ]
-+    },
-+    {
-+      "name": "365",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "366",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "367",
-+      "members": [
-+        {
-+          "name": "cid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "368",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "369",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet"
-+      ]
-+    },
-+    {
-+      "name": "370",
-+      "members": [
-+        {
-+          "name": "template",
-+          "default": null,
-+          "type": "371"
-+        },
-+        {
-+          "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "371",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "constant",
-+        "cached",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "372",
-+      "meta-type": "enum",
-+      "values": [
-+        "aes",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "373",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "374",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "375",
-+      "meta-type": "enum",
-+      "values": [
-+        "aes"
-+      ]
-+    },
-+    {
-+      "name": "376",
-+      "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": "377",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "378",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "240"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "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": "reconnect",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "379",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "remote",
-+          "type": "240"
-+        },
-+        {
-+          "name": "local",
-+          "default": null,
-+          "type": "240"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "380",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "381",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "382",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "signal",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "383",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "384",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fqdn",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "385",
-+      "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": "386",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "387",
-+      "members": [
-+        {
-+          "name": "key",
-+          "type": "291"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "388",
-+      "members": [
-+        {
-+          "name": "button",
-+          "type": "399"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "389",
-+      "members": [
-+        {
-+          "name": "axis",
-+          "type": "400"
-+        },
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "390",
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow2",
-+        "vmdk",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "391",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "401"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "392",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "402"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "393",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "403"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "394",
-+      "members": [
-+        {
-+          "name": "number",
-+          "type": "int"
-+        },
-+        {
-+          "name": "secondary",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subordinate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "io_range",
-+          "type": "404"
-+        },
-+        {
-+          "name": "memory_range",
-+          "type": "404"
-+        },
-+        {
-+          "name": "prefetchable_range",
-+          "type": "404"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "395",
-+      "members": [
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cancel-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "396",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "397",
-+      "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",
-+        "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"
-+      ]
-+    },
-+    {
-+      "name": "398",
-+      "members": [
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "399",
-+      "meta-type": "enum",
-+      "values": [
-+        "left",
-+        "middle",
-+        "right",
-+        "wheel-up",
-+        "wheel-down",
-+        "side",
-+        "extra"
-+      ]
-+    },
-+    {
-+      "name": "400",
-+      "meta-type": "enum",
-+      "values": [
-+        "x",
-+        "y"
-+      ]
-+    },
-+    {
-+      "name": "401",
-+      "members": [
-+        {
-+          "name": "compat",
-+          "type": "str"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "corrupt",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "405"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "402",
-+      "members": [
-+        {
-+          "name": "create-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "parent-cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[265]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "403",
-+      "members": [
-+        {
-+          "name": "cipher-alg",
-+          "type": "406"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "type": "407"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "type": "408"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "409"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "type": "409"
-+        },
-+        {
-+          "name": "payload-offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "master-key-iters",
-+          "type": "int"
-+        },
-+        {
-+          "name": "uuid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slots",
-+          "type": "[410]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "404",
-+      "members": [
-+        {
-+          "name": "base",
-+          "type": "int"
-+        },
-+        {
-+          "name": "limit",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "405",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "411"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "403"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "372"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[265]",
-+      "element-type": "265",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "406",
-+      "meta-type": "enum",
-+      "values": [
-+        "aes-128",
-+        "aes-192",
-+        "aes-256",
-+        "des-rfb",
-+        "3des",
-+        "cast5-128",
-+        "serpent-128",
-+        "serpent-192",
-+        "serpent-256",
-+        "twofish-128",
-+        "twofish-192",
-+        "twofish-256"
-+      ]
-+    },
-+    {
-+      "name": "407",
-+      "meta-type": "enum",
-+      "values": [
-+        "ecb",
-+        "cbc",
-+        "xts",
-+        "ctr"
-+      ]
-+    },
-+    {
-+      "name": "408",
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "plain64",
-+        "essiv"
-+      ]
-+    },
-+    {
-+      "name": "409",
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1",
-+        "sha224",
-+        "sha256",
-+        "sha384",
-+        "sha512",
-+        "ripemd160"
-+      ]
-+    },
-+    {
-+      "name": "[410]",
-+      "element-type": "410",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "410",
-+      "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": "411",
-+      "members": [
-+      ],
-+      "meta-type": "object"
-+    }
-+  ],
-+  "id": "libvirt-47"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "osxsave": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": false,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "osxsave": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": false,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-49"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "osxsave": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": true,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "abm": true,
-+        "avx512pf": 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": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "osxsave": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-50"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "osxsave": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "osxsave": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "cr8legacy": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": true,
-+        "sse3": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": true,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": true,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": true,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "abm": true,
-+        "avx512pf": 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
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [
-+        "kvm"
-+      ],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "3dnowprefetch",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "3dnowprefetch",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "avx",
-+        "f16c",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "invpcid"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "rdseed",
-+        "sha-ni",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "invpcid",
-+        "rdseed",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "npt": false,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": true,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "npt": false,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": true,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483658,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": false,
-+        "kvm_asyncpf": false,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "cr8legacy": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": false,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": true,
-+        "hle": false,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": true,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 6,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": false,
-+        "tsc_adjust": false,
-+        "kvm-steal-time": false,
-+        "kvm_steal_time": false,
-+        "kvmclock": false,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": true,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": true,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "kvm-pv-unhalt": false,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max",
-+      "props": {
-+        "migratable": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "npt": false,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": true,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "npt": false,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": true,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483658,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "osxsave": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": false,
-+        "kvm_asyncpf": false,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "cr8legacy": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": false,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": true,
-+        "hle": false,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": true,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 6,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": false,
-+        "tsc_adjust": false,
-+        "kvm-steal-time": false,
-+        "kvm_steal_time": false,
-+        "kvmclock": false,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "xop": false,
-+        "avx": false,
-+        "ospke": true,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": true,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "kvm-pv-unhalt": false,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-6"
-+}
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-new file mode 100644
-index 0000000000..c52e44a498
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-@@ -0,0 +1,961 @@
-+<qemuCaps>
-+  <qemuctime>0</qemuctime>
-+  <selfctime>0</selfctime>
-+  <selfvers>0</selfvers>
-+  <usedQMP/>
-+  <flag name='kvm'/>
-+  <flag name='no-hpet'/>
-+  <flag name='spice'/>
-+  <flag name='boot-index'/>
-+  <flag name='hda-duplex'/>
-+  <flag name='ccid-emulated'/>
-+  <flag name='ccid-passthru'/>
-+  <flag name='virtio-tx-alg'/>
-+  <flag name='virtio-blk-pci.ioeventfd'/>
-+  <flag name='sga'/>
-+  <flag name='virtio-blk-pci.event_idx'/>
-+  <flag name='virtio-net-pci.event_idx'/>
-+  <flag name='piix3-usb-uhci'/>
-+  <flag name='piix4-usb-uhci'/>
-+  <flag name='usb-ehci'/>
-+  <flag name='ich9-usb-ehci1'/>
-+  <flag name='vt82c686b-usb-uhci'/>
-+  <flag name='pci-ohci'/>
-+  <flag name='usb-redir'/>
-+  <flag name='usb-hub'/>
-+  <flag name='ich9-ahci'/>
-+  <flag name='no-acpi'/>
-+  <flag name='virtio-blk-pci.scsi'/>
-+  <flag name='scsi-disk.channel'/>
-+  <flag name='scsi-block'/>
-+  <flag name='transaction'/>
-+  <flag name='block-job-async'/>
-+  <flag name='scsi-cd'/>
-+  <flag name='ide-cd'/>
-+  <flag name='hda-micro'/>
-+  <flag name='dump-guest-memory'/>
-+  <flag name='nec-usb-xhci'/>
-+  <flag name='balloon-event'/>
-+  <flag name='lsi'/>
-+  <flag name='virtio-scsi-pci'/>
-+  <flag name='blockio'/>
-+  <flag name='disable-s3'/>
-+  <flag name='disable-s4'/>
-+  <flag name='usb-redir.filter'/>
-+  <flag name='ide-drive.wwn'/>
-+  <flag name='scsi-disk.wwn'/>
-+  <flag name='seccomp-sandbox'/>
-+  <flag name='reboot-timeout'/>
-+  <flag name='seamless-migration'/>
-+  <flag name='block-commit'/>
-+  <flag name='vnc'/>
-+  <flag name='drive-mirror'/>
-+  <flag name='usb-redir.bootindex'/>
-+  <flag name='usb-host.bootindex'/>
-+  <flag name='blockdev-snapshot-sync'/>
-+  <flag name='qxl'/>
-+  <flag name='VGA'/>
-+  <flag name='cirrus-vga'/>
-+  <flag name='vmware-svga'/>
-+  <flag name='device-video-primary'/>
-+  <flag name='usb-serial'/>
-+  <flag name='usb-net'/>
-+  <flag name='add-fd'/>
-+  <flag name='nbd-server'/>
-+  <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='vfio-pci.bootindex'/>
-+  <flag name='scsi-generic'/>
-+  <flag name='scsi-generic.bootindex'/>
-+  <flag name='mem-merge'/>
-+  <flag name='vnc-websocket'/>
-+  <flag name='drive-discard'/>
-+  <flag name='mlock'/>
-+  <flag name='device-del-event'/>
-+  <flag name='dmi-to-pci-bridge'/>
-+  <flag name='i440fx-pci-hole64-size'/>
-+  <flag name='q35-pci-hole64-size'/>
-+  <flag name='usb-storage'/>
-+  <flag name='usb-storage.removable'/>
-+  <flag name='virtio-mmio'/>
-+  <flag name='ich9-intel-hda'/>
-+  <flag name='kvm-pit-lost-tick-policy'/>
-+  <flag name='boot-strict'/>
-+  <flag name='pvpanic'/>
-+  <flag name='spice-file-xfer-disable'/>
-+  <flag name='spiceport'/>
-+  <flag name='usb-kbd'/>
-+  <flag name='msg-timestamp'/>
-+  <flag name='active-commit'/>
-+  <flag name='change-backing-file'/>
-+  <flag name='memory-backend-ram'/>
-+  <flag name='numa'/>
-+  <flag name='memory-backend-file'/>
-+  <flag name='usb-audio'/>
-+  <flag name='rtc-reset-reinjection'/>
-+  <flag name='splash-timeout'/>
-+  <flag name='iothread'/>
-+  <flag name='migrate-rdma'/>
-+  <flag name='ivshmem'/>
-+  <flag name='drive-iotune-max'/>
-+  <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='aes-key-wrap'/>
-+  <flag name='dea-key-wrap'/>
-+  <flag name='pci-serial'/>
-+  <flag name='vhost-user-multiqueue'/>
-+  <flag name='migration-event'/>
-+  <flag name='ioh3420'/>
-+  <flag name='x3130-upstream'/>
-+  <flag name='xio3130-downstream'/>
-+  <flag name='rtl8139'/>
-+  <flag name='e1000'/>
-+  <flag name='virtio-net'/>
-+  <flag name='gic-version'/>
-+  <flag name='incoming-defer'/>
-+  <flag name='virtio-gpu'/>
-+  <flag name='virtio-gpu.virgl'/>
-+  <flag name='virtio-keyboard'/>
-+  <flag name='virtio-mouse'/>
-+  <flag name='virtio-tablet'/>
-+  <flag name='virtio-input-host'/>
-+  <flag name='chardev-file-append'/>
-+  <flag name='ich9-disable-s3'/>
-+  <flag name='ich9-disable-s4'/>
-+  <flag name='vserport-change-event'/>
-+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-+  <flag name='mptsas1068'/>
-+  <flag name='spice-gl'/>
-+  <flag name='qxl.vram64_size_mb'/>
-+  <flag name='chardev-logfile'/>
-+  <flag name='debug-threads'/>
-+  <flag name='secret'/>
-+  <flag name='pxb'/>
-+  <flag name='pxb-pcie'/>
-+  <flag name='device-tray-moved-event'/>
-+  <flag name='nec-usb-xhci-ports'/>
-+  <flag name='virtio-scsi-pci.iothread'/>
-+  <flag name='name-guest'/>
-+  <flag name='qxl.max_outputs'/>
-+  <flag name='spice-unix'/>
-+  <flag name='drive-detect-zeroes'/>
-+  <flag name='tls-creds-x509'/>
-+  <flag name='intel-iommu'/>
-+  <flag name='smm'/>
-+  <flag name='virtio-pci-disable-legacy'/>
-+  <flag name='query-hotpluggable-cpus'/>
-+  <flag name='virtio-net.rx_queue_size'/>
-+  <flag name='virtio-vga'/>
-+  <flag name='drive-iotune-max-length'/>
-+  <flag name='ivshmem-plain'/>
-+  <flag name='ivshmem-doorbell'/>
-+  <flag name='query-qmp-schema'/>
-+  <flag name='gluster.debug_level'/>
-+  <flag name='vhost-scsi'/>
-+  <flag name='drive-iotune-group'/>
-+  <flag name='query-cpu-model-expansion'/>
-+  <flag name='virtio-net.host_mtu'/>
-+  <flag name='spice-rendernode'/>
-+  <flag name='nvdimm'/>
-+  <flag name='pcie-root-port'/>
-+  <flag name='query-cpu-definitions'/>
-+  <flag name='block-write-threshold'/>
-+  <flag name='query-named-block-nodes'/>
-+  <flag name='cpu-cache'/>
-+  <flag name='qemu-xhci'/>
-+  <flag name='kernel-irqchip'/>
-+  <flag name='kernel-irqchip.split'/>
-+  <flag name='intel-iommu.intremap'/>
-+  <flag name='intel-iommu.caching-mode'/>
-+  <flag name='intel-iommu.eim'/>
-+  <flag name='intel-iommu.device-iotlb'/>
-+  <flag name='virtio.iommu_platform'/>
-+  <flag name='virtio.ats'/>
-+  <flag name='loadparm'/>
-+  <flag name='vnc-multi-servers'/>
-+  <flag name='virtio-net.tx_queue_size'/>
-+  <flag name='chardev-reconnect'/>
-+  <flag name='virtio-gpu.max_outputs'/>
-+  <flag name='vxhs'/>
-+  <flag name='virtio-blk.num-queues'/>
-+  <flag name='vmcoreinfo'/>
-+  <flag name='numa.dist'/>
-+  <flag name='disk-share-rw'/>
-+  <flag name='iscsi.password-secret'/>
-+  <flag name='isa-serial'/>
-+  <flag name='dump-completed'/>
-+  <flag name='qcow2-luks'/>
-+  <flag name='pcie-pci-bridge'/>
-+  <flag name='seccomp-blacklist'/>
-+  <flag name='disk-write-cache'/>
-+  <flag name='nbd-tls'/>
-+  <flag name='pr-manager-helper'/>
-+  <flag name='sdl-gl'/>
-+  <flag name='hda-output'/>
-+  <flag name='blockdev-del'/>
-+  <flag name='vmgenid'/>
-+  <flag name='vhost-vsock'/>
-+  <flag name='tpm-emulator'/>
-+  <flag name='mch'/>
-+  <flag name='mch.extended-tseg-mbytes'/>
-+  <version>2011000</version>
-+  <kvmVersion>0</kvmVersion>
-+  <microcodeVersion>371455</microcodeVersion>
-+  <package> (v2.11.0)</package>
-+  <arch>x86_64</arch>
-+  <hostCPU type='kvm' model='base' migratability='yes'>
-+    <property name='phys-bits' type='number' value='0'/>
-+    <property name='core-id' type='number' value='-1'/>
-+    <property name='xlevel' type='number' value='2147483656'/>
-+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-+    <property name='ia64' type='boolean' value='false'/>
-+    <property name='aes' type='boolean' value='true' migratable='yes'/>
-+    <property name='mmx' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdpid' type='boolean' value='false'/>
-+    <property name='arat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pause-filter' type='boolean' value='false'/>
-+    <property name='xsavec' type='boolean' value='true' migratable='yes'/>
-+    <property name='osxsave' type='boolean' value='false'/>
-+    <property name='tsc-frequency' type='number' value='0'/>
-+    <property name='xd' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vendor-id' type='string' value=''/>
-+    <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='perfctr_core' type='boolean' value='false'/>
-+    <property name='perfctr-core' type='boolean' value='false'/>
-+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='6'/>
-+    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-runtime' type='boolean' value='false'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='thread-id' type='number' value='-1'/>
-+    <property name='min-level' type='number' value='13'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='hv-relaxed' type='boolean' value='false'/>
-+    <property name='hv-crash' type='boolean' value='false'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xtpr' 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='cr8legacy' type='boolean' value='false'/>
-+    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-+    <property name='apic-id' type='number' value='4294967295'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='GenuineIntel'/>
-+    <property name='pku' type='boolean' value='false'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='cmp_legacy' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='node-id' type='number' value='-1'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb_clean' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='true' migratable='yes'/>
-+    <property name='npt' type='boolean' value='false'/>
-+    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-+    <property name='clwb' 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='svm_lock' type='boolean' value='false'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='pfthreshold' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <property name='x2apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512vbmi' type='boolean' value='false'/>
-+    <property name='hv-stimer' type='boolean' value='false'/>
-+    <property name='i64' type='boolean' value='true' migratable='yes'/>
-+    <property name='flushbyasid' type='boolean' value='false'/>
-+    <property name='f16c' type='boolean' value='true' migratable='yes'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pae' 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='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
-+    <property name='tm' type='boolean' value='false'/>
-+    <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
-+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-+    <property name='socket-id' type='number' value='-1'/>
-+    <property name='pcommit' type='boolean' value='false'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='level' type='number' value='13'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='svm' type='boolean' value='false'/>
-+    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-reset' type='boolean' value='false'/>
-+    <property name='invtsc' type='boolean' value='true' migratable='no'/>
-+    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_mmu' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-+    <property name='nodeid_msr' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='model' type='number' value='94'/>
-+    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='false'/>
-+    <property name='invpcid' type='boolean' value='true' migratable='yes'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc-deadline' type='boolean' value='true' migratable='yes'/>
-+    <property name='fma' type='boolean' value='true' migratable='yes'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='enforce' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='3'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='ds_cpl' type='boolean' value='false'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='false'/>
-+    <property name='osvw' type='boolean' value='false'/>
-+    <property name='check' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-spinlocks' type='number' value='-1'/>
-+    <property name='pmu' type='boolean' value='false'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='min-xlevel2' type='number' value='0'/>
-+    <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-+    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='true' migratable='yes'/>
-+    <property name='ospke' type='boolean' value='false'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='false'/>
-+    <property name='hv-vapic' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='ht' 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='false'/>
-+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-+    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='umip' type='boolean' value='true' migratable='yes'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-+    <property name='x-hv-max-vps' type='number' value='-1'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-+    <property name='misalignsse' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483656'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='realized' type='boolean' value='false'/>
-+    <property name='tsc_scale' type='boolean' value='false'/>
-+    <property name='tsc-scale' type='boolean' value='false'/>
-+    <property name='topoext' type='boolean' value='false'/>
-+    <property name='hv-vpindex' type='boolean' value='false'/>
-+    <property name='xlevel2' type='number' value='0'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='false'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='true' migratable='yes'/>
-+    <property name='3dnow' type='boolean' value='false'/>
-+    <property name='erms' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='hv-synic' type='boolean' value='false'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='fxsr_opt' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lmce' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-time' type='boolean' value='false'/>
-+    <property name='perfctr-nb' type='boolean' value='false'/>
-+    <property name='perfctr_nb' type='boolean' value='false'/>
-+    <property name='ffxsr' type='boolean' value='false'/>
-+    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdseed' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
-+    <property name='vme' type='boolean' value='true' migratable='yes'/>
-+    <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='pse36' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='pause_filter' type='boolean' value='false'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <hostCPU type='tcg' model='base' migratability='yes'>
-+    <property name='phys-bits' type='number' value='0'/>
-+    <property name='core-id' type='number' value='-1'/>
-+    <property name='xlevel' type='number' value='2147483658'/>
-+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-+    <property name='ia64' type='boolean' value='false'/>
-+    <property name='aes' type='boolean' value='true' migratable='yes'/>
-+    <property name='mmx' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdpid' type='boolean' value='false'/>
-+    <property name='arat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pause-filter' type='boolean' value='false'/>
-+    <property name='xsavec' type='boolean' value='false'/>
-+    <property name='osxsave' type='boolean' value='false'/>
-+    <property name='tsc-frequency' type='number' value='0'/>
-+    <property name='xd' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vendor-id' type='string' value=''/>
-+    <property name='kvm-asyncpf' type='boolean' value='false'/>
-+    <property name='kvm_asyncpf' type='boolean' value='false'/>
-+    <property name='perfctr_core' type='boolean' value='false'/>
-+    <property name='perfctr-core' type='boolean' value='false'/>
-+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='6'/>
-+    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-runtime' type='boolean' value='false'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='thread-id' type='number' value='-1'/>
-+    <property name='min-level' type='number' value='13'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='hv-relaxed' type='boolean' value='false'/>
-+    <property name='hv-crash' type='boolean' value='false'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xtpr' 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='false'/>
-+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-+    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-+    <property name='apic-id' type='number' value='4294967295'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='AuthenticAMD'/>
-+    <property name='pku' type='boolean' value='true' migratable='yes'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='cmp_legacy' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='node-id' type='number' value='-1'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb_clean' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-+    <property name='hle' type='boolean' value='false'/>
-+    <property name='npt' type='boolean' value='false'/>
-+    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-+    <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='svm_lock' type='boolean' value='false'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='pfthreshold' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <property name='x2apic' type='boolean' value='false'/>
-+    <property name='avx512vbmi' type='boolean' value='false'/>
-+    <property name='hv-stimer' type='boolean' value='false'/>
-+    <property name='i64' type='boolean' value='true' migratable='yes'/>
-+    <property name='flushbyasid' type='boolean' value='false'/>
-+    <property name='f16c' type='boolean' value='false'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pae' 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='kvm_nopiodelay' type='boolean' value='false'/>
-+    <property name='kvm-nopiodelay' type='boolean' value='false'/>
-+    <property name='tm' type='boolean' value='false'/>
-+    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
-+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-+    <property name='socket-id' type='number' value='-1'/>
-+    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='level' type='number' value='13'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='svm' type='boolean' value='true' migratable='yes'/>
-+    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-reset' type='boolean' value='false'/>
-+    <property name='invtsc' type='boolean' value='false'/>
-+    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='false'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_mmu' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-+    <property name='nodeid_msr' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='model' type='number' value='6'/>
-+    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-+    <property name='invpcid' type='boolean' value='false'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc-deadline' type='boolean' value='false'/>
-+    <property name='fma' type='boolean' value='false'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='enforce' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='3'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='ds_cpl' type='boolean' value='false'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='true' migratable='yes'/>
-+    <property name='osvw' type='boolean' value='false'/>
-+    <property name='check' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-spinlocks' type='number' value='-1'/>
-+    <property name='pmu' type='boolean' value='false'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='min-xlevel2' type='number' value='0'/>
-+    <property name='tsc-adjust' type='boolean' value='false'/>
-+    <property name='tsc_adjust' type='boolean' value='false'/>
-+    <property name='kvm-steal-time' type='boolean' value='false'/>
-+    <property name='kvm_steal_time' type='boolean' value='false'/>
-+    <property name='kvmclock' type='boolean' value='false'/>
-+    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='false'/>
-+    <property name='ospke' type='boolean' value='true' migratable='yes'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vapic' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='ht' 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='xsaves' type='boolean' value='false'/>
-+    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='umip' type='boolean' value='false'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='false'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-+    <property name='x-hv-max-vps' type='number' value='-1'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-+    <property name='misalignsse' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483658'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='realized' type='boolean' value='false'/>
-+    <property name='tsc_scale' type='boolean' value='false'/>
-+    <property name='tsc-scale' type='boolean' value='false'/>
-+    <property name='topoext' type='boolean' value='false'/>
-+    <property name='hv-vpindex' type='boolean' value='false'/>
-+    <property name='xlevel2' type='number' value='0'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='false'/>
-+    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-+    <property name='erms' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='hv-synic' type='boolean' value='false'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='fxsr_opt' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='false'/>
-+    <property name='lmce' type='boolean' value='false'/>
-+    <property name='hv-time' type='boolean' value='false'/>
-+    <property name='perfctr-nb' type='boolean' value='false'/>
-+    <property name='perfctr_nb' type='boolean' value='false'/>
-+    <property name='ffxsr' type='boolean' value='false'/>
-+    <property name='rdrand' type='boolean' value='false'/>
-+    <property name='rdseed' type='boolean' value='false'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='false'/>
-+    <property name='vme' 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='pse36' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='pause_filter' type='boolean' value='false'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <cpu type='kvm' name='max' usable='yes'/>
-+  <cpu type='kvm' name='host' usable='yes'/>
-+  <cpu type='kvm' name='base' usable='yes'/>
-+  <cpu type='kvm' name='qemu64' usable='yes'/>
-+  <cpu type='kvm' name='qemu32' usable='yes'/>
-+  <cpu type='kvm' name='phenom' usable='no'>
-+    <blocker name='mmxext'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+    <blocker name='sse4a'/>
-+    <blocker name='npt'/>
-+  </cpu>
-+  <cpu type='kvm' name='pentium3' usable='yes'/>
-+  <cpu type='kvm' name='pentium2' usable='yes'/>
-+  <cpu type='kvm' name='pentium' usable='yes'/>
-+  <cpu type='kvm' name='n270' usable='yes'/>
-+  <cpu type='kvm' name='kvm64' usable='yes'/>
-+  <cpu type='kvm' name='kvm32' usable='yes'/>
-+  <cpu type='kvm' name='coreduo' usable='yes'/>
-+  <cpu type='kvm' name='core2duo' usable='yes'/>
-+  <cpu type='kvm' name='athlon' usable='no'>
-+    <blocker name='mmxext'/>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+  </cpu>
-+  <cpu type='kvm' name='Westmere' usable='yes'/>
-+  <cpu type='kvm' name='Skylake-Server' usable='no'>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='clwb'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-+  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-+  <cpu type='kvm' name='Penryn' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G5' usable='no'>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G4' usable='no'>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G3' usable='no'>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-+  <cpu type='kvm' name='Nehalem' usable='yes'/>
-+  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-+  <cpu type='kvm' name='Haswell' usable='yes'/>
-+  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-+  <cpu type='kvm' name='EPYC' usable='no'>
-+    <blocker name='sha-ni'/>
-+    <blocker name='mmxext'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='cr8legacy'/>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+  </cpu>
-+  <cpu type='kvm' name='Conroe' usable='yes'/>
-+  <cpu type='kvm' name='Broadwell' usable='yes'/>
-+  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-+  <cpu type='kvm' name='486' usable='yes'/>
-+  <cpu type='tcg' name='max' usable='yes'/>
-+  <cpu type='tcg' name='host' usable='no'>
-+    <blocker name='kvm'/>
-+  </cpu>
-+  <cpu type='tcg' name='base' usable='yes'/>
-+  <cpu type='tcg' name='qemu64' usable='yes'/>
-+  <cpu type='tcg' name='qemu32' usable='yes'/>
-+  <cpu type='tcg' name='phenom' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='npt'/>
-+  </cpu>
-+  <cpu type='tcg' name='pentium3' usable='yes'/>
-+  <cpu type='tcg' name='pentium2' usable='yes'/>
-+  <cpu type='tcg' name='pentium' usable='yes'/>
-+  <cpu type='tcg' name='n270' usable='yes'/>
-+  <cpu type='tcg' name='kvm64' usable='yes'/>
-+  <cpu type='tcg' name='kvm32' usable='yes'/>
-+  <cpu type='tcg' name='coreduo' usable='yes'/>
-+  <cpu type='tcg' name='core2duo' usable='yes'/>
-+  <cpu type='tcg' name='athlon' usable='yes'/>
-+  <cpu type='tcg' name='Westmere' usable='yes'/>
-+  <cpu type='tcg' name='Skylake-Server' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='SandyBridge' usable='no'>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+  </cpu>
-+  <cpu type='tcg' name='Penryn' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G5' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G4' usable='no'>
-+    <blocker name='avx'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G3' usable='no'>
-+    <blocker name='misalignsse'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-+  <cpu type='tcg' name='Nehalem' usable='yes'/>
-+  <cpu type='tcg' name='IvyBridge' usable='no'>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='sha-ni'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='osvw'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Conroe' usable='yes'/>
-+  <cpu type='tcg' name='Broadwell' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='486' usable='yes'/>
-+  <machine name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
-+  <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
-+</qemuCaps>
-diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
-index 0813672537..4aec175968 100644
---- a/tests/qemucapabilitiestest.c
-+++ b/tests/qemucapabilitiestest.c
-@@ -174,6 +174,7 @@ mymain(void)
-     DO_TEST("x86_64", "caps_2.8.0");
-     DO_TEST("x86_64", "caps_2.9.0");
-     DO_TEST("x86_64", "caps_2.10.0");
-+    DO_TEST("x86_64", "caps_2.11.0");
-     DO_TEST("x86_64", "caps_2.12.0");
-     DO_TEST("x86_64", "caps_3.0.0");
-     DO_TEST("aarch64", "caps_2.6.0");
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-3.1.0-on-ppc64.patch b/SOURCES/libvirt-tests-Add-capabilities-for-QEMU-5.0.0-on-aarch64.patch
similarity index 66%
rename from SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-3.1.0-on-ppc64.patch
rename to SOURCES/libvirt-tests-Add-capabilities-for-QEMU-5.0.0-on-aarch64.patch
index 8c40181..b7037b5 100644
--- a/SOURCES/libvirt-tests-Add-capabilities-data-for-QEMU-3.1.0-on-ppc64.patch
+++ b/SOURCES/libvirt-tests-Add-capabilities-for-QEMU-5.0.0-on-aarch64.patch
@@ -1,54 +1,365 @@
-From 2166e637bd0b124581058dfc660cd951484748c1 Mon Sep 17 00:00:00 2001
-Message-Id: <2166e637bd0b124581058dfc660cd951484748c1@dist-git>
+From 3fddf6edcbf3b0448c96b82c358ae9a4d2272c39 Mon Sep 17 00:00:00 2001
+Message-Id: <3fddf6edcbf3b0448c96b82c358ae9a4d2272c39@dist-git>
 From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 4 Dec 2018 16:46:17 +0100
-Subject: [PATCH] tests: Add capabilities data for QEMU 3.1.0 on ppc64
+Date: Fri, 14 Feb 2020 13:12:32 +0100
+Subject: [PATCH] tests: Add capabilities for QEMU 5.0.0 on aarch64
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit e95bcd8d187b2fe0d92816f81ca05a15f81ca111)
-
-No conflicts, but
-
-  tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
-  tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-  tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
-
-had to be tweaked because we're missing
-
-  22d8f55b21 qemu: capabilities: Detect active block commit via QMP schema probing if possible
-  f2019083de qemu: capabilities: Always assume QEMU_CAPS_ADD_FD
-  4168e33755 qemu: remove leftover property probing
-  b37b41f868 qemu: Don't duplicate binary name in capabilities
-  21b18ea5d9 qemu: add memory-backend-memfd capability check
-  a6fd5b596a qemu: check memory-backend-memfd.hugetlb capability
-  9aec374b01 qemu: Detect whether iothread polling is supported
-
-downstream.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1647822
+This will be the first QEMU version that will support the
+kvm-no-adjvtime CPU feature.
 
 Signed-off-by: Andrea Bolognani <abologna@redhat.com>
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../caps_3.1.0.ppc64.replies                  | 23616 ++++++++++++++++
- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1081 +
- tests/qemucapabilitiestest.c                  |     1 +
- .../qemucaps2xmloutdata/caps_3.1.0.ppc64.xml  |    28 +
- tests/qemucaps2xmltest.c                      |     1 +
- 5 files changed, 24727 insertions(+)
- create mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
- create mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
+(cherry picked from commit 79ebc31a1b671577f413a4fed4addca8ae3423c9)
 
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+Changes:
+
+  * tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+    tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+    tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+
+    + rng-builting support has not been backported
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214121237.623948-2-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ .../qemu_5.0.0-virt.aarch64.xml               |   155 +
+ tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |   149 +
+ .../caps_5.0.0.aarch64.replies                | 22717 ++++++++++++++++
+ .../caps_5.0.0.aarch64.xml                    |   455 +
+ 4 files changed, 23476 insertions(+)
+ create mode 100644 tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+ create mode 100644 tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+ create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+ create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+
+diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
 new file mode 100644
-index 0000000000..576e0b69e9
+index 0000000000..6b6235fccc
 --- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
-@@ -0,0 +1,23616 @@
++++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+@@ -0,0 +1,155 @@
++<domainCapabilities>
++  <path>/usr/bin/qemu-system-aarch64</path>
++  <domain>kvm</domain>
++  <machine>virt-5.0</machine>
++  <arch>aarch64</arch>
++  <vcpu max='512'/>
++  <iothreads supported='yes'/>
++  <os supported='yes'>
++    <enum name='firmware'>
++      <value>efi</value>
++    </enum>
++    <loader supported='yes'>
++      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
++      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
++      <value>/usr/share/OVMF/OVMF_CODE.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'/>
++    <mode name='host-model' supported='no'/>
++    <mode name='custom' supported='yes'>
++      <model usable='unknown'>pxa262</model>
++      <model usable='unknown'>pxa270-a0</model>
++      <model usable='unknown'>arm1136</model>
++      <model usable='unknown'>cortex-a15</model>
++      <model usable='unknown'>pxa260</model>
++      <model usable='unknown'>arm1136-r2</model>
++      <model usable='unknown'>pxa261</model>
++      <model usable='unknown'>pxa255</model>
++      <model usable='unknown'>cortex-a72</model>
++      <model usable='unknown'>cortex-m33</model>
++      <model usable='unknown'>arm926</model>
++      <model usable='unknown'>cortex-r5f</model>
++      <model usable='unknown'>arm11mpcore</model>
++      <model usable='unknown'>pxa250</model>
++      <model usable='unknown'>ti925t</model>
++      <model usable='unknown'>cortex-a57</model>
++      <model usable='unknown'>sa1110</model>
++      <model usable='unknown'>arm1176</model>
++      <model usable='unknown'>cortex-a53</model>
++      <model usable='unknown'>sa1100</model>
++      <model usable='unknown'>pxa270-c5</model>
++      <model usable='unknown'>cortex-a9</model>
++      <model usable='unknown'>cortex-m7</model>
++      <model usable='unknown'>cortex-a8</model>
++      <model usable='unknown'>cortex-a7</model>
++      <model usable='unknown'>pxa270-c0</model>
++      <model usable='unknown'>arm1026</model>
++      <model usable='unknown'>pxa270-b1</model>
++      <model usable='unknown'>cortex-m3</model>
++      <model usable='unknown'>max</model>
++      <model usable='unknown'>cortex-m4</model>
++      <model usable='unknown'>pxa270-b0</model>
++      <model usable='unknown'>arm946</model>
++      <model usable='unknown'>cortex-m0</model>
++      <model usable='unknown'>cortex-r5</model>
++      <model usable='unknown'>pxa270-a1</model>
++      <model usable='unknown'>pxa270</model>
++    </mode>
++  </cpu>
++  <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>
++      </enum>
++    </graphics>
++    <video supported='yes'>
++      <enum name='modelType'>
++        <value>vga</value>
++        <value>cirrus</value>
++        <value>vmvga</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>
++      </enum>
++    </rng>
++  </devices>
++  <features>
++    <gic supported='yes'>
++      <enum name='version'>
++        <value>3</value>
++      </enum>
++    </gic>
++    <vmcoreinfo supported='yes'/>
++    <genid supported='no'/>
++    <backingStoreInput supported='yes'/>
++    <backup supported='no'/>
++    <sev supported='no'/>
++  </features>
++</domainCapabilities>
+diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+new file mode 100644
+index 0000000000..5cebdcf7db
+--- /dev/null
++++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+@@ -0,0 +1,149 @@
++<domainCapabilities>
++  <path>/usr/bin/qemu-system-aarch64</path>
++  <domain>kvm</domain>
++  <machine>integratorcp</machine>
++  <arch>aarch64</arch>
++  <vcpu max='1'/>
++  <iothreads supported='yes'/>
++  <os supported='yes'>
++    <enum name='firmware'/>
++    <loader supported='yes'>
++      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
++      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
++      <value>/usr/share/OVMF/OVMF_CODE.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'/>
++    <mode name='host-model' supported='no'/>
++    <mode name='custom' supported='yes'>
++      <model usable='unknown'>pxa262</model>
++      <model usable='unknown'>pxa270-a0</model>
++      <model usable='unknown'>arm1136</model>
++      <model usable='unknown'>cortex-a15</model>
++      <model usable='unknown'>pxa260</model>
++      <model usable='unknown'>arm1136-r2</model>
++      <model usable='unknown'>pxa261</model>
++      <model usable='unknown'>pxa255</model>
++      <model usable='unknown'>cortex-a72</model>
++      <model usable='unknown'>cortex-m33</model>
++      <model usable='unknown'>arm926</model>
++      <model usable='unknown'>cortex-r5f</model>
++      <model usable='unknown'>arm11mpcore</model>
++      <model usable='unknown'>pxa250</model>
++      <model usable='unknown'>ti925t</model>
++      <model usable='unknown'>cortex-a57</model>
++      <model usable='unknown'>sa1110</model>
++      <model usable='unknown'>arm1176</model>
++      <model usable='unknown'>cortex-a53</model>
++      <model usable='unknown'>sa1100</model>
++      <model usable='unknown'>pxa270-c5</model>
++      <model usable='unknown'>cortex-a9</model>
++      <model usable='unknown'>cortex-m7</model>
++      <model usable='unknown'>cortex-a8</model>
++      <model usable='unknown'>cortex-a7</model>
++      <model usable='unknown'>pxa270-c0</model>
++      <model usable='unknown'>arm1026</model>
++      <model usable='unknown'>pxa270-b1</model>
++      <model usable='unknown'>cortex-m3</model>
++      <model usable='unknown'>max</model>
++      <model usable='unknown'>cortex-m4</model>
++      <model usable='unknown'>pxa270-b0</model>
++      <model usable='unknown'>arm946</model>
++      <model usable='unknown'>cortex-m0</model>
++      <model usable='unknown'>cortex-r5</model>
++      <model usable='unknown'>pxa270-a1</model>
++      <model usable='unknown'>pxa270</model>
++    </mode>
++  </cpu>
++  <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>
++      </enum>
++    </graphics>
++    <video supported='yes'>
++      <enum name='modelType'>
++        <value>vga</value>
++        <value>cirrus</value>
++        <value>vmvga</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>
++      </enum>
++    </rng>
++  </devices>
++  <features>
++    <gic supported='no'/>
++    <vmcoreinfo supported='yes'/>
++    <genid supported='no'/>
++    <backingStoreInput supported='yes'/>
++    <backup supported='no'/>
++    <sev supported='no'/>
++  </features>
++</domainCapabilities>
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+new file mode 100644
+index 0000000000..a3136a0966
+--- /dev/null
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+@@ -0,0 +1,22717 @@
 +{
 +  "execute": "qmp_capabilities",
 +  "id": "libvirt-1"
@@ -68,11 +379,11 @@ index 0000000000..576e0b69e9
 +{
 +  "return": {
 +    "qemu": {
-+      "micro": 91,
-+      "minor": 0,
-+      "major": 3
++      "micro": 50,
++      "minor": 2,
++      "major": 4
 +    },
-+    "package": "v3.1.0-rc1-74-g3c035a41dc"
++    "package": "v4.2.0-1157-gadcd6e93b9"
 +  },
 +  "id": "libvirt-2"
 +}
@@ -84,7 +395,7 @@ index 0000000000..576e0b69e9
 +
 +{
 +  "return": {
-+    "arch": "ppc64"
++    "arch": "aarch64"
 +  },
 +  "id": "libvirt-3"
 +}
@@ -106,15 +417,12 @@ index 0000000000..576e0b69e9
 +      "name": "query-qmp-schema"
 +    },
 +    {
-+      "name": "set-numa-node"
++      "name": "query-gic-capabilities"
 +    },
 +    {
 +      "name": "query-vm-generation-id"
 +    },
 +    {
-+      "name": "query-hotpluggable-cpus"
-+    },
-+    {
 +      "name": "xen-load-devices-state"
 +    },
 +    {
@@ -124,15 +432,9 @@ index 0000000000..576e0b69e9
 +      "name": "query-memory-devices"
 +    },
 +    {
-+      "name": "query-memdev"
-+    },
-+    {
 +      "name": "query-command-line-options"
 +    },
 +    {
-+      "name": "query-target"
-+    },
-+    {
 +      "name": "query-fdsets"
 +    },
 +    {
@@ -142,63 +444,21 @@ index 0000000000..576e0b69e9
 +      "name": "add-fd"
 +    },
 +    {
-+      "name": "query-cpu-definitions"
-+    },
-+    {
 +      "name": "query-memory-size-summary"
 +    },
 +    {
-+      "name": "query-machines"
-+    },
-+    {
 +      "name": "closefd"
 +    },
 +    {
 +      "name": "getfd"
 +    },
 +    {
-+      "name": "object-del"
-+    },
-+    {
-+      "name": "object-add"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability"
-+    },
-+    {
-+      "name": "query-dump"
-+    },
-+    {
-+      "name": "dump-guest-memory"
-+    },
-+    {
-+      "name": "device_del"
-+    },
-+    {
 +      "name": "xen-set-global-dirty-log"
 +    },
 +    {
-+      "name": "qom-list-properties"
-+    },
-+    {
-+      "name": "device-list-properties"
-+    },
-+    {
-+      "name": "qom-list-types"
-+    },
-+    {
 +      "name": "change"
 +    },
 +    {
-+      "name": "qom-set"
-+    },
-+    {
-+      "name": "qom-get"
-+    },
-+    {
-+      "name": "qom-list"
-+    },
-+    {
 +      "name": "human-monitor-command"
 +    },
 +    {
@@ -223,9 +483,6 @@ index 0000000000..576e0b69e9
 +      "name": "memsave"
 +    },
 +    {
-+      "name": "cpu-add"
-+    },
-+    {
 +      "name": "system_powerdown"
 +    },
 +    {
@@ -247,12 +504,6 @@ index 0000000000..576e0b69e9
 +      "name": "query-iothreads"
 +    },
 +    {
-+      "name": "query-cpus-fast"
-+    },
-+    {
-+      "name": "query-cpus"
-+    },
-+    {
 +      "name": "query-events"
 +    },
 +    {
@@ -277,6 +528,66 @@ index 0000000000..576e0b69e9
 +      "name": "qmp_capabilities"
 +    },
 +    {
++      "name": "query-cpu-definitions"
++    },
++    {
++      "name": "query-cpu-model-expansion"
++    },
++    {
++      "name": "set-numa-node"
++    },
++    {
++      "name": "query-hotpluggable-cpus"
++    },
++    {
++      "name": "query-memdev"
++    },
++    {
++      "name": "query-target"
++    },
++    {
++      "name": "query-current-machine"
++    },
++    {
++      "name": "query-machines"
++    },
++    {
++      "name": "cpu-add"
++    },
++    {
++      "name": "query-cpus-fast"
++    },
++    {
++      "name": "query-cpus"
++    },
++    {
++      "name": "device_del"
++    },
++    {
++      "name": "device-list-properties"
++    },
++    {
++      "name": "object-del"
++    },
++    {
++      "name": "object-add"
++    },
++    {
++      "name": "qom-list-properties"
++    },
++    {
++      "name": "qom-list-types"
++    },
++    {
++      "name": "qom-set"
++    },
++    {
++      "name": "qom-get"
++    },
++    {
++      "name": "qom-list"
++    },
++    {
 +      "name": "trace-event-set-state"
 +    },
 +    {
@@ -355,6 +666,9 @@ index 0000000000..576e0b69e9
 +      "name": "query-migrate"
 +    },
 +    {
++      "name": "query-display-options"
++    },
++    {
 +      "name": "input-send-event"
 +    },
 +    {
@@ -403,6 +717,9 @@ index 0000000000..576e0b69e9
 +      "name": "query-rocker"
 +    },
 +    {
++      "name": "announce-self"
++    },
++    {
 +      "name": "query-rx-filter"
 +    },
 +    {
@@ -412,6 +729,15 @@ index 0000000000..576e0b69e9
 +      "name": "set_link"
 +    },
 +    {
++      "name": "query-dump-guest-memory-capability"
++    },
++    {
++      "name": "query-dump"
++    },
++    {
++      "name": "dump-guest-memory"
++    },
++    {
 +      "name": "chardev-send-break"
 +    },
 +    {
@@ -436,31 +762,25 @@ index 0000000000..576e0b69e9
 +      "name": "query-chardev"
 +    },
 +    {
-+      "name": "nbd-server-stop"
++      "name": "query-jobs"
 +    },
 +    {
-+      "name": "x-nbd-server-add-bitmap"
++      "name": "job-finalize"
 +    },
 +    {
-+      "name": "nbd-server-remove"
++      "name": "job-dismiss"
 +    },
 +    {
-+      "name": "nbd-server-add"
++      "name": "job-complete"
 +    },
 +    {
-+      "name": "nbd-server-start"
++      "name": "job-cancel"
 +    },
 +    {
-+      "name": "eject"
++      "name": "job-resume"
 +    },
 +    {
-+      "name": "blockdev-snapshot-delete-internal-sync"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync"
-+    },
-+    {
-+      "name": "query-pr-managers"
++      "name": "job-pause"
 +    },
 +    {
 +      "name": "x-blockdev-set-iothread"
@@ -493,6 +813,9 @@ index 0000000000..576e0b69e9
 +      "name": "blockdev-del"
 +    },
 +    {
++      "name": "x-blockdev-reopen"
++    },
++    {
 +      "name": "blockdev-add"
 +    },
 +    {
@@ -529,13 +852,13 @@ index 0000000000..576e0b69e9
 +      "name": "x-debug-block-dirty-bitmap-sha256"
 +    },
 +    {
-+      "name": "x-block-dirty-bitmap-merge"
++      "name": "block-dirty-bitmap-merge"
 +    },
 +    {
-+      "name": "x-block-dirty-bitmap-disable"
++      "name": "block-dirty-bitmap-disable"
 +    },
 +    {
-+      "name": "x-block-dirty-bitmap-enable"
++      "name": "block-dirty-bitmap-enable"
 +    },
 +    {
 +      "name": "block-dirty-bitmap-clear"
@@ -550,6 +873,9 @@ index 0000000000..576e0b69e9
 +      "name": "drive-mirror"
 +    },
 +    {
++      "name": "x-debug-query-block-graph"
++    },
++    {
 +      "name": "query-named-block-nodes"
 +    },
 +    {
@@ -586,28 +912,31 @@ index 0000000000..576e0b69e9
 +      "name": "query-block"
 +    },
 +    {
-+      "name": "x-block-latency-histogram-set"
++      "name": "block-latency-histogram-set"
 +    },
 +    {
-+      "name": "query-jobs"
++      "name": "nbd-server-stop"
 +    },
 +    {
-+      "name": "job-finalize"
++      "name": "nbd-server-remove"
 +    },
 +    {
-+      "name": "job-dismiss"
++      "name": "nbd-server-add"
 +    },
 +    {
-+      "name": "job-complete"
++      "name": "nbd-server-start"
 +    },
 +    {
-+      "name": "job-cancel"
++      "name": "eject"
 +    },
 +    {
-+      "name": "job-resume"
++      "name": "blockdev-snapshot-delete-internal-sync"
 +    },
 +    {
-+      "name": "job-pause"
++      "name": "blockdev-snapshot-internal-sync"
++    },
++    {
++      "name": "query-pr-managers"
 +    },
 +    {
 +      "name": "watchdog-set-action"
@@ -620,41 +949,8 @@ index 0000000000..576e0b69e9
 +}
 +
 +{
-+  "execute": "add-fd",
-+  "arguments": {
-+    "fdset-id": 0,
-+    "opaque": "/dev/null"
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "fd": 19,
-+    "fdset-id": 0
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "block-commit",
-+  "arguments": {
-+    "device": "bogus"
-+  },
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "id": "libvirt-6",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'bogus' not found"
-+  }
-+}
-+
-+{
 +  "execute": "query-kvm",
-+  "id": "libvirt-7"
++  "id": "libvirt-5"
 +}
 +
 +{
@@ -662,166 +958,17 @@ index 0000000000..576e0b69e9
 +    "enabled": true,
 +    "present": true
 +  },
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "execute": "query-events",
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "COMMAND_DROPPED"
-+    },
-+    {
-+      "name": "RTC_CHANGE"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST"
-+    },
-+    {
-+      "name": "MEM_UNPLUG_ERROR"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED"
-+    },
-+    {
-+      "name": "DEVICE_DELETED"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE"
-+    },
-+    {
-+      "name": "COLO_EXIT"
-+    },
-+    {
-+      "name": "MIGRATION_PASS"
-+    },
-+    {
-+      "name": "MIGRATION"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED"
-+    },
-+    {
-+      "name": "VNC_CONNECTED"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD"
-+    },
-+    {
-+      "name": "QUORUM_FAILURE"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED"
-+    },
-+    {
-+      "name": "JOB_STATUS_CHANGE"
-+    },
-+    {
-+      "name": "GUEST_PANICKED"
-+    },
-+    {
-+      "name": "WATCHDOG"
-+    },
-+    {
-+      "name": "WAKEUP"
-+    },
-+    {
-+      "name": "SUSPEND_DISK"
-+    },
-+    {
-+      "name": "SUSPEND"
-+    },
-+    {
-+      "name": "RESUME"
-+    },
-+    {
-+      "name": "STOP"
-+    },
-+    {
-+      "name": "RESET"
-+    },
-+    {
-+      "name": "POWERDOWN"
-+    },
-+    {
-+      "name": "SHUTDOWN"
-+    }
-+  ],
-+  "id": "libvirt-8"
++  "id": "libvirt-5"
 +}
 +
 +{
 +  "execute": "qom-list-types",
-+  "id": "libvirt-9"
++  "id": "libvirt-6"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "vhost-vsock-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "scsi-generic",
-+      "parent": "scsi-device"
-+    },
-+    {
-+      "name": "qio-channel-tls",
-+      "parent": "qio-channel"
-+    },
-+    {
 +      "name": "scsi-hd",
 +      "parent": "scsi-disk-base"
 +    },
@@ -830,346 +977,306 @@ index 0000000000..576e0b69e9
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "mpc8568e-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "vhost-vsock-pci",
++      "parent": "vhost-vsock-pci-base"
 +    },
 +    {
-+      "name": "power7+_v2.1-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
++      "name": "pxa270-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "usb-bot",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "chardev-null",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "40p-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "power5+_v2.1-powerpc64-cpu",
-+      "parent": "POWER5P-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "isa-m48t59",
-+      "parent": "isa-m48txx"
-+    },
-+    {
-+      "name": "qemu-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "lsi53c895a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "750_v3.1-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc5200_v10-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8533e_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8343e-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "npe405h2-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e300c2-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "403gb-powerpc64-cpu",
-+      "parent": "403-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7447a_v1.1-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power8e_v2.1-powerpc64-cpu",
-+      "parent": "POWER8-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8555e_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pr-manager-helper",
-+      "parent": "pr-manager"
-+    },
-+    {
-+      "name": "dec-21154",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "750cxe_v3.1-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8541e_v11-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "401-powerpc64-cpu",
-+      "parent": "401-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750cxr-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750cl_v2.0-powerpc64-cpu",
-+      "parent": "750cl-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power8_v2.0-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "745_v1.0-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "ide-hd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "at24c-eeprom",
-+      "parent": "i2c-slave"
-+    },
-+    {
-+      "name": "g2legp1-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-net-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "ppc4xx-i2c",
++      "name": "imx7.analog",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "601_v0-powerpc64-cpu",
-+      "parent": "601-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "macio-newworld",
-+      "parent": "macio"
++      "name": "aspeed.gpio-ast2600",
++      "parent": "aspeed.gpio"
 +    },
 +    {
 +      "name": "chardev-pty",
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "ppc4xx-pcihost",
-+      "parent": "pci-host-bridge"
++      "name": "pxa270-a1-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "spapr-vio-bus",
-+      "parent": "bus"
++      "name": "digic",
++      "parent": "device"
 +    },
 +    {
-+      "name": "ppc4xx-host-bridge",
++      "name": "mv88w8618_flashcfg",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "at25df641",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "lm3s811evb-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "chardev-null",
++      "parent": "chardev"
++    },
++    {
++      "name": "bcm2835-property",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pxa2xx-pcmcia",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "mx25l3205d",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "vhost-user-fs-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "canon-a1100-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "n25q512a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "lsi53c895a",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "750fx_v2.1-powerpc64-cpu",
-+      "parent": "750fx-family-powerpc64-cpu"
++      "name": "pr-manager-helper",
++      "parent": "pr-manager"
 +    },
 +    {
-+      "name": "iop480-powerpc64-cpu",
-+      "parent": "IOP480-family-powerpc64-cpu"
++      "name": "cpu-cluster",
++      "parent": "device"
 +    },
 +    {
-+      "name": "usb-audio",
++      "name": "virtio-keyboard-pci",
++      "parent": "virtio-keyboard-pci-base-type"
++    },
++    {
++      "name": "imx2.wdt",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virt-3.1-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "mx25l6405d",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "virt-5.0-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "w25q256",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "ich9-usb-uhci4",
++      "parent": "pci-uhci-usb"
++    },
++    {
++      "name": "s25fl064k",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "musicpal_gpio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vhost-scsi-pci-non-transitional",
++      "parent": "vhost-scsi-pci-base"
++    },
++    {
++      "name": "ide-hd",
++      "parent": "ide-device"
++    },
++    {
++      "name": "virtio-net-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "virtio-9p-pci-non-transitional",
++      "parent": "virtio-9p-pci-base"
++    },
++    {
++      "name": "iotkit-secctl",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "usb-mtp",
 +      "parent": "usb-device"
 +    },
 +    {
-+      "name": "power7_v2.3-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
++      "name": "n25q00",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "970fx_v2.1-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
++      "name": "tz-mpc-iommu-memory-region",
++      "parent": "qemu:iommu-memory-region"
 +    },
 +    {
-+      "name": "SUNW,fdtwo",
-+      "parent": "base-sysbus-fdc"
++      "name": "cortex-r5-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "440epa-powerpc64-cpu",
-+      "parent": "440EP-family-powerpc64-cpu"
++      "name": "usb-mouse",
++      "parent": "usb-hid"
 +    },
 +    {
-+      "name": "isa-pcspk",
-+      "parent": "isa-device"
++      "name": "xlnx-zcu102-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "dec-21154-p2p-bridge",
-+      "parent": "base-pci-bridge"
++      "name": "vexpress-a15-machine",
++      "parent": "vexpress"
 +    },
 +    {
-+      "name": "pnv8-chip",
-+      "parent": "pnv-chip"
++      "name": "imx7.gpt",
++      "parent": "imx25.gpt"
 +    },
 +    {
-+      "name": "7445_v3.3-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
++      "name": "at45db081d",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "603e_v4.1-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "en25p32",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "mpc603-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "imx7.gpr",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pxa2xx-i2c-slave",
++      "parent": "i2c-slave"
++    },
++    {
++      "name": "gpex-pcihost",
++      "parent": "pcie-host-bridge"
++    },
++    {
++      "name": "cortex-m0-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "aspeed.gpio-ast2500",
++      "parent": "aspeed.gpio"
++    },
++    {
++      "name": "ftgmac100",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "filter-rewriter",
 +      "parent": "netfilter"
 +    },
 +    {
-+      "name": "spapr-vscsi",
-+      "parent": "vio-spapr-device"
-+    },
-+    {
 +      "name": "loader",
 +      "parent": "device"
 +    },
 +    {
-+      "name": "xlnx.xps-ethernetlite",
-+      "parent": "sys-bus-device"
++      "name": "s25fl256s1",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "7410_v1.0-powerpc64-cpu",
-+      "parent": "7410-family-powerpc64-cpu"
++      "name": "arm946-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "iotkit",
++      "parent": "arm-sse"
++    },
++    {
++      "name": "m25pe80",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pxa270-b0-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "s25fl256s0",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "virtio-serial-pci",
++      "parent": "virtio-serial-pci-base"
++    },
++    {
++      "name": "usb-audio",
++      "parent": "usb-device"
 +    },
 +    {
 +      "name": "platform-bus-device",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "virtio-serial-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "ics",
-+      "parent": "ics-base"
-+    },
-+    {
-+      "name": "750cxe_v2.4b-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8641-powerpc64-cpu",
-+      "parent": "e600-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "sysbus-sm501",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "icp",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "virtio-crypto-device",
-+      "parent": "virtio-device"
++      "name": "qio-channel-file",
++      "parent": "qio-channel"
 +    },
 +    {
 +      "name": "usb-host",
 +      "parent": "usb-device"
 +    },
 +    {
-+      "name": "mpc8379e-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "pcie-root-port",
++      "parent": "pcie-root-port-base"
 +    },
 +    {
-+      "name": "745_v2.5-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
++      "name": "iotkit-sysinfo",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "chardev-socket",
-+      "parent": "chardev"
++      "name": "mt25qu01g",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "970fx_v3.1-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
++      "name": "virtio-crypto-device",
++      "parent": "virtio-device"
 +    },
 +    {
-+      "name": "7447_v1.0-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
++      "name": "platform-ehci-usb",
++      "parent": "sysbus-ehci-usb"
 +    },
 +    {
-+      "name": "7457_v1.2-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
++      "name": "ich9-usb-uhci1",
++      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "usb-bt-dongle",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "filter-redirector",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "mpc8567-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "ccid-bus",
++      "parent": "bus"
 +    },
 +    {
 +      "name": "xlnx,ps7-usb",
 +      "parent": "sysbus-ehci-usb"
 +    },
 +    {
-+      "name": "virtio-input-host-pci",
-+      "parent": "virtio-input-pci"
++      "name": "imx31.gpt",
++      "parent": "imx25.gpt"
 +    },
 +    {
-+      "name": "xlnx.xps-intc",
++      "name": "s25fl129p1",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "s25fl129p0",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "xlnx.xps-timer",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "tegra2-ehci-usb",
-+      "parent": "sysbus-ehci-usb"
-+    },
-+    {
-+      "name": "mpc8378-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8xxx_gpio",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "e1000",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "mpc8545e_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pseries-2.1-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
 +      "name": "ich9-usb-uhci6",
 +      "parent": "pci-uhci-usb"
 +    },
@@ -1178,372 +1285,416 @@ index 0000000000..576e0b69e9
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "usb-mtp",
-+      "parent": "usb-device"
++      "name": "xlnx.xps-intc",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "ich9-usb-uhci3",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "mpc8548e_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "kvm-arm-gicv3",
++      "parent": "arm-gicv3-common"
 +    },
 +    {
-+      "name": "ich9-usb-uhci4",
-+      "parent": "pci-uhci-usb"
++      "name": "virtio-input-host-pci",
++      "parent": "virtio-input-host-pci-base-type"
 +    },
 +    {
-+      "name": "sysbus-ahci",
++      "name": "mcimx6ul-evk-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "SSI",
++      "parent": "bus"
++    },
++    {
++      "name": "e1000",
++      "parent": "e1000-base"
++    },
++    {
++      "name": "xlnx,zynq-xadc",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "e500v2_v22-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "xlnx.axi-dma",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "s25sl12801",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "s25sl12800",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pxa2xx_rtc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "exynos4210",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "ich9-usb-uhci2",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
-+      "name": "ich9-usb-uhci1",
-+      "parent": "pci-uhci-usb"
++      "name": "cortex-m4-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "sysbus-m48t59",
-+      "parent": "sysbus-m48txx"
++      "name": "sysbus-ahci",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "tls-creds-psk",
-+      "parent": "tls-creds"
++      "name": "kvm-arm-gic",
++      "parent": "arm_gic_common"
 +    },
 +    {
-+      "name": "i82559er",
-+      "parent": "pci-device"
++      "name": "imx.fec",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "aspeed.timer-ast2600",
++      "parent": "aspeed.timer"
 +    },
 +    {
 +      "name": "tpci200",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "aspeed.gpio-ast2400",
++      "parent": "aspeed.gpio"
++    },
++    {
++      "name": "spitz-lcdtg",
++      "parent": "ssi-slave"
++    },
++    {
 +      "name": "memory-backend-file",
 +      "parent": "memory-backend"
 +    },
 +    {
-+      "name": "604r-powerpc64-cpu",
-+      "parent": "604E-family-powerpc64-cpu"
++      "name": "stm32f2xx-usart",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "vhost-scsi-pci",
-+      "parent": "virtio-pci"
++      "name": "max-arm-cpu",
++      "parent": "aarch64-cpu"
 +    },
 +    {
-+      "name": "megasas",
-+      "parent": "megasas-base"
++      "name": "cortex-m3-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "uni-north-internal-pci-pcihost",
-+      "parent": "pci-host-bridge"
++      "name": "s25sl064p",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "input-barrier",
++      "parent": "object"
 +    },
 +    {
 +      "name": "container",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "603e7v2-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "lan9118",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "970mp_v1.1-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
++      "name": "stm32f2xx-syscfg",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "mps2-an521-machine",
++      "parent": "mps2tz"
 +    },
 +    {
 +      "name": "rtl8139",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "7450_v2.0-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
++      "name": "armsse-mhu",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8544e_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "exynos4210.i2c",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "chardev-hci",
-+      "parent": "chardev"
++      "name": "s25sl064a",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "power7+_v2.1-powerpc64-cpu",
-+      "parent": "POWER7-family-powerpc64-cpu"
++      "name": "vexpress-a9-machine",
++      "parent": "vexpress"
 +    },
 +    {
-+      "name": "405gpc-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "usb-chipidea",
++      "parent": "sysbus-ehci-usb"
 +    },
 +    {
-+      "name": "7455_v2.1-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
++      "name": "megasas",
++      "parent": "megasas-base"
 +    },
 +    {
-+      "name": "7400_v2.8-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "corgi-ssp",
++      "parent": "ssi-slave"
 +    },
 +    {
-+      "name": "u3-agp",
-+      "parent": "pci-device"
++      "name": "pxa2xx-fir",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "401g2-powerpc64-cpu",
-+      "parent": "401x2-family-powerpc64-cpu"
++      "name": "virtio-balloon-pci-non-transitional",
++      "parent": "virtio-balloon-pci-base"
 +    },
 +    {
-+      "name": "603e_v1.1-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "designware-pcie-host",
++      "parent": "pci-host-bridge"
 +    },
 +    {
 +      "name": "scsi-block",
 +      "parent": "scsi-disk-base"
 +    },
 +    {
-+      "name": "7451_v2.3-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
++      "name": "mx66u1g45g",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "omap-intc",
++      "parent": "common-omap-intc"
 +    },
 +    {
 +      "name": "unimplemented-device",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8533e_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "vhost-user-input",
++      "parent": "virtio-input-device"
 +    },
 +    {
-+      "name": "eTSEC",
++      "name": "strongarm_pic",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mac-dbdma",
-+      "parent": "sys-bus-device"
++      "name": "max7310",
++      "parent": "i2c-slave"
 +    },
 +    {
-+      "name": "mpc8567e-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "uni-north-agp",
-+      "parent": "pci-device"
++      "name": "sst25wf512",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "scsi-cd",
 +      "parent": "scsi-disk-base"
 +    },
 +    {
-+      "name": "floppy-bus",
-+      "parent": "bus"
++      "name": "chardev-udp",
++      "parent": "chardev"
++    },
++    {
++      "name": "aspeed.fmc-ast2600",
++      "parent": "aspeed.smc"
 +    },
 +    {
 +      "name": "accel",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "740p-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power5+_v2.1-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "ppc440-pcix-host",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "xlnx.xps-timer",
++      "name": "microbit.i2c",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "virtio-vga",
-+      "parent": "virtio-pci"
++      "name": "pxa270-b1-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "isa-serial",
-+      "parent": "isa-device"
++      "name": "luminary-watchdog",
++      "parent": "cmsdk-apb-watchdog"
 +    },
 +    {
-+      "name": "g2hip4-powerpc64-cpu",
-+      "parent": "G2-family-powerpc64-cpu"
++      "name": "m45pe80",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "spapr-rng",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "via-pmu",
++      "name": "pxa2xx-dma",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "g2lels-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
++      "name": "xlnx.axi-ethernet",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vmware-svga",
++      "parent": "pci-device"
++    },
++    {
++      "name": "ast2600-evb-machine",
++      "parent": "aspeed-machine"
++    },
++    {
++      "name": "imx.gpio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "tegra2-ehci-usb",
++      "parent": "sysbus-ehci-usb"
 +    },
 +    {
 +      "name": "virtio-serial-device",
 +      "parent": "virtio-device"
 +    },
 +    {
-+      "name": "970_v2.2-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "gpio_i2c",
++      "name": "digic-timer",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "pc-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "escc",
++      "name": "integrator_debug",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8349e-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "aspeed.scu-ast2600",
++      "parent": "aspeed.scu"
 +    },
 +    {
 +      "name": "chardev-gdb",
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "fdc37m81x-superio",
-+      "parent": "isa-superio"
++      "name": "vhost-scsi-pci",
++      "parent": "vhost-scsi-pci-base"
 +    },
 +    {
-+      "name": "icskvm",
-+      "parent": "ics-base"
++      "name": "xlnx.usmp-gqspi",
++      "parent": "xlnx.ps7-qspi"
 +    },
 +    {
-+      "name": "tls-creds-anon",
-+      "parent": "tls-creds"
++      "name": "imx25.ccm",
++      "parent": "imx.ccm"
++    },
++    {
++      "name": "a15mpcore_priv",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "dc390",
++      "parent": "am53c974"
 +    },
 +    {
 +      "name": "fw_cfg_mem",
 +      "parent": "fw_cfg"
 +    },
 +    {
-+      "name": "603e_v3-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "virtio-scsi-pci-transitional",
++      "parent": "virtio-scsi-pci-base"
 +    },
 +    {
-+      "name": "pseries-2.3-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "taihu-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "npe4gs3-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "icp-kvm",
-+      "parent": "icp"
-+    },
-+    {
-+      "name": "440epb-powerpc64-cpu",
-+      "parent": "440EP-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "usb-uas",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-balloon-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "ide-cd",
-+      "parent": "ide-device"
++      "name": "chardev-socket",
++      "parent": "chardev"
 +    },
 +    {
 +      "name": "usb-ccid",
 +      "parent": "usb-device"
 +    },
 +    {
-+      "name": "chardev-udp",
++      "name": "virtio-rng-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "usb-uas",
++      "parent": "usb-device"
++    },
++    {
++      "name": "chardev-mux",
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "7445_v3.4-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
++      "name": "ide-cd",
++      "parent": "ide-device"
 +    },
 +    {
-+      "name": "pseries-2.2-machine",
-+      "parent": "spapr-machine"
++      "name": "mss-spi",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "750p-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
++      "name": "cadence_uart",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "e6500-powerpc64-cpu",
-+      "parent": "e6500-family-powerpc64-cpu"
++      "name": "mps2-an385-machine",
++      "parent": "mps2"
 +    },
 +    {
-+      "name": "sb16",
-+      "parent": "isa-device"
++      "name": "virtio-balloon-pci",
++      "parent": "virtio-balloon-pci-base"
++    },
++    {
++      "name": "gpio_i2c",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "imx.rngc",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "iothread",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "750gl-powerpc64-cpu",
-+      "parent": "750gx-family-powerpc64-cpu"
++      "name": "spitz-keyboard",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "bochs-display",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "745_v2.1-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7410_v1.1-powerpc64-cpu",
-+      "parent": "7410-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "755_v2.3-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "vhost-vsock-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "7450_v1.0-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
++      "name": "lm8323",
++      "parent": "i2c-slave"
 +    },
 +    {
 +      "name": "qio-channel-rdma",
 +      "parent": "qio-channel"
 +    },
 +    {
-+      "name": "750_v2.2-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
++      "name": "n25q256a",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "mpc8347at-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "bochs-display",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "mpc8544_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "bcm2835-ic",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "405ep-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "xilinx-zynq-a9-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "aspeed.timer-ast2400",
++      "parent": "aspeed.timer"
++    },
++    {
++      "name": "arm1026-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "twl92230",
++      "parent": "i2c-slave"
++    },
++    {
++      "name": "vhost-vsock-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "qio-channel-websock",
++      "parent": "qio-channel"
++    },
++    {
++      "name": "authz-list-file",
++      "parent": "authz"
 +    },
 +    {
 +      "name": "sdhci-pci",
@@ -1554,352 +1705,364 @@ index 0000000000..576e0b69e9
 +      "parent": "virtio-input-device"
 +    },
 +    {
-+      "name": "stb03-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-rng-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "cs4231a",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "745_v2.6-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "heathrow",
++      "name": "nrf51_soc.timer",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "405lp-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "aspeed.timer-ast2500",
++      "parent": "aspeed.timer"
 +    },
 +    {
-+      "name": "755_v2.8-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "xlnx.v-dp",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "604e_v2.4-powerpc64-cpu",
-+      "parent": "604E-family-powerpc64-cpu"
++      "name": "stm32f2xx-timer",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pci-bridge",
++      "parent": "base-pci-bridge"
++    },
++    {
++      "name": "i82559er",
++      "parent": "pci-device"
++    },
++    {
++      "name": "aspeed.fmc-ast2500",
++      "parent": "aspeed.smc"
 +    },
 +    {
 +      "name": "ivshmem-doorbell",
 +      "parent": "ivshmem-common"
 +    },
 +    {
-+      "name": "750cxe_v2.2-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750cx_v1.0-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7457a_v1.2-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pnv-icp",
-+      "parent": "icp"
-+    },
-+    {
-+      "name": "mpc8568-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "isa-parallel",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "mpc8555_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "460exb-powerpc64-cpu",
-+      "parent": "460EX-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "spapr-drc-cpu",
-+      "parent": "spapr-drc-logical"
-+    },
-+    {
-+      "name": "spapr-iommu-memory-region",
-+      "parent": "qemu:iommu-memory-region"
-+    },
-+    {
-+      "name": "mpc8343a-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "adlib",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "mpc8378e-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "602-powerpc64-cpu",
-+      "parent": "602-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8545e_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "dc390",
-+      "parent": "am53c974"
-+    },
-+    {
-+      "name": "hda-micro",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "pci-bridge-seat",
-+      "parent": "pci-bridge"
-+    },
-+    {
-+      "name": "IDE",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "740_v3.0-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7441_v2.1-powerpc64-cpu",
-+      "parent": "7440-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "qemu,register",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pnv-psi",
++      "name": "arm-gicv2m",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc5200_v11-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "fw_cfg_io",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "e300c3-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "403gc-powerpc64-cpu",
-+      "parent": "403-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7447a_v1.2-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "sysbus-m48t08",
-+      "parent": "sysbus-m48txx"
-+    },
-+    {
-+      "name": "spapr-pci-host-bridge",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "memory-backend-ram",
-+      "parent": "memory-backend"
++      "name": "mx66l1g45g",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "am53c974",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "pseries-2.5-machine",
-+      "parent": "spapr-machine"
++      "name": "versatile_pci_host",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "mpc8548e_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "w25x80",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "750cx_v2.0-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
++      "name": "mv88w8618_wlan",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pci-bridge-seat",
++      "parent": "pci-bridge"
++    },
++    {
++      "name": "en25q32b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pxa27x-timer",
++      "parent": "pxa2xx-timer"
++    },
++    {
++      "name": "pxa270-c0-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "witherspoon-bmc-machine",
++      "parent": "aspeed-machine"
++    },
++    {
++      "name": "mx25l1606e",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "microbit-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "nand",
++      "parent": "device"
++    },
++    {
++      "name": "aspeed.scu-ast2500",
++      "parent": "aspeed.scu"
++    },
++    {
++      "name": "designware-pcie-root",
++      "parent": "base-pci-bridge"
++    },
++    {
++      "name": "gpio-key",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "serial-mm",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "hda-micro",
++      "parent": "hda-audio"
++    },
++    {
++      "name": "fw_cfg_io",
++      "parent": "fw_cfg"
++    },
++    {
++      "name": "pl190",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "aspeed.sdmc-ast2600",
++      "parent": "aspeed.sdmc"
++    },
++    {
++      "name": "s3c-sdhci",
++      "parent": "generic-sdhci"
++    },
++    {
++      "name": "IDE",
++      "parent": "bus"
++    },
++    {
++      "name": "qemu,register",
++      "parent": "device"
++    },
++    {
++      "name": "cortex-a7-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "at25256a-nonjedec",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "m25pe20",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "integrator_core",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virt-2.12-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "ads7846",
++      "parent": "ssi-slave"
++    },
++    {
++      "name": "sst25wf080",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "memory-backend-ram",
++      "parent": "memory-backend"
++    },
++    {
++      "name": "arm_gic",
++      "parent": "arm_gic_common"
++    },
++    {
++      "name": "aspeed.fmc-ast2400",
++      "parent": "aspeed.smc"
++    },
++    {
++      "name": "exynos4210.mct",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "stellaris-adc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "connex-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "virtio-blk-device",
 +      "parent": "virtio-device"
 +    },
 +    {
++      "name": "imx6.ccm",
++      "parent": "imx.ccm"
++    },
++    {
++      "name": "virt-2.11-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "at25128a-nonjedec",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "n25q512a13",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "cortex-a8-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "n25q512a11",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "sl-nand",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "armv7m",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "icp-ctrl-regs",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "bcm2835-sdhost",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "stellaris-gptm",
++      "parent": "sys-bus-device"
++    },
++    {
 +      "name": "chardev-pipe",
 +      "parent": "chardev-fd"
 +    },
 +    {
-+      "name": "qio-channel-file",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "745_v1.1-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "601_v1-powerpc64-cpu",
-+      "parent": "601-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "sysbus-m48t02",
-+      "parent": "sysbus-m48txx"
-+    },
-+    {
-+      "name": "uni-north-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "740_v1.0-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "qio-channel-websock",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "pseries-2.4-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "mc146818rtc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "spapr-nvram",
-+      "parent": "vio-spapr-device"
-+    },
-+    {
 +      "name": "chardev-msmouse",
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "hda-output",
-+      "parent": "hda-audio"
++      "name": "virt-2.10-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "pl181",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "cortex-m7-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
 +      "name": "cryptodev-backend-builtin",
 +      "parent": "cryptodev-backend"
 +    },
 +    {
-+      "name": "mpc8347eat-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "m25pe16",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "750fx_v2.2-powerpc64-cpu",
-+      "parent": "750fx-family-powerpc64-cpu"
++      "name": "hda-output",
++      "parent": "hda-audio"
 +    },
 +    {
-+      "name": "mpc5200b_v20-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "603e_v1.2-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "stb25-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mptsas1068",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "raven",
-+      "parent": "pci-device"
++      "name": "w25x64",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "VGA",
 +      "parent": "pci-vga"
 +    },
 +    {
-+      "name": "405gpr-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "qio-net-listener",
++      "parent": "object"
 +    },
 +    {
-+      "name": "mpc8349a-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "iotkit-sysctl",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "s25fl016k",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "n800-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "vfio-pci-nohotplug",
 +      "parent": "vfio-pci"
 +    },
 +    {
-+      "name": "mpc8533_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "m25p80",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "401f2-powerpc64-cpu",
-+      "parent": "401x2-family-powerpc64-cpu"
++      "name": "at25df321a",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "i8257",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "440-xilinx-powerpc64-cpu",
-+      "parent": "440x5-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power8e_v2.1-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "pc87312",
-+      "parent": "isa-superio"
-+    },
-+    {
-+      "name": "qio-net-listener",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "mpc8560_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "pxa2xx-mmci-bus",
++      "parent": "sd-bus"
 +    },
 +    {
 +      "name": "edu",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "mptsas1068",
++      "parent": "pci-device"
++    },
++    {
++      "name": "bcm2835-fb",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "lm3s6965evb-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "aspeed.scu-ast2400",
++      "parent": "aspeed.scu"
++    },
++    {
++      "name": "versatileab-machine",
++      "parent": "machine"
++    },
++    {
 +      "name": "virtio-mouse-pci",
-+      "parent": "virtio-input-hid-pci"
++      "parent": "virtio-mouse-pci-base-type"
 +    },
 +    {
-+      "name": "740_v2.0-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
++      "name": "strongarm-uart",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7455_v3.2-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
++      "name": "pl330",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "power8nvl_v1.0-powernv-cpu-core",
-+      "parent": "powernv-cpu-core"
++      "name": "gpex-root",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "g2legp-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
++      "name": "cmsdk-apb-watchdog",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "vfio-pci-igd-lpc-bridge",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "spapr-vlan",
-+      "parent": "vio-spapr-device"
++      "name": "mv88w8618_pit",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "603e_v4-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "qio-channel-command",
++      "parent": "qio-channel"
 +    },
 +    {
 +      "name": "HDA",
@@ -1910,264 +2073,296 @@ index 0000000000..576e0b69e9
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "603e_v2.2-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
++      "name": "stm32f2xx-adc",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "qio-channel-command",
-+      "parent": "qio-channel"
++      "name": "cmsdk-apb-timer",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7447_v1.1-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
++      "name": "mx66u51235f",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "pseries-2.8-machine",
-+      "parent": "spapr-machine"
++      "name": "aspeed.sdmc-ast2500",
++      "parent": "aspeed.sdmc"
++    },
++    {
++      "name": "aspeed.xdma",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "pcm3680_pci",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "floppy",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "mioe3680_pci",
-+      "parent": "pci-device"
++      "name": "usb-serial",
++      "parent": "usb-serial-dev"
 +    },
 +    {
 +      "name": "qemu:memory-region",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "macio-oldworld",
-+      "parent": "macio"
++      "name": "mioe3680_pci",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "adb-keyboard",
-+      "parent": "adb-device"
++      "name": "mv88w8618_pic",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "ppc460ex-pcie-host",
-+      "parent": "pcie-host-bridge"
++      "name": "ssd0323",
++      "parent": "ssi-slave"
 +    },
 +    {
 +      "name": "i2c-ddc",
 +      "parent": "i2c-slave"
 +    },
 +    {
-+      "name": "pseries-2.7-machine",
-+      "parent": "spapr-machine"
++      "name": "omap2-intc",
++      "parent": "common-omap-intc"
 +    },
 +    {
 +      "name": "sysbus-ohci",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7445_v1.0-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
++      "name": "xlnx.ps7-dev-cfg",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8379-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "pl080",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "755_v2.4-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "borzoi-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "7450_v1.1-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
++      "name": "stellaris-i2c",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pl081",
++      "parent": "pl080"
++    },
++    {
++      "name": "xlnx.dpdma",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "aspeed.smc-ast2400",
++      "parent": "aspeed.smc"
 +    },
 +    {
 +      "name": "can-bus",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "e600-powerpc64-cpu",
-+      "parent": "e600-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "405ez-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "x2vp20-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pseries-2.6-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
 +      "name": "qtest-accel",
 +      "parent": "accel"
 +    },
 +    {
-+      "name": "mpc8548e_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "m25p64",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "stb04-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "w25x40",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "750l_v2.0-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750fl-powerpc64-cpu",
-+      "parent": "750fx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8543e_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "usb-serial",
-+      "parent": "usb-serial-dev"
++      "name": "tosa-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "cirrus-vga",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "xio3130-downstream",
++      "parent": "pcie-slot"
++    },
++    {
++      "name": "acpi-ged",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vhost-user-gpu",
++      "parent": "virtio-gpu-base"
++    },
++    {
++      "name": "n25q128a13",
++      "parent": "m25p80-generic"
++    },
++    {
 +      "name": "virtio-blk-pci",
-+      "parent": "virtio-pci"
++      "parent": "virtio-blk-pci-base"
++    },
++    {
++      "name": "cortex-a9-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
 +      "name": "virtio-gpu-device",
-+      "parent": "virtio-device"
++      "parent": "virtio-gpu-base"
 +    },
 +    {
-+      "name": "mpc8541_v10-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750gx_v1.0-powerpc64-cpu",
-+      "parent": "750gx-family-powerpc64-cpu"
++      "name": "xlnx-versal",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "cryptodev-vhost-user",
 +      "parent": "cryptodev-backend"
 +    },
 +    {
-+      "name": "mpc8555_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "ast2500-a1",
++      "parent": "aspeed-soc"
++    },
++    {
++      "name": "n25q128a11",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "vt82c686b-usb-uhci",
 +      "parent": "pci-uhci-usb"
 +    },
 +    {
++      "name": "imx-gpcv2",
++      "parent": "sys-bus-device"
++    },
++    {
 +      "name": "lsi53c810",
 +      "parent": "lsi53c895a"
 +    },
 +    {
-+      "name": "603e7t-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "uni-north-agp-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "603-powerpc64-cpu",
-+      "parent": "603-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "System",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "405gpd-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7400_v2.9-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "g2-powerpc64-cpu",
-+      "parent": "G2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750cxe_v3.1b-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7450_v2.1-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "chardev-braille",
-+      "parent": "chardev"
-+    },
-+    {
 +      "name": "chardev-file",
 +      "parent": "chardev-fd"
 +    },
 +    {
-+      "name": "7448_v2.0-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "System",
++      "parent": "bus"
 +    },
 +    {
-+      "name": "mpc5200_v12-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
++      "name": "strongarm-gpio",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mac99-machine",
++      "name": "cheetah-machine",
 +      "parent": "machine"
 +    },
 +    {
-+      "name": "e300c4-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "m45pe16",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "mpc8377e-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "usb-hub",
++      "parent": "usb-device"
 +    },
 +    {
-+      "name": "750l_v3.0-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
++      "name": "pxa270-c5-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "sst25wf040",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "m45pe10",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "chardev-braille",
++      "parent": "chardev"
++    },
++    {
++      "name": "exynos4210.rtc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "romulus-bmc-machine",
++      "parent": "aspeed-machine"
++    },
++    {
++      "name": "w25x32",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "s25sl032p",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "vhost-user-scsi-pci-non-transitional",
++      "parent": "vhost-user-scsi-pci-base"
++    },
++    {
++      "name": "aspeed.gpio-ast2600-1_8v",
++      "parent": "aspeed.gpio"
++    },
++    {
++      "name": "aspeed.sdmc-ast2400",
++      "parent": "aspeed.sdmc"
++    },
++    {
++      "name": "filter-dump",
++      "parent": "netfilter"
++    },
++    {
++      "name": "imx25.gpt",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "PCIE",
 +      "parent": "PCI"
 +    },
 +    {
-+      "name": "g2h4-powerpc64-cpu",
-+      "parent": "G2-family-powerpc64-cpu"
++      "name": "pl061",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8610-powerpc64-cpu",
-+      "parent": "e600-family-powerpc64-cpu"
++      "name": "pcie-pci-bridge",
++      "parent": "base-pci-bridge"
 +    },
 +    {
-+      "name": "qio-dns-resolver",
-+      "parent": "object"
++      "name": "sa1100-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "750cx_v2.1-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
++      "name": "ssd0303",
++      "parent": "i2c-slave"
++    },
++    {
++      "name": "s25sl032a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "s25sl016a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "virtio-net-pci-transitional",
++      "parent": "virtio-net-pci-base"
++    },
++    {
++      "name": "mv88w8618_audio",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "vhost-user-blk-pci",
-+      "parent": "virtio-pci"
++      "parent": "vhost-user-blk-pci-base"
 +    },
 +    {
-+      "name": "cuda",
-+      "parent": "sys-bus-device"
++      "name": "s25sl008a",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "virtio-serial-bus",
 +      "parent": "bus"
 +    },
 +    {
-+      "name": "604e_v1.0-powerpc64-cpu",
-+      "parent": "604E-family-powerpc64-cpu"
++      "name": "ssi-sd",
++      "parent": "ssi-slave"
 +    },
 +    {
 +      "name": "secondary-vga",
@@ -2178,136 +2373,192 @@ index 0000000000..576e0b69e9
 +      "parent": "vhost-scsi-common"
 +    },
 +    {
-+      "name": "g2legp3-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e500-ccsr",
++      "name": "serial-io",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "601_v2-powerpc64-cpu",
-+      "parent": "601v-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "usb-hub",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ccid-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "pci-ohci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cfi.pflash02",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "cfi.pflash01",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pseries-2.9-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
 +      "name": "exynos4210-ehci-usb",
 +      "parent": "sysbus-ehci-usb"
 +    },
 +    {
-+      "name": "750fx_v2.3-powerpc64-cpu",
-+      "parent": "750fx-family-powerpc64-cpu"
++      "name": "exynos4210.pwm",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc5200b_v21-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
++      "name": "cfi.pflash02",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "power8_v2.0-pnv-chip",
-+      "parent": "pnv8-chip"
++      "name": "pci-ohci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "s70fl01gs",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "cfi.pflash01",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "w25x20",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "tmp421",
++      "parent": "tmp421-generic"
++    },
++    {
++      "name": "s25fl512s",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "m25p40",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "mx25l12855e",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "tmp423",
++      "parent": "tmp421-generic"
 +    },
 +    {
 +      "name": "input-linux",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "mpc8533_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "midway-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "mpc8347ap-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "tmp422",
++      "parent": "tmp421-generic"
 +    },
 +    {
-+      "name": "x2vp4-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "netduinoplus2-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "7410_v1.2-powerpc64-cpu",
-+      "parent": "7410-family-powerpc64-cpu"
++      "name": "bcm2835-aux",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7400_v1.0-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "sabrelite-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "745_v2.2-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
++      "name": "aspeed.spi2-ast2600",
++      "parent": "aspeed.smc"
 +    },
 +    {
-+      "name": "740_v2.1-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
++      "name": "arm_mptimer",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "401e2-powerpc64-cpu",
-+      "parent": "401x2-family-powerpc64-cpu"
++      "name": "musicpal-misc",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7448_v1.0-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "bcm2835-sys-timer",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8544_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "aspeed.spi1-ast2600",
++      "parent": "aspeed.smc"
++    },
++    {
++      "name": "stm32f4xx-syscfg",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "SCSI",
++      "parent": "bus"
++    },
++    {
++      "name": "virtio-rng-pci-transitional",
++      "parent": "virtio-rng-pci-base"
++    },
++    {
++      "name": "virtio-serial-pci-transitional",
++      "parent": "virtio-serial-pci-base"
++    },
++    {
++      "name": "w25x16",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "ati-vga",
++      "parent": "pci-device"
++    },
++    {
++      "name": "sst25wf020",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "m25p32",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "vfio-amd-xgbe",
++      "parent": "vfio-platform"
++    },
++    {
++      "name": "w25x10",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pxa2xx-gpio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "tacoma-bmc-machine",
++      "parent": "aspeed-machine"
++    },
++    {
++      "name": "palmetto-bmc-machine",
++      "parent": "aspeed-machine"
 +    },
 +    {
 +      "name": "xlnx.xps-uartlite",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "e5500-powerpc64-cpu",
-+      "parent": "e5500-family-powerpc64-cpu"
++      "name": "mainstone-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "n810-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "pci-serial",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "mpc8560_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "at26df161a",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "vhost-user-scsi-pci",
-+      "parent": "virtio-pci"
++      "name": "rocker",
++      "parent": "pci-device"
 +    },
 +    {
-+      "name": "ipmi-bmc-extern",
-+      "parent": "ipmi-bmc"
++      "name": "terrier-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "745_v2.7-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
++      "name": "max1111",
++      "parent": "max111x"
 +    },
 +    {
-+      "name": "i8042",
-+      "parent": "isa-device"
++      "name": "netduino2-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "750cxe_v2.3-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
++      "name": "max1110",
++      "parent": "max111x"
 +    },
 +    {
 +      "name": "i82559c",
@@ -2322,80 +2573,120 @@ index 0000000000..576e0b69e9
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "macio-bus",
-+      "parent": "bus"
++      "name": "vhost-user-scsi-pci",
++      "parent": "vhost-user-scsi-pci-base"
 +    },
 +    {
-+      "name": "SCSI",
-+      "parent": "bus"
++      "name": "xlnx,zynqmp",
++      "parent": "device"
 +    },
 +    {
-+      "name": "rocker",
-+      "parent": "pci-device"
++      "name": "virtio-blk-pci-non-transitional",
++      "parent": "virtio-blk-pci-base"
++    },
++    {
++      "name": "realview_pci",
++      "parent": "versatile_pci"
 +    },
 +    {
 +      "name": "pcnet",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "pl041",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "nrf51_soc.uart",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "n25q032a13",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "n25q032a11",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "gd25q64",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "sst25wf010",
++      "parent": "m25p80-generic"
++    },
++    {
 +      "name": "rng-egd",
 +      "parent": "rng-backend"
 +    },
 +    {
-+      "name": "spapr-tce-table",
-+      "parent": "device"
++      "name": "m25p20",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "7400_v2.0-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "xlnx.zdma",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "405cra-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "exynos4210.gic",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "sm501",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-testdev",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "e200z5-powerpc64-cpu",
-+      "parent": "e200-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "740_v3.1-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
++      "name": "raspi3-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "migration",
 +      "parent": "device"
 +    },
 +    {
-+      "name": "usb-storage",
-+      "parent": "usb-storage-dev"
++      "name": "l2x0",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "filter-dump",
-+      "parent": "netfilter"
++      "name": "chardev-testdev",
++      "parent": "chardev"
++    },
++    {
++      "name": "n25q064",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "allwinner-A10-timer",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "aspeed.spi1-ast2500",
++      "parent": "aspeed.smc"
++    },
++    {
++      "name": "n25q064a13",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "i82558b",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "power8_v2.0-powerpc64-cpu",
-+      "parent": "POWER8-family-powerpc64-cpu"
++      "name": "n25q064a11",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "tls-creds-x509",
-+      "parent": "tls-creds"
++      "name": "pl031",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "401d2-powerpc64-cpu",
-+      "parent": "401x2-family-powerpc64-cpu"
++      "name": "raspi2-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "filter-mirror",
++      "parent": "netfilter"
++    },
++    {
++      "name": "strongarm-ssp",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "i82558a",
@@ -2406,38 +2697,46 @@ index 0000000000..576e0b69e9
 +      "parent": "smbus-device"
 +    },
 +    {
-+      "name": "mpc8543_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "scoop",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8548e_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "msf2-soc",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8347eap-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "pl111",
++      "parent": "pl110"
 +    },
 +    {
-+      "name": "mpc8543e_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "pl110",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "host-powerpc64-cpu",
-+      "parent": "power9_v2.0-powerpc64-cpu"
++      "name": "tosa_dac",
++      "parent": "i2c-slave"
++    },
++    {
++      "name": "onenand",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virt-4.1-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "bcm2835-dma",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "m25p16",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "i82801",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "chardev-mux",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-net-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
 +      "name": "virtio-keyboard-device",
 +      "parent": "virtio-input-hid-device"
 +    },
@@ -2446,88 +2745,132 @@ index 0000000000..576e0b69e9
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "virtio-net-pci",
++      "parent": "virtio-net-pci-base"
++    },
++    {
++      "name": "exynos4210.fimd",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "m25p10",
++      "parent": "m25p80-generic"
++    },
++    {
 +      "name": "usb-net",
 +      "parent": "usb-device"
 +    },
 +    {
-+      "name": "throttle-group",
-+      "parent": "object"
++      "name": "highbank-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "chardev-memory",
-+      "parent": "chardev-ringbuf"
-+    },
-+    {
-+      "name": "power9_v2.0-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "603e_v1.3-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "755_v1.0-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "virt-4.0-machine",
++      "parent": "virt-machine"
 +    },
 +    {
 +      "name": "i82557c",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "at26df081a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "aspeed.spi2-ast2500",
++      "parent": "aspeed.smc"
++    },
++    {
++      "name": "chardev-memory",
++      "parent": "chardev-ringbuf"
++    },
++    {
++      "name": "xilinx-axi-dma-control-stream",
++      "parent": "object"
++    },
++    {
 +      "name": "i82557b",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "aspeed.wdt-ast2600",
++      "parent": "aspeed.wdt"
++    },
++    {
++      "name": "digic-uart",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "cortex-a53-arm-cpu",
++      "parent": "aarch64-cpu"
++    },
++    {
++      "name": "sse-200",
++      "parent": "arm-sse"
++    },
++    {
++      "name": "arm1176-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
 +      "name": "i82557a",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "mpc8347t-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "s25sl004a",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "can-host-socketcan",
-+      "parent": "can-host"
++      "name": "pl022",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "sdhci-bus",
 +      "parent": "sd-bus"
 +    },
 +    {
-+      "name": "uni-north",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isa-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "virtio-gpu-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "mpc8548_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power8nvl_v1.0-pnv-chip",
-+      "parent": "pnv8-chip"
-+    },
-+    {
-+      "name": "mpc8343-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8560_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
 +      "name": "split-irq",
 +      "parent": "device"
 +    },
 +    {
-+      "name": "usb-mouse",
-+      "parent": "usb-hid"
++      "name": "bcm2835-rng",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virtio-gpu-pci",
++      "parent": "virtio-gpu-pci-base-type"
++    },
++    {
++      "name": "pl061_luminary",
++      "parent": "pl061"
++    },
++    {
++      "name": "nrf51_soc.gpio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "xilinx-axienet-control-stream",
++      "parent": "object"
++    },
++    {
++      "name": "m25p05",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "bcm2835-sdhost-bus",
++      "parent": "sd-bus"
++    },
++    {
++      "name": "strongarm-rtc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "n25q128",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "imx.epit",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "i82551",
@@ -2538,70 +2881,78 @@ index 0000000000..576e0b69e9
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "pseries-2.12-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "macio-gpio",
++      "name": "armv7m_nvic",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "405d2-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "cubieboard-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "piix3-usb-uhci",
-+      "parent": "pci-uhci-usb"
++      "name": "fsl,imx31",
++      "parent": "device"
 +    },
 +    {
-+      "name": "mpc8540_v20-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
++      "name": "host-arm-cpu",
++      "parent": "aarch64-cpu"
 +    },
 +    {
-+      "name": "7455_v3.3-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
++      "name": "qio-channel-socket",
++      "parent": "qio-channel"
 +    },
 +    {
-+      "name": "nec-usb-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "e500v2_v30-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pseries-2.11-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "power9_v2.0-pnv-chip",
-+      "parent": "pnv9-chip"
-+    },
-+    {
-+      "name": "host-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "macio-ide",
++      "name": "cadence_ttc",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "virtio-crypto-pci",
-+      "parent": "virtio-pci"
++      "name": "throttle-group",
++      "parent": "object"
 +    },
 +    {
-+      "name": "755_v2.0-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "imx.i2c",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "filter-mirror",
-+      "parent": "netfilter"
++      "name": "highbank-regs",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "aspeed.wdt-ast2500",
++      "parent": "aspeed.wdt"
++    },
++    {
++      "name": "virt-2.6-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "sa1110-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "arm.cortex-a9-global-timer",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "exynos4210.rng",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "ich9-usb-ehci2",
 +      "parent": "pci-ehci-usb"
 +    },
 +    {
++      "name": "virtio-crypto-pci",
++      "parent": "virtio-crypto-pci-base-type"
++    },
++    {
++      "name": "dpcd",
++      "parent": "aux-slave"
++    },
++    {
++      "name": "pl011",
++      "parent": "sys-bus-device"
++    },
++    {
 +      "name": "ich9-usb-ehci1",
 +      "parent": "pci-ehci-usb"
 +    },
@@ -2610,900 +2961,1064 @@ index 0000000000..576e0b69e9
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "prep-machine",
-+      "parent": "machine"
++      "name": "nec-usb-xhci",
++      "parent": "base-xhci"
 +    },
 +    {
-+      "name": "pvscsi",
-+      "parent": "pci-device"
++      "name": "imx6.gpt",
++      "parent": "imx25.gpt"
 +    },
 +    {
 +      "name": "irq",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "pseries-2.10-machine",
-+      "parent": "spapr-machine"
++      "name": "tusb6010",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "apple-desktop-bus",
-+      "parent": "bus"
++      "name": "realview_mpcore",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "can-host-socketcan",
++      "parent": "can-host"
++    },
++    {
++      "name": "fsl,imx25",
++      "parent": "device"
++    },
++    {
++      "name": "sx1-v1-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "w25q32dw",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "gd25q32",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "dbus-vmstate",
++      "parent": "object"
++    },
++    {
++      "name": "cortex-a57-arm-cpu",
++      "parent": "aarch64-cpu"
 +    },
 +    {
 +      "name": "memory-backend-memfd",
 +      "parent": "memory-backend"
 +    },
 +    {
-+      "name": "isa-ide",
-+      "parent": "isa-device"
++      "name": "n25q032",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "745_v2.3-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
++      "name": "aspeed.spi1-ast2400",
++      "parent": "aspeed.smc"
 +    },
 +    {
-+      "name": "7410_v1.3-powerpc64-cpu",
-+      "parent": "7410-family-powerpc64-cpu"
++      "name": "aspeed-mmi",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "755_v2.5-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "pxa2xx_pic",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7450_v1.2-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
++      "name": "w25q512jv",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "7457_v1.0-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pnv9-chip",
-+      "parent": "pnv-chip"
-+    },
-+    {
-+      "name": "ich9-ahci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "750l_v2.1-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "qio-channel-socket",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "mpc8543e_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "sd-bus",
-+      "parent": "bus"
++      "name": "piix3-usb-uhci",
++      "parent": "pci-uhci-usb"
 +    },
 +    {
 +      "name": "virtserialport",
 +      "parent": "virtio-serial-port"
 +    },
 +    {
-+      "name": "mpc8641d-powerpc64-cpu",
-+      "parent": "e600-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pseries-3.0-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "750cxe_v2.4-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "i82378",
++      "name": "pvscsi",
 +      "parent": "pci-device"
 +    },
 +    {
++      "name": "ti925t-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "virtio-rng-pci-non-transitional",
++      "parent": "virtio-rng-pci-base"
++    },
++    {
++      "name": "virt-4.2-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "virtio-serial-pci-non-transitional",
++      "parent": "virtio-serial-pci-base"
++    },
++    {
++      "name": "imx7.snvs",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "sd-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "sx1-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "320s33b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "ich9-ahci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "serial",
++      "parent": "device"
++    },
++    {
++      "name": "dscm1xxxx",
++      "parent": "microdrive"
++    },
++    {
 +      "name": "chardev-stdio",
 +      "parent": "chardev-fd"
 +    },
 +    {
-+      "name": "750gx_v1.1-powerpc64-cpu",
-+      "parent": "750gx-family-powerpc64-cpu"
++      "name": "armv7m_systick",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8541_v11-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
++      "name": "imx6ul.ccm",
++      "parent": "imx.ccm"
 +    },
 +    {
-+      "name": "gus",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "e500_v20-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "cobra-powerpc64-cpu",
-+      "parent": "401-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pnv-lpc",
++      "name": "aux-to-i2c-bridge",
 +      "parent": "device"
 +    },
 +    {
-+      "name": "i82374",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "7445_v2.1-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
-+    },
-+    {
 +      "name": "pc-dimm",
 +      "parent": "device"
 +    },
 +    {
-+      "name": "440-xilinx-w-dfpu-powerpc64-cpu",
-+      "parent": "440x5wDFPU-family-powerpc64-cpu"
++      "name": "cmsdk-apb-dualtimer",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7400_v2.1-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "vhost-vsock-pci-non-transitional",
++      "parent": "vhost-vsock-pci-base"
 +    },
 +    {
-+      "name": "604-powerpc64-cpu",
-+      "parent": "604-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "g3beige-machine",
++      "name": "mcimx7d-sabre-machine",
 +      "parent": "machine"
 +    },
 +    {
-+      "name": "405crb-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "tls-creds-anon",
++      "parent": "tls-creds"
 +    },
 +    {
-+      "name": "fusbh200-ehci-usb",
-+      "parent": "sysbus-ehci-usb"
++      "name": "arm-smmuv3",
++      "parent": "arm-smmu"
++    },
++    {
++      "name": "musca-a-machine",
++      "parent": "musca"
++    },
++    {
++      "name": "xlnx-zynmp.rtc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "n25q00a",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "IndustryPack",
 +      "parent": "bus"
 +    },
 +    {
-+      "name": "7441_v2.3-powerpc64-cpu",
-+      "parent": "7440-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7448_v2.1-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "603e7-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-rng-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
 +      "name": "cryptodev-backend",
 +      "parent": "object"
 +    },
 +    {
-+      "name": "adb-mouse",
-+      "parent": "adb-device"
-+    },
-+    {
-+      "name": "or-irq",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "mpc8543_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750cx_v2.2-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "ipmi-bmc-sim",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "usb-ehci",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "chardev-serial",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "7451_v2.10-powerpc64-cpu",
-+      "parent": "7450-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "401c2-powerpc64-cpu",
-+      "parent": "401x2-family-powerpc64-cpu"
++      "name": "realview-eb-mpcore-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "chardev-vc",
 +      "parent": "chardev"
 +    },
 +    {
-+      "name": "bamboo-machine",
-+      "parent": "machine"
++      "name": "virt-2.8-machine",
++      "parent": "virt-machine"
 +    },
 +    {
-+      "name": "mpc8543_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "filter-replay",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "603e_v1.4-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "970mp_v1.1-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "pseries-2.12-sxxm-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "dec-21154-sysbus",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "chardev-wctablet",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "e1000-82545em",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "spapr-vty",
-+      "parent": "vio-spapr-device"
-+    },
-+    {
-+      "name": "power9_v1.0-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "7441_v2.10-powerpc64-cpu",
-+      "parent": "7440-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8347et-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-9p-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "7400_v1.1-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e1000-82544gc",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "filter-buffer",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "7448_v1.1-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "740_v2.2-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7455_v3.4-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pseries-3.1-machine",
-+      "parent": "spapr-machine"
-+    },
-+    {
-+      "name": "mpc8548_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8545_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8343ea-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "npe405l-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "imx-usdhc",
-+      "parent": "generic-sdhci"
-+    },
-+    {
-+      "name": "prep-systemio",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "e500-spin",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "745_v2.8-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "755_v2.1-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mos6522-pmu",
-+      "parent": "mos6522"
-+    },
-+    {
-+      "name": "mpc8544ds-machine",
-+      "parent": "ppce500-base-machine"
-+    },
-+    {
-+      "name": "mpc8540_v10-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pci-serial-4x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ich9-intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "virtio-9p-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "power8nvl_v1.0-powerpc64-cpu",
-+      "parent": "POWER8-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "ivshmem",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "e500v2_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "qemu-console",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "mpc8349ea-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7457a_v1.0-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "piix4-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "mpc8547e_v20-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e200z6-powerpc64-cpu",
-+      "parent": "e200-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "isa-ipmi-bt",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "ppce500-machine",
-+      "parent": "ppce500-base-machine"
-+    },
-+    {
-+      "name": "virtio-pci-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "750l_v2.2-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pci-testdev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ipoctal232",
-+      "parent": "ipack-device"
-+    },
-+    {
-+      "name": "uni-north-pci-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "spapr-drc-lmb",
-+      "parent": "spapr-drc-logical"
-+    },
-+    {
-+      "name": "440epx-powerpc64-cpu",
-+      "parent": "440EP-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "405gpa-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7400_v2.6-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "m41t80",
++      "name": "sii9022",
 +      "parent": "i2c-slave"
 +    },
 +    {
-+      "name": "virtio-tablet-device",
-+      "parent": "virtio-input-hid-device"
++      "name": "swift-bmc-machine",
++      "parent": "aspeed-machine"
 +    },
 +    {
-+      "name": "powernv-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "ISA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "750_v3.0-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "ES1370",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "mpc8543e_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "603e7v-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power7_v2.3-powerpc64-cpu",
-+      "parent": "POWER7-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8544-guts",
++      "name": "exynos4210.clk",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "power9_v2.0-powerpc64-cpu",
-+      "parent": "POWER9-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8555e_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8347p-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "openpic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "mpc8541e_v10-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750cxe_v3.0-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e500_v10-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power8_v2.0-powernv-cpu-core",
-+      "parent": "powernv-cpu-core"
-+    },
-+    {
-+      "name": "755_v1.1-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "tcg-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "virtconsole",
-+      "parent": "virtserialport"
-+    },
-+    {
-+      "name": "750_v1.0-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750l_v3.2-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-tablet-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "pci-serial-2x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ne2k_isa",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "isa-fdc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "esp",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "mpc8548_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "usb-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "colo-compare",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "ne2k_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "spapr-drc-pci",
-+      "parent": "spapr-drc-physical"
-+    },
-+    {
-+      "name": "745_v2.4-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "sii3112",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "403gcx-powerpc64-cpu",
-+      "parent": "403GCX-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power8e_v2.1-pnv-chip",
-+      "parent": "pnv8-chip"
-+    },
-+    {
-+      "name": "e1000e",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "mpc8543_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8540_v21-powerpc64-cpu",
-+      "parent": "e500v1-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7445_v3.2-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "rs6000-mc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "mpc8347ep-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8349-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "PCI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "kvm-openpic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isabus-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "401b2-powerpc64-cpu",
-+      "parent": "401x2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "vhost-user-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "tpm-emulator",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "virtex-ml507-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "usb-kbd",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "750_v2.0-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e500-host-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vhost-user-blk",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "7410_v1.4-powerpc64-cpu",
-+      "parent": "7410-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "g2ls-powerpc64-cpu",
-+      "parent": "G2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "npe405h-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "power9_v1.0-powerpc64-cpu",
-+      "parent": "POWER9-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "970mp_v1.0-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
-+    },
-+    {
-+      "name": "401a1-powerpc64-cpu",
-+      "parent": "401-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "ivshmem-plain",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "755_v2.6-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "604e_v2.2-powerpc64-cpu",
-+      "parent": "604E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "970fx_v3.0-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "7457_v1.1-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "pnv-occ",
++      "name": "or-irq",
 +      "parent": "device"
 +    },
 +    {
-+      "name": "spapr-vio-bridge",
-+      "parent": "sys-bus-device"
++      "name": "mx25l8005",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "secret",
-+      "parent": "object"
++      "name": "pl050_keyboard",
++      "parent": "pl050"
 +    },
 +    {
-+      "name": "hda-duplex",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "ppc4xx-ehci-usb",
-+      "parent": "sysbus-ehci-usb"
-+    },
-+    {
-+      "name": "u3-agp-pcihost",
-+      "parent": "pci-host-bridge"
++      "name": "kzm-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "qio-channel-buffer",
 +      "parent": "qio-channel"
 +    },
 +    {
-+      "name": "none-machine",
-+      "parent": "machine"
++      "name": "pxa250-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "raven-pcihost",
++      "name": "usb-ehci",
++      "parent": "pci-ehci-usb"
++    },
++    {
++      "name": "filter-redirector",
++      "parent": "netfilter"
++    },
++    {
++      "name": "virt-2.7-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "xgmac",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "versatile_pci",
 +      "parent": "pci-host-bridge"
 +    },
 +    {
-+      "name": "virtio-balloon-device",
-+      "parent": "virtio-device"
++      "name": "realview_sysctl",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "sysbus-fdc",
-+      "parent": "base-sysbus-fdc"
++      "name": "smc91c111",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "750fx_v1.0-powerpc64-cpu",
-+      "parent": "750fx-family-powerpc64-cpu"
++      "name": "arm11mpcore-arm-cpu",
++      "parent": "arm-cpu"
 +    },
 +    {
-+      "name": "750gx_v1.2-powerpc64-cpu",
-+      "parent": "750gx-family-powerpc64-cpu"
++      "name": "virtio-rng-pci",
++      "parent": "virtio-rng-pci-base"
 +    },
 +    {
-+      "name": "megasas-gen2",
-+      "parent": "megasas-base"
++      "name": "pxa2xx-mmci",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "nvme",
++      "name": "filter-replay",
++      "parent": "netfilter"
++    },
++    {
++      "name": "nrf51_soc.rng",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "sst25vf080b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "nrf51_soc.nvm",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "akita-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "aspeed.wdt-ast2400",
++      "parent": "aspeed.wdt"
++    },
++    {
++      "name": "qemu-console",
++      "parent": "object"
++    },
++    {
++      "name": "cortex-r5f-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "ppc4xx-ehci-usb",
++      "parent": "sysbus-ehci-usb"
++    },
++    {
++      "name": "e1000-82545em",
++      "parent": "e1000-base"
++    },
++    {
++      "name": "virtio-mmio-bus",
++      "parent": "virtio-bus"
++    },
++    {
++      "name": "vhost-user-blk-pci-transitional",
++      "parent": "vhost-user-blk-pci-base"
++    },
++    {
++      "name": "allwinner-a10",
++      "parent": "device"
++    },
++    {
++      "name": "armsse-cpuid",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "chardev-wctablet",
++      "parent": "chardev"
++    },
++    {
++      "name": "filter-buffer",
++      "parent": "netfilter"
++    },
++    {
++      "name": "sp804",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vhost-user-gpu-pci",
++      "parent": "vhost-user-gpu-pci-base-type"
++    },
++    {
++      "name": "tmp105",
++      "parent": "i2c-slave"
++    },
++    {
++      "name": "w25q80",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "piix4-usb-uhci",
++      "parent": "pci-uhci-usb"
++    },
++    {
++      "name": "integrator_pit",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "generic-sdhci",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "usb-storage",
++      "parent": "usb-storage-dev"
++    },
++    {
++      "name": "e1000-82544gc",
++      "parent": "e1000-base"
++    },
++    {
++      "name": "xilinx,zynq_slcr",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "ioh3420",
++      "parent": "pcie-root-port-base"
++    },
++    {
++      "name": "pci-serial-4x",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "usb-tablet",
-+      "parent": "usb-hid"
++      "name": "vmcoreinfo",
++      "parent": "device"
 +    },
 +    {
-+      "name": "970fx_v1.0-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
++      "name": "mv88w8618_eth",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "e500v2_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "versatilepb_sic",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8572e-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "aspeed.sdhci",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "e300c1-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "virtio-9p-pci",
++      "parent": "virtio-9p-pci-base"
 +    },
 +    {
-+      "name": "7400_v2.2-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "integrator_pic",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "7447a_v1.0-powerpc64-cpu",
-+      "parent": "7445-family-powerpc64-cpu"
++      "name": "versatile_i2c",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "403ga-powerpc64-cpu",
-+      "parent": "403-family-powerpc64-cpu"
++      "name": "m25p128",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "405crc-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "en25f32",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "usb-wacom-tablet",
-+      "parent": "usb-device"
++      "name": "z2-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "740e-powerpc64-cpu",
-+      "parent": "740-family-powerpc64-cpu"
++      "name": "s70fs01gs",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "at26f004",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "virtio-9p-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "ich9-intel-hda",
++      "parent": "intel-hda-generic"
++    },
++    {
++      "name": "s25fs512s",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "sbsa-ref-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "n25q256a13",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "160s33b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "n25q256a11",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "imx-usdhc",
++      "parent": "generic-sdhci"
++    },
++    {
++      "name": "secret",
++      "parent": "object"
++    },
++    {
++      "name": "exynos4210.irq_gate",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "musicpal-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "stm32f2xx-spi",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "imx6.src",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "exynos4210.combiner",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pxa25x-timer",
++      "parent": "pxa2xx-timer"
++    },
++    {
++      "name": "arm926-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "chardev-serial",
++      "parent": "chardev-fd"
++    },
++    {
++      "name": "virt-2.9-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "vhost-user-blk-pci-non-transitional",
++      "parent": "vhost-user-blk-pci-base"
++    },
++    {
++      "name": "exynos4210.pmu",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vhost-user-backend",
++      "parent": "object"
++    },
++    {
++      "name": "imx7.ccm",
++      "parent": "imx.ccm"
++    },
++    {
++      "name": "ipoctal232",
++      "parent": "ipack-device"
++    },
++    {
++      "name": "vhost-user-fs-pci",
++      "parent": "vhost-user-fs-pci-base"
++    },
++    {
++      "name": "virtio-pci-bus",
++      "parent": "virtio-bus"
++    },
++    {
++      "name": "omap_i2c",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "omap-gpio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "cmsdk-apb-uart",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virtio-tablet-device",
++      "parent": "virtio-input-hid-device"
++    },
++    {
++      "name": "w25q64",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "virtio-scsi-pci",
++      "parent": "virtio-scsi-pci-base"
++    },
++    {
++      "name": "at25df041a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "mx25l12805d",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "x3130-upstream",
++      "parent": "pcie-port"
++    },
++    {
++      "name": "ES1370",
++      "parent": "pci-device"
++    },
++    {
++      "name": "tz-ppc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pci-testdev",
++      "parent": "pci-device"
++    },
++    {
++      "name": "at25fs040",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "emcraft-sf2-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "aspeed.rtc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "authz-list",
++      "parent": "authz"
++    },
++    {
++      "name": "xlnx.ps7-spi",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "e1000e",
++      "parent": "pci-device"
++    },
++    {
++      "name": "cortex-m33-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "virtio-balloon-pci-transitional",
++      "parent": "virtio-balloon-pci-base"
++    },
++    {
++      "name": "cortex-a72-arm-cpu",
++      "parent": "aarch64-cpu"
++    },
++    {
++      "name": "ARM,bitband-memory",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "tcg-accel",
++      "parent": "accel"
++    },
++    {
++      "name": "nrf51-soc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virtconsole",
++      "parent": "virtserialport"
++    },
++    {
++      "name": "mx25l25655e",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "mss-timer",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "msf2-sysreg",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "pci-serial-2x",
++      "parent": "pci-device"
++    },
++    {
++      "name": "mps2-scc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "colo-compare",
++      "parent": "object"
++    },
++    {
++      "name": "vhost-user-scsi-pci-transitional",
++      "parent": "vhost-user-scsi-pci-base"
++    },
++    {
++      "name": "mps2-fpgaio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "virtio-tablet-pci",
++      "parent": "virtio-tablet-pci-base-type"
++    },
++    {
++      "name": "allwinner-emac",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "i82801b11-bridge",
++      "parent": "base-pci-bridge"
++    },
++    {
++      "name": "bcm2836-control",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "bcm2835-peripherals",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "arm-its-kvm",
++      "parent": "arm-gicv3-its-common"
++    },
++    {
++      "name": "realview-pb-a8-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "fsl,imx7",
++      "parent": "device"
++    },
++    {
++      "name": "fsl,imx6",
++      "parent": "device"
++    },
++    {
++      "name": "usb-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "versatilepb-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "w25q80bl",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pxa255-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "at26df321",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "musicpal_key",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "PCI",
++      "parent": "bus"
++    },
++    {
++      "name": "pxa261-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "tosa-ssp",
++      "parent": "ssi-slave"
++    },
++    {
++      "name": "pl050_mouse",
++      "parent": "pl050"
++    },
++    {
++      "name": "tulip",
++      "parent": "pci-device"
++    },
++    {
++      "name": "tz-msc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "strongarm-ppc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "fusbh200-ehci-usb",
++      "parent": "sysbus-ehci-usb"
++    },
++    {
++      "name": "aspeed.i2c-ast2600",
++      "parent": "aspeed.i2c"
++    },
++    {
++      "name": "vhost-user-scsi",
++      "parent": "vhost-scsi-common"
++    },
++    {
++      "name": "arm1136-r2-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "imx.enet",
++      "parent": "imx.fec"
++    },
++    {
++      "name": "esp",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "usb-braille",
 +      "parent": "usb-serial-dev"
 +    },
 +    {
++      "name": "pxa260-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "ast2400-a1",
++      "parent": "aspeed-soc"
++    },
++    {
++      "name": "arm-gicv3",
++      "parent": "arm-gicv3-common"
++    },
++    {
++      "name": "stellaris_enet",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "musicpal_lcd",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "fsl,imx6ul",
++      "parent": "device"
++    },
++    {
++      "name": "realview-eb-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "ne2k_pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "realview-pbx-a9-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "ivshmem-plain",
++      "parent": "ivshmem-common"
++    },
++    {
++      "name": "vhost-user-blk",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "usb-kbd",
++      "parent": "usb-hid"
++    },
++    {
++      "name": "musca-b1-machine",
++      "parent": "musca"
++    },
++    {
++      "name": "authz-simple",
++      "parent": "authz"
++    },
++    {
++      "name": "pxa2xx_i2c",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "a9-scu",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "imx31.ccm",
++      "parent": "imx.ccm"
++    },
++    {
++      "name": "cortex-a15-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "spitz-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "hda-duplex",
++      "parent": "hda-audio"
++    },
++    {
++      "name": "megasas-gen2",
++      "parent": "megasas-base"
++    },
++    {
++      "name": "none-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "virtio-9p-pci-transitional",
++      "parent": "virtio-9p-pci-base"
++    },
++    {
++      "name": "mt25ql01g",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "w25q32",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "stm32f205-soc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "wm8750",
++      "parent": "i2c-slave"
++    },
++    {
++      "name": "virtio-balloon-device",
++      "parent": "virtio-device"
++    },
++    {
++      "name": "kvaser_pci",
++      "parent": "pci-device"
++    },
++    {
++      "name": "allwinner-ahci",
++      "parent": "sysbus-ahci"
++    },
++    {
++      "name": "m25px64",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pl011_luminary",
++      "parent": "pl011"
++    },
++    {
++      "name": "at25fs010",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "allwinner-a10-pic",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "usb-wacom-tablet",
++      "parent": "usb-device"
++    },
++    {
++      "name": "nvme",
++      "parent": "pci-device"
++    },
++    {
++      "name": "imx25-pdk-machine",
++      "parent": "machine"
++    },
++    {
 +      "name": "scsi-disk",
 +      "parent": "scsi-disk-base"
 +    },
 +    {
++      "name": "vhost-scsi-pci-transitional",
++      "parent": "vhost-scsi-pci-base"
++    },
++    {
++      "name": "ramfb",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "arm1136-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "mx25l4005a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "usb-tablet",
++      "parent": "usb-hid"
++    },
++    {
++      "name": "xlnx.ps7-qspi",
++      "parent": "xlnx.ps7-spi"
++    },
++    {
++      "name": "vhost-user-input-pci",
++      "parent": "vhost-user-input-pci-base-type"
++    },
++    {
++      "name": "bcm2835-thermal",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "xlnx-versal-virt-machine",
++      "parent": "machine"
++    },
++    {
 +      "name": "intel-hda",
 +      "parent": "intel-hda-generic"
 +    },
 +    {
-+      "name": "970mp_v1.0-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
++      "name": "aspeed.i2c-ast2500",
++      "parent": "aspeed.i2c"
 +    },
 +    {
-+      "name": "603e7v1-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e500mc-powerpc64-cpu",
-+      "parent": "e500mc-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "e500v2_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8544e_v10-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "en25q64",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "kvm-accel",
 +      "parent": "accel"
 +    },
 +    {
-+      "name": "power8nvl_v1.0-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
++      "name": "collie-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "7400_v2.7-powerpc64-cpu",
-+      "parent": "7400-family-powerpc64-cpu"
++      "name": "arm11mpcore_priv",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "imx.spi",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "xlnx.xps-spi",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "realview_gic",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "virtio-scsi-device",
 +      "parent": "virtio-scsi-common"
 +    },
 +    {
-+      "name": "405gpb-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "bcm2835-mbox",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "603p-powerpc64-cpu",
-+      "parent": "603E-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "grackle",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "970_v2.2-spapr-cpu-core",
-+      "parent": "spapr-cpu-core"
++      "name": "smdkc210-machine",
++      "parent": "machine"
 +    },
 +    {
 +      "name": "AC97",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "750fx_v2.0-powerpc64-cpu",
-+      "parent": "750fx-family-powerpc64-cpu"
++      "name": "ds1338",
++      "parent": "i2c-slave"
 +    },
 +    {
-+      "name": "power9_v2.0-powernv-cpu-core",
-+      "parent": "powernv-cpu-core"
++      "name": "arm11-scu",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "970fx_v2.0-powerpc64-cpu",
-+      "parent": "970-family-powerpc64-cpu"
++      "name": "pxa270-a0-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "virtio-blk-pci-transitional",
++      "parent": "virtio-blk-pci-base"
++    },
++    {
++      "name": "xilinx-axi-dma-data-stream",
++      "parent": "object"
++    },
++    {
++      "name": "pxa262-arm-cpu",
++      "parent": "arm-cpu"
++    },
++    {
++      "name": "tls-creds-x509",
++      "parent": "tls-creds"
++    },
++    {
++      "name": "sd-card",
++      "parent": "device"
++    },
++    {
++      "name": "bcm2835_gpio",
++      "parent": "sys-bus-device"
 +    },
 +    {
 +      "name": "i2c-bus",
@@ -3514,47 +4029,71 @@ index 0000000000..576e0b69e9
 +      "parent": "virtio-input-hid-device"
 +    },
 +    {
-+      "name": "mos6522-cuda",
-+      "parent": "mos6522"
-+    },
-+    {
-+      "name": "mpc8572-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "750e-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "g2hip3-powerpc64-cpu",
-+      "parent": "G2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "g2le-powerpc64-cpu",
-+      "parent": "G2LE-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "macio-nvram",
++      "name": "exynos4210.uart",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "isa-pit",
-+      "parent": "pit-common"
++      "name": "mx25l25635e",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "640s33b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "pl110_versatile",
++      "parent": "pl110"
++    },
++    {
++      "name": "ast2500-evb-machine",
++      "parent": "aspeed-machine"
++    },
++    {
++      "name": "ast2600-a0",
++      "parent": "aspeed-soc"
 +    },
 +    {
 +      "name": "i6300esb",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "ide-drive",
-+      "parent": "ide-device"
++      "name": "mainstone-fpga",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "sam460ex-machine",
-+      "parent": "machine"
++      "name": "qio-dns-resolver",
++      "parent": "object"
 +    },
 +    {
-+      "name": "generic-sdhci",
++      "name": "aux-bus",
++      "parent": "bus"
++    },
++    {
++      "name": "virt-3.0-machine",
++      "parent": "virt-machine"
++    },
++    {
++      "name": "stm32f405-soc",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "mx25l2005a",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "a9mpcore_priv",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "xilinx-axienet-data-stream",
++      "parent": "object"
++    },
++    {
++      "name": "aspeed.vic",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "stm32f4xx-exti",
 +      "parent": "sys-bus-device"
 +    },
 +    {
@@ -3562,111 +4101,163 @@ index 0000000000..576e0b69e9
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "ref405ep-machine",
-+      "parent": "machine"
++      "name": "cadence_gem",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "grackle-pcihost",
-+      "parent": "pci-host-bridge"
++      "name": "sst25vf040b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "ide-drive",
++      "parent": "ide-device"
++    },
++    {
++      "name": "sst25vf032b",
++      "parent": "m25p80-generic"
++    },
++    {
++      "name": "bcm2837",
++      "parent": "bcm283x"
++    },
++    {
++      "name": "bcm2836",
++      "parent": "bcm283x"
++    },
++    {
++      "name": "sst25vf016b",
++      "parent": "m25p80-generic"
 +    },
 +    {
 +      "name": "vfio-platform",
 +      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "405d4-powerpc64-cpu",
-+      "parent": "405-family-powerpc64-cpu"
++      "name": "virtio-net-pci-non-transitional",
++      "parent": "virtio-net-pci-base"
 +    },
 +    {
-+      "name": "sungem",
++      "name": "omap2-gpio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "imx.serial",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "vmxnet3",
 +      "parent": "pci-device"
 +    },
 +    {
-+      "name": "mpc8548_v11-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "pca9552",
++      "parent": "i2c-slave"
 +    },
 +    {
-+      "name": "mpc8545_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
++      "name": "aspeed.i2c-ast2400",
++      "parent": "aspeed.i2c"
 +    },
 +    {
-+      "name": "sd-card",
-+      "parent": "device"
++      "name": "en25p64",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "7455_v1.0-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
++      "name": "pxa2xx-ssp",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "mpc8377-powerpc64-cpu",
-+      "parent": "e300-family-powerpc64-cpu"
++      "name": "xlnx.zynqmp_ipi",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "745_v2.0-powerpc64-cpu",
-+      "parent": "745-family-powerpc64-cpu"
++      "name": "tz-mpc",
++      "parent": "sys-bus-device"
 +    },
 +    {
-+      "name": "755_v2.2-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "virtio-scsi-pci-non-transitional",
++      "parent": "virtio-scsi-pci-base"
 +    },
 +    {
-+      "name": "e500-pcihost",
-+      "parent": "pci-host-bridge"
++      "name": "verdex-machine",
++      "parent": "machine"
 +    },
 +    {
-+      "name": "kvaser_pci",
-+      "parent": "pci-device"
++      "name": "mps2-an505-machine",
++      "parent": "mps2tz"
 +    },
 +    {
-+      "name": "750_v2.1-powerpc64-cpu",
-+      "parent": "750-family-powerpc64-cpu"
++      "name": "m25px32",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "power8e_v2.1-powernv-cpu-core",
-+      "parent": "powernv-cpu-core"
++      "name": "smmuv3-iommu-memory-region",
++      "parent": "qemu:iommu-memory-region"
 +    },
 +    {
-+      "name": "uni-north-internal-pci",
-+      "parent": "pci-device"
++      "name": "m25px32-s1",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "spapr-rtc",
-+      "parent": "device"
++      "name": "m25px32-s0",
++      "parent": "m25p80-generic"
 +    },
 +    {
-+      "name": "755_v2.7-powerpc64-cpu",
-+      "parent": "755-family-powerpc64-cpu"
++      "name": "mps2-an511-machine",
++      "parent": "mps2"
 +    },
 +    {
-+      "name": "750cxe_v2.1-powerpc64-cpu",
-+      "parent": "750cx-family-powerpc64-cpu"
++      "name": "vfio-calxeda-xgmac",
++      "parent": "vfio-platform"
++    },
++    {
++      "name": "imx.avic",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "nuri-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "tls-creds-psk",
++      "parent": "tls-creds"
++    },
++    {
++      "name": "vhost-vsock-pci-transitional",
++      "parent": "vhost-vsock-pci-base"
++    },
++    {
++      "name": "integratorcp-machine",
++      "parent": "machine"
++    },
++    {
++      "name": "qio-channel-tls",
++      "parent": "qio-channel"
++    },
++    {
++      "name": "virtio-mmio",
++      "parent": "sys-bus-device"
++    },
++    {
++      "name": "scsi-generic",
++      "parent": "scsi-device"
 +    },
 +    {
 +      "name": "rng-random",
 +      "parent": "rng-backend"
 +    },
 +    {
-+      "name": "g2gp-powerpc64-cpu",
-+      "parent": "G2-family-powerpc64-cpu"
++      "name": "rng-builtin",
++      "parent": "rng-backend"
 +    },
 +    {
-+      "name": "7457a_v1.1-powerpc64-cpu",
-+      "parent": "7455-family-powerpc64-cpu"
++      "name": "usb-bot",
++      "parent": "usb-storage-dev"
 +    },
 +    {
-+      "name": "750cl_v1.0-powerpc64-cpu",
-+      "parent": "750cl-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "mpc8547e_v21-powerpc64-cpu",
-+      "parent": "e500v2-family-powerpc64-cpu"
-+    },
-+    {
-+      "name": "virtio-keyboard-pci",
-+      "parent": "virtio-input-hid-pci"
++      "name": "qemu-xhci",
++      "parent": "base-xhci"
 +    }
 +  ],
-+  "id": "libvirt-9"
++  "id": "libvirt-6"
 +}
 +
 +{
@@ -3674,86 +4265,215 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-blk-pci"
 +  },
-+  "id": "libvirt-10"
++  "id": "libvirt-7"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "secs",
++      "default-value": 1,
++      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "rombar",
-+      "type": "uint32"
++      "name": "romfile",
++      "type": "str"
 +    },
 +    {
-+      "name": "scsi",
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "cyls",
-+      "type": "uint32"
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": false,
++      "name": "virtio-pci-bus-master-bug-migration",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnkctl-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-flr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "page-per-vq",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "migrate-extra",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-pm-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "modern-pio-notify",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-deverr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "ats",
++      "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": false,
++      "name": "disable-modern",
++      "type": "bool"
++    },
++    {
++      "default-value": "auto",
++      "name": "disable-legacy",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": true,
++      "name": "request-merging",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "secs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "lsecs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "heads",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "write-zeroes",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "cyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
 +      "name": "logical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": false,
++      "name": "scsi",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "lcyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
 +      "name": "indirect_desc",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
++      "default-value": 4194303,
++      "name": "max-write-zeroes-sectors",
++      "type": "uint32"
 +    },
 +    {
 +      "name": "drive",
@@ -3761,107 +4481,71 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": "auto",
 +      "name": "werror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
++      "default-value": 4294967295,
++      "name": "discard_granularity",
++      "type": "uint32"
++    },
++    {
++      "default-value": "auto",
++      "name": "rerror",
++      "description": "Error handling policy, report/ignore/enospc/stop/auto",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": true,
++      "name": "x-enable-wce-if-config-wce",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "lheads",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "any_layout",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "share-rw",
++      "type": "bool"
++    },
++    {
++      "name": "iothread",
++      "type": "link<iothread>"
++    },
++    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
 +      "name": "bootindex",
 +      "type": "int32"
 +    },
 +    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": 0,
 +      "name": "physical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": false,
 +      "name": "iommu_platform",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": false,
++      "name": "packed",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -3870,43 +4554,60 @@ index 0000000000..576e0b69e9
 +      "type": "child<virtio-blk-device>"
 +    },
 +    {
-+      "name": "x-ignore-backend-features",
++      "default-value": true,
++      "name": "seg-max-adjust",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "config-wce",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "discard",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
 +      "name": "notify_on_empty",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "serial",
++      "type": "str"
++    },
++    {
++      "default-value": 128,
++      "name": "queue-size",
++      "type": "uint16"
++    },
++    {
++      "default-value": 1,
++      "name": "num-queues",
++      "type": "uint16"
++    },
++    {
++      "default-value": "auto",
 +      "name": "write-cache",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
++      "default-value": 4194303,
++      "name": "max-discard-sectors",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
++      "default-value": 0,
++      "name": "opt_io_size",
++      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-10"
++  "id": "libvirt-7"
 +}
 +
 +{
@@ -3914,13 +4615,25 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-net-pci"
 +  },
-+  "id": "libvirt-11"
++  "id": "libvirt-8"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "ctrl_mac_addr",
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -3929,231 +4642,177 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "speed",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ecn",
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
 +    },
 +    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "duplex",
++      "name": "failover_pair_id",
 +      "type": "str"
 +    },
 +    {
-+      "name": "guest_tso6",
++      "default-value": false,
++      "name": "virtio-pci-bus-master-bug-migration",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "ctrl_guest_offloads",
++      "default-value": true,
++      "name": "x-pcie-lnkctl-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "csum",
++      "default-value": true,
++      "name": "x-pcie-flr-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "page-per-vq",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "migrate-extra",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-pm-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "modern-pio-notify",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-pcie-deverr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "ats",
++      "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": true,
 +      "name": "ioeventfd",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "mq",
++      "default-value": false,
++      "name": "disable-modern",
++      "type": "bool"
++    },
++    {
++      "default-value": "auto",
++      "name": "disable-legacy",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ecn",
++      "default-value": false,
++      "name": "packed",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
 +      "name": "guest_ufo",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "virtio-pci-bus-master-bug-migration",
++      "default-value": true,
++      "name": "host_ecn",
++      "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": "status",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 256,
++      "name": "tx_queue_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "name": "tx",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_rx_extra",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 300000,
++      "name": "rsc_interval",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "indirect_desc",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -4163,48 +4822,179 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
-+      "name": "tx_queue_size",
++      "default-value": 256,
++      "name": "rx_queue_size",
 +      "type": "uint16"
 +    },
 +    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "tx",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": true,
++      "name": "guest_ecn",
 +      "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": "guest_tso4",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "guest_csum",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "guest_announce",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "gso",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_vq",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_rx",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "duplex",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_vlan",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 256,
++      "name": "x-txburst",
++      "type": "int32"
++    },
++    {
++      "default-value": true,
++      "name": "csum",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "mrg_rxbuf",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_guest_offloads",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "any_layout",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "failover",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "ctrl_mac_addr",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "host_tso6",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
 +      "name": "x-mtu-bypass-backend",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-pcie-deverr-init",
++      "default-value": true,
++      "name": "host_tso4",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "host_ufo",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "virtio-backend",
++      "type": "child<virtio-net-device>"
++    },
++    {
++      "name": "bootindex",
++      "type": "int32"
++    },
++    {
 +      "name": "netdev",
 +      "description": "ID of a netdev to use as a backend",
 +      "type": "str"
 +    },
 +    {
-+      "name": "migrate-extra",
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "notify_on_empty",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "rx_queue_size",
++      "default-value": false,
++      "name": "guest_rsc_ext",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "iommu_platform",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "host_mtu",
 +      "type": "uint16"
 +    }
 +  ],
-+  "id": "libvirt-11"
++  "id": "libvirt-8"
 +}
 +
 +{
@@ -4212,135 +5002,186 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-scsi-pci"
 +  },
-+  "id": "libvirt-12"
++  "id": "libvirt-9"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": 1,
 +      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "max_sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "param_change",
++      "default-value": false,
++      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": false,
++      "name": "virtio-pci-bus-master-bug-migration",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnkctl-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-flr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "page-per-vq",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "migrate-extra",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-pm-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "modern-pio-notify",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-deverr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "ats",
++      "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": false,
++      "name": "disable-modern",
++      "type": "bool"
++    },
++    {
++      "default-value": "auto",
++      "name": "disable-legacy",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": true,
++      "name": "notify_on_empty",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 65535,
++      "name": "max_sectors",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
 +      "name": "any_layout",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": 128,
++      "name": "cmd_per_lun",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "indirect_desc",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
 +      "name": "iothread",
 +      "type": "link<iothread>"
 +    },
 +    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
++      "default-value": 128,
++      "name": "virtqueue_size",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": true,
++      "name": "hotplug",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -4349,35 +5190,40 @@ index 0000000000..576e0b69e9
 +      "type": "child<virtio-scsi-device>"
 +    },
 +    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
++      "default-value": 1,
++      "name": "num_queues",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "notify_on_empty",
++      "default-value": true,
++      "name": "param_change",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "seg_max_adjust",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "iommu_platform",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "ats",
-+      "description": "on/off",
++      "default-value": true,
++      "name": "use-disabled-flag",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "virtio-pci-bus-master-bug-migration",
++      "default-value": false,
++      "name": "packed",
 +      "description": "on/off",
 +      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
 +    }
 +  ],
-+  "id": "libvirt-12"
++  "id": "libvirt-9"
 +}
 +
 +{
@@ -4385,11 +5231,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-net-ccw"
 +  },
-+  "id": "libvirt-13"
++  "id": "libvirt-10"
 +}
 +
 +{
-+  "id": "libvirt-13",
++  "id": "libvirt-10",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-net-ccw' not found"
@@ -4401,11 +5247,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-scsi-ccw"
 +  },
-+  "id": "libvirt-14"
++  "id": "libvirt-11"
 +}
 +
 +{
-+  "id": "libvirt-14",
++  "id": "libvirt-11",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-scsi-ccw' not found"
@@ -4417,11 +5263,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-net-s390"
 +  },
-+  "id": "libvirt-15"
++  "id": "libvirt-12"
 +}
 +
 +{
-+  "id": "libvirt-15",
++  "id": "libvirt-12",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-net-s390' not found"
@@ -4431,85 +5277,116 @@ index 0000000000..576e0b69e9
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "pci-assign"
-+  },
-+  "id": "libvirt-16"
-+}
-+
-+{
-+  "id": "libvirt-16",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "kvm-pci-assign"
-+  },
-+  "id": "libvirt-17"
-+}
-+
-+{
-+  "id": "libvirt-17",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'kvm-pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
 +    "typename": "vfio-pci"
 +  },
-+  "id": "libvirt-18"
++  "id": "libvirt-13"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "x-igd-opregion",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pci-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pci-sub-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-kvm-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": 1,
 +      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "x-pci-sub-device-id",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "x-no-kvm-msi",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-igd-opregion",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": "off",
++      "name": "display",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": false,
++      "name": "x-vga",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "x-pci-vendor-id",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "x-balloon-allowed",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
 +      "name": "x-req",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-no-kvm-msi",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": false,
 +      "name": "x-no-vfio-ioeventfd",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
++      "name": "x-no-geforce-quirks",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-no-kvm-ioeventfd",
++      "type": "bool"
++    },
++    {
++      "default-value": 4294967295,
++      "name": "x-pci-device-id",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
 +      "name": "x-no-kvm-intx",
 +      "type": "bool"
 +    },
@@ -4519,136 +5396,132 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
++      "default-value": false,
 +      "name": "x-no-kvm-msix",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
++      "default-value": 1100,
++      "name": "x-intx-mmap-timeout-ms",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "x-balloon-allowed",
-+      "type": "bool"
++      "default-value": 0,
++      "name": "yres",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
++      "default-value": 0,
++      "name": "x-igd-gms",
++      "type": "uint32"
 +    },
 +    {
++      "default-value": 4294967295,
 +      "name": "x-pci-sub-vendor-id",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "x-pci-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-geforce-quirks",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "display",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
 +      "name": "x-nv-gpudirect-clique",
 +      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
 +      "type": "uint4"
 +    },
 +    {
-+      "name": "x-igd-gms",
++      "name": "sysfsdev",
++      "type": "str"
++    },
++    {
++      "default-value": 0,
++      "name": "xres",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
++      "default-value": "off",
 +      "name": "x-msix-relocation",
 +      "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
 +      "type": "OffAutoPCIBAR"
 +    },
 +    {
-+      "name": "x-intx-mmap-timeout-ms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": false,
 +      "name": "x-no-mmap",
 +      "type": "bool"
 +    },
 +    {
 +      "name": "bootindex",
 +      "type": "int32"
-+    },
-+    {
-+      "name": "sysfsdev",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-vga",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
 +    }
 +  ],
-+  "id": "libvirt-18"
++  "id": "libvirt-13"
 +}
 +
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "scsi-disk"
++    "typename": "scsi-hd"
 +  },
-+  "id": "libvirt-19"
++  "id": "libvirt-14"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "serial",
-+      "type": "str"
++      "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": "heads",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
 +      "name": "port_index",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": false,
 +      "name": "dpofua",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "lun",
-+      "type": "uint32"
++      "name": "serial",
++      "type": "str"
 +    },
 +    {
++      "default-value": 1073741824,
++      "name": "max_unmap_size",
++      "type": "uint64"
++    },
++    {
++      "default-value": 0,
 +      "name": "logical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": 4294967295,
 +      "name": "discard_granularity",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "scsi_version",
-+      "type": "int32"
++      "default-value": 0,
++      "name": "rotation_rate",
++      "type": "uint16"
 +    },
 +    {
-+      "name": "max_unmap_size",
-+      "type": "uint64"
++      "name": "device_id",
++      "type": "str"
 +    },
 +    {
 +      "name": "drive",
@@ -4656,140 +5529,214 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
++      "default-value": 0,
 +      "name": "port_wwn",
 +      "type": "uint64"
 +    },
 +    {
++      "default-value": 0,
++      "name": "opt_io_size",
++      "type": "uint32"
++    },
++    {
++      "default-value": 5,
++      "name": "scsi_version",
++      "type": "int32"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": "auto",
 +      "name": "write-cache",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
++      "default-value": false,
 +      "name": "share-rw",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
 +      "name": "product",
 +      "type": "str"
 +    },
 +    {
-+      "name": "scsi-id",
++      "default-value": 0,
++      "name": "lsecs",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "bootindex",
-+      "type": "int32"
++      "default-value": 0,
++      "name": "lheads",
++      "type": "uint32"
 +    },
 +    {
 +      "name": "vendor",
 +      "type": "str"
 +    },
 +    {
-+      "name": "channel",
++      "default-value": 0,
++      "name": "lcyls",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": 0,
++      "name": "secs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
 +      "name": "wwn",
 +      "type": "uint64"
 +    },
 +    {
++      "default-value": "auto",
 +      "name": "werror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
++      "default-value": false,
 +      "name": "removable",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
++      "default-value": 0,
++      "name": "cyls",
++      "type": "uint32"
 +    },
 +    {
 +      "name": "ver",
 +      "type": "str"
 +    },
 +    {
++      "default-value": "auto",
++      "name": "rerror",
++      "description": "Error handling policy, report/ignore/enospc/stop/auto",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": 0,
 +      "name": "physical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": 2147483647,
 +      "name": "max_io_size",
 +      "type": "uint64"
++    },
++    {
++      "name": "bootindex",
++      "type": "int32"
 +    }
 +  ],
-+  "id": "libvirt-19"
++  "id": "libvirt-14"
 +}
 +
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "ide-drive"
++    "typename": "ide-hd"
 +  },
-+  "id": "libvirt-20"
++  "id": "libvirt-15"
 +}
 +
 +{
 +  "return": [
 +    {
++      "default-value": 4294967295,
++      "name": "unit",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "lsecs",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "secs",
++      "type": "uint32"
++    },
++    {
 +      "name": "serial",
 +      "type": "str"
 +    },
 +    {
++      "default-value": 0,
++      "name": "lcyls",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
 +      "name": "logical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": 4294967295,
 +      "name": "discard_granularity",
 +      "type": "uint32"
 +    },
 +    {
++      "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": "bootindex",
-+      "type": "int32"
++      "default-value": 0,
++      "name": "heads",
++      "type": "uint32"
 +    },
 +    {
++      "default-value": 0,
++      "name": "opt_io_size",
++      "type": "uint32"
++    },
++    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": "auto",
 +      "name": "write-cache",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
++      "default-value": false,
 +      "name": "share-rw",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "min_io_size",
-+      "type": "uint16"
++      "default-value": "auto",
++      "name": "bios-chs-trans",
++      "description": "Logical CHS translation algorithm, auto/none/lba/large/rechs",
++      "type": "BiosAtaTranslation"
 +    },
 +    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "unit",
++      "default-value": 0,
++      "name": "lheads",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": 0,
 +      "name": "wwn",
 +      "type": "uint64"
 +    },
 +    {
++      "default-value": "auto",
 +      "name": "werror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
@@ -4799,21 +5746,32 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
++      "name": "ver",
++      "type": "str"
++    },
++    {
++      "default-value": "auto",
 +      "name": "rerror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
++      "default-value": 0,
 +      "name": "physical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
++    },
++    {
++      "default-value": 0,
++      "name": "cyls",
++      "type": "uint32"
++    },
++    {
++      "name": "bootindex",
++      "type": "int32"
 +    }
 +  ],
-+  "id": "libvirt-20"
++  "id": "libvirt-15"
 +}
 +
 +{
@@ -4821,11 +5779,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "PIIX4_PM"
 +  },
-+  "id": "libvirt-21"
++  "id": "libvirt-16"
 +}
 +
 +{
-+  "id": "libvirt-21",
++  "id": "libvirt-16",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'PIIX4_PM' not found"
@@ -4835,129 +5793,13 @@ index 0000000000..576e0b69e9
 +{
 +  "execute": "device-list-properties",
 +  "arguments": {
-+    "typename": "usb-host"
-+  },
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "isobufs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostaddr",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "productid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "isobsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vendorid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pipeline",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hostport",
-+      "type": "str"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "loglevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostbus",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-generic"
-+  },
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
 +    "typename": "i440FX-pcihost"
 +  },
-+  "id": "libvirt-24"
++  "id": "libvirt-17"
 +}
 +
 +{
-+  "id": "libvirt-24",
++  "id": "libvirt-17",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'i440FX-pcihost' not found"
@@ -4969,11 +5811,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "q35-pcihost"
 +  },
-+  "id": "libvirt-25"
++  "id": "libvirt-18"
 +}
 +
 +{
-+  "id": "libvirt-25",
++  "id": "libvirt-18",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'q35-pcihost' not found"
@@ -4985,26 +5827,39 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "usb-storage"
 +  },
-+  "id": "libvirt-26"
++  "id": "libvirt-19"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
++      "default-value": true,
 +      "name": "msos-desc",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "port",
++      "type": "str"
++    },
++    {
++      "name": "serial",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "full-path",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
 +      "name": "logical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
 +    },
 +    {
++      "default-value": 4294967295,
 +      "name": "discard_granularity",
 +      "type": "uint32"
 +    },
@@ -5014,61 +5869,60 @@ index 0000000000..576e0b69e9
 +      "type": "str"
 +    },
 +    {
-+      "name": "bootindex",
-+      "type": "int32"
++      "default-value": 0,
++      "name": "opt_io_size",
++      "type": "uint32"
 +    },
 +    {
++      "default-value": 0,
++      "name": "min_io_size",
++      "type": "uint16"
++    },
++    {
++      "default-value": "auto",
 +      "name": "write-cache",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
++      "default-value": false,
 +      "name": "share-rw",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": "auto",
 +      "name": "werror",
 +      "description": "Error handling policy, report/ignore/enospc/stop/auto",
 +      "type": "BlockdevOnError"
 +    },
 +    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
++      "default-value": false,
 +      "name": "removable",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": "auto",
++      "name": "rerror",
++      "description": "Error handling policy, report/ignore/enospc/stop/auto",
++      "type": "BlockdevOnError"
++    },
++    {
++      "default-value": 0,
 +      "name": "physical_block_size",
 +      "description": "A power of two between 512 and 32768",
 +      "type": "uint16"
++    },
++    {
++      "name": "bootindex",
++      "type": "int32"
++    },
++    {
++      "name": "attached",
++      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-26"
++  "id": "libvirt-19"
 +}
 +
 +{
@@ -5076,11 +5930,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "kvm-pit"
 +  },
-+  "id": "libvirt-27"
++  "id": "libvirt-20"
 +}
 +
 +{
-+  "id": "libvirt-27",
++  "id": "libvirt-20",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'kvm-pit' not found"
@@ -5092,81 +5946,163 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "VGA"
 +  },
-+  "id": "libvirt-28"
++  "id": "libvirt-21"
 +}
 +
 +{
 +  "return": [
 +    {
++      "default-value": 1,
 +      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "mmio",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "qemu-extended-regs",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "big-endian-framebuffer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "romfile",
 +      "type": "str"
 +    },
 +    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": true,
 +      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
 +    },
 +    {
-+      "name": "global-vmstate",
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "mmio",
++      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "qemu-extended-regs",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 0,
++      "name": "ymax",
++      "type": "uint32"
++    },
++    {
++      "default-value": 16,
++      "name": "vgamem_mb",
++      "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"
++    },
++    {
++      "default-value": false,
++      "name": "global-vmstate",
++      "type": "bool"
++    },
++    {
++      "name": "big-endian-framebuffer",
++      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-28"
++  "id": "libvirt-21"
++}
++
++{
++  "execute": "device-list-properties",
++  "arguments": {
++    "typename": "vmware-svga"
++  },
++  "id": "libvirt-22"
++}
++
++{
++  "return": [
++    {
++      "default-value": 1,
++      "name": "rombar",
++      "type": "uint32"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "multifunction",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": 16,
++      "name": "vgamem_mb",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "global-vmstate",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-22"
 +}
 +
 +{
@@ -5174,117 +6110,161 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-gpu-pci"
 +  },
-+  "id": "libvirt-29"
++  "id": "libvirt-23"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": 1,
 +      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "any_layout",
++      "default-value": false,
++      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": false,
++      "name": "virtio-pci-bus-master-bug-migration",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnkctl-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-flr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "page-per-vq",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
 +      "name": "migrate-extra",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-pcie-pm-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "modern-pio-notify",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-pcie-deverr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "ats",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-disable-pcie",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 3,
 +      "name": "vectors",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": false,
++      "name": "ioeventfd",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "disable-modern",
++      "type": "bool"
++    },
++    {
++      "default-value": "auto",
++      "name": "disable-legacy",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "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": "indirect_desc",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -5293,39 +6273,50 @@ index 0000000000..576e0b69e9
 +      "type": "child<virtio-gpu-device>"
 +    },
 +    {
-+      "name": "max_hostmem",
-+      "type": "size"
++      "default-value": 768,
++      "name": "yres",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
++      "default-value": true,
++      "name": "use-disabled-flag",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": false,
 +      "name": "iommu_platform",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "ats",
++      "default-value": true,
++      "name": "edid",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
++      "default-value": 1,
++      "name": "max_outputs",
++      "type": "uint32"
 +    },
 +    {
-+      "name": "romfile",
-+      "type": "str"
++      "default-value": 268435456,
++      "name": "max_hostmem",
++      "type": "size"
++    },
++    {
++      "default-value": 1024,
++      "name": "xres",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "packed",
++      "description": "on/off",
++      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-29"
++  "id": "libvirt-23"
 +}
 +
 +{
@@ -5333,54 +6324,85 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-gpu-device"
 +  },
-+  "id": "libvirt-30"
++  "id": "libvirt-24"
 +}
 +
 +{
 +  "return": [
 +    {
++      "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": "indirect_desc",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
 +      "name": "event_idx",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": false,
 +      "name": "iommu_platform",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "max_outputs",
-+      "type": "uint32"
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
 +    },
 +    {
++      "default-value": false,
++      "name": "packed",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "edid",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 268435456,
++      "name": "max_hostmem",
++      "type": "size"
++    },
++    {
++      "default-value": 1024,
 +      "name": "xres",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "max_hostmem",
-+      "type": "size"
++      "default-value": 768,
++      "name": "yres",
++      "type": "uint32"
++    },
++    {
++      "default-value": 1,
++      "name": "max_outputs",
++      "type": "uint32"
 +    }
 +  ],
-+  "id": "libvirt-30"
++  "id": "libvirt-24"
 +}
 +
 +{
@@ -5388,11 +6410,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "ICH9-LPC"
 +  },
-+  "id": "libvirt-31"
++  "id": "libvirt-25"
 +}
 +
 +{
-+  "id": "libvirt-31",
++  "id": "libvirt-25",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'ICH9-LPC' not found"
@@ -5404,113 +6426,173 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-balloon-pci"
 +  },
-+  "id": "libvirt-32"
++  "id": "libvirt-26"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": 1,
 +      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
++      "name": "x-pcie-lnksta-dllla",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "name": "romfile",
++      "type": "str"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-extcap-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": -1,
++      "name": "addr",
++      "description": "Slot and optional function number, example: 06.0 or 06",
++      "type": "int32"
++    },
++    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": false,
++      "name": "virtio-pci-bus-master-bug-migration",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-lnkctl-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-flr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "x-ignore-backend-features",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "page-per-vq",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "migrate-extra",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-pm-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "modern-pio-notify",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "x-pcie-deverr-init",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "ats",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
 +      "name": "x-disable-pcie",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
++      "default-value": 0,
++      "name": "class",
++      "type": "uint32"
 +    },
 +    {
++      "default-value": false,
 +      "name": "disable-modern",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": "auto",
 +      "name": "disable-legacy",
 +      "description": "on/off/auto",
 +      "type": "OnOffAuto"
 +    },
 +    {
-+      "name": "command_serr_enable",
++      "default-value": true,
++      "name": "notify_on_empty",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "x-pcie-lnkctl-init",
++      "default-value": true,
++      "name": "any_layout",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "indirect_desc",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
 +      "name": "guest-stats",
 +      "type": "guest statistics"
 +    },
 +    {
-+      "name": "deflate-on-oom",
++      "name": "guest-stats-polling-interval",
++      "type": "int"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
++      "name": "iothread",
++      "type": "link<iothread>"
 +    },
 +    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
++      "default-value": false,
++      "name": "free-page-hint",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
@@ -5519,35 +6601,35 @@ index 0000000000..576e0b69e9
 +      "type": "child<virtio-balloon-device>"
 +    },
 +    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": false,
 +      "name": "iommu_platform",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "ats",
++      "default-value": false,
++      "name": "qemu-4-0-config-size",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "use-disabled-flag",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "packed",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "virtio-pci-bus-master-bug-migration",
++      "default-value": false,
++      "name": "deflate-on-oom",
 +      "description": "on/off",
 +      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
 +    }
 +  ],
-+  "id": "libvirt-32"
++  "id": "libvirt-26"
 +}
 +
 +{
@@ -5555,11 +6637,11 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-balloon-ccw"
 +  },
-+  "id": "libvirt-33"
++  "id": "libvirt-27"
 +}
 +
 +{
-+  "id": "libvirt-33",
++  "id": "libvirt-27",
 +  "error": {
 +    "class": "DeviceNotFound",
 +    "desc": "Device 'virtio-balloon-ccw' not found"
@@ -5571,51 +6653,88 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "virtio-balloon-device"
 +  },
-+  "id": "libvirt-34"
++  "id": "libvirt-28"
 +}
 +
 +{
 +  "return": [
 +    {
++      "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": "indirect_desc",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
++      "default-value": true,
++      "name": "use-started",
++      "type": "bool"
++    },
++    {
++      "default-value": true,
++      "name": "event_idx",
++      "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": false,
++      "name": "packed",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "free-page-hint",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": false,
++      "name": "deflate-on-oom",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "name": "iothread",
++      "type": "link<iothread>"
++    },
++    {
++      "default-value": false,
++      "name": "qemu-4-0-config-size",
++      "type": "bool"
++    },
++    {
 +      "name": "guest-stats",
 +      "type": "guest statistics"
 +    },
 +    {
 +      "name": "guest-stats-polling-interval",
 +      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-34"
++  "id": "libvirt-28"
 +}
 +
 +{
@@ -5623,153 +6742,100 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "nec-usb-xhci"
 +  },
-+  "id": "libvirt-35"
++  "id": "libvirt-29"
 +}
 +
 +{
 +  "return": [
 +    {
++      "default-value": 1,
 +      "name": "rombar",
 +      "type": "uint32"
 +    },
 +    {
-+      "name": "intrs",
-+      "type": "uint32"
-+    },
-+    {
++      "default-value": true,
 +      "name": "x-pcie-lnksta-dllla",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "msix",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
++      "default-value": false,
 +      "name": "multifunction",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "msi",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "superspeed-ports-first",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "streams",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "romfile",
 +      "type": "str"
 +    },
 +    {
-+      "name": "force-pcie-endcap",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": true,
 +      "name": "x-pcie-extcap-init",
 +      "description": "on/off",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
++      "default-value": -1,
 +      "name": "addr",
 +      "description": "Slot and optional function number, example: 06.0 or 06",
 +      "type": "int32"
 +    },
 +    {
++      "name": "failover_pair_id",
++      "type": "str"
++    },
++    {
++      "default-value": 4,
 +      "name": "p3",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": true,
++      "name": "streams",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 4,
 +      "name": "p2",
 +      "type": "uint32"
 +    },
 +    {
++      "default-value": "auto",
++      "name": "msi",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": 16,
++      "name": "intrs",
++      "type": "uint32"
++    },
++    {
++      "default-value": false,
++      "name": "force-pcie-endcap",
++      "description": "on/off",
++      "type": "bool"
++    },
++    {
++      "default-value": 64,
 +      "name": "slots",
 +      "type": "uint32"
++    },
++    {
++      "default-value": "auto",
++      "name": "msix",
++      "description": "on/off/auto",
++      "type": "OnOffAuto"
++    },
++    {
++      "default-value": true,
++      "name": "superspeed-ports-first",
++      "description": "on/off",
++      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "spapr-pci-host-bridge"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "dynamic-reconfiguration",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ddw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dma_win_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "numa_node",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "mem64_win_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pgsz",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pre-2.8-migration",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dma_win_addr",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "io_win_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "mem_win_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "dma64_win_addr",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pcie-extended-configuration-space",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "index",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-36"
++  "id": "libvirt-29"
 +}
 +
 +{
@@ -5777,7 +6843,7 @@ index 0000000000..576e0b69e9
 +  "arguments": {
 +    "typename": "memory-backend-file"
 +  },
-+  "id": "libvirt-37"
++  "id": "libvirt-30"
 +}
 +
 +{
@@ -5792,14 +6858,14 @@ index 0000000000..576e0b69e9
 +      "type": "HostMemPolicy"
 +    },
 +    {
-+      "name": "share",
-+      "description": "Mark the memory as private to QEMU or shared",
++      "name": "dump",
++      "description": "Set to 'off' to exclude from core dump",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "host-nodes",
-+      "description": "Binds memory to the list of NUMA host nodes",
-+      "type": "int"
++      "name": "share",
++      "description": "Mark the memory as private to QEMU or shared",
++      "type": "bool"
 +    },
 +    {
 +      "name": "prealloc",
@@ -5807,13 +6873,17 @@ index 0000000000..576e0b69e9
 +      "type": "bool"
 +    },
 +    {
-+      "name": "dump",
-+      "description": "Set to 'off' to exclude from core dump",
++      "name": "size",
++      "description": "Size of the memory region (ex: 500M)",
++      "type": "int"
++    },
++    {
++      "name": "x-use-canonical-path-for-ramblock-id",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "size",
-+      "description": "Size of the memory region (ex: 500M)",
++      "name": "host-nodes",
++      "description": "Binds memory to the list of NUMA host nodes",
 +      "type": "int"
 +    },
 +    {
@@ -5838,15 +6908,880 @@ index 0000000000..576e0b69e9
 +      "type": "bool"
 +    }
 +  ],
-+  "id": "libvirt-37"
++  "id": "libvirt-30"
 +}
 +
 +{
 +  "execute": "qom-list-properties",
 +  "arguments": {
-+    "typename": "spapr-machine"
++    "typename": "memory-backend-memfd"
 +  },
-+  "id": "libvirt-38"
++  "id": "libvirt-31"
++}
++
++{
++  "return": [
++    {
++      "name": "type",
++      "type": "string"
++    },
++    {
++      "name": "policy",
++      "description": "Set the NUMA policy",
++      "type": "HostMemPolicy"
++    },
++    {
++      "name": "dump",
++      "description": "Set to 'off' to exclude from core dump",
++      "type": "bool"
++    },
++    {
++      "name": "share",
++      "description": "Mark the memory as private to QEMU or shared",
++      "type": "bool"
++    },
++    {
++      "name": "prealloc",
++      "description": "Preallocate memory",
++      "type": "bool"
++    },
++    {
++      "name": "size",
++      "description": "Size of the memory region (ex: 500M)",
++      "type": "int"
++    },
++    {
++      "name": "x-use-canonical-path-for-ramblock-id",
++      "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": "seal",
++      "description": "Seal growing & shrinking",
++      "type": "bool"
++    },
++    {
++      "name": "hugetlbsize",
++      "description": "Huge pages size (ex: 2M, 1G)",
++      "type": "int"
++    },
++    {
++      "name": "hugetlb",
++      "description": "Use huge pages",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-31"
++}
++
++{
++  "execute": "qom-list-properties",
++  "arguments": {
++    "typename": "max-arm-cpu"
++  },
++  "id": "libvirt-32"
++}
++
++{
++  "return": [
++    {
++      "name": "type",
++      "type": "string"
++    },
++    {
++      "name": "parent_bus",
++      "type": "link<bus>"
++    },
++    {
++      "name": "hotplugged",
++      "type": "bool"
++    },
++    {
++      "name": "hotpluggable",
++      "type": "bool"
++    },
++    {
++      "name": "realized",
++      "type": "bool"
++    },
++    {
++      "name": "legacy-memory",
++      "type": "str"
++    },
++    {
++      "name": "memory",
++      "type": "link<qemu:memory-region>"
++    },
++    {
++      "name": "psci-conduit",
++      "type": "uint32"
++    },
++    {
++      "name": "core-count",
++      "type": "int32"
++    },
++    {
++      "name": "start-powered-off",
++      "type": "bool"
++    },
++    {
++      "name": "mp-affinity",
++      "type": "uint64"
++    },
++    {
++      "name": "node-id",
++      "type": "int32"
++    },
++    {
++      "name": "midr",
++      "type": "uint32"
++    },
++    {
++      "name": "sve640",
++      "type": "bool"
++    },
++    {
++      "name": "sve1152",
++      "type": "bool"
++    },
++    {
++      "name": "sve1408",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-in[3]",
++      "type": "child<irq>"
++    },
++    {
++      "name": "unnamed-gpio-in[1]",
++      "type": "child<irq>"
++    },
++    {
++      "name": "sve1664",
++      "type": "bool"
++    },
++    {
++      "name": "sve128",
++      "type": "bool"
++    },
++    {
++      "name": "aarch64",
++      "description": "Set on/off to enable/disable aarch64 execution state ",
++      "type": "bool"
++    },
++    {
++      "name": "sve2048",
++      "type": "bool"
++    },
++    {
++      "name": "rvbar",
++      "type": "uint64"
++    },
++    {
++      "name": "cntfrq",
++      "type": "uint64"
++    },
++    {
++      "name": "sve384",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-out[2]",
++      "type": "link<irq>"
++    },
++    {
++      "name": "kvm-no-adjvtime",
++      "description": "Set on to disable the adjustment of the virtual counter. VM stopped time will be counted.",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-out[0]",
++      "type": "link<irq>"
++    },
++    {
++      "name": "sve512",
++      "type": "bool"
++    },
++    {
++      "name": "sve896",
++      "type": "bool"
++    },
++    {
++      "name": "gicv3-maintenance-interrupt[0]",
++      "type": "link<irq>"
++    },
++    {
++      "name": "sve1024",
++      "type": "bool"
++    },
++    {
++      "name": "pmu-interrupt[0]",
++      "type": "link<irq>"
++    },
++    {
++      "name": "sve1280",
++      "type": "bool"
++    },
++    {
++      "name": "sve1536",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-in[2]",
++      "type": "child<irq>"
++    },
++    {
++      "name": "sve-max-vq",
++      "type": "uint32"
++    },
++    {
++      "name": "sve",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-in[0]",
++      "type": "child<irq>"
++    },
++    {
++      "name": "sve256",
++      "type": "bool"
++    },
++    {
++      "name": "sve1792",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-out[3]",
++      "type": "link<irq>"
++    },
++    {
++      "name": "cfgend",
++      "type": "bool"
++    },
++    {
++      "name": "pmu",
++      "type": "bool"
++    },
++    {
++      "name": "unnamed-gpio-out[1]",
++      "type": "link<irq>"
++    },
++    {
++      "name": "sve1920",
++      "type": "bool"
++    },
++    {
++      "name": "reset-hivecs",
++      "type": "bool"
++    },
++    {
++      "name": "sve768",
++      "type": "bool"
++    }
++  ],
++  "id": "libvirt-32"
++}
++
++{
++  "execute": "query-machines",
++  "id": "libvirt-33"
++}
++
++{
++  "return": [
++    {
++      "hotpluggable-cpus": false,
++      "name": "integratorcp",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "nuri",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an511",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an505",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "verdex",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-3.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "ast2500-evb",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "smdkc210",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "collie",
++      "numa-mem-supported": false,
++      "default-cpu-type": "sa1110-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "xlnx-versal-virt",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "imx25-pdk",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "none",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "spitz",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "musca-b1",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-pbx-a9",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-eb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "versatilepb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-pb-a8",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a8-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "emcraft-sf2",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.9",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "musicpal",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sbsa-ref",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a57-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "z2",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c5-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "akita",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "kzm",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "swift-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.8",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-eb-mpcore",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm11mpcore-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "musca-a",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mcimx7d-sabre",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sx1",
++      "numa-mem-supported": false,
++      "default-cpu-type": "ti925t-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-4.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sx1-v1",
++      "numa-mem-supported": false,
++      "default-cpu-type": "ti925t-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "cubieboard",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-4.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "highbank",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-4.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "raspi2",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "raspi3",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "netduino2",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "terrier",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c5-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "n810",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm1136-r2-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mainstone",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c5-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "palmetto-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "tacoma-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sabrelite",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "netduinoplus2",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "midway",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "romulus-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "cheetah",
++      "numa-mem-supported": false,
++      "default-cpu-type": "ti925t-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "tosa",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "borzoi",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "versatileab",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "lm3s6965evb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "n800",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm1136-r2-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.10",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.11",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "connex",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.12",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "microbit",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "witherspoon-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "xilinx-zynq-a9",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an385",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "ast2600-evb",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "vexpress-a9",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an521",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mcimx6ul-evk",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "vexpress-a15",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "xlnx-zcu102",
++      "numa-mem-supported": false,
++      "cpu-max": 6,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-5.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false,
++      "alias": "virt"
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-3.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "canon-a1100",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "lm3s811evb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    }
++  ],
++  "id": "libvirt-33"
++}
++
++{
++  "execute": "qom-list-properties",
++  "arguments": {
++    "typename": "virt-5.0-machine"
++  },
++  "id": "libvirt-34"
 +}
 +
 +{
@@ -5867,20 +7802,10 @@ index 0000000000..576e0b69e9
 +    },
 +    {
 +      "name": "dump-guest-core",
-+      "description": "Include guest memory in  a core dump",
++      "description": "Include guest memory in a core dump",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "kernel-irqchip",
-+      "description": "Configure KVM in-kernel irqchip",
-+      "type": "on|off|split"
-+    },
-+    {
-+      "name": "accel",
-+      "description": "Accelerator list",
-+      "type": "string"
-+    },
-+    {
 +      "name": "append",
 +      "description": "Linux kernel command line",
 +      "type": "string"
@@ -5896,11 +7821,6 @@ index 0000000000..576e0b69e9
 +      "type": "string"
 +    },
 +    {
-+      "name": "igd-passthru",
-+      "description": "Set on/off to enable/disable igd passthrou",
-+      "type": "bool"
-+    },
-+    {
 +      "name": "dt-compatible",
 +      "description": "Overrides the \"compatible\" property of the dt root node",
 +      "type": "string"
@@ -5946,2434 +7866,288 @@ index 0000000000..576e0b69e9
 +      "type": "bool"
 +    },
 +    {
-+      "name": "kvm-shadow-mem",
-+      "description": "KVM shadow MMU size",
-+      "type": "int"
-+    },
-+    {
-+      "name": "cap-hpt-max-page-size",
-+      "description": "Maximum page size for Hash Page Table guests",
-+      "type": "int"
-+    },
-+    {
-+      "name": "cap-dfp",
-+      "description": "Allow Decimal Floating Point (DFP)",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cap-cfpc",
-+      "description": "Cache Flush on Privilege Change (broken, workaround, fixed)",
++      "name": "iommu",
++      "description": "Set the IOMMU type. Valid values are none and smmuv3",
 +      "type": "string"
 +    },
 +    {
-+      "name": "cap-ibs",
-+      "description": "Indirect Branch Speculation (broken, fixed-ibs, fixed-ccd)",
++      "name": "virt.flash0",
++      "type": "child<cfi.pflash01>"
++    },
++    {
++      "name": "highmem",
++      "description": "Set on/off to enable/disable using physical address space above 32 bits",
++      "type": "bool"
++    },
++    {
++      "name": "pflash1",
++      "description": "Node name or ID of a block device to use as a backend",
++      "type": "str"
++    },
++    {
++      "name": "pflash0",
++      "description": "Node name or ID of a block device to use as a backend",
++      "type": "str"
++    },
++    {
++      "name": "gic-version",
++      "description": "Set GIC version. Valid values are 2, 3 and host",
 +      "type": "string"
 +    },
 +    {
-+      "name": "cap-sbbc",
-+      "description": "Speculation Barrier Bounds Checking (broken, workaround, fixed)",
-+      "type": "string"
-+    },
-+    {
-+      "name": "cap-vsx",
-+      "description": "Allow Vector Scalar Extensions (VSX)",
++      "name": "its",
++      "description": "Set on/off to enable/disable ITS instantiation",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "cap-htm",
-+      "description": "Allow Hardware Transactional Memory (HTM)",
++      "name": "secure",
++      "description": "Set on/off to enable/disable the ARM Security Extensions (TrustZone)",
 +      "type": "bool"
 +    },
 +    {
-+      "name": "cap-nested-hv",
-+      "description": "Allow Nested KVM-HV",
++      "name": "virtualization",
++      "description": "Set on/off to enable/disable emulating a guest CPU which implements the ARM Virtualization Extensions",
 +      "type": "bool"
++    },
++    {
++      "name": "hmat",
++      "description": "Set on/off to enable/disable ACPI Heterogeneous Memory Attribute Table (HMAT)",
++      "type": "bool"
++    },
++    {
++      "name": "virt.flash1",
++      "type": "child<cfi.pflash01>"
 +    }
 +  ],
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "ref405ep",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "sam460ex",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "virtex-ml507",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "powernv",
-+      "cpu-max": 2048
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "ppce500",
-+      "cpu-max": 32
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "mpc8544ds",
-+      "cpu-max": 15
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-3.1",
-+      "is-default": true,
-+      "cpu-max": 1024,
-+      "alias": "pseries"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.12-sxxm",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "bamboo",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "g3beige",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-3.0",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.10",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "prep",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.11",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.12",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.9",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "mac99",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "pseries-2.6",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.7",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pseries-2.8",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "pseries-2.4",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "pseries-2.5",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "pseries-2.2",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "taihu",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "pseries-2.3",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "pseries-2.1",
-+      "cpu-max": 1024
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "40p",
-+      "cpu-max": 1
-+    }
-+  ],
-+  "id": "libvirt-39"
++  "id": "libvirt-34"
 +}
 +
 +{
 +  "execute": "query-cpu-definitions",
-+  "id": "libvirt-40"
++  "id": "libvirt-35"
 +}
 +
 +{
 +  "return": [
 +    {
-+      "name": "default",
-+      "typename": "604-powerpc64-cpu",
++      "name": "pxa262",
++      "typename": "pxa262-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "ppc",
-+      "typename": "604-powerpc64-cpu",
++      "name": "pxa270-a0",
++      "typename": "pxa270-a0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "ppc32",
-+      "typename": "604-powerpc64-cpu",
++      "name": "arm1136",
++      "typename": "arm1136-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "ppc64",
-+      "typename": "970fx_v3.1-powerpc64-cpu",
++      "name": "cortex-a15",
++      "typename": "cortex-a15-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power9",
-+      "typename": "host-powerpc64-cpu",
++      "name": "pxa260",
++      "typename": "pxa260-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8nvl",
-+      "typename": "power8nvl_v1.0-powerpc64-cpu",
++      "name": "arm1136-r2",
++      "typename": "arm1136-r2-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8",
-+      "typename": "power8_v2.0-powerpc64-cpu",
++      "name": "pxa261",
++      "typename": "pxa261-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8e",
-+      "typename": "power8e_v2.1-powerpc64-cpu",
++      "name": "pxa255",
++      "typename": "pxa255-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power7+",
-+      "typename": "power7+_v2.1-powerpc64-cpu",
++      "name": "cortex-a72",
++      "typename": "cortex-a72-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power7",
-+      "typename": "power7_v2.3-powerpc64-cpu",
++      "name": "cortex-m33",
++      "typename": "cortex-m33-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power5gs",
-+      "typename": "power5+_v2.1-powerpc64-cpu",
++      "name": "arm926",
++      "typename": "arm926-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power5+",
-+      "typename": "power5+_v2.1-powerpc64-cpu",
++      "name": "cortex-r5f",
++      "typename": "cortex-r5f-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "970mp",
-+      "typename": "970mp_v1.1-powerpc64-cpu",
++      "name": "arm11mpcore",
++      "typename": "arm11mpcore-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "970fx",
-+      "typename": "970fx_v3.1-powerpc64-cpu",
++      "name": "pxa250",
++      "typename": "pxa250-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "970",
-+      "typename": "970_v2.2-powerpc64-cpu",
++      "name": "ti925t",
++      "typename": "ti925t-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "apollo7pm",
-+      "typename": "7457a_v1.0-powerpc64-cpu",
++      "name": "cortex-a57",
++      "typename": "cortex-a57-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7457a",
-+      "typename": "7457a_v1.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a",
-+      "typename": "7447a_v1.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "apollo7",
-+      "typename": "7457_v1.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7457",
-+      "typename": "7457_v1.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7447",
-+      "typename": "7447_v1.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "apollo6",
-+      "typename": "7455_v3.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7455",
-+      "typename": "7455_v3.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7445",
-+      "typename": "7445_v3.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7451",
-+      "typename": "7451_v2.3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7441",
-+      "typename": "7441_v2.3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "vger",
-+      "typename": "7450_v2.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7450",
-+      "typename": "7450_v2.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7448",
-+      "typename": "7448_v2.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "nitro",
-+      "typename": "7410_v1.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7410",
-+      "typename": "7410_v1.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "g4",
-+      "typename": "7400_v2.9-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "max",
-+      "typename": "7400_v2.9-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7400",
-+      "typename": "7400_v2.9-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "goldfinger",
-+      "typename": "755_v2.8-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "755",
-+      "typename": "755_v2.8-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "745",
-+      "typename": "745_v2.8-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "lonestar",
-+      "typename": "750l_v3.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750l",
-+      "typename": "750l_v3.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx",
-+      "typename": "750gx_v1.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx",
-+      "typename": "750fx_v2.3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe",
-+      "typename": "750cxe_v3.1b-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx",
-+      "typename": "750cx_v2.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750cl",
-+      "typename": "750cl_v2.0-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "conan/doyle",
-+      "typename": "750p-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "g3",
-+      "typename": "750_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "typhoon",
-+      "typename": "750_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750",
-+      "typename": "750_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "arthur",
-+      "typename": "740_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "740",
-+      "typename": "740_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mach5",
-+      "typename": "604r-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "sirocco",
-+      "typename": "604e_v2.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "604e",
-+      "typename": "604e_v2.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "goldeneye",
-+      "typename": "603e7t-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "603r",
-+      "typename": "603e7t-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "vaillant",
-+      "typename": "603e7v-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "stretch",
-+      "typename": "603e_v4.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "603e",
-+      "typename": "603e_v4.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "vanilla",
-+      "typename": "603-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "601v",
-+      "typename": "601_v2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "601",
-+      "typename": "601_v2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560",
-+      "typename": "mpc8560_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555e",
-+      "typename": "mpc8555e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555",
-+      "typename": "mpc8555_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e",
-+      "typename": "mpc8548e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548",
-+      "typename": "mpc8548_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8547e",
-+      "typename": "mpc8547e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545e",
-+      "typename": "mpc8545e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545",
-+      "typename": "mpc8545_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544e",
-+      "typename": "mpc8544e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544",
-+      "typename": "mpc8544_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e",
-+      "typename": "mpc8543e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543",
-+      "typename": "mpc8543_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541e",
-+      "typename": "mpc8541e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541",
-+      "typename": "mpc8541_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540",
-+      "typename": "mpc8540_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533e",
-+      "typename": "mpc8533e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533",
-+      "typename": "mpc8533_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2",
-+      "typename": "e500v2_v22-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v1",
-+      "typename": "e500_v20-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e500",
-+      "typename": "e500v2_v22-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347ea",
-+      "typename": "mpc8347eat-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347e",
-+      "typename": "mpc8347et-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347a",
-+      "typename": "mpc8347at-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347",
-+      "typename": "mpc8347t-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e300",
-+      "typename": "e300c3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e200",
-+      "typename": "e200z6-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8280",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8275",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8272",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8271",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8270",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8266_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8266_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8266",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8265_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8265_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8265",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8264_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8264_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8264",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8260_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8260_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8260",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8255_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8255_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8255",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8250_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8250_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8250",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8248",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8247",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8245",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8241",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "powerquicc-ii",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc82xx",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200b",
-+      "typename": "mpc5200b_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200",
-+      "typename": "mpc5200_v12-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc52xx",
-+      "typename": "mpc5200_v12-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8240",
-+      "typename": "603-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "460ex",
-+      "typename": "460exb-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "440ep",
-+      "typename": "440epb-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp50",
-+      "typename": "x2vp20-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp7",
-+      "typename": "x2vp4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpe",
-+      "typename": "405crc-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405gp",
-+      "typename": "405gpd-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405cr",
-+      "typename": "405crc-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405",
-+      "typename": "405d4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "403",
-+      "typename": "403gc-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8547e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cl_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457a_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2gp",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8377",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405d4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2le",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2hip3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8572",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500mc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7v1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970mp_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405crc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403ga",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8572e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604e_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401a1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power9_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe405h",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2ls",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401b2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347ep",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v3.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403gcx",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v3.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power9_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power7_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7v",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpa",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440epx",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e200z6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8547e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457a_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349ea",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power8nvl_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.8",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe405l",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343ea",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v3.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347et",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7441_v2.10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401c2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7451_v2.10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7441_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405crb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440-xilinx-w-dfpu",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "cobra",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8641d",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.5",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v30",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v3.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405d2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347t",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.3",
-+      "typename": "",
++      "name": "sa1110",
++      "typename": "sa1110-arm-cpu",
 +      "static": false
 +    },
 +    {
 +      "name": "host",
-+      "typename": "",
++      "typename": "host-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "mpc8543e_v10",
-+      "typename": "",
++      "name": "arm1176",
++      "typename": "arm1176-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "mpc8347eap",
-+      "typename": "",
++      "name": "cortex-a53",
++      "typename": "cortex-a53-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "mpc8548e_v11",
-+      "typename": "",
++      "name": "sa1100",
++      "typename": "sa1100-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "mpc8543_v20",
-+      "typename": "",
++      "name": "pxa270-c5",
++      "typename": "pxa270-c5-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "401d2",
-+      "typename": "",
++      "name": "cortex-a9",
++      "typename": "cortex-a9-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8_v2.0",
-+      "typename": "",
++      "name": "cortex-m7",
++      "typename": "cortex-m7-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "740_v3.1",
-+      "typename": "",
++      "name": "cortex-a8",
++      "typename": "cortex-a8-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "e200z5",
-+      "typename": "",
++      "name": "cortex-a7",
++      "typename": "cortex-a7-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "405cra",
-+      "typename": "",
++      "name": "pxa270-c0",
++      "typename": "pxa270-c0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7400_v2.0",
-+      "typename": "",
++      "name": "arm1026",
++      "typename": "arm1026-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "750cxe_v2.3",
-+      "typename": "",
++      "name": "pxa270-b1",
++      "typename": "pxa270-b1-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "745_v2.7",
-+      "typename": "",
++      "name": "cortex-m3",
++      "typename": "cortex-m3-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "mpc8560_v10",
-+      "typename": "",
++      "name": "max",
++      "typename": "max-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "e5500",
-+      "typename": "",
++      "name": "cortex-m4",
++      "typename": "cortex-m4-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "mpc8544_v11",
-+      "typename": "",
++      "name": "pxa270-b0",
++      "typename": "pxa270-b0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7448_v1.0",
-+      "typename": "",
++      "name": "arm946",
++      "typename": "arm946-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "401e2",
-+      "typename": "",
++      "name": "cortex-m0",
++      "typename": "cortex-m0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "740_v2.1",
-+      "typename": "",
++      "name": "cortex-r5",
++      "typename": "cortex-r5-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "745_v2.2",
-+      "typename": "",
++      "name": "pxa270-a1",
++      "typename": "pxa270-a1-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7400_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347ap",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200b_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "601_v2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2legp3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604e_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8610",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2h4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8377e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200_v12",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v3.1b",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.9",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpd",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7t",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fl",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "stb04",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405ez",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e600",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8379",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2legp",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v3.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440-xilinx",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401f2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349a",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpr",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "stb25",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200b_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347eat",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "601_v1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403gc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7441_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "602",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8378e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343a",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "460exb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8568",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457a_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604e_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.8",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405lp",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "stb03",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405ep",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347at",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gl",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e6500",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v3.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440epb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe4gs3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2lels",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2hip4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8567e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7451_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401g2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.8",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power7+_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970mp_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7v2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604r",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v22",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8378",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8567",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.5",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8379e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8641",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.4b",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc603",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v4.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v3.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440epa",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "iop480",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "601_v0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2legp1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cl_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxr",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power8e_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403gb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe405h2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power5+_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8568e",
-+      "typename": "",
++      "name": "pxa270",
++      "typename": "pxa270-arm-cpu",
 +      "static": false
 +    }
 +  ],
-+  "id": "libvirt-40"
++  "id": "libvirt-35"
 +}
 +
 +{
 +  "execute": "query-tpm-models",
-+  "id": "libvirt-41"
++  "id": "libvirt-36"
 +}
 +
 +{
 +  "return": [
 +  ],
-+  "id": "libvirt-41"
++  "id": "libvirt-36"
 +}
 +
 +{
 +  "execute": "query-tpm-types",
-+  "id": "libvirt-42"
++  "id": "libvirt-37"
 +}
 +
 +{
 +  "return": [
-+    "emulator"
 +  ],
-+  "id": "libvirt-42"
++  "id": "libvirt-37"
 +}
 +
 +{
 +  "execute": "query-command-line-options",
-+  "id": "libvirt-43"
++  "id": "libvirt-38"
 +}
 +
 +{
@@ -8416,6 +8190,10 @@ index 0000000000..576e0b69e9
 +    {
 +      "parameters": [
 +        {
++          "name": "audiodev",
++          "type": "string"
++        },
++        {
 +          "name": "non-adaptive",
 +          "type": "boolean"
 +        },
@@ -8424,6 +8202,14 @@ index 0000000000..576e0b69e9
 +          "type": "boolean"
 +        },
 +        {
++          "name": "sasl-authz",
++          "type": "string"
++        },
++        {
++          "name": "tls-authz",
++          "type": "string"
++        },
++        {
 +          "name": "acl",
 +          "type": "boolean"
 +        },
@@ -8492,6 +8278,11 @@ index 0000000000..576e0b69e9
 +    },
 +    {
 +      "parameters": [
++      ],
++      "option": "smbios"
++    },
++    {
++      "parameters": [
 +        {
 +          "name": "dmode",
 +          "type": "number"
@@ -8509,6 +8300,10 @@ index 0000000000..576e0b69e9
 +          "type": "string"
 +        },
 +        {
++          "name": "multidevs",
++          "type": "string"
++        },
++        {
 +          "name": "readonly",
 +          "type": "boolean"
 +        },
@@ -8649,6 +8444,10 @@ index 0000000000..576e0b69e9
 +          "type": "string"
 +        },
 +        {
++          "name": "multidevs",
++          "type": "string"
++        },
++        {
 +          "name": "readonly",
 +          "type": "boolean"
 +        },
@@ -8723,6 +8522,10 @@ index 0000000000..576e0b69e9
 +          "type": "string"
 +        },
 +        {
++          "name": "chardev",
++          "type": "string"
++        },
++        {
 +          "name": "target",
 +          "type": "string"
 +        },
@@ -8856,11 +8659,11 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "reboot-timeout",
-+          "type": "string"
++          "type": "number"
 +        },
 +        {
 +          "name": "splash-time",
-+          "type": "string"
++          "type": "number"
 +        },
 +        {
 +          "name": "splash",
@@ -8896,6 +8699,10 @@ index 0000000000..576e0b69e9
 +          "type": "number"
 +        },
 +        {
++          "name": "dies",
++          "type": "number"
++        },
++        {
 +          "name": "sockets",
 +          "type": "number"
 +        },
@@ -8925,16 +8732,6 @@ index 0000000000..576e0b69e9
 +    },
 +    {
 +      "parameters": [
-+        {
-+          "name": "thread",
-+          "help": "Enable/disable multi-threaded TCG",
-+          "type": "string"
-+        },
-+        {
-+          "name": "accel",
-+          "help": "Select the type of accelerator",
-+          "type": "string"
-+        }
 +      ],
 +      "option": "accel"
 +    },
@@ -9076,10 +8873,6 @@ index 0000000000..576e0b69e9
 +    {
 +      "parameters": [
 +        {
-+          "name": "x-oob",
-+          "type": "boolean"
-+        },
-+        {
 +          "name": "pretty",
 +          "type": "boolean"
 +        },
@@ -9207,6 +9000,10 @@ index 0000000000..576e0b69e9
 +          "type": "boolean"
 +        },
 +        {
++          "name": "tls-authz",
++          "type": "string"
++        },
++        {
 +          "name": "tls-creds",
 +          "type": "string"
 +        },
@@ -9461,7 +9258,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "aio",
-+          "help": "host AIO implementation (threads, native)",
++          "help": "host AIO implementation (threads, native, io_uring)",
 +          "type": "string"
 +        },
 +        {
@@ -9508,12 +9305,12 @@ index 0000000000..576e0b69e9
 +      "option": "drive"
 +    }
 +  ],
-+  "id": "libvirt-43"
++  "id": "libvirt-38"
 +}
 +
 +{
 +  "execute": "query-migrate-capabilities",
-+  "id": "libvirt-44"
++  "id": "libvirt-39"
 +}
 +
 +{
@@ -9568,7 +9365,7 @@ index 0000000000..576e0b69e9
 +    },
 +    {
 +      "state": false,
-+      "capability": "x-multifd"
++      "capability": "multifd"
 +    },
 +    {
 +      "state": false,
@@ -9581,14 +9378,22 @@ index 0000000000..576e0b69e9
 +    {
 +      "state": false,
 +      "capability": "late-block-activate"
++    },
++    {
++      "state": false,
++      "capability": "x-ignore-shared"
++    },
++    {
++      "state": false,
++      "capability": "validate-uuid"
 +    }
 +  ],
-+  "id": "libvirt-44"
++  "id": "libvirt-39"
 +}
 +
 +{
 +  "execute": "query-qmp-schema",
-+  "id": "libvirt-45"
++  "id": "libvirt-40"
 +}
 +
 +{
@@ -9656,347 +9461,13 @@ index 0000000000..576e0b69e9
 +      "arg-type": "6"
 +    },
 +    {
-+      "name": "JOB_STATUS_CHANGE",
++      "name": "GUEST_CRASHLOADED",
 +      "meta-type": "event",
 +      "arg-type": "7"
 +    },
 +    {
-+      "name": "job-pause",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "8"
-+    },
-+    {
-+      "name": "job-resume",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "9"
-+    },
-+    {
-+      "name": "job-cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "10"
-+    },
-+    {
-+      "name": "job-complete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "11"
-+    },
-+    {
-+      "name": "job-dismiss",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "12"
-+    },
-+    {
-+      "name": "job-finalize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "13"
-+    },
-+    {
-+      "name": "query-jobs",
-+      "ret-type": "[14]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "x-block-latency-histogram-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "15"
-+    },
-+    {
-+      "name": "query-block",
-+      "ret-type": "[16]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-blockstats",
-+      "ret-type": "[18]",
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-block-jobs",
-+      "ret-type": "[19]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "block_passwd",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "20"
-+    },
-+    {
-+      "name": "block_resize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "21"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "22"
-+    },
-+    {
-+      "name": "blockdev-snapshot",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "23"
-+    },
-+    {
-+      "name": "change-backing-file",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "24"
-+    },
-+    {
-+      "name": "block-commit",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "25"
-+    },
-+    {
-+      "name": "drive-backup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "26"
-+    },
-+    {
-+      "name": "blockdev-backup",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "27"
-+    },
-+    {
-+      "name": "query-named-block-nodes",
-+      "ret-type": "[28]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "drive-mirror",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "29"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "30"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-enable",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-disable",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-merge",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "32"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256",
-+      "ret-type": "33",
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "blockdev-mirror",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "34"
-+    },
-+    {
-+      "name": "block_set_io_throttle",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "35"
-+    },
-+    {
-+      "name": "block-stream",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "36"
-+    },
-+    {
-+      "name": "block-job-set-speed",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "block-job-cancel",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "38"
-+    },
-+    {
-+      "name": "block-job-pause",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "39"
-+    },
-+    {
-+      "name": "block-job-resume",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "40"
-+    },
-+    {
-+      "name": "block-job-complete",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "41"
-+    },
-+    {
-+      "name": "block-job-dismiss",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "42"
-+    },
-+    {
-+      "name": "block-job-finalize",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "43"
-+    },
-+    {
-+      "name": "blockdev-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "44"
-+    },
-+    {
-+      "name": "blockdev-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "blockdev-create",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "46"
-+    },
-+    {
-+      "name": "blockdev-open-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "47"
-+    },
-+    {
-+      "name": "blockdev-close-tray",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "48"
-+    },
-+    {
-+      "name": "blockdev-remove-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "49"
-+    },
-+    {
-+      "name": "blockdev-insert-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "50"
-+    },
-+    {
-+      "name": "blockdev-change-medium",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "51"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED",
-+      "meta-type": "event",
-+      "arg-type": "52"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "53"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "54"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED",
-+      "meta-type": "event",
-+      "arg-type": "55"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "56"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY",
-+      "meta-type": "event",
-+      "arg-type": "57"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING",
-+      "meta-type": "event",
-+      "arg-type": "58"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD",
-+      "meta-type": "event",
-+      "arg-type": "59"
-+    },
-+    {
-+      "name": "block-set-write-threshold",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "60"
-+    },
-+    {
-+      "name": "x-blockdev-change",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "61"
-+    },
-+    {
-+      "name": "x-blockdev-set-iothread",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "62"
-+    },
-+    {
 +      "name": "query-pr-managers",
-+      "ret-type": "[63]",
++      "ret-type": "[8]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10004,43 +9475,37 @@ index 0000000000..576e0b69e9
 +      "name": "blockdev-snapshot-internal-sync",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "64"
++      "arg-type": "9"
 +    },
 +    {
 +      "name": "blockdev-snapshot-delete-internal-sync",
-+      "ret-type": "66",
++      "ret-type": "11",
 +      "meta-type": "command",
-+      "arg-type": "65"
++      "arg-type": "10"
 +    },
 +    {
 +      "name": "eject",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "67"
++      "arg-type": "12"
 +    },
 +    {
 +      "name": "nbd-server-start",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "68"
++      "arg-type": "13"
 +    },
 +    {
 +      "name": "nbd-server-add",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "69"
++      "arg-type": "14"
 +    },
 +    {
 +      "name": "nbd-server-remove",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "70"
-+    },
-+    {
-+      "name": "x-nbd-server-add-bitmap",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "71"
++      "arg-type": "15"
 +    },
 +    {
 +      "name": "nbd-server-stop",
@@ -10051,144 +9516,534 @@ index 0000000000..576e0b69e9
 +    {
 +      "name": "DEVICE_TRAY_MOVED",
 +      "meta-type": "event",
-+      "arg-type": "72"
++      "arg-type": "16"
 +    },
 +    {
 +      "name": "PR_MANAGER_STATUS_CHANGED",
 +      "meta-type": "event",
-+      "arg-type": "73"
++      "arg-type": "17"
 +    },
 +    {
 +      "name": "QUORUM_FAILURE",
 +      "meta-type": "event",
-+      "arg-type": "74"
++      "arg-type": "18"
 +    },
 +    {
 +      "name": "QUORUM_REPORT_BAD",
 +      "meta-type": "event",
++      "arg-type": "19"
++    },
++    {
++      "name": "block-latency-histogram-set",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "20"
++    },
++    {
++      "name": "query-block",
++      "ret-type": "[21]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-blockstats",
++      "ret-type": "[23]",
++      "meta-type": "command",
++      "arg-type": "22"
++    },
++    {
++      "name": "query-block-jobs",
++      "ret-type": "[24]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "block_passwd",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "25"
++    },
++    {
++      "name": "block_resize",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "26"
++    },
++    {
++      "name": "blockdev-snapshot-sync",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "27"
++    },
++    {
++      "name": "blockdev-snapshot",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "28"
++    },
++    {
++      "name": "change-backing-file",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "29"
++    },
++    {
++      "name": "block-commit",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "30"
++    },
++    {
++      "name": "drive-backup",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "31"
++    },
++    {
++      "name": "blockdev-backup",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "32"
++    },
++    {
++      "name": "query-named-block-nodes",
++      "ret-type": "[33]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "x-debug-query-block-graph",
++      "ret-type": "34",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "drive-mirror",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "35"
++    },
++    {
++      "name": "block-dirty-bitmap-add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "36"
++    },
++    {
++      "name": "block-dirty-bitmap-remove",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "37"
++    },
++    {
++      "name": "block-dirty-bitmap-clear",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "37"
++    },
++    {
++      "name": "block-dirty-bitmap-enable",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "37"
++    },
++    {
++      "name": "block-dirty-bitmap-disable",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "37"
++    },
++    {
++      "name": "block-dirty-bitmap-merge",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "38"
++    },
++    {
++      "name": "x-debug-block-dirty-bitmap-sha256",
++      "ret-type": "39",
++      "meta-type": "command",
++      "arg-type": "37"
++    },
++    {
++      "name": "blockdev-mirror",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "40"
++    },
++    {
++      "name": "block_set_io_throttle",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "41"
++    },
++    {
++      "name": "block-stream",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "42"
++    },
++    {
++      "name": "block-job-set-speed",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "43"
++    },
++    {
++      "name": "block-job-cancel",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "44"
++    },
++    {
++      "name": "block-job-pause",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "45"
++    },
++    {
++      "name": "block-job-resume",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "46"
++    },
++    {
++      "name": "block-job-complete",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "47"
++    },
++    {
++      "name": "block-job-dismiss",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "48"
++    },
++    {
++      "name": "block-job-finalize",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "49"
++    },
++    {
++      "name": "blockdev-add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "50"
++    },
++    {
++      "name": "x-blockdev-reopen",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "50"
++    },
++    {
++      "name": "blockdev-del",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "51"
++    },
++    {
++      "name": "blockdev-create",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "52"
++    },
++    {
++      "name": "blockdev-open-tray",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "53"
++    },
++    {
++      "name": "blockdev-close-tray",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "54"
++    },
++    {
++      "name": "blockdev-remove-medium",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "55"
++    },
++    {
++      "name": "blockdev-insert-medium",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "56"
++    },
++    {
++      "name": "blockdev-change-medium",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "57"
++    },
++    {
++      "name": "BLOCK_IMAGE_CORRUPTED",
++      "meta-type": "event",
++      "arg-type": "58"
++    },
++    {
++      "name": "BLOCK_IO_ERROR",
++      "meta-type": "event",
++      "arg-type": "59"
++    },
++    {
++      "name": "BLOCK_JOB_COMPLETED",
++      "meta-type": "event",
++      "arg-type": "60"
++    },
++    {
++      "name": "BLOCK_JOB_CANCELLED",
++      "meta-type": "event",
++      "arg-type": "61"
++    },
++    {
++      "name": "BLOCK_JOB_ERROR",
++      "meta-type": "event",
++      "arg-type": "62"
++    },
++    {
++      "name": "BLOCK_JOB_READY",
++      "meta-type": "event",
++      "arg-type": "63"
++    },
++    {
++      "name": "BLOCK_JOB_PENDING",
++      "meta-type": "event",
++      "arg-type": "64"
++    },
++    {
++      "name": "BLOCK_WRITE_THRESHOLD",
++      "meta-type": "event",
++      "arg-type": "65"
++    },
++    {
++      "name": "block-set-write-threshold",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "66"
++    },
++    {
++      "name": "x-blockdev-change",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "67"
++    },
++    {
++      "name": "x-blockdev-set-iothread",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "68"
++    },
++    {
++      "name": "JOB_STATUS_CHANGE",
++      "meta-type": "event",
++      "arg-type": "69"
++    },
++    {
++      "name": "job-pause",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "70"
++    },
++    {
++      "name": "job-resume",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "71"
++    },
++    {
++      "name": "job-cancel",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "72"
++    },
++    {
++      "name": "job-complete",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "73"
++    },
++    {
++      "name": "job-dismiss",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "74"
++    },
++    {
++      "name": "job-finalize",
++      "ret-type": "0",
++      "meta-type": "command",
 +      "arg-type": "75"
 +    },
 +    {
-+      "name": "query-chardev",
++      "name": "query-jobs",
 +      "ret-type": "[76]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "query-chardev-backends",
++      "name": "query-chardev",
 +      "ret-type": "[77]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
++      "name": "query-chardev-backends",
++      "ret-type": "[78]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
 +      "name": "ringbuf-write",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "78"
++      "arg-type": "79"
 +    },
 +    {
 +      "name": "ringbuf-read",
 +      "ret-type": "str",
 +      "meta-type": "command",
-+      "arg-type": "79"
-+    },
-+    {
-+      "name": "chardev-add",
-+      "ret-type": "81",
-+      "meta-type": "command",
 +      "arg-type": "80"
 +    },
 +    {
-+      "name": "chardev-change",
-+      "ret-type": "81",
++      "name": "chardev-add",
++      "ret-type": "82",
 +      "meta-type": "command",
-+      "arg-type": "82"
++      "arg-type": "81"
++    },
++    {
++      "name": "chardev-change",
++      "ret-type": "82",
++      "meta-type": "command",
++      "arg-type": "83"
 +    },
 +    {
 +      "name": "chardev-remove",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "83"
++      "arg-type": "84"
 +    },
 +    {
 +      "name": "chardev-send-break",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "84"
++      "arg-type": "85"
 +    },
 +    {
 +      "name": "VSERPORT_CHANGE",
 +      "meta-type": "event",
-+      "arg-type": "85"
-+    },
-+    {
-+      "name": "set_link",
-+      "ret-type": "0",
-+      "meta-type": "command",
 +      "arg-type": "86"
 +    },
 +    {
-+      "name": "netdev_add",
++      "name": "dump-guest-memory",
 +      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "87"
 +    },
 +    {
-+      "name": "netdev_del",
-+      "ret-type": "0",
++      "name": "query-dump",
++      "ret-type": "88",
 +      "meta-type": "command",
-+      "arg-type": "88"
++      "arg-type": "0"
 +    },
 +    {
-+      "name": "query-rx-filter",
-+      "ret-type": "[90]",
-+      "meta-type": "command",
++      "name": "DUMP_COMPLETED",
++      "meta-type": "event",
 +      "arg-type": "89"
 +    },
 +    {
-+      "name": "NIC_RX_FILTER_CHANGED",
-+      "meta-type": "event",
++      "name": "query-dump-guest-memory-capability",
++      "ret-type": "90",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "set_link",
++      "ret-type": "0",
++      "meta-type": "command",
 +      "arg-type": "91"
 +    },
 +    {
-+      "name": "query-rocker",
-+      "ret-type": "93",
++      "name": "netdev_add",
++      "ret-type": "0",
 +      "meta-type": "command",
 +      "arg-type": "92"
 +    },
 +    {
-+      "name": "query-rocker-ports",
++      "name": "netdev_del",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "93"
++    },
++    {
++      "name": "query-rx-filter",
 +      "ret-type": "[95]",
 +      "meta-type": "command",
 +      "arg-type": "94"
 +    },
 +    {
-+      "name": "query-rocker-of-dpa-flows",
-+      "ret-type": "[97]",
-+      "meta-type": "command",
++      "name": "NIC_RX_FILTER_CHANGED",
++      "meta-type": "event",
 +      "arg-type": "96"
 +    },
 +    {
-+      "name": "query-rocker-of-dpa-groups",
-+      "ret-type": "[99]",
++      "name": "announce-self",
++      "ret-type": "0",
 +      "meta-type": "command",
++      "arg-type": "97"
++    },
++    {
++      "name": "FAILOVER_NEGOTIATED",
++      "meta-type": "event",
 +      "arg-type": "98"
 +    },
 +    {
++      "name": "RDMA_GID_STATUS_CHANGED",
++      "meta-type": "event",
++      "arg-type": "99"
++    },
++    {
++      "name": "query-rocker",
++      "ret-type": "101",
++      "meta-type": "command",
++      "arg-type": "100"
++    },
++    {
++      "name": "query-rocker-ports",
++      "ret-type": "[103]",
++      "meta-type": "command",
++      "arg-type": "102"
++    },
++    {
++      "name": "query-rocker-of-dpa-flows",
++      "ret-type": "[105]",
++      "meta-type": "command",
++      "arg-type": "104"
++    },
++    {
++      "name": "query-rocker-of-dpa-groups",
++      "ret-type": "[107]",
++      "meta-type": "command",
++      "arg-type": "106"
++    },
++    {
 +      "name": "query-tpm-models",
-+      "ret-type": "[100]",
++      "ret-type": "[108]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-tpm-types",
-+      "ret-type": "[101]",
++      "ret-type": "[109]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-tpm",
-+      "ret-type": "[102]",
++      "ret-type": "[110]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10196,29 +10051,29 @@ index 0000000000..576e0b69e9
 +      "name": "set_password",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "103"
++      "arg-type": "111"
 +    },
 +    {
 +      "name": "expire_password",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "104"
++      "arg-type": "112"
 +    },
 +    {
 +      "name": "screendump",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "105"
++      "arg-type": "113"
 +    },
 +    {
 +      "name": "query-vnc",
-+      "ret-type": "110",
++      "ret-type": "118",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-vnc-servers",
-+      "ret-type": "[111]",
++      "ret-type": "[119]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10226,26 +10081,26 @@ index 0000000000..576e0b69e9
 +      "name": "change-vnc-password",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "112"
++      "arg-type": "120"
 +    },
 +    {
 +      "name": "VNC_CONNECTED",
 +      "meta-type": "event",
-+      "arg-type": "113"
++      "arg-type": "121"
 +    },
 +    {
 +      "name": "VNC_INITIALIZED",
 +      "meta-type": "event",
-+      "arg-type": "114"
++      "arg-type": "122"
 +    },
 +    {
 +      "name": "VNC_DISCONNECTED",
 +      "meta-type": "event",
-+      "arg-type": "115"
++      "arg-type": "123"
 +    },
 +    {
 +      "name": "query-mice",
-+      "ret-type": "[116]",
++      "ret-type": "[124]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10253,17 +10108,23 @@ index 0000000000..576e0b69e9
 +      "name": "send-key",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "117"
++      "arg-type": "125"
 +    },
 +    {
 +      "name": "input-send-event",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "118"
++      "arg-type": "126"
++    },
++    {
++      "name": "query-display-options",
++      "ret-type": "127",
++      "meta-type": "command",
++      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-migrate",
-+      "ret-type": "119",
++      "ret-type": "128",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10271,11 +10132,11 @@ index 0000000000..576e0b69e9
 +      "name": "migrate-set-capabilities",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "120"
++      "arg-type": "129"
 +    },
 +    {
 +      "name": "query-migrate-capabilities",
-+      "ret-type": "[121]",
++      "ret-type": "[130]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10283,11 +10144,11 @@ index 0000000000..576e0b69e9
 +      "name": "migrate-set-parameters",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "122"
++      "arg-type": "131"
 +    },
 +    {
 +      "name": "query-migrate-parameters",
-+      "ret-type": "123",
++      "ret-type": "132",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10295,7 +10156,7 @@ index 0000000000..576e0b69e9
 +      "name": "client_migrate_info",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "124"
++      "arg-type": "133"
 +    },
 +    {
 +      "name": "migrate-start-postcopy",
@@ -10306,17 +10167,17 @@ index 0000000000..576e0b69e9
 +    {
 +      "name": "MIGRATION",
 +      "meta-type": "event",
-+      "arg-type": "125"
++      "arg-type": "134"
 +    },
 +    {
 +      "name": "MIGRATION_PASS",
 +      "meta-type": "event",
-+      "arg-type": "126"
++      "arg-type": "135"
 +    },
 +    {
 +      "name": "COLO_EXIT",
 +      "meta-type": "event",
-+      "arg-type": "127"
++      "arg-type": "136"
 +    },
 +    {
 +      "name": "x-colo-lost-heartbeat",
@@ -10334,25 +10195,25 @@ index 0000000000..576e0b69e9
 +      "name": "migrate-continue",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "128"
++      "arg-type": "137"
 +    },
 +    {
 +      "name": "migrate_set_downtime",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "129"
++      "arg-type": "138"
 +    },
 +    {
 +      "name": "migrate_set_speed",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "130"
++      "arg-type": "139"
 +    },
 +    {
 +      "name": "migrate-set-cache-size",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "131"
++      "arg-type": "140"
 +    },
 +    {
 +      "name": "query-migrate-cache-size",
@@ -10364,29 +10225,29 @@ index 0000000000..576e0b69e9
 +      "name": "migrate",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "132"
++      "arg-type": "141"
 +    },
 +    {
 +      "name": "migrate-incoming",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "133"
++      "arg-type": "142"
 +    },
 +    {
 +      "name": "xen-save-devices-state",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "134"
++      "arg-type": "143"
 +    },
 +    {
 +      "name": "xen-set-replication",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "135"
++      "arg-type": "144"
 +    },
 +    {
 +      "name": "query-xen-replication-status",
-+      "ret-type": "136",
++      "ret-type": "145",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10398,7 +10259,7 @@ index 0000000000..576e0b69e9
 +    },
 +    {
 +      "name": "query-colo-status",
-+      "ret-type": "137",
++      "ret-type": "146",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10407,7 +10268,7 @@ index 0000000000..576e0b69e9
 +      "ret-type": "0",
 +      "allow-oob": true,
 +      "meta-type": "command",
-+      "arg-type": "138"
++      "arg-type": "147"
 +    },
 +    {
 +      "name": "migrate-pause",
@@ -10417,26 +10278,162 @@ index 0000000000..576e0b69e9
 +      "arg-type": "0"
 +    },
 +    {
++      "name": "UNPLUG_PRIMARY",
++      "meta-type": "event",
++      "arg-type": "148"
++    },
++    {
 +      "name": "transaction",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "139"
++      "arg-type": "149"
 +    },
 +    {
 +      "name": "trace-event-get-state",
-+      "ret-type": "[141]",
++      "ret-type": "[151]",
 +      "meta-type": "command",
-+      "arg-type": "140"
++      "arg-type": "150"
 +    },
 +    {
 +      "name": "trace-event-set-state",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "142"
++      "arg-type": "152"
 +    },
 +    {
 +      "name": "query-qmp-schema",
-+      "ret-type": "[143]",
++      "ret-type": "[153]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "qom-list",
++      "ret-type": "[155]",
++      "meta-type": "command",
++      "arg-type": "154"
++    },
++    {
++      "name": "qom-get",
++      "ret-type": "any",
++      "meta-type": "command",
++      "arg-type": "156"
++    },
++    {
++      "name": "qom-set",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "157"
++    },
++    {
++      "name": "qom-list-types",
++      "ret-type": "[159]",
++      "meta-type": "command",
++      "arg-type": "158"
++    },
++    {
++      "name": "qom-list-properties",
++      "ret-type": "[155]",
++      "meta-type": "command",
++      "arg-type": "160"
++    },
++    {
++      "name": "object-add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "161"
++    },
++    {
++      "name": "object-del",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "162"
++    },
++    {
++      "name": "device-list-properties",
++      "ret-type": "[155]",
++      "meta-type": "command",
++      "arg-type": "163"
++    },
++    {
++      "name": "device_add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "164"
++    },
++    {
++      "name": "device_del",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "165"
++    },
++    {
++      "name": "DEVICE_DELETED",
++      "meta-type": "event",
++      "arg-type": "166"
++    },
++    {
++      "name": "query-cpus",
++      "ret-type": "[167]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-cpus-fast",
++      "ret-type": "[168]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "cpu-add",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "169"
++    },
++    {
++      "name": "query-machines",
++      "ret-type": "[170]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-current-machine",
++      "ret-type": "171",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-target",
++      "ret-type": "172",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-memdev",
++      "ret-type": "[173]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "query-hotpluggable-cpus",
++      "ret-type": "[174]",
++      "meta-type": "command",
++      "arg-type": "0"
++    },
++    {
++      "name": "set-numa-node",
++      "ret-type": "0",
++      "meta-type": "command",
++      "arg-type": "175"
++    },
++    {
++      "name": "query-cpu-model-expansion",
++      "ret-type": "181",
++      "meta-type": "command",
++      "arg-type": "180"
++    },
++    {
++      "name": "query-cpu-definitions",
++      "ret-type": "[182]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10444,17 +10441,17 @@ index 0000000000..576e0b69e9
 +      "name": "qmp_capabilities",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "144"
++      "arg-type": "183"
 +    },
 +    {
 +      "name": "query-version",
-+      "ret-type": "145",
++      "ret-type": "184",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-commands",
-+      "ret-type": "[146]",
++      "ret-type": "[185]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10462,64 +10459,52 @@ index 0000000000..576e0b69e9
 +      "name": "add_client",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "147"
++      "arg-type": "186"
 +    },
 +    {
 +      "name": "query-name",
-+      "ret-type": "148",
++      "ret-type": "187",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-kvm",
-+      "ret-type": "149",
++      "ret-type": "188",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-uuid",
-+      "ret-type": "150",
++      "ret-type": "189",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-events",
-+      "ret-type": "[151]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpus",
-+      "ret-type": "[152]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpus-fast",
-+      "ret-type": "[153]",
++      "ret-type": "[190]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-iothreads",
-+      "ret-type": "[154]",
++      "ret-type": "[191]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-balloon",
-+      "ret-type": "155",
++      "ret-type": "192",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "BALLOON_CHANGE",
 +      "meta-type": "event",
-+      "arg-type": "156"
++      "arg-type": "193"
 +    },
 +    {
 +      "name": "query-pci",
-+      "ret-type": "[157]",
++      "ret-type": "[194]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
@@ -10548,22 +10533,16 @@ index 0000000000..576e0b69e9
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "cpu-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "158"
-+    },
-+    {
 +      "name": "memsave",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "159"
++      "arg-type": "195"
 +    },
 +    {
 +      "name": "pmemsave",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "160"
++      "arg-type": "196"
 +    },
 +    {
 +      "name": "cont",
@@ -10593,291 +10572,117 @@ index 0000000000..576e0b69e9
 +      "name": "balloon",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "161"
++      "arg-type": "197"
 +    },
 +    {
 +      "name": "human-monitor-command",
 +      "ret-type": "str",
 +      "meta-type": "command",
-+      "arg-type": "162"
-+    },
-+    {
-+      "name": "qom-list",
-+      "ret-type": "[164]",
-+      "meta-type": "command",
-+      "arg-type": "163"
-+    },
-+    {
-+      "name": "qom-get",
-+      "ret-type": "any",
-+      "meta-type": "command",
-+      "arg-type": "165"
-+    },
-+    {
-+      "name": "qom-set",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "166"
++      "arg-type": "198",
++      "features": [
++        "savevm-monitor-nodes"
++      ]
 +    },
 +    {
 +      "name": "change",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "167"
-+    },
-+    {
-+      "name": "qom-list-types",
-+      "ret-type": "[169]",
-+      "meta-type": "command",
-+      "arg-type": "168"
-+    },
-+    {
-+      "name": "device-list-properties",
-+      "ret-type": "[164]",
-+      "meta-type": "command",
-+      "arg-type": "170"
-+    },
-+    {
-+      "name": "qom-list-properties",
-+      "ret-type": "[164]",
-+      "meta-type": "command",
-+      "arg-type": "171"
++      "arg-type": "199"
 +    },
 +    {
 +      "name": "xen-set-global-dirty-log",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "172"
-+    },
-+    {
-+      "name": "device_add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "173"
-+    },
-+    {
-+      "name": "device_del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "174"
-+    },
-+    {
-+      "name": "DEVICE_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "175"
-+    },
-+    {
-+      "name": "dump-guest-memory",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "176"
-+    },
-+    {
-+      "name": "query-dump",
-+      "ret-type": "177",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "178"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability",
-+      "ret-type": "179",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "dump-skeys",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "180"
-+    },
-+    {
-+      "name": "object-add",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "181"
-+    },
-+    {
-+      "name": "object-del",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "182"
++      "arg-type": "200"
 +    },
 +    {
 +      "name": "getfd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "183"
++      "arg-type": "201"
 +    },
 +    {
 +      "name": "closefd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "184"
-+    },
-+    {
-+      "name": "query-machines",
-+      "ret-type": "[185]",
-+      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "202"
 +    },
 +    {
 +      "name": "query-memory-size-summary",
-+      "ret-type": "186",
++      "ret-type": "203",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "query-cpu-definitions",
-+      "ret-type": "[187]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion",
-+      "ret-type": "189",
-+      "meta-type": "command",
-+      "arg-type": "188"
-+    },
-+    {
-+      "name": "query-cpu-model-comparison",
-+      "ret-type": "191",
-+      "meta-type": "command",
-+      "arg-type": "190"
-+    },
-+    {
-+      "name": "query-cpu-model-baseline",
-+      "ret-type": "193",
-+      "meta-type": "command",
-+      "arg-type": "192"
-+    },
-+    {
 +      "name": "add-fd",
-+      "ret-type": "195",
++      "ret-type": "205",
 +      "meta-type": "command",
-+      "arg-type": "194"
++      "arg-type": "204"
 +    },
 +    {
 +      "name": "remove-fd",
 +      "ret-type": "0",
 +      "meta-type": "command",
-+      "arg-type": "196"
++      "arg-type": "206"
 +    },
 +    {
 +      "name": "query-fdsets",
-+      "ret-type": "[197]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-target",
-+      "ret-type": "198",
++      "ret-type": "[207]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "query-command-line-options",
-+      "ret-type": "[200]",
++      "ret-type": "[209]",
 +      "meta-type": "command",
-+      "arg-type": "199"
-+    },
-+    {
-+      "name": "query-memdev",
-+      "ret-type": "[201]",
-+      "meta-type": "command",
-+      "arg-type": "0"
++      "arg-type": "208"
 +    },
 +    {
 +      "name": "query-memory-devices",
-+      "ret-type": "[202]",
++      "ret-type": "[210]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "MEM_UNPLUG_ERROR",
 +      "meta-type": "event",
-+      "arg-type": "203"
++      "arg-type": "211"
 +    },
 +    {
 +      "name": "query-acpi-ospm-status",
-+      "ret-type": "[204]",
++      "ret-type": "[212]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "ACPI_DEVICE_OST",
 +      "meta-type": "event",
-+      "arg-type": "205"
++      "arg-type": "213"
 +    },
 +    {
-+      "name": "rtc-reset-reinjection",
++      "name": "xen-load-devices-state",
 +      "ret-type": "0",
 +      "meta-type": "command",
++      "arg-type": "214"
++    },
++    {
++      "name": "query-vm-generation-id",
++      "ret-type": "215",
++      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
 +      "name": "RTC_CHANGE",
 +      "meta-type": "event",
-+      "arg-type": "206"
-+    },
-+    {
-+      "name": "xen-load-devices-state",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "207"
++      "arg-type": "216"
 +    },
 +    {
 +      "name": "query-gic-capabilities",
-+      "ret-type": "[208]",
++      "ret-type": "[221]",
 +      "meta-type": "command",
 +      "arg-type": "0"
 +    },
 +    {
-+      "name": "query-hotpluggable-cpus",
-+      "ret-type": "[209]",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vm-generation-id",
-+      "ret-type": "210",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev",
-+      "ret-type": "211",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev-launch-measure",
-+      "ret-type": "212",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev-capabilities",
-+      "ret-type": "213",
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "COMMAND_DROPPED",
-+      "meta-type": "event",
-+      "arg-type": "214"
-+    },
-+    {
-+      "name": "set-numa-node",
-+      "ret-type": "0",
-+      "meta-type": "command",
-+      "arg-type": "215"
-+    },
-+    {
 +      "name": "0",
 +      "members": [
 +      ],
@@ -10896,7 +10701,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "status",
-+          "type": "216"
++          "type": "222"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10907,6 +10712,10 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "guest",
 +          "type": "bool"
++        },
++        {
++          "name": "reason",
++          "type": "223"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10917,6 +10726,10 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "guest",
 +          "type": "bool"
++        },
++        {
++          "name": "reason",
++          "type": "223"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10926,7 +10739,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "action",
-+          "type": "217"
++          "type": "224"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10936,7 +10749,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "action",
-+          "type": "217"
++          "type": "224"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10946,12 +10759,12 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "action",
-+          "type": "218"
++          "type": "225"
 +        },
 +        {
 +          "name": "info",
 +          "default": null,
-+          "type": "219"
++          "type": "226"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10960,22 +10773,32 @@ index 0000000000..576e0b69e9
 +      "name": "7",
 +      "members": [
 +        {
-+          "name": "id",
-+          "type": "str"
++          "name": "action",
++          "type": "225"
 +        },
 +        {
-+          "name": "status",
-+          "type": "220"
++          "name": "info",
++          "default": null,
++          "type": "226"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
++      "name": "[8]",
++      "element-type": "8",
++      "meta-type": "array"
++    },
++    {
 +      "name": "8",
 +      "members": [
 +        {
 +          "name": "id",
 +          "type": "str"
++        },
++        {
++          "name": "connected",
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -10984,7 +10807,11 @@ index 0000000000..576e0b69e9
 +      "name": "9",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "name",
 +          "type": "str"
 +        }
 +      ],
@@ -10994,7 +10821,17 @@ index 0000000000..576e0b69e9
 +      "name": "10",
 +      "members": [
 +        {
++          "name": "device",
++          "type": "str"
++        },
++        {
 +          "name": "id",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "name",
++          "default": null,
 +          "type": "str"
 +        }
 +      ],
@@ -11006,6 +10843,30 @@ index 0000000000..576e0b69e9
 +        {
 +          "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"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11014,8 +10875,19 @@ index 0000000000..576e0b69e9
 +      "name": "12",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "device",
++          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "id",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "force",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -11024,42 +10896,41 @@ index 0000000000..576e0b69e9
 +      "name": "13",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "addr",
++          "type": "227"
++        },
++        {
++          "name": "tls-creds",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "tls-authz",
++          "default": null,
 +          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[14]",
-+      "element-type": "14",
-+      "meta-type": "array"
-+    },
-+    {
 +      "name": "14",
 +      "members": [
 +        {
-+          "name": "id",
++          "name": "device",
 +          "type": "str"
 +        },
 +        {
-+          "name": "type",
-+          "type": "221"
++          "name": "name",
++          "default": null,
++          "type": "str"
 +        },
 +        {
-+          "name": "status",
-+          "type": "220"
++          "name": "writable",
++          "default": null,
++          "type": "bool"
 +        },
 +        {
-+          "name": "current-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "error",
++          "name": "bitmap",
 +          "default": null,
 +          "type": "str"
 +        }
@@ -11070,10 +10941,102 @@ index 0000000000..576e0b69e9
 +      "name": "15",
 +      "members": [
 +        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "mode",
++          "default": null,
++          "type": "228"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "16",
++      "members": [
++        {
 +          "name": "device",
 +          "type": "str"
 +        },
 +        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "tray-open",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "17",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "connected",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "18",
++      "members": [
++        {
++          "name": "reference",
++          "type": "str"
++        },
++        {
++          "name": "sector-num",
++          "type": "int"
++        },
++        {
++          "name": "sectors-count",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "19",
++      "members": [
++        {
++          "name": "type",
++          "type": "229"
++        },
++        {
++          "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": "20",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        },
++        {
 +          "name": "boundaries",
 +          "default": null,
 +          "type": "[int]"
@@ -11097,12 +11060,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[16]",
-+      "element-type": "16",
++      "name": "[21]",
++      "element-type": "21",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "16",
++      "name": "21",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11128,7 +11091,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "inserted",
 +          "default": null,
-+          "type": "28"
++          "type": "33"
 +        },
 +        {
 +          "name": "tray_open",
@@ -11138,18 +11101,18 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "io-status",
 +          "default": null,
-+          "type": "222"
++          "type": "230"
 +        },
 +        {
 +          "name": "dirty-bitmaps",
 +          "default": null,
-+          "type": "[223]"
++          "type": "[231]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "17",
++      "name": "22",
 +      "members": [
 +        {
 +          "name": "query-nodes",
@@ -11160,12 +11123,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[18]",
-+      "element-type": "18",
++      "name": "[23]",
++      "element-type": "23",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "18",
++      "name": "23",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11184,28 +11147,33 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "stats",
-+          "type": "224"
++          "type": "232"
++        },
++        {
++          "name": "driver-specific",
++          "default": null,
++          "type": "233"
 +        },
 +        {
 +          "name": "parent",
 +          "default": null,
-+          "type": "18"
++          "type": "23"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "18"
++          "type": "23"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[19]",
-+      "element-type": "19",
++      "name": "[24]",
++      "element-type": "24",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "19",
++      "name": "24",
 +      "members": [
 +        {
 +          "name": "type",
@@ -11237,7 +11205,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "io-status",
-+          "type": "222"
++          "type": "230"
 +        },
 +        {
 +          "name": "ready",
@@ -11245,7 +11213,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "status",
-+          "type": "220"
++          "type": "234"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -11264,7 +11232,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "20",
++      "name": "25",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11284,7 +11252,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "21",
++      "name": "26",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11304,7 +11272,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "22",
++      "name": "27",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11333,13 +11301,13 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "mode",
 +          "default": null,
-+          "type": "225"
++          "type": "235"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "23",
++      "name": "28",
 +      "members": [
 +        {
 +          "name": "node",
@@ -11353,7 +11321,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "24",
++      "name": "29",
 +      "members": [
 +        {
 +          "name": "device",
@@ -11371,7 +11339,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "25",
++      "name": "30",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -11431,7 +11399,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "26",
++      "name": "31",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -11443,6 +11411,55 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
++          "name": "sync",
++          "type": "236"
++        },
++        {
++          "name": "speed",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "bitmap",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "bitmap-mode",
++          "default": null,
++          "type": "237"
++        },
++        {
++          "name": "compress",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "on-source-error",
++          "default": null,
++          "type": "238"
++        },
++        {
++          "name": "on-target-error",
++          "default": null,
++          "type": "238"
++        },
++        {
++          "name": "auto-finalize",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "auto-dismiss",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "filter-node-name",
++          "default": null,
++          "type": "str"
++        },
++        {
 +          "name": "target",
 +          "type": "str"
 +        },
@@ -11452,54 +11469,15 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
-+          "name": "sync",
-+          "type": "226"
-+        },
-+        {
 +          "name": "mode",
 +          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "227"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "227"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
++          "type": "235"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "27",
++      "name": "32",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -11511,12 +11489,8 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
 +          "name": "sync",
-+          "type": "226"
++          "type": "236"
 +        },
 +        {
 +          "name": "speed",
@@ -11529,6 +11503,11 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
++          "name": "bitmap-mode",
++          "default": null,
++          "type": "237"
++        },
++        {
 +          "name": "compress",
 +          "default": null,
 +          "type": "bool"
@@ -11536,12 +11515,12 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "on-source-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "on-target-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -11552,17 +11531,26 @@ index 0000000000..576e0b69e9
 +          "name": "auto-dismiss",
 +          "default": null,
 +          "type": "bool"
++        },
++        {
++          "name": "filter-node-name",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "target",
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[28]",
-+      "element-type": "28",
++      "name": "[33]",
++      "element-type": "33",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "28",
++      "name": "33",
 +      "members": [
 +        {
 +          "name": "file",
@@ -11600,7 +11588,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "detect_zeroes",
-+          "type": "228"
++          "type": "239"
 +        },
 +        {
 +          "name": "bps",
@@ -11628,7 +11616,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "image",
-+          "type": "229"
++          "type": "240"
 +        },
 +        {
 +          "name": "bps_max",
@@ -11702,17 +11690,36 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "cache",
-+          "type": "230"
++          "type": "241"
 +        },
 +        {
 +          "name": "write_threshold",
 +          "type": "int"
++        },
++        {
++          "name": "dirty-bitmaps",
++          "default": null,
++          "type": "[231]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "29",
++      "name": "34",
++      "members": [
++        {
++          "name": "nodes",
++          "type": "[242]"
++        },
++        {
++          "name": "edges",
++          "type": "[243]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "35",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -11744,12 +11751,12 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "sync",
-+          "type": "226"
++          "type": "236"
 +        },
 +        {
 +          "name": "mode",
 +          "default": null,
-+          "type": "225"
++          "type": "235"
 +        },
 +        {
 +          "name": "speed",
@@ -11769,12 +11776,12 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "on-source-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "on-target-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "unmap",
@@ -11784,7 +11791,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "copy-mode",
 +          "default": null,
-+          "type": "231"
++          "type": "244"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -11800,7 +11807,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "30",
++      "name": "36",
 +      "members": [
 +        {
 +          "name": "node",
@@ -11821,12 +11828,7 @@ index 0000000000..576e0b69e9
 +          "type": "bool"
 +        },
 +        {
-+          "name": "autoload",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-disabled",
++          "name": "disabled",
 +          "default": null,
 +          "type": "bool"
 +        }
@@ -11834,7 +11836,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "31",
++      "name": "37",
 +      "members": [
 +        {
 +          "name": "node",
@@ -11848,25 +11850,25 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "32",
++      "name": "38",
 +      "members": [
 +        {
 +          "name": "node",
 +          "type": "str"
 +        },
 +        {
-+          "name": "dst_name",
++          "name": "target",
 +          "type": "str"
 +        },
 +        {
-+          "name": "src_name",
-+          "type": "str"
++          "name": "bitmaps",
++          "type": "[245]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "33",
++      "name": "39",
 +      "members": [
 +        {
 +          "name": "sha256",
@@ -11876,7 +11878,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "34",
++      "name": "40",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -11898,7 +11900,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "sync",
-+          "type": "226"
++          "type": "236"
 +        },
 +        {
 +          "name": "speed",
@@ -11918,12 +11920,12 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "on-source-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "on-target-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "filter-node-name",
@@ -11933,7 +11935,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "copy-mode",
 +          "default": null,
-+          "type": "231"
++          "type": "244"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -11949,7 +11951,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "35",
++      "name": "41",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12059,7 +12061,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "36",
++      "name": "42",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -12093,7 +12095,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "on-error",
 +          "default": null,
-+          "type": "227"
++          "type": "238"
 +        },
 +        {
 +          "name": "auto-finalize",
@@ -12109,7 +12111,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "37",
++      "name": "43",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12123,7 +12125,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "38",
++      "name": "44",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12138,7 +12140,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "39",
++      "name": "45",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12148,7 +12150,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "40",
++      "name": "46",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12158,7 +12160,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "41",
++      "name": "47",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12168,7 +12170,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "42",
++      "name": "48",
 +      "members": [
 +        {
 +          "name": "id",
@@ -12178,7 +12180,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "43",
++      "name": "49",
 +      "members": [
 +        {
 +          "name": "id",
@@ -12188,170 +12190,178 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "44",
++      "name": "50",
 +      "tag": "driver",
 +      "variants": [
 +        {
 +          "case": "blkdebug",
-+          "type": "235"
++          "type": "249"
 +        },
 +        {
 +          "case": "blklogwrites",
-+          "type": "236"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "237"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "238"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "238"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "238"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "238"
-+        },
-+        {
-+          "case": "file",
-+          "type": "239"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "240"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "241"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "242"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "239"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "239"
-+        },
-+        {
-+          "case": "http",
-+          "type": "243"
-+        },
-+        {
-+          "case": "https",
-+          "type": "244"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "245"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "246"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "247"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "248"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "249"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "249"
-+        },
-+        {
-+          "case": "nvme",
 +          "type": "250"
 +        },
 +        {
-+          "case": "parallels",
-+          "type": "238"
-+        },
-+        {
-+          "case": "qcow2",
++          "case": "blkverify",
 +          "type": "251"
 +        },
 +        {
-+          "case": "qcow",
++          "case": "blkreplay",
 +          "type": "252"
 +        },
 +        {
-+          "case": "qed",
++          "case": "bochs",
 +          "type": "253"
 +        },
 +        {
-+          "case": "quorum",
++          "case": "cloop",
++          "type": "253"
++        },
++        {
++          "case": "compress",
++          "type": "253"
++        },
++        {
++          "case": "copy-on-read",
++          "type": "253"
++        },
++        {
++          "case": "dmg",
++          "type": "253"
++        },
++        {
++          "case": "file",
 +          "type": "254"
 +        },
 +        {
-+          "case": "raw",
++          "case": "ftp",
 +          "type": "255"
 +        },
 +        {
-+          "case": "rbd",
++          "case": "ftps",
 +          "type": "256"
 +        },
 +        {
-+          "case": "replication",
++          "case": "gluster",
 +          "type": "257"
 +        },
 +        {
-+          "case": "sheepdog",
++          "case": "host_cdrom",
++          "type": "254"
++        },
++        {
++          "case": "host_device",
++          "type": "254"
++        },
++        {
++          "case": "http",
 +          "type": "258"
 +        },
 +        {
-+          "case": "ssh",
++          "case": "https",
 +          "type": "259"
 +        },
 +        {
-+          "case": "throttle",
++          "case": "iscsi",
 +          "type": "260"
 +        },
 +        {
-+          "case": "vdi",
-+          "type": "238"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "238"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "253"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "238"
-+        },
-+        {
-+          "case": "vvfat",
++          "case": "luks",
 +          "type": "261"
 +        },
 +        {
-+          "case": "vxhs",
++          "case": "nbd",
 +          "type": "262"
++        },
++        {
++          "case": "nfs",
++          "type": "263"
++        },
++        {
++          "case": "null-aio",
++          "type": "264"
++        },
++        {
++          "case": "null-co",
++          "type": "264"
++        },
++        {
++          "case": "nvme",
++          "type": "265"
++        },
++        {
++          "case": "parallels",
++          "type": "253"
++        },
++        {
++          "case": "qcow2",
++          "type": "266"
++        },
++        {
++          "case": "qcow",
++          "type": "267"
++        },
++        {
++          "case": "qed",
++          "type": "268"
++        },
++        {
++          "case": "quorum",
++          "type": "269"
++        },
++        {
++          "case": "raw",
++          "type": "270"
++        },
++        {
++          "case": "rbd",
++          "type": "271"
++        },
++        {
++          "case": "replication",
++          "type": "272"
++        },
++        {
++          "case": "sheepdog",
++          "type": "273"
++        },
++        {
++          "case": "ssh",
++          "type": "274"
++        },
++        {
++          "case": "throttle",
++          "type": "275"
++        },
++        {
++          "case": "vdi",
++          "type": "253"
++        },
++        {
++          "case": "vhdx",
++          "type": "253"
++        },
++        {
++          "case": "vmdk",
++          "type": "268"
++        },
++        {
++          "case": "vpc",
++          "type": "253"
++        },
++        {
++          "case": "vvfat",
++          "type": "276"
++        },
++        {
++          "case": "vxhs",
++          "type": "277"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "driver",
-+          "type": "232"
++          "type": "246"
 +        },
 +        {
 +          "name": "node-name",
@@ -12361,12 +12371,12 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "discard",
 +          "default": null,
-+          "type": "233"
++          "type": "247"
 +        },
 +        {
 +          "name": "cache",
 +          "default": null,
-+          "type": "234"
++          "type": "248"
 +        },
 +        {
 +          "name": "read-only",
@@ -12386,13 +12396,13 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "detect-zeroes",
 +          "default": null,
-+          "type": "228"
++          "type": "239"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "45",
++      "name": "51",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -12402,7 +12412,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "46",
++      "name": "52",
 +      "members": [
 +        {
 +          "name": "job-id",
@@ -12410,13 +12420,13 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "options",
-+          "type": "263"
++          "type": "278"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "47",
++      "name": "53",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12437,7 +12447,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "48",
++      "name": "54",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12453,7 +12463,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "49",
++      "name": "55",
 +      "members": [
 +        {
 +          "name": "id",
@@ -12463,7 +12473,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "50",
++      "name": "56",
 +      "members": [
 +        {
 +          "name": "id",
@@ -12477,7 +12487,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "51",
++      "name": "57",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12501,13 +12511,13 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "read-only-mode",
 +          "default": null,
-+          "type": "264"
++          "type": "279"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "52",
++      "name": "58",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12540,7 +12550,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "53",
++      "name": "59",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12553,11 +12563,11 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "operation",
-+          "type": "265"
++          "type": "280"
 +        },
 +        {
 +          "name": "action",
-+          "type": "266"
++          "type": "281"
 +        },
 +        {
 +          "name": "nospace",
@@ -12572,11 +12582,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "54",
++      "name": "60",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "221"
++          "type": "282"
 +        },
 +        {
 +          "name": "device",
@@ -12603,11 +12613,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "55",
++      "name": "61",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "221"
++          "type": "282"
 +        },
 +        {
 +          "name": "device",
@@ -12629,7 +12639,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "56",
++      "name": "62",
 +      "members": [
 +        {
 +          "name": "device",
@@ -12637,21 +12647,21 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "operation",
-+          "type": "265"
++          "type": "280"
 +        },
 +        {
 +          "name": "action",
-+          "type": "266"
++          "type": "281"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "57",
++      "name": "63",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "221"
++          "type": "282"
 +        },
 +        {
 +          "name": "device",
@@ -12673,11 +12683,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "58",
++      "name": "64",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "221"
++          "type": "282"
 +        },
 +        {
 +          "name": "id",
@@ -12687,7 +12697,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "59",
++      "name": "65",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -12705,7 +12715,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "60",
++      "name": "66",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -12719,7 +12729,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "61",
++      "name": "67",
 +      "members": [
 +        {
 +          "name": "parent",
@@ -12739,7 +12749,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "62",
++      "name": "68",
 +      "members": [
 +        {
 +          "name": "node-name",
@@ -12747,7 +12757,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "iothread",
-+          "type": "267"
++          "type": "283"
 +        },
 +        {
 +          "name": "force",
@@ -12758,144 +12768,15 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[63]",
-+      "element-type": "63",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "63",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "64",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "65",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "66",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "67",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "68",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "268"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "69",
 +      "members": [
 +        {
-+          "name": "device",
++          "name": "id",
 +          "type": "str"
 +        },
 +        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
++          "name": "status",
++          "type": "234"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -12904,13 +12785,8 @@ index 0000000000..576e0b69e9
 +      "name": "70",
 +      "members": [
 +        {
-+          "name": "name",
++          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "269"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -12919,16 +12795,7 @@ index 0000000000..576e0b69e9
 +      "name": "71",
 +      "members": [
 +        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap-export-name",
-+          "default": null,
++          "name": "id",
 +          "type": "str"
 +        }
 +      ],
@@ -12938,16 +12805,8 @@ index 0000000000..576e0b69e9
 +      "name": "72",
 +      "members": [
 +        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
 +          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "tray-open",
-+          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -12958,10 +12817,6 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -12970,16 +12825,8 @@ index 0000000000..576e0b69e9
 +      "name": "74",
 +      "members": [
 +        {
-+          "name": "reference",
++          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -12988,25 +12835,8 @@ index 0000000000..576e0b69e9
 +      "name": "75",
 +      "members": [
 +        {
-+          "name": "type",
-+          "type": "270"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
++          "name": "id",
 +          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sector-num",
-+          "type": "int"
-+        },
-+        {
-+          "name": "sectors-count",
-+          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -13020,6 +12850,42 @@ index 0000000000..576e0b69e9
 +      "name": "76",
 +      "members": [
 +        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "type",
++          "type": "282"
++        },
++        {
++          "name": "status",
++          "type": "234"
++        },
++        {
++          "name": "current-progress",
++          "type": "int"
++        },
++        {
++          "name": "total-progress",
++          "type": "int"
++        },
++        {
++          "name": "error",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[77]",
++      "element-type": "77",
++      "meta-type": "array"
++    },
++    {
++      "name": "77",
++      "members": [
++        {
 +          "name": "label",
 +          "type": "str"
 +        },
@@ -13035,35 +12901,16 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[77]",
-+      "element-type": "77",
++      "name": "[78]",
++      "element-type": "78",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "77",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "78",
 +      "members": [
 +        {
-+          "name": "device",
++          "name": "name",
 +          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "271"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -13076,13 +12923,32 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
++          "name": "data",
++          "type": "str"
++        },
++        {
++          "name": "format",
++          "default": null,
++          "type": "284"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "80",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
 +          "name": "size",
 +          "type": "int"
 +        },
 +        {
 +          "name": "format",
 +          "default": null,
-+          "type": "271"
++          "type": "284"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -13093,7 +12959,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "80",
++      "name": "81",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13101,13 +12967,13 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "backend",
-+          "type": "272"
++          "type": "285"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "81",
++      "name": "82",
 +      "members": [
 +        {
 +          "name": "pty",
@@ -13118,7 +12984,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "82",
++      "name": "83",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13126,17 +12992,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "backend",
-+          "type": "272"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "83",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
++          "type": "285"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -13157,6 +13013,16 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "id",
 +          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "86",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
 +        },
 +        {
 +          "name": "open",
@@ -13166,7 +13032,84 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "86",
++      "name": "87",
++      "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": "286"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "88",
++      "members": [
++        {
++          "name": "status",
++          "type": "287"
++        },
++        {
++          "name": "completed",
++          "type": "int"
++        },
++        {
++          "name": "total",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "89",
++      "members": [
++        {
++          "name": "result",
++          "type": "88"
++        },
++        {
++          "name": "error",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "90",
++      "members": [
++        {
++          "name": "formats",
++          "type": "[286]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "91",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13180,7 +13123,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "87",
++      "name": "92",
 +      "members": [
 +        {
 +          "name": "type",
@@ -13194,7 +13137,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "88",
++      "name": "93",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13204,7 +13147,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "89",
++      "name": "94",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13215,12 +13158,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[90]",
-+      "element-type": "90",
++      "name": "[95]",
++      "element-type": "95",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "90",
++      "name": "95",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13232,15 +13175,15 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "multicast",
-+          "type": "273"
++          "type": "288"
 +        },
 +        {
 +          "name": "unicast",
-+          "type": "273"
++          "type": "288"
 +        },
 +        {
 +          "name": "vlan",
-+          "type": "273"
++          "type": "288"
 +        },
 +        {
 +          "name": "broadcast-allowed",
@@ -13274,7 +13217,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "91",
++      "name": "96",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13289,7 +13232,71 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "92",
++      "name": "97",
++      "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": "98",
++      "members": [
++        {
++          "name": "device-id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "99",
++      "members": [
++        {
++          "name": "netdev",
++          "type": "str"
++        },
++        {
++          "name": "gid-status",
++          "type": "bool"
++        },
++        {
++          "name": "subnet-prefix",
++          "type": "int"
++        },
++        {
++          "name": "interface-id",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "100",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13299,7 +13306,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "93",
++      "name": "101",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13317,7 +13324,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "94",
++      "name": "102",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13327,12 +13334,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[95]",
-+      "element-type": "95",
++      "name": "[103]",
++      "element-type": "103",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "95",
++      "name": "103",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13352,17 +13359,17 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "duplex",
-+          "type": "274"
++          "type": "289"
 +        },
 +        {
 +          "name": "autoneg",
-+          "type": "275"
++          "type": "290"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "96",
++      "name": "104",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13377,12 +13384,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[97]",
-+      "element-type": "97",
++      "name": "[105]",
++      "element-type": "105",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "97",
++      "name": "105",
 +      "members": [
 +        {
 +          "name": "cookie",
@@ -13394,21 +13401,21 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "key",
-+          "type": "276"
++          "type": "291"
 +        },
 +        {
 +          "name": "mask",
-+          "type": "277"
++          "type": "292"
 +        },
 +        {
 +          "name": "action",
-+          "type": "278"
++          "type": "293"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "98",
++      "name": "106",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13423,12 +13430,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[99]",
-+      "element-type": "99",
++      "name": "[107]",
++      "element-type": "107",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "99",
++      "name": "107",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13497,12 +13504,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[100]",
-+      "element-type": "100",
++      "name": "[108]",
++      "element-type": "108",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "100",
++      "name": "108",
 +      "meta-type": "enum",
 +      "values": [
 +        "tpm-tis",
@@ -13510,12 +13517,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[101]",
-+      "element-type": "101",
++      "name": "[109]",
++      "element-type": "109",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "101",
++      "name": "109",
 +      "meta-type": "enum",
 +      "values": [
 +        "passthrough",
@@ -13523,12 +13530,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[102]",
-+      "element-type": "102",
++      "name": "[110]",
++      "element-type": "110",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "102",
++      "name": "110",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13536,17 +13543,17 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "model",
-+          "type": "100"
++          "type": "108"
 +        },
 +        {
 +          "name": "options",
-+          "type": "279"
++          "type": "294"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "103",
++      "name": "111",
 +      "members": [
 +        {
 +          "name": "protocol",
@@ -13565,7 +13572,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "104",
++      "name": "112",
 +      "members": [
 +        {
 +          "name": "protocol",
@@ -13579,7 +13586,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "105",
++      "name": "113",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -13599,7 +13606,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "110",
++      "name": "118",
 +      "members": [
 +        {
 +          "name": "enabled",
@@ -13613,7 +13620,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "family",
 +          "default": null,
-+          "type": "284"
++          "type": "299"
 +        },
 +        {
 +          "name": "service",
@@ -13628,18 +13635,18 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "clients",
 +          "default": null,
-+          "type": "[285]"
++          "type": "[300]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[111]",
-+      "element-type": "111",
++      "name": "[119]",
++      "element-type": "119",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "111",
++      "name": "119",
 +      "members": [
 +        {
 +          "name": "id",
@@ -13647,20 +13654,20 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "server",
-+          "type": "[286]"
++          "type": "[301]"
 +        },
 +        {
 +          "name": "clients",
-+          "type": "[285]"
++          "type": "[300]"
 +        },
 +        {
 +          "name": "auth",
-+          "type": "287"
++          "type": "302"
 +        },
 +        {
 +          "name": "vencrypt",
 +          "default": null,
-+          "type": "288"
++          "type": "303"
 +        },
 +        {
 +          "name": "display",
@@ -13671,7 +13678,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "112",
++      "name": "120",
 +      "members": [
 +        {
 +          "name": "password",
@@ -13681,54 +13688,54 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "113",
++      "name": "121",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "289"
++          "type": "304"
 +        },
 +        {
 +          "name": "client",
-+          "type": "290"
++          "type": "305"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "114",
++      "name": "122",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "289"
++          "type": "304"
 +        },
 +        {
 +          "name": "client",
-+          "type": "285"
++          "type": "300"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "115",
++      "name": "123",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "289"
++          "type": "304"
 +        },
 +        {
 +          "name": "client",
-+          "type": "285"
++          "type": "300"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[116]",
-+      "element-type": "116",
++      "name": "[124]",
++      "element-type": "124",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "116",
++      "name": "124",
 +      "members": [
 +        {
 +          "name": "name",
@@ -13750,11 +13757,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "117",
++      "name": "125",
 +      "members": [
 +        {
 +          "name": "keys",
-+          "type": "[291]"
++          "type": "[306]"
 +        },
 +        {
 +          "name": "hold-time",
@@ -13765,7 +13772,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "118",
++      "name": "126",
 +      "members": [
 +        {
 +          "name": "device",
@@ -13779,33 +13786,93 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "events",
-+          "type": "[292]"
++          "type": "[307]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "119",
++      "name": "127",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "gtk",
++          "type": "310"
++        },
++        {
++          "case": "curses",
++          "type": "311"
++        },
++        {
++          "case": "egl-headless",
++          "type": "312"
++        },
++        {
++          "case": "default",
++          "type": "0"
++        },
++        {
++          "case": "none",
++          "type": "0"
++        },
++        {
++          "case": "sdl",
++          "type": "0"
++        },
++        {
++          "case": "cocoa",
++          "type": "0"
++        },
++        {
++          "case": "spice-app",
++          "type": "0"
++        }
++      ],
++      "members": [
++        {
++          "name": "type",
++          "type": "308"
++        },
++        {
++          "name": "full-screen",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "window-close",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "gl",
++          "default": null,
++          "type": "309"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "128",
 +      "members": [
 +        {
 +          "name": "status",
 +          "default": null,
-+          "type": "293"
++          "type": "313"
 +        },
 +        {
 +          "name": "ram",
 +          "default": null,
-+          "type": "294"
++          "type": "314"
 +        },
 +        {
 +          "name": "disk",
 +          "default": null,
-+          "type": "294"
++          "type": "314"
 +        },
 +        {
 +          "name": "xbzrle-cache",
 +          "default": null,
-+          "type": "295"
++          "type": "315"
 +        },
 +        {
 +          "name": "total-time",
@@ -13850,32 +13917,37 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "compression",
 +          "default": null,
-+          "type": "296"
++          "type": "316"
++        },
++        {
++          "name": "socket-address",
++          "default": null,
++          "type": "[317]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "120",
++      "name": "129",
 +      "members": [
 +        {
 +          "name": "capabilities",
-+          "type": "[121]"
++          "type": "[130]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[121]",
-+      "element-type": "121",
++      "name": "[130]",
++      "element-type": "130",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "121",
++      "name": "130",
 +      "members": [
 +        {
 +          "name": "capability",
-+          "type": "297"
++          "type": "318"
 +        },
 +        {
 +          "name": "state",
@@ -13885,9 +13957,29 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "122",
++      "name": "131",
 +      "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": "compress-level",
 +          "default": null,
 +          "type": "int"
@@ -13920,12 +14012,17 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "tls-creds",
 +          "default": null,
-+          "type": "267"
++          "type": "283"
 +        },
 +        {
 +          "name": "tls-hostname",
 +          "default": null,
-+          "type": "267"
++          "type": "283"
++        },
++        {
++          "name": "tls-authz",
++          "default": null,
++          "type": "283"
 +        },
 +        {
 +          "name": "max-bandwidth",
@@ -13948,12 +14045,7 @@ index 0000000000..576e0b69e9
 +          "type": "bool"
 +        },
 +        {
-+          "name": "x-multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-multifd-page-count",
++          "name": "multifd-channels",
 +          "default": null,
 +          "type": "int"
 +        },
@@ -13976,9 +14068,29 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "123",
++      "name": "132",
 +      "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": "compress-level",
 +          "default": null,
 +          "type": "int"
@@ -14019,6 +14131,11 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
++          "name": "tls-authz",
++          "default": null,
++          "type": "str"
++        },
++        {
 +          "name": "max-bandwidth",
 +          "default": null,
 +          "type": "int"
@@ -14039,12 +14156,7 @@ index 0000000000..576e0b69e9
 +          "type": "bool"
 +        },
 +        {
-+          "name": "x-multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-multifd-page-count",
++          "name": "multifd-channels",
 +          "default": null,
 +          "type": "int"
 +        },
@@ -14067,7 +14179,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "124",
++      "name": "133",
 +      "members": [
 +        {
 +          "name": "protocol",
@@ -14096,17 +14208,17 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "125",
++      "name": "134",
 +      "members": [
 +        {
 +          "name": "status",
-+          "type": "293"
++          "type": "313"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "126",
++      "name": "135",
 +      "members": [
 +        {
 +          "name": "pass",
@@ -14116,31 +14228,31 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "127",
++      "name": "136",
 +      "members": [
 +        {
 +          "name": "mode",
-+          "type": "298"
++          "type": "319"
 +        },
 +        {
 +          "name": "reason",
-+          "type": "299"
++          "type": "320"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "128",
++      "name": "137",
 +      "members": [
 +        {
 +          "name": "state",
-+          "type": "293"
++          "type": "313"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "129",
++      "name": "138",
 +      "members": [
 +        {
 +          "name": "value",
@@ -14150,7 +14262,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "130",
++      "name": "139",
 +      "members": [
 +        {
 +          "name": "value",
@@ -14160,7 +14272,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "131",
++      "name": "140",
 +      "members": [
 +        {
 +          "name": "value",
@@ -14175,7 +14287,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "132",
++      "name": "141",
 +      "members": [
 +        {
 +          "name": "uri",
@@ -14205,7 +14317,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "133",
++      "name": "142",
 +      "members": [
 +        {
 +          "name": "uri",
@@ -14215,7 +14327,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "134",
++      "name": "143",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -14230,7 +14342,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "135",
++      "name": "144",
 +      "members": [
 +        {
 +          "name": "enable",
@@ -14249,7 +14361,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "136",
++      "name": "145",
 +      "members": [
 +        {
 +          "name": "error",
@@ -14264,21 +14376,25 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "137",
++      "name": "146",
 +      "members": [
 +        {
 +          "name": "mode",
-+          "type": "298"
++          "type": "319"
++        },
++        {
++          "name": "last-mode",
++          "type": "319"
 +        },
 +        {
 +          "name": "reason",
-+          "type": "299"
++          "type": "320"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "138",
++      "name": "147",
 +      "members": [
 +        {
 +          "name": "uri",
@@ -14288,22 +14404,32 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "139",
++      "name": "148",
 +      "members": [
 +        {
-+          "name": "actions",
-+          "type": "[300]"
-+        },
-+        {
-+          "name": "properties",
-+          "default": null,
-+          "type": "301"
++          "name": "device-id",
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "140",
++      "name": "149",
++      "members": [
++        {
++          "name": "actions",
++          "type": "[321]"
++        },
++        {
++          "name": "properties",
++          "default": null,
++          "type": "322"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "150",
 +      "members": [
 +        {
 +          "name": "name",
@@ -14318,12 +14444,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[141]",
-+      "element-type": "141",
++      "name": "[151]",
++      "element-type": "151",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "141",
++      "name": "151",
 +      "members": [
 +        {
 +          "name": "name",
@@ -14331,7 +14457,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "state",
-+          "type": "302"
++          "type": "323"
 +        },
 +        {
 +          "name": "vcpu",
@@ -14341,7 +14467,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "142",
++      "name": "152",
 +      "members": [
 +        {
 +          "name": "name",
@@ -14365,41 +14491,41 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[143]",
-+      "element-type": "143",
++      "name": "[153]",
++      "element-type": "153",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "143",
++      "name": "153",
 +      "tag": "meta-type",
 +      "variants": [
 +        {
 +          "case": "builtin",
-+          "type": "304"
++          "type": "325"
 +        },
 +        {
 +          "case": "enum",
-+          "type": "305"
++          "type": "326"
 +        },
 +        {
 +          "case": "array",
-+          "type": "306"
++          "type": "327"
 +        },
 +        {
 +          "case": "object",
-+          "type": "307"
++          "type": "328"
 +        },
 +        {
 +          "case": "alternate",
-+          "type": "308"
++          "type": "329"
 +        },
 +        {
 +          "case": "command",
-+          "type": "309"
++          "type": "330"
 +        },
 +        {
 +          "case": "event",
-+          "type": "310"
++          "type": "331"
 +        }
 +      ],
 +      "members": [
@@ -14409,69 +14535,97 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "meta-type",
-+          "type": "303"
++          "type": "324"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "144",
++      "name": "154",
 +      "members": [
 +        {
-+          "name": "enable",
-+          "default": null,
-+          "type": "[311]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "145",
-+      "members": [
-+        {
-+          "name": "qemu",
-+          "type": "312"
-+        },
-+        {
-+          "name": "package",
++          "name": "path",
 +          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[146]",
-+      "element-type": "146",
++      "name": "[155]",
++      "element-type": "155",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "146",
++      "name": "155",
 +      "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": "147",
++      "name": "156",
 +      "members": [
 +        {
-+          "name": "protocol",
++          "name": "path",
 +          "type": "str"
 +        },
 +        {
-+          "name": "fdname",
++          "name": "property",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "any",
++      "json-type": "value",
++      "meta-type": "builtin"
++    },
++    {
++      "name": "157",
++      "members": [
++        {
++          "name": "path",
 +          "type": "str"
 +        },
 +        {
-+          "name": "skipauth",
++          "name": "property",
++          "type": "str"
++        },
++        {
++          "name": "value",
++          "type": "any"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "158",
++      "members": [
++        {
++          "name": "implements",
 +          "default": null,
-+          "type": "bool"
++          "type": "str"
 +        },
 +        {
-+          "name": "tls",
++          "name": "abstract",
 +          "default": null,
 +          "type": "bool"
 +        }
@@ -14479,91 +14633,160 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "148",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "149",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "present",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "150",
-+      "members": [
-+        {
-+          "name": "UUID",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[151]",
-+      "element-type": "151",
++      "name": "[159]",
++      "element-type": "159",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "151",
++      "name": "159",
 +      "members": [
 +        {
 +          "name": "name",
 +          "type": "str"
++        },
++        {
++          "name": "abstract",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "parent",
++          "default": null,
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[152]",
-+      "element-type": "152",
++      "name": "160",
++      "members": [
++        {
++          "name": "typename",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "161",
++      "members": [
++        {
++          "name": "qom-type",
++          "type": "str"
++        },
++        {
++          "name": "id",
++          "type": "str"
++        },
++        {
++          "name": "props",
++          "default": null,
++          "type": "any"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "162",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "163",
++      "members": [
++        {
++          "name": "typename",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "164",
++      "members": [
++        {
++          "name": "driver",
++          "type": "str"
++        },
++        {
++          "name": "bus",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "id",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "165",
++      "members": [
++        {
++          "name": "id",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "166",
++      "members": [
++        {
++          "name": "device",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "path",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[167]",
++      "element-type": "167",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "152",
++      "name": "167",
 +      "tag": "arch",
 +      "variants": [
 +        {
 +          "case": "x86",
-+          "type": "315"
++          "type": "334"
 +        },
 +        {
 +          "case": "sparc",
-+          "type": "316"
++          "type": "335"
 +        },
 +        {
 +          "case": "ppc",
-+          "type": "317"
++          "type": "336"
 +        },
 +        {
 +          "case": "mips",
-+          "type": "318"
++          "type": "337"
 +        },
 +        {
 +          "case": "tricore",
-+          "type": "319"
++          "type": "338"
 +        },
 +        {
 +          "case": "s390",
-+          "type": "320"
++          "type": "339"
 +        },
 +        {
 +          "case": "riscv",
-+          "type": "321"
++          "type": "340"
 +        },
 +        {
 +          "case": "other",
@@ -14594,27 +14817,27 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "props",
 +          "default": null,
-+          "type": "313"
++          "type": "332"
 +        },
 +        {
 +          "name": "arch",
-+          "type": "314"
++          "type": "333"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[153]",
-+      "element-type": "153",
++      "name": "[168]",
++      "element-type": "168",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "153",
++      "name": "168",
 +      "tag": "target",
 +      "variants": [
 +        {
 +          "case": "s390x",
-+          "type": "320"
++          "type": "339"
 +        },
 +        {
 +          "case": "aarch64",
@@ -14753,514 +14976,36 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "props",
 +          "default": null,
-+          "type": "313"
++          "type": "332"
 +        },
 +        {
 +          "name": "arch",
-+          "type": "314"
++          "type": "333"
 +        },
 +        {
 +          "name": "target",
-+          "type": "322"
++          "type": "341"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[154]",
-+      "element-type": "154",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "154",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "155",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "156",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[157]",
-+      "element-type": "157",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "157",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[323]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "158",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "159",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "160",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "161",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "162",
-+      "members": [
-+        {
-+          "name": "command-line",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "163",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[164]",
-+      "element-type": "164",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "164",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "165",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "any",
-+      "json-type": "value",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "166",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "167",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "arg",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "168",
-+      "members": [
-+        {
-+          "name": "implements",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[169]",
-+      "element-type": "169",
-+      "meta-type": "array"
-+    },
-+    {
 +      "name": "169",
 +      "members": [
 +        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "170",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "171",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "172",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "173",
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bus",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
 +          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "174",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "175",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "176",
-+      "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": "324"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "177",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "325"
-+        },
-+        {
-+          "name": "completed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
 +          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "178",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "177"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "179",
-+      "members": [
-+        {
-+          "name": "formats",
-+          "type": "[324]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "180",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "181",
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "182",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "183",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "184",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[185]",
-+      "element-type": "185",
++      "name": "[170]",
++      "element-type": "170",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "185",
++      "name": "170",
 +      "members": [
 +        {
 +          "name": "name",
@@ -15283,144 +15028,17 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "hotpluggable-cpus",
 +          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "186",
-+      "members": [
-+        {
-+          "name": "base-memory",
-+          "type": "int"
 +        },
 +        {
-+          "name": "plugged-memory",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[187]",
-+      "element-type": "187",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "187",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "migration-safe",
-+          "default": null,
++          "name": "numa-mem-supported",
 +          "type": "bool"
 +        },
 +        {
-+          "name": "static",
++          "name": "deprecated",
 +          "type": "bool"
 +        },
 +        {
-+          "name": "unavailable-features",
-+          "default": null,
-+          "type": "[str]"
-+        },
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "188",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "326"
-+        },
-+        {
-+          "name": "model",
-+          "type": "327"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "189",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "327"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "190",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "327"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "327"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "191",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "328"
-+        },
-+        {
-+          "name": "responsible-properties",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "192",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "327"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "327"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "193",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "327"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "194",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
++          "name": "default-cpu-type",
 +          "default": null,
 +          "type": "str"
 +        }
@@ -15428,100 +15046,32 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "195",
++      "name": "171",
 +      "members": [
 +        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "int"
++          "name": "wakeup-suspend-support",
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "196",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[197]",
-+      "element-type": "197",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "197",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fds",
-+          "type": "[329]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "198",
++      "name": "172",
 +      "members": [
 +        {
 +          "name": "arch",
-+          "type": "322"
++          "type": "341"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "199",
-+      "members": [
-+        {
-+          "name": "option",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[200]",
-+      "element-type": "200",
++      "name": "[173]",
++      "element-type": "173",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "200",
-+      "members": [
-+        {
-+          "name": "option",
-+          "type": "str"
-+        },
-+        {
-+          "name": "parameters",
-+          "type": "[330]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[201]",
-+      "element-type": "201",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "201",
++      "name": "173",
 +      "members": [
 +        {
 +          "name": "id",
@@ -15550,33 +15100,429 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "policy",
-+          "type": "331"
++          "type": "342"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[202]",
-+      "element-type": "202",
++      "name": "[174]",
++      "element-type": "174",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "202",
++      "name": "174",
++      "members": [
++        {
++          "name": "type",
++          "type": "str"
++        },
++        {
++          "name": "vcpus-count",
++          "type": "int"
++        },
++        {
++          "name": "props",
++          "type": "332"
++        },
++        {
++          "name": "qom-path",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "175",
 +      "tag": "type",
 +      "variants": [
 +        {
-+          "case": "dimm",
-+          "type": "333"
++          "case": "node",
++          "type": "344"
 +        },
 +        {
-+          "case": "nvdimm",
-+          "type": "333"
++          "case": "dist",
++          "type": "345"
++        },
++        {
++          "case": "cpu",
++          "type": "346"
++        },
++        {
++          "case": "hmat-lb",
++          "type": "347"
++        },
++        {
++          "case": "hmat-cache",
++          "type": "348"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "332"
++          "type": "343"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "180",
++      "members": [
++        {
++          "name": "type",
++          "type": "351"
++        },
++        {
++          "name": "model",
++          "type": "349"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "181",
++      "members": [
++        {
++          "name": "model",
++          "type": "349"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[182]",
++      "element-type": "182",
++      "meta-type": "array"
++    },
++    {
++      "name": "182",
++      "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"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "183",
++      "members": [
++        {
++          "name": "enable",
++          "default": null,
++          "type": "[352]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "184",
++      "members": [
++        {
++          "name": "qemu",
++          "type": "353"
++        },
++        {
++          "name": "package",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[185]",
++      "element-type": "185",
++      "meta-type": "array"
++    },
++    {
++      "name": "185",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "186",
++      "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": "187",
++      "members": [
++        {
++          "name": "name",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "188",
++      "members": [
++        {
++          "name": "enabled",
++          "type": "bool"
++        },
++        {
++          "name": "present",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "189",
++      "members": [
++        {
++          "name": "UUID",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[190]",
++      "element-type": "190",
++      "meta-type": "array"
++    },
++    {
++      "name": "190",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[191]",
++      "element-type": "191",
++      "meta-type": "array"
++    },
++    {
++      "name": "191",
++      "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"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "192",
++      "members": [
++        {
++          "name": "actual",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "193",
++      "members": [
++        {
++          "name": "actual",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[194]",
++      "element-type": "194",
++      "meta-type": "array"
++    },
++    {
++      "name": "194",
++      "members": [
++        {
++          "name": "bus",
++          "type": "int"
++        },
++        {
++          "name": "devices",
++          "type": "[354]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "195",
++      "members": [
++        {
++          "name": "val",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "filename",
++          "type": "str"
++        },
++        {
++          "name": "cpu-index",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "196",
++      "members": [
++        {
++          "name": "val",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "filename",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "197",
++      "members": [
++        {
++          "name": "value",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "198",
++      "members": [
++        {
++          "name": "command-line",
++          "type": "str"
++        },
++        {
++          "name": "cpu-index",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "199",
++      "members": [
++        {
++          "name": "device",
++          "type": "str"
++        },
++        {
++          "name": "target",
++          "type": "str"
++        },
++        {
++          "name": "arg",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "200",
++      "members": [
++        {
++          "name": "enable",
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "201",
++      "members": [
++        {
++          "name": "fdname",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "202",
++      "members": [
++        {
++          "name": "fdname",
++          "type": "str"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -15585,6 +15531,145 @@ index 0000000000..576e0b69e9
 +      "name": "203",
 +      "members": [
 +        {
++          "name": "base-memory",
++          "type": "int"
++        },
++        {
++          "name": "plugged-memory",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "204",
++      "members": [
++        {
++          "name": "fdset-id",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "opaque",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "205",
++      "members": [
++        {
++          "name": "fdset-id",
++          "type": "int"
++        },
++        {
++          "name": "fd",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "206",
++      "members": [
++        {
++          "name": "fdset-id",
++          "type": "int"
++        },
++        {
++          "name": "fd",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[207]",
++      "element-type": "207",
++      "meta-type": "array"
++    },
++    {
++      "name": "207",
++      "members": [
++        {
++          "name": "fdset-id",
++          "type": "int"
++        },
++        {
++          "name": "fds",
++          "type": "[355]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "208",
++      "members": [
++        {
++          "name": "option",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[209]",
++      "element-type": "209",
++      "meta-type": "array"
++    },
++    {
++      "name": "209",
++      "members": [
++        {
++          "name": "option",
++          "type": "str"
++        },
++        {
++          "name": "parameters",
++          "type": "[356]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[210]",
++      "element-type": "210",
++      "meta-type": "array"
++    },
++    {
++      "name": "210",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "dimm",
++          "type": "358"
++        },
++        {
++          "case": "nvdimm",
++          "type": "358"
++        },
++        {
++          "case": "virtio-pmem",
++          "type": "359"
++        }
++      ],
++      "members": [
++        {
++          "name": "type",
++          "type": "357"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "211",
++      "members": [
++        {
 +          "name": "device",
 +          "type": "str"
 +        },
@@ -15596,12 +15681,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[204]",
-+      "element-type": "204",
++      "name": "[212]",
++      "element-type": "212",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "204",
++      "name": "212",
 +      "members": [
 +        {
 +          "name": "device",
@@ -15614,7 +15699,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "slot-type",
-+          "type": "334"
++          "type": "360"
 +        },
 +        {
 +          "name": "source",
@@ -15628,27 +15713,17 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "205",
++      "name": "213",
 +      "members": [
 +        {
 +          "name": "info",
-+          "type": "204"
++          "type": "212"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "206",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "207",
++      "name": "214",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -15658,12 +15733,32 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[208]",
-+      "element-type": "208",
++      "name": "215",
++      "members": [
++        {
++          "name": "guid",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "216",
++      "members": [
++        {
++          "name": "offset",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[221]",
++      "element-type": "221",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "208",
++      "name": "221",
 +      "members": [
 +        {
 +          "name": "version",
@@ -15681,155 +15776,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[209]",
-+      "element-type": "209",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "209",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpus-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "type": "313"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "210",
-+      "members": [
-+        {
-+          "name": "guid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "211",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "api-major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "api-minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "build-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "int"
-+        },
-+        {
-+          "name": "state",
-+          "type": "335"
-+        },
-+        {
-+          "name": "handle",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "212",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "213",
-+      "members": [
-+        {
-+          "name": "pdh",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cert-chain",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "214",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "any"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "336"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "215",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "node",
-+          "type": "338"
-+        },
-+        {
-+          "case": "dist",
-+          "type": "339"
-+        },
-+        {
-+          "case": "cpu",
-+          "type": "340"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "337"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "bool",
 +      "json-type": "boolean",
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "216",
++      "name": "222",
 +      "meta-type": "enum",
 +      "values": [
 +        "debug",
@@ -15852,7 +15804,23 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "217",
++      "name": "223",
++      "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"
++      ]
++    },
++    {
++      "name": "224",
 +      "meta-type": "enum",
 +      "values": [
 +        "reset",
@@ -15865,60 +15833,79 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "218",
++      "name": "225",
 +      "meta-type": "enum",
 +      "values": [
 +        "pause",
-+        "poweroff"
++        "poweroff",
++        "run"
 +      ]
 +    },
 +    {
-+      "name": "219",
++      "name": "226",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "hyper-v",
-+          "type": "342"
++          "type": "363"
 +        },
 +        {
 +          "case": "s390",
-+          "type": "343"
++          "type": "364"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "341"
++          "type": "362"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "220",
++      "name": "227",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "inet",
++          "type": "366"
++        },
++        {
++          "case": "unix",
++          "type": "367"
++        },
++        {
++          "case": "vsock",
++          "type": "368"
++        },
++        {
++          "case": "fd",
++          "type": "369"
++        }
++      ],
++      "members": [
++        {
++          "name": "type",
++          "type": "365"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "228",
 +      "meta-type": "enum",
 +      "values": [
-+        "undefined",
-+        "created",
-+        "running",
-+        "paused",
-+        "ready",
-+        "standby",
-+        "waiting",
-+        "pending",
-+        "aborting",
-+        "concluded",
-+        "null"
++        "safe",
++        "hard"
 +      ]
 +    },
 +    {
-+      "name": "221",
++      "name": "229",
 +      "meta-type": "enum",
 +      "values": [
-+        "commit",
-+        "stream",
-+        "mirror",
-+        "backup",
-+        "create"
++        "read",
++        "write",
++        "flush"
 +      ]
 +    },
 +    {
@@ -15927,7 +15914,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "222",
++      "name": "230",
 +      "meta-type": "enum",
 +      "values": [
 +        "ok",
@@ -15936,12 +15923,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[223]",
-+      "element-type": "223",
++      "name": "[231]",
++      "element-type": "231",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "223",
++      "name": "231",
 +      "members": [
 +        {
 +          "name": "name",
@@ -15957,14 +15944,31 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "recording",
++          "type": "bool"
++        },
++        {
++          "name": "busy",
++          "type": "bool"
++        },
++        {
 +          "name": "status",
-+          "type": "344"
++          "type": "370"
++        },
++        {
++          "name": "persistent",
++          "type": "bool"
++        },
++        {
++          "name": "inconsistent",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "224",
++      "name": "232",
 +      "members": [
 +        {
 +          "name": "rd_bytes",
@@ -15975,6 +15979,10 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "unmap_bytes",
++          "type": "int"
++        },
++        {
 +          "name": "rd_operations",
 +          "type": "int"
 +        },
@@ -15987,7 +15995,11 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
-+          "name": "flush_total_time_ns",
++          "name": "unmap_operations",
++          "type": "int"
++        },
++        {
++          "name": "rd_total_time_ns",
 +          "type": "int"
 +        },
 +        {
@@ -15995,7 +16007,11 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
-+          "name": "rd_total_time_ns",
++          "name": "flush_total_time_ns",
++          "type": "int"
++        },
++        {
++          "name": "unmap_total_time_ns",
 +          "type": "int"
 +        },
 +        {
@@ -16011,6 +16027,10 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "unmap_merged",
++          "type": "int"
++        },
++        {
 +          "name": "idle_time_ns",
 +          "default": null,
 +          "type": "int"
@@ -16028,6 +16048,10 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "failed_unmap_operations",
++          "type": "int"
++        },
++        {
 +          "name": "invalid_rd_operations",
 +          "type": "int"
 +        },
@@ -16040,6 +16064,10 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "invalid_unmap_operations",
++          "type": "int"
++        },
++        {
 +          "name": "account_invalid",
 +          "type": "bool"
 +        },
@@ -16049,28 +16077,222 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "timed_stats",
-+          "type": "[345]"
++          "type": "[371]"
 +        },
 +        {
-+          "name": "x_rd_latency_histogram",
++          "name": "rd_latency_histogram",
 +          "default": null,
-+          "type": "346"
++          "type": "372"
 +        },
 +        {
-+          "name": "x_wr_latency_histogram",
++          "name": "wr_latency_histogram",
 +          "default": null,
-+          "type": "346"
++          "type": "372"
 +        },
 +        {
-+          "name": "x_flush_latency_histogram",
++          "name": "flush_latency_histogram",
 +          "default": null,
-+          "type": "346"
++          "type": "372"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "225",
++      "name": "233",
++      "tag": "driver",
++      "variants": [
++        {
++          "case": "file",
++          "type": "373"
++        },
++        {
++          "case": "host_device",
++          "type": "373"
++        },
++        {
++          "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-on-read",
++          "type": "0"
++        },
++        {
++          "case": "dmg",
++          "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": "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",
++          "type": "0"
++        },
++        {
++          "case": "parallels",
++          "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": "sheepdog",
++          "type": "0"
++        },
++        {
++          "case": "ssh",
++          "type": "0"
++        },
++        {
++          "case": "throttle",
++          "type": "0"
++        },
++        {
++          "case": "vdi",
++          "type": "0"
++        },
++        {
++          "case": "vhdx",
++          "type": "0"
++        },
++        {
++          "case": "vmdk",
++          "type": "0"
++        },
++        {
++          "case": "vpc",
++          "type": "0"
++        },
++        {
++          "case": "vvfat",
++          "type": "0"
++        },
++        {
++          "case": "vxhs",
++          "type": "0"
++        }
++      ],
++      "members": [
++        {
++          "name": "driver",
++          "type": "246"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "234",
++      "meta-type": "enum",
++      "values": [
++        "undefined",
++        "created",
++        "running",
++        "paused",
++        "ready",
++        "standby",
++        "waiting",
++        "pending",
++        "aborting",
++        "concluded",
++        "null"
++      ]
++    },
++    {
++      "name": "235",
 +      "meta-type": "enum",
 +      "values": [
 +        "existing",
@@ -16078,17 +16300,27 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "226",
++      "name": "236",
 +      "meta-type": "enum",
 +      "values": [
 +        "top",
 +        "full",
 +        "none",
-+        "incremental"
++        "incremental",
++        "bitmap"
 +      ]
 +    },
 +    {
-+      "name": "227",
++      "name": "237",
++      "meta-type": "enum",
++      "values": [
++        "on-success",
++        "never",
++        "always"
++      ]
++    },
++    {
++      "name": "238",
 +      "meta-type": "enum",
 +      "values": [
 +        "report",
@@ -16099,7 +16331,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "228",
++      "name": "239",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -16108,7 +16340,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "229",
++      "name": "240",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -16165,23 +16397,23 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "snapshots",
 +          "default": null,
-+          "type": "[66]"
++          "type": "[11]"
 +        },
 +        {
 +          "name": "backing-image",
 +          "default": null,
-+          "type": "229"
++          "type": "240"
 +        },
 +        {
 +          "name": "format-specific",
 +          "default": null,
-+          "type": "347"
++          "type": "374"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "230",
++      "name": "241",
 +      "members": [
 +        {
 +          "name": "writeback",
@@ -16199,7 +16431,61 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "231",
++      "name": "[242]",
++      "element-type": "242",
++      "meta-type": "array"
++    },
++    {
++      "name": "242",
++      "members": [
++        {
++          "name": "id",
++          "type": "int"
++        },
++        {
++          "name": "type",
++          "type": "375"
++        },
++        {
++          "name": "name",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[243]",
++      "element-type": "243",
++      "meta-type": "array"
++    },
++    {
++      "name": "243",
++      "members": [
++        {
++          "name": "parent",
++          "type": "int"
++        },
++        {
++          "name": "child",
++          "type": "int"
++        },
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "perm",
++          "type": "[376]"
++        },
++        {
++          "name": "shared-perm",
++          "type": "[376]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "244",
 +      "meta-type": "enum",
 +      "values": [
 +        "background",
@@ -16207,14 +16493,33 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "232",
++      "name": "[245]",
++      "element-type": "245",
++      "meta-type": "array"
++    },
++    {
++      "name": "245",
++      "members": [
++        {
++          "type": "str"
++        },
++        {
++          "type": "37"
++        }
++      ],
++      "meta-type": "alternate"
++    },
++    {
++      "name": "246",
 +      "meta-type": "enum",
 +      "values": [
 +        "blkdebug",
 +        "blklogwrites",
++        "blkreplay",
 +        "blkverify",
 +        "bochs",
 +        "cloop",
++        "compress",
 +        "copy-on-read",
 +        "dmg",
 +        "file",
@@ -16252,7 +16557,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "233",
++      "name": "247",
 +      "meta-type": "enum",
 +      "values": [
 +        "ignore",
@@ -16260,7 +16565,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "234",
++      "name": "248",
 +      "members": [
 +        {
 +          "name": "direct",
@@ -16276,11 +16581,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "235",
++      "name": "249",
 +      "members": [
 +        {
 +          "name": "image",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "config",
@@ -16320,26 +16625,36 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "inject-error",
 +          "default": null,
-+          "type": "[349]"
++          "type": "[378]"
 +        },
 +        {
 +          "name": "set-state",
 +          "default": null,
-+          "type": "[350]"
++          "type": "[379]"
++        },
++        {
++          "name": "take-child-perms",
++          "default": null,
++          "type": "[376]"
++        },
++        {
++          "name": "unshare-child-perms",
++          "default": null,
++          "type": "[376]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "236",
++      "name": "250",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "log",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "log-sector-size",
@@ -16360,31 +16675,41 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "237",
++      "name": "251",
 +      "members": [
 +        {
 +          "name": "test",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "raw",
-+          "type": "348"
++          "type": "377"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "238",
++      "name": "252",
++      "members": [
++        {
++          "name": "image",
++          "type": "377"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "253",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "239",
++      "name": "254",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -16398,12 +16723,17 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "locking",
 +          "default": null,
-+          "type": "351"
++          "type": "380"
 +        },
 +        {
 +          "name": "aio",
 +          "default": null,
-+          "type": "352"
++          "type": "381"
++        },
++        {
++          "name": "drop-cache",
++          "default": null,
++          "type": "bool"
 +        },
 +        {
 +          "name": "x-check-cache-dropped",
@@ -16411,10 +16741,13 @@ index 0000000000..576e0b69e9
 +          "type": "bool"
 +        }
 +      ],
-+      "meta-type": "object"
++      "meta-type": "object",
++      "features": [
++        "dynamic-auto-read-only"
++      ]
 +    },
 +    {
-+      "name": "240",
++      "name": "255",
 +      "members": [
 +        {
 +          "name": "url",
@@ -16454,7 +16787,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "241",
++      "name": "256",
 +      "members": [
 +        {
 +          "name": "url",
@@ -16499,7 +16832,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "242",
++      "name": "257",
 +      "members": [
 +        {
 +          "name": "volume",
@@ -16511,7 +16844,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "server",
-+          "type": "[353]"
++          "type": "[317]"
 +        },
 +        {
 +          "name": "debug",
@@ -16527,7 +16860,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "243",
++      "name": "258",
 +      "members": [
 +        {
 +          "name": "url",
@@ -16577,7 +16910,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "244",
++      "name": "259",
 +      "members": [
 +        {
 +          "name": "url",
@@ -16632,11 +16965,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "245",
++      "name": "260",
 +      "members": [
 +        {
 +          "name": "transport",
-+          "type": "354"
++          "type": "382"
 +        },
 +        {
 +          "name": "portal",
@@ -16669,7 +17002,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "header-digest",
 +          "default": null,
-+          "type": "355"
++          "type": "383"
 +        },
 +        {
 +          "name": "timeout",
@@ -16680,11 +17013,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "246",
++      "name": "261",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "key-secret",
@@ -16695,11 +17028,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "247",
++      "name": "262",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "353"
++          "type": "317"
 +        },
 +        {
 +          "name": "export",
@@ -16715,16 +17048,21 @@ index 0000000000..576e0b69e9
 +          "name": "x-dirty-bitmap",
 +          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "reconnect-delay",
++          "default": null,
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "248",
++      "name": "263",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "356"
++          "type": "384"
 +        },
 +        {
 +          "name": "path",
@@ -16764,7 +17102,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "249",
++      "name": "264",
 +      "members": [
 +        {
 +          "name": "size",
@@ -16775,12 +17113,17 @@ index 0000000000..576e0b69e9
 +          "name": "latency-ns",
 +          "default": null,
 +          "type": "int"
++        },
++        {
++          "name": "read-zeroes",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "250",
++      "name": "265",
 +      "members": [
 +        {
 +          "name": "device",
@@ -16794,16 +17137,16 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "251",
++      "name": "266",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "357"
++          "type": "385"
 +        },
 +        {
 +          "name": "lazy-refcounts",
@@ -16828,7 +17171,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "overlap-check",
 +          "default": null,
-+          "type": "358"
++          "type": "386"
 +        },
 +        {
 +          "name": "cache-size",
@@ -16858,48 +17201,53 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "359"
++          "type": "387"
++        },
++        {
++          "name": "data-file",
++          "default": null,
++          "type": "377"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "252",
++      "name": "267",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "357"
++          "type": "385"
 +        },
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "360"
++          "type": "388"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "253",
++      "name": "268",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "backing",
 +          "default": null,
-+          "type": "357"
++          "type": "385"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "254",
++      "name": "269",
 +      "members": [
 +        {
 +          "name": "blkverify",
@@ -16908,7 +17256,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "children",
-+          "type": "[348]"
++          "type": "[377]"
 +        },
 +        {
 +          "name": "vote-threshold",
@@ -16922,17 +17270,17 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "read-pattern",
 +          "default": null,
-+          "type": "361"
++          "type": "389"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "255",
++      "name": "270",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "offset",
@@ -16948,7 +17296,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "256",
++      "name": "271",
 +      "members": [
 +        {
 +          "name": "pool",
@@ -16976,7 +17324,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "auth-client-required",
 +          "default": null,
-+          "type": "[362]"
++          "type": "[390]"
 +        },
 +        {
 +          "name": "key-secret",
@@ -16986,21 +17334,21 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "server",
 +          "default": null,
-+          "type": "[363]"
++          "type": "[391]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "257",
++      "name": "272",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "mode",
-+          "type": "364"
++          "type": "392"
 +        },
 +        {
 +          "name": "top-id",
@@ -17011,11 +17359,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "258",
++      "name": "273",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "353"
++          "type": "317"
 +        },
 +        {
 +          "name": "vdi",
@@ -17035,11 +17383,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "259",
++      "name": "274",
 +      "members": [
 +        {
 +          "name": "server",
-+          "type": "365"
++          "type": "393"
 +        },
 +        {
 +          "name": "path",
@@ -17053,13 +17401,13 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "host-key-check",
 +          "default": null,
-+          "type": "366"
++          "type": "394"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "260",
++      "name": "275",
 +      "members": [
 +        {
 +          "name": "throttle-group",
@@ -17067,13 +17415,13 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "261",
++      "name": "276",
 +      "members": [
 +        {
 +          "name": "dir",
@@ -17103,7 +17451,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "262",
++      "name": "277",
 +      "members": [
 +        {
 +          "name": "vdisk-id",
@@ -17111,7 +17459,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "server",
-+          "type": "363"
++          "type": "391"
 +        },
 +        {
 +          "name": "tls-creds",
@@ -17122,64 +17470,68 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "263",
++      "name": "278",
 +      "tag": "driver",
 +      "variants": [
 +        {
 +          "case": "file",
-+          "type": "367"
++          "type": "395"
 +        },
 +        {
 +          "case": "gluster",
-+          "type": "368"
++          "type": "396"
 +        },
 +        {
 +          "case": "luks",
-+          "type": "369"
++          "type": "397"
 +        },
 +        {
 +          "case": "nfs",
-+          "type": "370"
++          "type": "398"
 +        },
 +        {
 +          "case": "parallels",
-+          "type": "371"
++          "type": "399"
 +        },
 +        {
 +          "case": "qcow",
-+          "type": "372"
++          "type": "400"
 +        },
 +        {
 +          "case": "qcow2",
-+          "type": "373"
++          "type": "401"
 +        },
 +        {
 +          "case": "qed",
-+          "type": "374"
++          "type": "402"
 +        },
 +        {
 +          "case": "rbd",
-+          "type": "375"
++          "type": "403"
 +        },
 +        {
 +          "case": "sheepdog",
-+          "type": "376"
++          "type": "404"
 +        },
 +        {
 +          "case": "ssh",
-+          "type": "377"
++          "type": "405"
 +        },
 +        {
 +          "case": "vdi",
-+          "type": "378"
++          "type": "406"
 +        },
 +        {
 +          "case": "vhdx",
-+          "type": "379"
++          "type": "407"
++        },
++        {
++          "case": "vmdk",
++          "type": "408"
 +        },
 +        {
 +          "case": "vpc",
-+          "type": "380"
++          "type": "409"
 +        },
 +        {
 +          "case": "blkdebug",
@@ -17190,6 +17542,10 @@ index 0000000000..576e0b69e9
 +          "type": "0"
 +        },
 +        {
++          "case": "blkreplay",
++          "type": "0"
++        },
++        {
 +          "case": "blkverify",
 +          "type": "0"
 +        },
@@ -17202,6 +17558,10 @@ index 0000000000..576e0b69e9
 +          "type": "0"
 +        },
 +        {
++          "case": "compress",
++          "type": "0"
++        },
++        {
 +          "case": "copy-on-read",
 +          "type": "0"
 +        },
@@ -17270,10 +17630,6 @@ index 0000000000..576e0b69e9
 +          "type": "0"
 +        },
 +        {
-+          "case": "vmdk",
-+          "type": "0"
-+        },
-+        {
 +          "case": "vvfat",
 +          "type": "0"
 +        },
@@ -17285,13 +17641,13 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "driver",
-+          "type": "232"
++          "type": "246"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "264",
++      "name": "279",
 +      "meta-type": "enum",
 +      "values": [
 +        "retain",
@@ -17300,7 +17656,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "265",
++      "name": "280",
 +      "meta-type": "enum",
 +      "values": [
 +        "read",
@@ -17308,7 +17664,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "266",
++      "name": "281",
 +      "meta-type": "enum",
 +      "values": [
 +        "ignore",
@@ -17317,7 +17673,18 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "267",
++      "name": "282",
++      "meta-type": "enum",
++      "values": [
++        "commit",
++        "stream",
++        "mirror",
++        "backup",
++        "create"
++      ]
++    },
++    {
++      "name": "283",
 +      "members": [
 +        {
 +          "type": "str"
@@ -17329,53 +17696,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "268",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "382"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "383"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "384"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "385"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "381"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "269",
-+      "meta-type": "enum",
-+      "values": [
-+        "safe",
-+        "hard"
-+      ]
-+    },
-+    {
-+      "name": "270",
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "flush"
-+      ]
-+    },
-+    {
-+      "name": "271",
++      "name": "284",
 +      "meta-type": "enum",
 +      "values": [
 +        "utf8",
@@ -17383,100 +17704,118 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "272",
++      "name": "285",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "file",
-+          "type": "387"
++          "type": "411"
 +        },
 +        {
 +          "case": "serial",
-+          "type": "388"
++          "type": "412"
 +        },
 +        {
 +          "case": "parallel",
-+          "type": "388"
++          "type": "412"
 +        },
 +        {
 +          "case": "pipe",
-+          "type": "388"
++          "type": "412"
 +        },
 +        {
 +          "case": "socket",
-+          "type": "389"
++          "type": "413"
 +        },
 +        {
 +          "case": "udp",
-+          "type": "390"
++          "type": "414"
 +        },
 +        {
 +          "case": "pty",
-+          "type": "391"
++          "type": "415"
 +        },
 +        {
 +          "case": "null",
-+          "type": "391"
++          "type": "415"
 +        },
 +        {
 +          "case": "mux",
-+          "type": "392"
++          "type": "416"
 +        },
 +        {
 +          "case": "msmouse",
-+          "type": "391"
++          "type": "415"
 +        },
 +        {
 +          "case": "wctablet",
-+          "type": "391"
++          "type": "415"
 +        },
 +        {
 +          "case": "braille",
-+          "type": "391"
++          "type": "415"
 +        },
 +        {
 +          "case": "testdev",
-+          "type": "391"
++          "type": "415"
 +        },
 +        {
 +          "case": "stdio",
-+          "type": "393"
++          "type": "417"
 +        },
 +        {
 +          "case": "console",
-+          "type": "391"
-+        },
-+        {
-+          "case": "spicevmc",
-+          "type": "394"
-+        },
-+        {
-+          "case": "spiceport",
-+          "type": "395"
++          "type": "415"
 +        },
 +        {
 +          "case": "vc",
-+          "type": "396"
++          "type": "420"
 +        },
 +        {
 +          "case": "ringbuf",
-+          "type": "397"
++          "type": "421"
 +        },
 +        {
 +          "case": "memory",
-+          "type": "397"
++          "type": "421"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "386"
++          "type": "410"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "273",
++      "name": "286",
++      "meta-type": "enum",
++      "values": [
++        "elf",
++        "kdump-zlib",
++        "kdump-lzo",
++        "kdump-snappy",
++        "win-dmp"
++      ]
++    },
++    {
++      "name": "287",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "active",
++        "completed",
++        "failed"
++      ]
++    },
++    {
++      "name": "[286]",
++      "element-type": "286",
++      "meta-type": "array"
++    },
++    {
++      "name": "288",
 +      "meta-type": "enum",
 +      "values": [
 +        "normal",
@@ -17490,7 +17829,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "274",
++      "name": "289",
 +      "meta-type": "enum",
 +      "values": [
 +        "half",
@@ -17498,7 +17837,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "275",
++      "name": "290",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -17506,7 +17845,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "276",
++      "name": "291",
 +      "members": [
 +        {
 +          "name": "priority",
@@ -17565,7 +17904,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "277",
++      "name": "292",
 +      "members": [
 +        {
 +          "name": "in-pport",
@@ -17606,7 +17945,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "278",
++      "name": "293",
 +      "members": [
 +        {
 +          "name": "goto-tbl",
@@ -17642,28 +17981,28 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "279",
++      "name": "294",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "passthrough",
-+          "type": "399"
++          "type": "423"
 +        },
 +        {
 +          "case": "emulator",
-+          "type": "400"
++          "type": "424"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "398"
++          "type": "422"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "284",
++      "name": "299",
 +      "meta-type": "enum",
 +      "values": [
 +        "ipv4",
@@ -17674,12 +18013,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[285]",
-+      "element-type": "285",
++      "name": "[300]",
++      "element-type": "300",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "285",
++      "name": "300",
 +      "members": [
 +        {
 +          "name": "host",
@@ -17691,7 +18030,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "family",
-+          "type": "284"
++          "type": "299"
 +        },
 +        {
 +          "name": "websocket",
@@ -17711,12 +18050,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[286]",
-+      "element-type": "286",
++      "name": "[301]",
++      "element-type": "301",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "286",
++      "name": "301",
 +      "members": [
 +        {
 +          "name": "host",
@@ -17728,7 +18067,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "family",
-+          "type": "284"
++          "type": "299"
 +        },
 +        {
 +          "name": "websocket",
@@ -17736,18 +18075,18 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "auth",
-+          "type": "287"
++          "type": "302"
 +        },
 +        {
 +          "name": "vencrypt",
 +          "default": null,
-+          "type": "288"
++          "type": "303"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "287",
++      "name": "302",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -17762,7 +18101,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "288",
++      "name": "303",
 +      "meta-type": "enum",
 +      "values": [
 +        "plain",
@@ -17777,7 +18116,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "289",
++      "name": "304",
 +      "members": [
 +        {
 +          "name": "host",
@@ -17789,7 +18128,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "family",
-+          "type": "284"
++          "type": "299"
 +        },
 +        {
 +          "name": "websocket",
@@ -17804,7 +18143,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "290",
++      "name": "305",
 +      "members": [
 +        {
 +          "name": "host",
@@ -17816,7 +18155,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "family",
-+          "type": "284"
++          "type": "299"
 +        },
 +        {
 +          "name": "websocket",
@@ -17826,67 +18165,129 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[291]",
-+      "element-type": "291",
++      "name": "[306]",
++      "element-type": "306",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "291",
++      "name": "306",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "number",
-+          "type": "402"
++          "type": "426"
 +        },
 +        {
 +          "case": "qcode",
-+          "type": "403"
++          "type": "427"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "401"
++          "type": "425"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[292]",
-+      "element-type": "292",
++      "name": "[307]",
++      "element-type": "307",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "292",
++      "name": "307",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "key",
-+          "type": "405"
++          "type": "429"
 +        },
 +        {
 +          "case": "btn",
-+          "type": "406"
++          "type": "430"
 +        },
 +        {
 +          "case": "rel",
-+          "type": "407"
++          "type": "431"
 +        },
 +        {
 +          "case": "abs",
-+          "type": "407"
++          "type": "431"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "404"
++          "type": "428"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "293",
++      "name": "308",
++      "meta-type": "enum",
++      "values": [
++        "default",
++        "none",
++        "gtk",
++        "sdl",
++        "egl-headless",
++        "curses",
++        "cocoa",
++        "spice-app"
++      ]
++    },
++    {
++      "name": "309",
++      "meta-type": "enum",
++      "values": [
++        "off",
++        "on",
++        "core",
++        "es"
++      ]
++    },
++    {
++      "name": "310",
++      "members": [
++        {
++          "name": "grab-on-hover",
++          "default": null,
++          "type": "bool"
++        },
++        {
++          "name": "zoom-to-fit",
++          "default": null,
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "311",
++      "members": [
++        {
++          "name": "charset",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "312",
++      "members": [
++        {
++          "name": "rendernode",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "313",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -17901,11 +18302,12 @@ index 0000000000..576e0b69e9
 +        "failed",
 +        "colo",
 +        "pre-switchover",
-+        "device"
++        "device",
++        "wait-unplug"
 +      ]
 +    },
 +    {
-+      "name": "294",
++      "name": "314",
 +      "members": [
 +        {
 +          "name": "transferred",
@@ -17958,12 +18360,16 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "multifd-bytes",
 +          "type": "int"
++        },
++        {
++          "name": "pages-per-second",
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "295",
++      "name": "315",
 +      "members": [
 +        {
 +          "name": "cache-size",
@@ -17993,7 +18399,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "296",
++      "name": "316",
 +      "members": [
 +        {
 +          "name": "pages",
@@ -18019,7 +18425,41 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "297",
++      "name": "[317]",
++      "element-type": "317",
++      "meta-type": "array"
++    },
++    {
++      "name": "317",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "inet",
++          "type": "393"
++        },
++        {
++          "case": "unix",
++          "type": "433"
++        },
++        {
++          "case": "vsock",
++          "type": "434"
++        },
++        {
++          "case": "fd",
++          "type": "435"
++        }
++      ],
++      "members": [
++        {
++          "name": "type",
++          "type": "432"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "318",
 +      "meta-type": "enum",
 +      "values": [
 +        "xbzrle",
@@ -18034,14 +18474,16 @@ index 0000000000..576e0b69e9
 +        "block",
 +        "return-path",
 +        "pause-before-switchover",
-+        "x-multifd",
++        "multifd",
 +        "dirty-bitmaps",
 +        "postcopy-blocktime",
-+        "late-block-activate"
++        "late-block-activate",
++        "x-ignore-shared",
++        "validate-uuid"
 +      ]
 +    },
 +    {
-+      "name": "298",
++      "name": "319",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -18050,12 +18492,13 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "299",
++      "name": "320",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
 +        "request",
-+        "error"
++        "error",
++        "processing"
 +      ]
 +    },
 +    {
@@ -18064,80 +18507,84 @@ index 0000000000..576e0b69e9
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "[300]",
-+      "element-type": "300",
++      "name": "[321]",
++      "element-type": "321",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "300",
++      "name": "321",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "abort",
-+          "type": "409"
++          "type": "437"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-add",
-+          "type": "410"
++          "type": "438"
++        },
++        {
++          "case": "block-dirty-bitmap-remove",
++          "type": "439"
 +        },
 +        {
 +          "case": "block-dirty-bitmap-clear",
-+          "type": "411"
++          "type": "439"
 +        },
 +        {
-+          "case": "x-block-dirty-bitmap-enable",
-+          "type": "411"
++          "case": "block-dirty-bitmap-enable",
++          "type": "439"
 +        },
 +        {
-+          "case": "x-block-dirty-bitmap-disable",
-+          "type": "411"
++          "case": "block-dirty-bitmap-disable",
++          "type": "439"
 +        },
 +        {
-+          "case": "x-block-dirty-bitmap-merge",
-+          "type": "412"
++          "case": "block-dirty-bitmap-merge",
++          "type": "440"
 +        },
 +        {
 +          "case": "blockdev-backup",
-+          "type": "413"
++          "type": "441"
 +        },
 +        {
 +          "case": "blockdev-snapshot",
-+          "type": "414"
++          "type": "442"
 +        },
 +        {
 +          "case": "blockdev-snapshot-internal-sync",
-+          "type": "415"
++          "type": "443"
 +        },
 +        {
 +          "case": "blockdev-snapshot-sync",
-+          "type": "416"
++          "type": "444"
 +        },
 +        {
 +          "case": "drive-backup",
-+          "type": "417"
++          "type": "445"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "408"
++          "type": "436"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "301",
++      "name": "322",
 +      "members": [
 +        {
 +          "name": "completion-mode",
 +          "default": null,
-+          "type": "418"
++          "type": "446"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "302",
++      "name": "323",
 +      "meta-type": "enum",
 +      "values": [
 +        "unavailable",
@@ -18146,7 +18593,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "303",
++      "name": "324",
 +      "meta-type": "enum",
 +      "values": [
 +        "builtin",
@@ -18159,17 +18606,17 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "304",
++      "name": "325",
 +      "members": [
 +        {
 +          "name": "json-type",
-+          "type": "419"
++          "type": "447"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "305",
++      "name": "326",
 +      "members": [
 +        {
 +          "name": "values",
@@ -18179,7 +18626,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "306",
++      "name": "327",
 +      "members": [
 +        {
 +          "name": "element-type",
@@ -18189,11 +18636,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "307",
++      "name": "328",
 +      "members": [
 +        {
 +          "name": "members",
-+          "type": "[420]"
++          "type": "[448]"
 +        },
 +        {
 +          "name": "tag",
@@ -18203,23 +18650,28 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "variants",
 +          "default": null,
-+          "type": "[421]"
++          "type": "[449]"
++        },
++        {
++          "name": "features",
++          "default": null,
++          "type": "[str]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "308",
++      "name": "329",
 +      "members": [
 +        {
 +          "name": "members",
-+          "type": "[422]"
++          "type": "[450]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "309",
++      "name": "330",
 +      "members": [
 +        {
 +          "name": "arg-type",
@@ -18233,12 +18685,17 @@ index 0000000000..576e0b69e9
 +          "name": "allow-oob",
 +          "default": null,
 +          "type": "bool"
++        },
++        {
++          "name": "features",
++          "default": null,
++          "type": "[str]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "310",
++      "name": "331",
 +      "members": [
 +        {
 +          "name": "arg-type",
@@ -18248,37 +18705,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[311]",
-+      "element-type": "311",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "311",
-+      "meta-type": "enum",
-+      "values": [
-+        "oob"
-+      ]
-+    },
-+    {
-+      "name": "312",
-+      "members": [
-+        {
-+          "name": "major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "micro",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "313",
++      "name": "332",
 +      "members": [
 +        {
 +          "name": "node-id",
@@ -18291,6 +18718,11 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "die-id",
++          "default": null,
++          "type": "int"
++        },
++        {
 +          "name": "core-id",
 +          "default": null,
 +          "type": "int"
@@ -18304,7 +18736,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "314",
++      "name": "333",
 +      "meta-type": "enum",
 +      "values": [
 +        "x86",
@@ -18318,7 +18750,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "315",
++      "name": "334",
 +      "members": [
 +        {
 +          "name": "pc",
@@ -18328,7 +18760,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "316",
++      "name": "335",
 +      "members": [
 +        {
 +          "name": "pc",
@@ -18342,7 +18774,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "317",
++      "name": "336",
 +      "members": [
 +        {
 +          "name": "nip",
@@ -18352,7 +18784,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "318",
++      "name": "337",
 +      "members": [
 +        {
 +          "name": "PC",
@@ -18362,7 +18794,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "319",
++      "name": "338",
 +      "members": [
 +        {
 +          "name": "PC",
@@ -18372,17 +18804,17 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "320",
++      "name": "339",
 +      "members": [
 +        {
 +          "name": "cpu-state",
-+          "type": "423"
++          "type": "451"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "321",
++      "name": "340",
 +      "members": [
 +        {
 +          "name": "pc",
@@ -18392,7 +18824,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "322",
++      "name": "341",
 +      "meta-type": "enum",
 +      "values": [
 +        "aarch64",
@@ -18429,164 +18861,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[323]",
-+      "element-type": "323",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "323",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "function",
-+          "type": "int"
-+        },
-+        {
-+          "name": "class_info",
-+          "type": "424"
-+        },
-+        {
-+          "name": "id",
-+          "type": "425"
-+        },
-+        {
-+          "name": "irq",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "qdev_id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pci_bridge",
-+          "default": null,
-+          "type": "426"
-+        },
-+        {
-+          "name": "regions",
-+          "type": "[427]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "324",
-+      "meta-type": "enum",
-+      "values": [
-+        "elf",
-+        "kdump-zlib",
-+        "kdump-lzo",
-+        "kdump-snappy",
-+        "win-dmp"
-+      ]
-+    },
-+    {
-+      "name": "325",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "active",
-+        "completed",
-+        "failed"
-+      ]
-+    },
-+    {
-+      "name": "[324]",
-+      "element-type": "324",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "326",
-+      "meta-type": "enum",
-+      "values": [
-+        "static",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "327",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "328",
-+      "meta-type": "enum",
-+      "values": [
-+        "incompatible",
-+        "identical",
-+        "superset",
-+        "subset"
-+      ]
-+    },
-+    {
-+      "name": "[329]",
-+      "element-type": "329",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "329",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[330]",
-+      "element-type": "330",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "330",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "428"
-+        },
-+        {
-+          "name": "help",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "331",
++      "name": "342",
 +      "meta-type": "enum",
 +      "values": [
 +        "default",
@@ -18596,61 +18871,18 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "332",
-+      "meta-type": "enum",
-+      "values": [
-+        "dimm",
-+        "nvdimm"
-+      ]
-+    },
-+    {
-+      "name": "333",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "429"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "334",
-+      "meta-type": "enum",
-+      "values": [
-+        "DIMM",
-+        "CPU"
-+      ]
-+    },
-+    {
-+      "name": "335",
-+      "meta-type": "enum",
-+      "values": [
-+        "uninit",
-+        "launch-update",
-+        "launch-secret",
-+        "running",
-+        "send-update",
-+        "receive-update"
-+      ]
-+    },
-+    {
-+      "name": "336",
-+      "meta-type": "enum",
-+      "values": [
-+        "queue-full"
-+      ]
-+    },
-+    {
-+      "name": "337",
++      "name": "343",
 +      "meta-type": "enum",
 +      "values": [
 +        "node",
 +        "dist",
-+        "cpu"
++        "cpu",
++        "hmat-lb",
++        "hmat-cache"
 +      ]
 +    },
 +    {
-+      "name": "338",
++      "name": "344",
 +      "members": [
 +        {
 +          "name": "nodeid",
@@ -18671,12 +18903,17 @@ index 0000000000..576e0b69e9
 +          "name": "memdev",
 +          "default": null,
 +          "type": "str"
++        },
++        {
++          "name": "initiator",
++          "default": null,
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "339",
++      "name": "345",
 +      "members": [
 +        {
 +          "name": "src",
@@ -18694,7 +18931,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "340",
++      "name": "346",
 +      "members": [
 +        {
 +          "name": "node-id",
@@ -18707,6 +18944,11 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "die-id",
++          "default": null,
++          "type": "int"
++        },
++        {
 +          "name": "core-id",
 +          "default": null,
 +          "type": "int"
@@ -18720,7 +18962,267 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "341",
++      "name": "347",
++      "members": [
++        {
++          "name": "initiator",
++          "type": "int"
++        },
++        {
++          "name": "target",
++          "type": "int"
++        },
++        {
++          "name": "hierarchy",
++          "type": "452"
++        },
++        {
++          "name": "data-type",
++          "type": "453"
++        },
++        {
++          "name": "latency",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "bandwidth",
++          "default": null,
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "348",
++      "members": [
++        {
++          "name": "node-id",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "level",
++          "type": "int"
++        },
++        {
++          "name": "associativity",
++          "type": "454"
++        },
++        {
++          "name": "policy",
++          "type": "455"
++        },
++        {
++          "name": "line",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "349",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "props",
++          "default": null,
++          "type": "any"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "350",
++      "meta-type": "enum",
++      "values": [
++        "incompatible",
++        "identical",
++        "superset",
++        "subset"
++      ]
++    },
++    {
++      "name": "351",
++      "meta-type": "enum",
++      "values": [
++        "static",
++        "full"
++      ]
++    },
++    {
++      "name": "[352]",
++      "element-type": "352",
++      "meta-type": "array"
++    },
++    {
++      "name": "352",
++      "meta-type": "enum",
++      "values": [
++        "oob"
++      ]
++    },
++    {
++      "name": "353",
++      "members": [
++        {
++          "name": "major",
++          "type": "int"
++        },
++        {
++          "name": "minor",
++          "type": "int"
++        },
++        {
++          "name": "micro",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[354]",
++      "element-type": "354",
++      "meta-type": "array"
++    },
++    {
++      "name": "354",
++      "members": [
++        {
++          "name": "bus",
++          "type": "int"
++        },
++        {
++          "name": "slot",
++          "type": "int"
++        },
++        {
++          "name": "function",
++          "type": "int"
++        },
++        {
++          "name": "class_info",
++          "type": "456"
++        },
++        {
++          "name": "id",
++          "type": "457"
++        },
++        {
++          "name": "irq",
++          "default": null,
++          "type": "int"
++        },
++        {
++          "name": "qdev_id",
++          "type": "str"
++        },
++        {
++          "name": "pci_bridge",
++          "default": null,
++          "type": "458"
++        },
++        {
++          "name": "regions",
++          "type": "[459]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[355]",
++      "element-type": "355",
++      "meta-type": "array"
++    },
++    {
++      "name": "355",
++      "members": [
++        {
++          "name": "fd",
++          "type": "int"
++        },
++        {
++          "name": "opaque",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[356]",
++      "element-type": "356",
++      "meta-type": "array"
++    },
++    {
++      "name": "356",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "type",
++          "type": "460"
++        },
++        {
++          "name": "help",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "default",
++          "default": null,
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "357",
++      "meta-type": "enum",
++      "values": [
++        "dimm",
++        "nvdimm",
++        "virtio-pmem"
++      ]
++    },
++    {
++      "name": "358",
++      "members": [
++        {
++          "name": "data",
++          "type": "461"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "359",
++      "members": [
++        {
++          "name": "data",
++          "type": "462"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "360",
++      "meta-type": "enum",
++      "values": [
++        "DIMM",
++        "CPU"
++      ]
++    },
++    {
++      "name": "362",
 +      "meta-type": "enum",
 +      "values": [
 +        "hyper-v",
@@ -18728,7 +19230,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "342",
++      "name": "363",
 +      "members": [
 +        {
 +          "name": "arg1",
@@ -18754,7 +19256,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "343",
++      "name": "364",
 +      "members": [
 +        {
 +          "name": "core",
@@ -18770,28 +19272,79 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "reason",
-+          "type": "430"
++          "type": "463"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "344",
++      "name": "365",
++      "meta-type": "enum",
++      "values": [
++        "inet",
++        "unix",
++        "vsock",
++        "fd"
++      ]
++    },
++    {
++      "name": "366",
++      "members": [
++        {
++          "name": "data",
++          "type": "393"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "367",
++      "members": [
++        {
++          "name": "data",
++          "type": "433"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "368",
++      "members": [
++        {
++          "name": "data",
++          "type": "434"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "369",
++      "members": [
++        {
++          "name": "data",
++          "type": "435"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "370",
 +      "meta-type": "enum",
 +      "values": [
 +        "active",
 +        "disabled",
 +        "frozen",
-+        "locked"
++        "locked",
++        "inconsistent"
 +      ]
 +    },
 +    {
-+      "name": "[345]",
-+      "element-type": "345",
++      "name": "[371]",
++      "element-type": "371",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "345",
++      "name": "371",
 +      "members": [
 +        {
 +          "name": "interval_length",
@@ -18845,7 +19398,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "346",
++      "name": "372",
 +      "members": [
 +        {
 +          "name": "boundaries",
@@ -18859,40 +19412,83 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[66]",
-+      "element-type": "66",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "347",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "qcow2",
-+          "type": "432"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "433"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "434"
-+        }
-+      ],
++      "name": "373",
 +      "members": [
 +        {
-+          "name": "type",
-+          "type": "431"
++          "name": "discard-nb-ok",
++          "type": "int"
++        },
++        {
++          "name": "discard-nb-failed",
++          "type": "int"
++        },
++        {
++          "name": "discard-bytes-ok",
++          "type": "int"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "348",
++      "name": "[11]",
++      "element-type": "11",
++      "meta-type": "array"
++    },
++    {
++      "name": "374",
++      "tag": "type",
++      "variants": [
++        {
++          "case": "qcow2",
++          "type": "465"
++        },
++        {
++          "case": "vmdk",
++          "type": "466"
++        },
++        {
++          "case": "luks",
++          "type": "467"
++        }
++      ],
 +      "members": [
 +        {
-+          "type": "44"
++          "name": "type",
++          "type": "464"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "375",
++      "meta-type": "enum",
++      "values": [
++        "block-backend",
++        "block-job",
++        "block-driver"
++      ]
++    },
++    {
++      "name": "[376]",
++      "element-type": "376",
++      "meta-type": "array"
++    },
++    {
++      "name": "376",
++      "meta-type": "enum",
++      "values": [
++        "consistent-read",
++        "write",
++        "write-unchanged",
++        "resize",
++        "graph-mod"
++      ]
++    },
++    {
++      "name": "377",
++      "members": [
++        {
++          "type": "50"
 +        },
 +        {
 +          "type": "str"
@@ -18901,16 +19497,16 @@ index 0000000000..576e0b69e9
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "[349]",
-+      "element-type": "349",
++      "name": "[378]",
++      "element-type": "378",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "349",
++      "name": "378",
 +      "members": [
 +        {
 +          "name": "event",
-+          "type": "435"
++          "type": "468"
 +        },
 +        {
 +          "name": "state",
@@ -18918,6 +19514,11 @@ index 0000000000..576e0b69e9
 +          "type": "int"
 +        },
 +        {
++          "name": "iotype",
++          "default": null,
++          "type": "469"
++        },
++        {
 +          "name": "errno",
 +          "default": null,
 +          "type": "int"
@@ -18941,16 +19542,16 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[350]",
-+      "element-type": "350",
++      "name": "[379]",
++      "element-type": "379",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "350",
++      "name": "379",
 +      "members": [
 +        {
 +          "name": "event",
-+          "type": "435"
++          "type": "468"
 +        },
 +        {
 +          "name": "state",
@@ -18965,7 +19566,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "351",
++      "name": "380",
 +      "meta-type": "enum",
 +      "values": [
 +        "auto",
@@ -18974,7 +19575,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "352",
++      "name": "381",
 +      "meta-type": "enum",
 +      "values": [
 +        "threads",
@@ -18982,41 +19583,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[353]",
-+      "element-type": "353",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "353",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "365"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "437"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "438"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "439"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "436"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "354",
++      "name": "382",
 +      "meta-type": "enum",
 +      "values": [
 +        "tcp",
@@ -19024,7 +19591,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "355",
++      "name": "383",
 +      "meta-type": "enum",
 +      "values": [
 +        "crc32c",
@@ -19034,11 +19601,11 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "356",
++      "name": "384",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "440"
++          "type": "470"
 +        },
 +        {
 +          "name": "host",
@@ -19048,10 +19615,10 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "357",
++      "name": "385",
 +      "members": [
 +        {
-+          "type": "44"
++          "type": "50"
 +        },
 +        {
 +          "type": "str"
@@ -19063,62 +19630,62 @@ index 0000000000..576e0b69e9
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "358",
++      "name": "386",
 +      "members": [
 +        {
-+          "type": "441"
++          "type": "471"
 +        },
 +        {
-+          "type": "442"
++          "type": "472"
 +        }
 +      ],
 +      "meta-type": "alternate"
 +    },
 +    {
-+      "name": "359",
++      "name": "387",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "aes",
-+          "type": "444"
++          "type": "474"
 +        },
 +        {
 +          "case": "luks",
-+          "type": "445"
++          "type": "475"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "443"
++          "type": "473"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "360",
++      "name": "388",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "aes",
-+          "type": "444"
++          "type": "474"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "446"
++          "type": "476"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[348]",
-+      "element-type": "348",
++      "name": "[377]",
++      "element-type": "377",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "361",
++      "name": "389",
 +      "meta-type": "enum",
 +      "values": [
 +        "quorum",
@@ -19126,12 +19693,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[362]",
-+      "element-type": "362",
++      "name": "[390]",
++      "element-type": "390",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "362",
++      "name": "390",
 +      "meta-type": "enum",
 +      "values": [
 +        "cephx",
@@ -19139,12 +19706,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[363]",
-+      "element-type": "363",
++      "name": "[391]",
++      "element-type": "391",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "363",
++      "name": "391",
 +      "members": [
 +        {
 +          "name": "host",
@@ -19158,7 +19725,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "364",
++      "name": "392",
 +      "meta-type": "enum",
 +      "values": [
 +        "primary",
@@ -19166,7 +19733,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "365",
++      "name": "393",
 +      "members": [
 +        {
 +          "name": "host",
@@ -19195,17 +19762,22 @@ index 0000000000..576e0b69e9
 +          "name": "ipv6",
 +          "default": null,
 +          "type": "bool"
++        },
++        {
++          "name": "keep-alive",
++          "default": null,
++          "type": "bool"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "366",
++      "name": "394",
 +      "tag": "mode",
 +      "variants": [
 +        {
 +          "case": "hash",
-+          "type": "448"
++          "type": "478"
 +        },
 +        {
 +          "case": "none",
@@ -19219,13 +19791,13 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "mode",
-+          "type": "447"
++          "type": "477"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "367",
++      "name": "395",
 +      "members": [
 +        {
 +          "name": "filename",
@@ -19238,7 +19810,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "449"
++          "type": "479"
 +        },
 +        {
 +          "name": "nocow",
@@ -19249,11 +19821,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "368",
++      "name": "396",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "242"
++          "type": "257"
 +        },
 +        {
 +          "name": "size",
@@ -19262,13 +19834,13 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "449"
++          "type": "479"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "369",
++      "name": "397",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -19278,27 +19850,27 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "cipher-alg",
 +          "default": null,
-+          "type": "450"
++          "type": "480"
 +        },
 +        {
 +          "name": "cipher-mode",
 +          "default": null,
-+          "type": "451"
++          "type": "481"
 +        },
 +        {
 +          "name": "ivgen-alg",
 +          "default": null,
-+          "type": "452"
++          "type": "482"
 +        },
 +        {
 +          "name": "ivgen-hash-alg",
 +          "default": null,
-+          "type": "453"
++          "type": "483"
 +        },
 +        {
 +          "name": "hash-alg",
 +          "default": null,
-+          "type": "453"
++          "type": "483"
 +        },
 +        {
 +          "name": "iter-time",
@@ -19307,21 +19879,26 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
 +          "type": "int"
++        },
++        {
++          "name": "preallocation",
++          "default": null,
++          "type": "479"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "370",
++      "name": "398",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "248"
++          "type": "263"
 +        },
 +        {
 +          "name": "size",
@@ -19331,11 +19908,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "371",
++      "name": "399",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
@@ -19350,11 +19927,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "372",
++      "name": "400",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
@@ -19368,17 +19945,27 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "454"
++          "type": "484"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "373",
++      "name": "401",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
++        },
++        {
++          "name": "data-file",
++          "default": null,
++          "type": "377"
++        },
++        {
++          "name": "data-file-raw",
++          "default": null,
++          "type": "bool"
 +        },
 +        {
 +          "name": "size",
@@ -19387,7 +19974,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "version",
 +          "default": null,
-+          "type": "455"
++          "type": "485"
 +        },
 +        {
 +          "name": "backing-file",
@@ -19397,12 +19984,12 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "backing-fmt",
 +          "default": null,
-+          "type": "232"
++          "type": "246"
 +        },
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "454"
++          "type": "484"
 +        },
 +        {
 +          "name": "cluster-size",
@@ -19412,7 +19999,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "449"
++          "type": "479"
 +        },
 +        {
 +          "name": "lazy-refcounts",
@@ -19428,11 +20015,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "374",
++      "name": "402",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
@@ -19446,7 +20033,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "backing-fmt",
 +          "default": null,
-+          "type": "232"
++          "type": "246"
 +        },
 +        {
 +          "name": "cluster-size",
@@ -19462,11 +20049,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "375",
++      "name": "403",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "256"
++          "type": "271"
 +        },
 +        {
 +          "name": "size",
@@ -19481,11 +20068,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "376",
++      "name": "404",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "258"
++          "type": "273"
 +        },
 +        {
 +          "name": "size",
@@ -19499,12 +20086,12 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "449"
++          "type": "479"
 +        },
 +        {
 +          "name": "redundancy",
 +          "default": null,
-+          "type": "456"
++          "type": "486"
 +        },
 +        {
 +          "name": "object-size",
@@ -19515,11 +20102,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "377",
++      "name": "405",
 +      "members": [
 +        {
 +          "name": "location",
-+          "type": "259"
++          "type": "274"
 +        },
 +        {
 +          "name": "size",
@@ -19529,11 +20116,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "378",
++      "name": "406",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
@@ -19542,17 +20129,17 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "preallocation",
 +          "default": null,
-+          "type": "449"
++          "type": "479"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "379",
++      "name": "407",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
@@ -19571,7 +20158,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "subformat",
 +          "default": null,
-+          "type": "457"
++          "type": "487"
 +        },
 +        {
 +          "name": "block-state-zero",
@@ -19582,11 +20169,55 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "380",
++      "name": "408",
 +      "members": [
 +        {
 +          "name": "file",
-+          "type": "348"
++          "type": "377"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "extents",
++          "default": null,
++          "type": "[377]"
++        },
++        {
++          "name": "subformat",
++          "default": null,
++          "type": "488"
++        },
++        {
++          "name": "backing-file",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "adapter-type",
++          "default": null,
++          "type": "489"
++        },
++        {
++          "name": "hwversion",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "zeroed-grain",
++          "default": null,
++          "type": "bool"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "409",
++      "members": [
++        {
++          "name": "file",
++          "type": "377"
 +        },
 +        {
 +          "name": "size",
@@ -19595,7 +20226,7 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "subformat",
 +          "default": null,
-+          "type": "458"
++          "type": "490"
 +        },
 +        {
 +          "name": "force-size",
@@ -19611,57 +20242,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "builtin"
 +    },
 +    {
-+      "name": "381",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "382",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "365"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "383",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "437"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "384",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "438"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "385",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "439"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "386",
++      "name": "410",
 +      "meta-type": "enum",
 +      "values": [
 +        "file",
@@ -19679,262 +20260,17 @@ index 0000000000..576e0b69e9
 +        "testdev",
 +        "stdio",
 +        "console",
-+        "spicevmc",
-+        "spiceport",
 +        "vc",
 +        "ringbuf",
 +        "memory"
 +      ]
 +    },
 +    {
-+      "name": "387",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "459"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "388",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "460"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "389",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "461"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "390",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "462"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "391",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "463"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "392",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "464"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "393",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "465"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "394",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "466"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "395",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "467"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "396",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "468"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "397",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "469"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "398",
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "399",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "470"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "400",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "471"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "401",
-+      "meta-type": "enum",
-+      "values": [
-+        "number",
-+        "qcode"
-+      ]
-+    },
-+    {
-+      "name": "402",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "403",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "472"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "404",
-+      "meta-type": "enum",
-+      "values": [
-+        "key",
-+        "btn",
-+        "rel",
-+        "abs"
-+      ]
-+    },
-+    {
-+      "name": "405",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "473"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "406",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "474"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "407",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "475"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "408",
-+      "meta-type": "enum",
-+      "values": [
-+        "abort",
-+        "block-dirty-bitmap-add",
-+        "block-dirty-bitmap-clear",
-+        "x-block-dirty-bitmap-enable",
-+        "x-block-dirty-bitmap-disable",
-+        "x-block-dirty-bitmap-merge",
-+        "blockdev-backup",
-+        "blockdev-snapshot",
-+        "blockdev-snapshot-internal-sync",
-+        "blockdev-snapshot-sync",
-+        "drive-backup"
-+      ]
-+    },
-+    {
-+      "name": "409",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "476"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "410",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "30"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
 +      "name": "411",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "31"
++          "type": "491"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -19944,7 +20280,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "32"
++          "type": "492"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -19954,7 +20290,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "27"
++          "type": "493"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -19964,7 +20300,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "23"
++          "type": "494"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -19974,7 +20310,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "64"
++          "type": "495"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -19984,7 +20320,7 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "22"
++          "type": "496"
 +        }
 +      ],
 +      "meta-type": "object"
@@ -19994,13 +20330,281 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "26"
++          "type": "497"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "418",
++      "name": "420",
++      "members": [
++        {
++          "name": "data",
++          "type": "500"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "421",
++      "members": [
++        {
++          "name": "data",
++          "type": "501"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "422",
++      "meta-type": "enum",
++      "values": [
++        "passthrough",
++        "emulator"
++      ]
++    },
++    {
++      "name": "423",
++      "members": [
++        {
++          "name": "data",
++          "type": "502"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "424",
++      "members": [
++        {
++          "name": "data",
++          "type": "503"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "425",
++      "meta-type": "enum",
++      "values": [
++        "number",
++        "qcode"
++      ]
++    },
++    {
++      "name": "426",
++      "members": [
++        {
++          "name": "data",
++          "type": "int"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "427",
++      "members": [
++        {
++          "name": "data",
++          "type": "504"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "428",
++      "meta-type": "enum",
++      "values": [
++        "key",
++        "btn",
++        "rel",
++        "abs"
++      ]
++    },
++    {
++      "name": "429",
++      "members": [
++        {
++          "name": "data",
++          "type": "505"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "430",
++      "members": [
++        {
++          "name": "data",
++          "type": "506"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "431",
++      "members": [
++        {
++          "name": "data",
++          "type": "507"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "432",
++      "meta-type": "enum",
++      "values": [
++        "inet",
++        "unix",
++        "vsock",
++        "fd"
++      ]
++    },
++    {
++      "name": "433",
++      "members": [
++        {
++          "name": "path",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "434",
++      "members": [
++        {
++          "name": "cid",
++          "type": "str"
++        },
++        {
++          "name": "port",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "435",
++      "members": [
++        {
++          "name": "str",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "436",
++      "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": "437",
++      "members": [
++        {
++          "name": "data",
++          "type": "508"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "438",
++      "members": [
++        {
++          "name": "data",
++          "type": "36"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "439",
++      "members": [
++        {
++          "name": "data",
++          "type": "37"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "440",
++      "members": [
++        {
++          "name": "data",
++          "type": "38"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "441",
++      "members": [
++        {
++          "name": "data",
++          "type": "32"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "442",
++      "members": [
++        {
++          "name": "data",
++          "type": "28"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "443",
++      "members": [
++        {
++          "name": "data",
++          "type": "9"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "444",
++      "members": [
++        {
++          "name": "data",
++          "type": "27"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "445",
++      "members": [
++        {
++          "name": "data",
++          "type": "31"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "446",
 +      "meta-type": "enum",
 +      "values": [
 +        "individual",
@@ -20008,7 +20612,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "419",
++      "name": "447",
 +      "meta-type": "enum",
 +      "values": [
 +        "string",
@@ -20022,12 +20626,12 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "[420]",
-+      "element-type": "420",
++      "name": "[448]",
++      "element-type": "448",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "420",
++      "name": "448",
 +      "members": [
 +        {
 +          "name": "name",
@@ -20046,12 +20650,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[421]",
-+      "element-type": "421",
++      "name": "[449]",
++      "element-type": "449",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "421",
++      "name": "449",
 +      "members": [
 +        {
 +          "name": "case",
@@ -20065,12 +20669,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[422]",
-+      "element-type": "422",
++      "name": "[450]",
++      "element-type": "450",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "422",
++      "name": "450",
 +      "members": [
 +        {
 +          "name": "type",
@@ -20080,7 +20684,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "423",
++      "name": "451",
 +      "meta-type": "enum",
 +      "values": [
 +        "uninitialized",
@@ -20091,7 +20695,47 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "424",
++      "name": "452",
++      "meta-type": "enum",
++      "values": [
++        "memory",
++        "first-level",
++        "second-level",
++        "third-level"
++      ]
++    },
++    {
++      "name": "453",
++      "meta-type": "enum",
++      "values": [
++        "access-latency",
++        "read-latency",
++        "write-latency",
++        "access-bandwidth",
++        "read-bandwidth",
++        "write-bandwidth"
++      ]
++    },
++    {
++      "name": "454",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "direct",
++        "complex"
++      ]
++    },
++    {
++      "name": "455",
++      "meta-type": "enum",
++      "values": [
++        "none",
++        "write-back",
++        "write-through"
++      ]
++    },
++    {
++      "name": "456",
 +      "members": [
 +        {
 +          "name": "desc",
@@ -20106,7 +20750,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "425",
++      "name": "457",
 +      "members": [
 +        {
 +          "name": "device",
@@ -20130,27 +20774,27 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "426",
++      "name": "458",
 +      "members": [
 +        {
 +          "name": "bus",
-+          "type": "477"
++          "type": "509"
 +        },
 +        {
 +          "name": "devices",
 +          "default": null,
-+          "type": "[323]"
++          "type": "[354]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[427]",
-+      "element-type": "427",
++      "name": "[459]",
++      "element-type": "459",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "427",
++      "name": "459",
 +      "members": [
 +        {
 +          "name": "bar",
@@ -20182,7 +20826,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "428",
++      "name": "460",
 +      "meta-type": "enum",
 +      "values": [
 +        "string",
@@ -20192,7 +20836,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "429",
++      "name": "461",
 +      "members": [
 +        {
 +          "name": "id",
@@ -20231,7 +20875,30 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "430",
++      "name": "462",
++      "members": [
++        {
++          "name": "id",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "memaddr",
++          "type": "int"
++        },
++        {
++          "name": "size",
++          "type": "int"
++        },
++        {
++          "name": "memdev",
++          "type": "str"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "463",
 +      "meta-type": "enum",
 +      "values": [
 +        "unknown",
@@ -20242,7 +20909,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "431",
++      "name": "464",
 +      "meta-type": "enum",
 +      "values": [
 +        "qcow2",
@@ -20251,37 +20918,37 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "432",
++      "name": "465",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "478"
++          "type": "510"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "433",
++      "name": "466",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "479"
++          "type": "511"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "434",
++      "name": "467",
 +      "members": [
 +        {
 +          "name": "data",
-+          "type": "480"
++          "type": "512"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "435",
++      "name": "468",
 +      "meta-type": "enum",
 +      "values": [
 +        "l1_update",
@@ -20329,67 +20996,37 @@ index 0000000000..576e0b69e9
 +        "empty_image_prepare",
 +        "l1_shrink_write_table",
 +        "l1_shrink_free_l2_clusters",
-+        "cor_write"
++        "cor_write",
++        "cluster_alloc_space",
++        "none"
 +      ]
 +    },
 +    {
-+      "name": "436",
++      "name": "469",
 +      "meta-type": "enum",
 +      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
++        "read",
++        "write",
++        "write-zeroes",
++        "discard",
++        "flush",
++        "block-status"
 +      ]
 +    },
 +    {
-+      "name": "437",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "438",
-+      "members": [
-+        {
-+          "name": "cid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "439",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "440",
++      "name": "470",
 +      "meta-type": "enum",
 +      "values": [
 +        "inet"
 +      ]
 +    },
 +    {
-+      "name": "441",
++      "name": "471",
 +      "members": [
 +        {
 +          "name": "template",
 +          "default": null,
-+          "type": "442"
++          "type": "472"
 +        },
 +        {
 +          "name": "main-header",
@@ -20440,7 +21077,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "442",
++      "name": "472",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -20450,7 +21087,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "443",
++      "name": "473",
 +      "meta-type": "enum",
 +      "values": [
 +        "aes",
@@ -20458,7 +21095,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "444",
++      "name": "474",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -20469,7 +21106,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "445",
++      "name": "475",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -20480,14 +21117,14 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "446",
++      "name": "476",
 +      "meta-type": "enum",
 +      "values": [
 +        "aes"
 +      ]
 +    },
 +    {
-+      "name": "447",
++      "name": "477",
 +      "meta-type": "enum",
 +      "values": [
 +        "none",
@@ -20496,11 +21133,11 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "448",
++      "name": "478",
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "481"
++          "type": "513"
 +        },
 +        {
 +          "name": "hash",
@@ -20510,7 +21147,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "449",
++      "name": "479",
 +      "meta-type": "enum",
 +      "values": [
 +        "off",
@@ -20520,7 +21157,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "450",
++      "name": "480",
 +      "meta-type": "enum",
 +      "values": [
 +        "aes-128",
@@ -20538,7 +21175,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "451",
++      "name": "481",
 +      "meta-type": "enum",
 +      "values": [
 +        "ecb",
@@ -20548,7 +21185,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "452",
++      "name": "482",
 +      "meta-type": "enum",
 +      "values": [
 +        "plain",
@@ -20557,7 +21194,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "453",
++      "name": "483",
 +      "meta-type": "enum",
 +      "values": [
 +        "md5",
@@ -20570,28 +21207,28 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "454",
++      "name": "484",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "qcow",
-+          "type": "444"
++          "type": "474"
 +        },
 +        {
 +          "case": "luks",
-+          "type": "483"
++          "type": "515"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "482"
++          "type": "514"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "455",
++      "name": "485",
 +      "meta-type": "enum",
 +      "values": [
 +        "v2",
@@ -20599,28 +21236,28 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "456",
++      "name": "486",
 +      "tag": "type",
 +      "variants": [
 +        {
 +          "case": "full",
-+          "type": "485"
++          "type": "517"
 +        },
 +        {
 +          "case": "erasure-coded",
-+          "type": "486"
++          "type": "518"
 +        }
 +      ],
 +      "members": [
 +        {
 +          "name": "type",
-+          "type": "484"
++          "type": "516"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "457",
++      "name": "487",
 +      "meta-type": "enum",
 +      "values": [
 +        "dynamic",
@@ -20628,7 +21265,28 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "458",
++      "name": "488",
++      "meta-type": "enum",
++      "values": [
++        "monolithicSparse",
++        "monolithicFlat",
++        "twoGbMaxExtentSparse",
++        "twoGbMaxExtentFlat",
++        "streamOptimized"
++      ]
++    },
++    {
++      "name": "489",
++      "meta-type": "enum",
++      "values": [
++        "ide",
++        "buslogic",
++        "lsilogic",
++        "legacyESX"
++      ]
++    },
++    {
++      "name": "490",
 +      "meta-type": "enum",
 +      "values": [
 +        "dynamic",
@@ -20636,7 +21294,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "459",
++      "name": "491",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20666,7 +21324,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "460",
++      "name": "492",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20686,7 +21344,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "461",
++      "name": "493",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20700,7 +21358,7 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "addr",
-+          "type": "268"
++          "type": "227"
 +        },
 +        {
 +          "name": "tls-creds",
@@ -20708,6 +21366,11 @@ index 0000000000..576e0b69e9
 +          "type": "str"
 +        },
 +        {
++          "name": "tls-authz",
++          "default": null,
++          "type": "str"
++        },
++        {
 +          "name": "server",
 +          "default": null,
 +          "type": "bool"
@@ -20746,7 +21409,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "462",
++      "name": "494",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20760,18 +21423,18 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "remote",
-+          "type": "268"
++          "type": "227"
 +        },
 +        {
 +          "name": "local",
 +          "default": null,
-+          "type": "268"
++          "type": "227"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "463",
++      "name": "495",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20787,7 +21450,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "464",
++      "name": "496",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20807,7 +21470,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "465",
++      "name": "497",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20828,47 +21491,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "466",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "467",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fqdn",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "468",
++      "name": "500",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20904,7 +21527,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "469",
++      "name": "501",
 +      "members": [
 +        {
 +          "name": "logfile",
@@ -20925,7 +21548,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "470",
++      "name": "502",
 +      "members": [
 +        {
 +          "name": "path",
@@ -20941,7 +21564,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "471",
++      "name": "503",
 +      "members": [
 +        {
 +          "name": "chardev",
@@ -20951,7 +21574,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "472",
++      "name": "504",
 +      "meta-type": "enum",
 +      "values": [
 +        "unmapped",
@@ -21105,11 +21728,11 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "473",
++      "name": "505",
 +      "members": [
 +        {
 +          "name": "key",
-+          "type": "291"
++          "type": "306"
 +        },
 +        {
 +          "name": "down",
@@ -21119,11 +21742,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "474",
++      "name": "506",
 +      "members": [
 +        {
 +          "name": "button",
-+          "type": "487"
++          "type": "519"
 +        },
 +        {
 +          "name": "down",
@@ -21133,11 +21756,11 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "475",
++      "name": "507",
 +      "members": [
 +        {
 +          "name": "axis",
-+          "type": "488"
++          "type": "520"
 +        },
 +        {
 +          "name": "value",
@@ -21147,13 +21770,13 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "476",
++      "name": "508",
 +      "members": [
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "477",
++      "name": "509",
 +      "members": [
 +        {
 +          "name": "number",
@@ -21169,27 +21792,37 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "io_range",
-+          "type": "489"
++          "type": "521"
 +        },
 +        {
 +          "name": "memory_range",
-+          "type": "489"
++          "type": "521"
 +        },
 +        {
 +          "name": "prefetchable_range",
-+          "type": "489"
++          "type": "521"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "478",
++      "name": "510",
 +      "members": [
 +        {
 +          "name": "compat",
 +          "type": "str"
 +        },
 +        {
++          "name": "data-file",
++          "default": null,
++          "type": "str"
++        },
++        {
++          "name": "data-file-raw",
++          "default": null,
++          "type": "bool"
++        },
++        {
 +          "name": "lazy-refcounts",
 +          "default": null,
 +          "type": "bool"
@@ -21206,13 +21839,18 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "encrypt",
 +          "default": null,
-+          "type": "490"
++          "type": "522"
++        },
++        {
++          "name": "bitmaps",
++          "default": null,
++          "type": "[523]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "479",
++      "name": "511",
 +      "members": [
 +        {
 +          "name": "create-type",
@@ -21228,34 +21866,34 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "extents",
-+          "type": "[229]"
++          "type": "[240]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "480",
++      "name": "512",
 +      "members": [
 +        {
 +          "name": "cipher-alg",
-+          "type": "450"
++          "type": "480"
 +        },
 +        {
 +          "name": "cipher-mode",
-+          "type": "451"
++          "type": "481"
 +        },
 +        {
 +          "name": "ivgen-alg",
-+          "type": "452"
++          "type": "482"
 +        },
 +        {
 +          "name": "ivgen-hash-alg",
 +          "default": null,
-+          "type": "453"
++          "type": "483"
 +        },
 +        {
 +          "name": "hash-alg",
-+          "type": "453"
++          "type": "483"
 +        },
 +        {
 +          "name": "payload-offset",
@@ -21271,13 +21909,13 @@ index 0000000000..576e0b69e9
 +        },
 +        {
 +          "name": "slots",
-+          "type": "[491]"
++          "type": "[524]"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "481",
++      "name": "513",
 +      "meta-type": "enum",
 +      "values": [
 +        "md5",
@@ -21285,7 +21923,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "482",
++      "name": "514",
 +      "meta-type": "enum",
 +      "values": [
 +        "qcow",
@@ -21293,7 +21931,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "483",
++      "name": "515",
 +      "members": [
 +        {
 +          "name": "key-secret",
@@ -21303,27 +21941,27 @@ index 0000000000..576e0b69e9
 +        {
 +          "name": "cipher-alg",
 +          "default": null,
-+          "type": "450"
++          "type": "480"
 +        },
 +        {
 +          "name": "cipher-mode",
 +          "default": null,
-+          "type": "451"
++          "type": "481"
 +        },
 +        {
 +          "name": "ivgen-alg",
 +          "default": null,
-+          "type": "452"
++          "type": "482"
 +        },
 +        {
 +          "name": "ivgen-hash-alg",
 +          "default": null,
-+          "type": "453"
++          "type": "483"
 +        },
 +        {
 +          "name": "hash-alg",
 +          "default": null,
-+          "type": "453"
++          "type": "483"
 +        },
 +        {
 +          "name": "iter-time",
@@ -21334,7 +21972,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "484",
++      "name": "516",
 +      "meta-type": "enum",
 +      "values": [
 +        "full",
@@ -21342,7 +21980,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "485",
++      "name": "517",
 +      "members": [
 +        {
 +          "name": "copies",
@@ -21352,7 +21990,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "486",
++      "name": "518",
 +      "members": [
 +        {
 +          "name": "data-strips",
@@ -21366,7 +22004,7 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "487",
++      "name": "519",
 +      "meta-type": "enum",
 +      "values": [
 +        "left",
@@ -21379,7 +22017,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "488",
++      "name": "520",
 +      "meta-type": "enum",
 +      "values": [
 +        "x",
@@ -21387,7 +22025,7 @@ index 0000000000..576e0b69e9
 +      ]
 +    },
 +    {
-+      "name": "489",
++      "name": "521",
 +      "members": [
 +        {
 +          "name": "base",
@@ -21401,12 +22039,12 @@ index 0000000000..576e0b69e9
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "490",
++      "name": "522",
 +      "tag": "format",
 +      "variants": [
 +        {
 +          "case": "luks",
-+          "type": "480"
++          "type": "512"
 +        },
 +        {
 +          "case": "aes",
@@ -21416,23 +22054,46 @@ index 0000000000..576e0b69e9
 +      "members": [
 +        {
 +          "name": "format",
-+          "type": "443"
++          "type": "473"
 +        }
 +      ],
 +      "meta-type": "object"
 +    },
 +    {
-+      "name": "[229]",
-+      "element-type": "229",
++      "name": "[523]",
++      "element-type": "523",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "[491]",
-+      "element-type": "491",
++      "name": "523",
++      "members": [
++        {
++          "name": "name",
++          "type": "str"
++        },
++        {
++          "name": "granularity",
++          "type": "int"
++        },
++        {
++          "name": "flags",
++          "type": "[525]"
++        }
++      ],
++      "meta-type": "object"
++    },
++    {
++      "name": "[240]",
++      "element-type": "240",
 +      "meta-type": "array"
 +    },
 +    {
-+      "name": "491",
++      "name": "[524]",
++      "element-type": "524",
++      "meta-type": "array"
++    },
++    {
++      "name": "524",
 +      "members": [
 +        {
 +          "name": "active",
@@ -21454,9 +22115,107 @@ index 0000000000..576e0b69e9
 +        }
 +      ],
 +      "meta-type": "object"
++    },
++    {
++      "name": "[525]",
++      "element-type": "525",
++      "meta-type": "array"
++    },
++    {
++      "name": "525",
++      "meta-type": "enum",
++      "values": [
++        "in-use",
++        "auto"
++      ]
 +    }
 +  ],
-+  "id": "libvirt-45"
++  "id": "libvirt-40"
++}
++
++{
++  "execute": "query-gic-capabilities",
++  "id": "libvirt-41"
++}
++
++{
++  "return": [
++    {
++      "emulated": true,
++      "version": 3,
++      "kernel": true
++    },
++    {
++      "emulated": true,
++      "version": 2,
++      "kernel": false
++    }
++  ],
++  "id": "libvirt-41"
++}
++
++{
++  "execute": "query-cpu-model-expansion",
++  "arguments": {
++    "type": "full",
++    "model": {
++      "name": "host"
++    }
++  },
++  "id": "libvirt-42"
++}
++
++{
++  "return": {
++    "model": {
++      "name": "host",
++      "props": {
++        "sve768": false,
++        "sve128": false,
++        "sve1024": false,
++        "sve1280": false,
++        "sve896": false,
++        "sve256": false,
++        "sve1536": false,
++        "sve1792": false,
++        "sve384": false,
++        "sve": false,
++        "sve2048": false,
++        "kvm-no-adjvtime": false,
++        "sve512": false,
++        "aarch64": true,
++        "pmu": true,
++        "sve1920": false,
++        "sve1152": false,
++        "sve640": false,
++        "sve1408": false,
++        "sve1664": false
++      }
++    }
++  },
++  "id": "libvirt-42"
++}
++
++{
++  "execute": "query-cpu-model-expansion",
++  "arguments": {
++    "type": "full",
++    "model": {
++      "name": "host",
++      "props": {
++        "migratable": false
++      }
++    }
++  },
++  "id": "libvirt-43"
++}
++
++{
++  "id": "libvirt-43",
++  "error": {
++    "class": "GenericError",
++    "desc": "Parameter 'migratable' is unexpected"
++  }
 +}
 +
 +{
@@ -21478,2206 +22237,858 @@ index 0000000000..576e0b69e9
 +{
 +  "return": [
 +    {
-+      "name": "default",
-+      "typename": "604-powerpc64-cpu",
++      "name": "pxa262",
++      "typename": "pxa262-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "ppc",
-+      "typename": "604-powerpc64-cpu",
++      "name": "pxa270-a0",
++      "typename": "pxa270-a0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "ppc32",
-+      "typename": "604-powerpc64-cpu",
++      "name": "arm1136",
++      "typename": "arm1136-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "ppc64",
-+      "typename": "970fx_v3.1-powerpc64-cpu",
++      "name": "cortex-a15",
++      "typename": "cortex-a15-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power9",
-+      "typename": "power9_v2.0-powerpc64-cpu",
++      "name": "pxa260",
++      "typename": "pxa260-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8nvl",
-+      "typename": "power8nvl_v1.0-powerpc64-cpu",
++      "name": "arm1136-r2",
++      "typename": "arm1136-r2-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8",
-+      "typename": "power8_v2.0-powerpc64-cpu",
++      "name": "pxa261",
++      "typename": "pxa261-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power8e",
-+      "typename": "power8e_v2.1-powerpc64-cpu",
++      "name": "pxa255",
++      "typename": "pxa255-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power7+",
-+      "typename": "power7+_v2.1-powerpc64-cpu",
++      "name": "cortex-a72",
++      "typename": "cortex-a72-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power7",
-+      "typename": "power7_v2.3-powerpc64-cpu",
++      "name": "cortex-m33",
++      "typename": "cortex-m33-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power5gs",
-+      "typename": "power5+_v2.1-powerpc64-cpu",
++      "name": "arm926",
++      "typename": "arm926-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "power5+",
-+      "typename": "power5+_v2.1-powerpc64-cpu",
++      "name": "cortex-r5f",
++      "typename": "cortex-r5f-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "970mp",
-+      "typename": "970mp_v1.1-powerpc64-cpu",
++      "name": "arm11mpcore",
++      "typename": "arm11mpcore-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "970fx",
-+      "typename": "970fx_v3.1-powerpc64-cpu",
++      "name": "pxa250",
++      "typename": "pxa250-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "970",
-+      "typename": "970_v2.2-powerpc64-cpu",
++      "name": "ti925t",
++      "typename": "ti925t-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "apollo7pm",
-+      "typename": "7457a_v1.0-powerpc64-cpu",
++      "name": "cortex-a57",
++      "typename": "cortex-a57-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7457a",
-+      "typename": "7457a_v1.2-powerpc64-cpu",
++      "name": "sa1110",
++      "typename": "sa1110-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7447a",
-+      "typename": "7447a_v1.2-powerpc64-cpu",
++      "name": "host",
++      "typename": "host-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "apollo7",
-+      "typename": "7457_v1.2-powerpc64-cpu",
++      "name": "arm1176",
++      "typename": "arm1176-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7457",
-+      "typename": "7457_v1.2-powerpc64-cpu",
++      "name": "cortex-a53",
++      "typename": "cortex-a53-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7447",
-+      "typename": "7447_v1.1-powerpc64-cpu",
++      "name": "sa1100",
++      "typename": "sa1100-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "apollo6",
-+      "typename": "7455_v3.2-powerpc64-cpu",
++      "name": "pxa270-c5",
++      "typename": "pxa270-c5-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7455",
-+      "typename": "7455_v3.2-powerpc64-cpu",
++      "name": "cortex-a9",
++      "typename": "cortex-a9-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7445",
-+      "typename": "7445_v3.2-powerpc64-cpu",
++      "name": "cortex-m7",
++      "typename": "cortex-m7-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7451",
-+      "typename": "7451_v2.3-powerpc64-cpu",
++      "name": "cortex-a8",
++      "typename": "cortex-a8-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7441",
-+      "typename": "7441_v2.3-powerpc64-cpu",
++      "name": "cortex-a7",
++      "typename": "cortex-a7-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "vger",
-+      "typename": "7450_v2.1-powerpc64-cpu",
++      "name": "pxa270-c0",
++      "typename": "pxa270-c0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7450",
-+      "typename": "7450_v2.1-powerpc64-cpu",
++      "name": "arm1026",
++      "typename": "arm1026-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7448",
-+      "typename": "7448_v2.1-powerpc64-cpu",
++      "name": "pxa270-b1",
++      "typename": "pxa270-b1-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "nitro",
-+      "typename": "7410_v1.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "7410",
-+      "typename": "7410_v1.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "g4",
-+      "typename": "7400_v2.9-powerpc64-cpu",
++      "name": "cortex-m3",
++      "typename": "cortex-m3-arm-cpu",
 +      "static": false
 +    },
 +    {
 +      "name": "max",
-+      "typename": "7400_v2.9-powerpc64-cpu",
++      "typename": "max-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "7400",
-+      "typename": "7400_v2.9-powerpc64-cpu",
++      "name": "cortex-m4",
++      "typename": "cortex-m4-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "goldfinger",
-+      "typename": "755_v2.8-powerpc64-cpu",
++      "name": "pxa270-b0",
++      "typename": "pxa270-b0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "755",
-+      "typename": "755_v2.8-powerpc64-cpu",
++      "name": "arm946",
++      "typename": "arm946-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "745",
-+      "typename": "745_v2.8-powerpc64-cpu",
++      "name": "cortex-m0",
++      "typename": "cortex-m0-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "lonestar",
-+      "typename": "750l_v3.2-powerpc64-cpu",
++      "name": "cortex-r5",
++      "typename": "cortex-r5-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "750l",
-+      "typename": "750l_v3.2-powerpc64-cpu",
++      "name": "pxa270-a1",
++      "typename": "pxa270-a1-arm-cpu",
 +      "static": false
 +    },
 +    {
-+      "name": "750gx",
-+      "typename": "750gx_v1.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx",
-+      "typename": "750fx_v2.3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe",
-+      "typename": "750cxe_v3.1b-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx",
-+      "typename": "750cx_v2.2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750cl",
-+      "typename": "750cl_v2.0-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "conan/doyle",
-+      "typename": "750p-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "g3",
-+      "typename": "750_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "typhoon",
-+      "typename": "750_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "750",
-+      "typename": "750_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "arthur",
-+      "typename": "740_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "740",
-+      "typename": "740_v3.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mach5",
-+      "typename": "604r-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "sirocco",
-+      "typename": "604e_v2.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "604e",
-+      "typename": "604e_v2.4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "goldeneye",
-+      "typename": "603e7t-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "603r",
-+      "typename": "603e7t-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "vaillant",
-+      "typename": "603e7v-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "stretch",
-+      "typename": "603e_v4.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "603e",
-+      "typename": "603e_v4.1-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "vanilla",
-+      "typename": "603-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "601v",
-+      "typename": "601_v2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "601",
-+      "typename": "601_v2-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560",
-+      "typename": "mpc8560_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555e",
-+      "typename": "mpc8555e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555",
-+      "typename": "mpc8555_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e",
-+      "typename": "mpc8548e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548",
-+      "typename": "mpc8548_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8547e",
-+      "typename": "mpc8547e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545e",
-+      "typename": "mpc8545e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545",
-+      "typename": "mpc8545_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544e",
-+      "typename": "mpc8544e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544",
-+      "typename": "mpc8544_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e",
-+      "typename": "mpc8543e_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543",
-+      "typename": "mpc8543_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541e",
-+      "typename": "mpc8541e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541",
-+      "typename": "mpc8541_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540",
-+      "typename": "mpc8540_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533e",
-+      "typename": "mpc8533e_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533",
-+      "typename": "mpc8533_v11-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2",
-+      "typename": "e500v2_v22-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v1",
-+      "typename": "e500_v20-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e500",
-+      "typename": "e500v2_v22-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347ea",
-+      "typename": "mpc8347eat-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347e",
-+      "typename": "mpc8347et-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347a",
-+      "typename": "mpc8347at-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347",
-+      "typename": "mpc8347t-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e300",
-+      "typename": "e300c3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "e200",
-+      "typename": "e200z6-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8280",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8275",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8272",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8271",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8270",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8266_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8266_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8266",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8265_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8265_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8265",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8264_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8264_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8264",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8260_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8260_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8260",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8255_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8255_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8255",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8250_hip4",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8250_hip3",
-+      "typename": "g2hip3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8250",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8248",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8247",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8245",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8241",
-+      "typename": "g2hip4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "powerquicc-ii",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc82xx",
-+      "typename": "g2legp3-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200b",
-+      "typename": "mpc5200b_v21-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200",
-+      "typename": "mpc5200_v12-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc52xx",
-+      "typename": "mpc5200_v12-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8240",
-+      "typename": "603-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "460ex",
-+      "typename": "460exb-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "440ep",
-+      "typename": "440epb-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp50",
-+      "typename": "x2vp20-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp7",
-+      "typename": "x2vp4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpe",
-+      "typename": "405crc-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405gp",
-+      "typename": "405gpd-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405cr",
-+      "typename": "405crc-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "405",
-+      "typename": "405d4-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "403",
-+      "typename": "403gc-powerpc64-cpu",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8547e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cl_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457a_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2gp",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8377",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405d4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2le",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2hip3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8572",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500mc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7v1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970mp_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405crc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403ga",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8572e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604e_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401a1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power9_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe405h",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2ls",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401b2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347ep",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v3.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403gcx",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v3.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power9_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power7_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7v",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpa",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440epx",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e200z6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8547e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457a_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349ea",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power8nvl_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.8",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe405l",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343ea",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v3.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347et",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7441_v2.10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401c2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7451_v2.10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7441_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405crb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440-xilinx-w-dfpu",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "cobra",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8641d",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.5",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v30",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v3.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8540_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405d2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347t",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347eap",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401d2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power8_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e200z5",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405cra",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.7",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e5500",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401e2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347ap",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200b_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "601_v2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2legp3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604e_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8610",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2h4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8377e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200_v12",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7448_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v3.1b",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.9",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpd",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7t",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8543e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fl",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750l_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "stb04",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "x2vp20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405ez",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e600",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8379",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2legp",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v3.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8560_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440-xilinx",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401f2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349a",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpr",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "stb25",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200b_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347eat",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "601_v1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403gc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7441_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740_v3.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545e_v21",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "602",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8378e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343a",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "460exb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8568",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457a_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cx_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604e_v2.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.8",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405lp",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.6",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "stb03",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405ep",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8347at",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "755_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750gl",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e6500",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v3.4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440epb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe4gs3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8349e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970_v2.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2lels",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2hip4",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "740p",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8567e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7451_v2.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401g2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7400_v2.8",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7455_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "405gpc",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power7+_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8544e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7450_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970mp_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e7v2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "604r",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e500v2_v22",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8548e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8545e_v20",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8378",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8567",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7457_v1.2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v2.5",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8379e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8641",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v2.4b",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7410_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc603",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "603e_v4.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7445_v3.3",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "440epa",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "970fx_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "iop480",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750fx_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "601_v0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "g2legp1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "745_v1.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cl_v2.0",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxr",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "401",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8541e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750cxe_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8555e_v11",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power8e_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "7447a_v1.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "403gb",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "e300c2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "npe405h2",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8343e",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8533e_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc5200_v10",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "750_v3.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "power5+_v2.1",
-+      "typename": "",
-+      "static": false
-+    },
-+    {
-+      "name": "mpc8568e",
-+      "typename": "",
++      "name": "pxa270",
++      "typename": "pxa270-arm-cpu",
 +      "static": false
 +    }
 +  ],
 +  "id": "libvirt-2"
 +}
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
++
++{
++  "execute": "query-cpu-model-expansion",
++  "arguments": {
++    "type": "full",
++    "model": {
++      "name": "max"
++    }
++  },
++  "id": "libvirt-3"
++}
++
++{
++  "return": {
++    "model": {
++      "name": "max",
++      "props": {
++        "sve768": true,
++        "sve128": true,
++        "sve1024": true,
++        "sve1280": true,
++        "sve896": true,
++        "sve256": true,
++        "sve1536": true,
++        "sve1792": true,
++        "sve384": true,
++        "sve": true,
++        "sve2048": true,
++        "sve512": true,
++        "aarch64": true,
++        "pmu": true,
++        "sve1920": true,
++        "sve1152": true,
++        "sve640": true,
++        "sve1408": true,
++        "sve1664": true
++      }
++    }
++  },
++  "id": "libvirt-3"
++}
++
++{
++  "execute": "query-cpu-model-expansion",
++  "arguments": {
++    "type": "full",
++    "model": {
++      "name": "max",
++      "props": {
++        "migratable": false
++      }
++    }
++  },
++  "id": "libvirt-4"
++}
++
++{
++  "id": "libvirt-4",
++  "error": {
++    "class": "GenericError",
++    "desc": "Parameter 'migratable' is unexpected"
++  }
++}
++
++{
++  "execute": "query-machines",
++  "id": "libvirt-5"
++}
++
++{
++  "return": [
++    {
++      "hotpluggable-cpus": false,
++      "name": "integratorcp",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "nuri",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an511",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an505",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "verdex",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-3.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "ast2500-evb",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "smdkc210",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "collie",
++      "numa-mem-supported": false,
++      "default-cpu-type": "sa1110-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "xlnx-versal-virt",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "imx25-pdk",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "none",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "spitz",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "musca-b1",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-pbx-a9",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-eb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "versatilepb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-pb-a8",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a8-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "emcraft-sf2",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.9",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "musicpal",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sbsa-ref",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a57-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "z2",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c5-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "akita",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.7",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "kzm",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "swift-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.8",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "realview-eb-mpcore",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm11mpcore-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "musca-a",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mcimx7d-sabre",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sx1",
++      "numa-mem-supported": false,
++      "default-cpu-type": "ti925t-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-4.2",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sx1-v1",
++      "numa-mem-supported": false,
++      "default-cpu-type": "ti925t-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.6",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "cubieboard",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-4.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "highbank",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-4.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "raspi2",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "raspi3",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "netduino2",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "terrier",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c5-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "n810",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm1136-r2-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mainstone",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c5-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "palmetto-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "tacoma-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "sabrelite",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "netduinoplus2",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "midway",
++      "numa-mem-supported": false,
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "romulus-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "cheetah",
++      "numa-mem-supported": false,
++      "default-cpu-type": "ti925t-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "tosa",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "borzoi",
++      "numa-mem-supported": false,
++      "default-cpu-type": "pxa270-c0-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "versatileab",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm926-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "lm3s6965evb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "n800",
++      "numa-mem-supported": false,
++      "default-cpu-type": "arm1136-r2-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.10",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.11",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "connex",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-2.12",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 255,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "microbit",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "witherspoon-bmc",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "xilinx-zynq-a9",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an385",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "ast2600-evb",
++      "numa-mem-supported": false,
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "vexpress-a9",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a9-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mps2-an521",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m33-arm-cpu",
++      "cpu-max": 2,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "mcimx6ul-evk",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "vexpress-a15",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 4,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "xlnx-zcu102",
++      "numa-mem-supported": false,
++      "cpu-max": 6,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-5.0",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false,
++      "alias": "virt"
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "virt-3.1",
++      "numa-mem-supported": true,
++      "default-cpu-type": "cortex-a15-arm-cpu",
++      "cpu-max": 512,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "canon-a1100",
++      "numa-mem-supported": false,
++      "cpu-max": 1,
++      "deprecated": false
++    },
++    {
++      "hotpluggable-cpus": false,
++      "name": "lm3s811evb",
++      "numa-mem-supported": false,
++      "default-cpu-type": "cortex-m3-arm-cpu",
++      "cpu-max": 1,
++      "deprecated": false
++    }
++  ],
++  "id": "libvirt-5"
++}
+diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
 new file mode 100644
-index 0000000000..bdd339c54a
+index 0000000000..6b365dd75d
 --- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-@@ -0,0 +1,1081 @@
++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+@@ -0,0 +1,455 @@
 +<qemuCaps>
++  <emulator>/usr/bin/qemu-system-aarch64</emulator>
 +  <qemuctime>0</qemuctime>
 +  <selfctime>0</selfctime>
 +  <selfvers>0</selfvers>
-+  <usedQMP/>
 +  <flag name='kvm'/>
-+  <flag name='boot-index'/>
 +  <flag name='hda-duplex'/>
 +  <flag name='virtio-tx-alg'/>
 +  <flag name='virtio-blk-pci.ioeventfd'/>
@@ -23691,17 +23102,13 @@ index 0000000000..bdd339c54a
 +  <flag name='pci-ohci'/>
 +  <flag name='usb-hub'/>
 +  <flag name='ich9-ahci'/>
++  <flag name='no-acpi'/>
 +  <flag name='virtio-blk-pci.scsi'/>
 +  <flag name='scsi-disk.channel'/>
 +  <flag name='scsi-block'/>
-+  <flag name='transaction'/>
-+  <flag name='block-job-async'/>
-+  <flag name='scsi-cd'/>
-+  <flag name='ide-cd'/>
 +  <flag name='hda-micro'/>
 +  <flag name='dump-guest-memory'/>
 +  <flag name='nec-usb-xhci'/>
-+  <flag name='balloon-event'/>
 +  <flag name='lsi'/>
 +  <flag name='virtio-scsi-pci'/>
 +  <flag name='blockio'/>
@@ -23709,39 +23116,27 @@ index 0000000000..bdd339c54a
 +  <flag name='scsi-disk.wwn'/>
 +  <flag name='seccomp-sandbox'/>
 +  <flag name='reboot-timeout'/>
-+  <flag name='seamless-migration'/>
-+  <flag name='block-commit'/>
 +  <flag name='vnc'/>
-+  <flag name='drive-mirror'/>
-+  <flag name='usb-host.bootindex'/>
-+  <flag name='blockdev-snapshot-sync'/>
 +  <flag name='VGA'/>
 +  <flag name='cirrus-vga'/>
++  <flag name='vmware-svga'/>
 +  <flag name='device-video-primary'/>
 +  <flag name='usb-serial'/>
-+  <flag name='usb-net'/>
-+  <flag name='add-fd'/>
 +  <flag name='nbd-server'/>
 +  <flag name='virtio-rng'/>
 +  <flag name='rng-random'/>
 +  <flag name='rng-egd'/>
 +  <flag name='megasas'/>
-+  <flag name='nvram'/>
 +  <flag name='pci-bridge'/>
 +  <flag name='vfio-pci'/>
-+  <flag name='vfio-pci.bootindex'/>
-+  <flag name='scsi-generic'/>
-+  <flag name='scsi-generic.bootindex'/>
 +  <flag name='mem-merge'/>
-+  <flag name='vnc-websocket'/>
 +  <flag name='drive-discard'/>
-+  <flag name='mlock'/>
-+  <flag name='device-del-event'/>
++  <flag name='dmi-to-pci-bridge'/>
 +  <flag name='usb-storage'/>
 +  <flag name='usb-storage.removable'/>
++  <flag name='virtio-mmio'/>
 +  <flag name='ich9-intel-hda'/>
 +  <flag name='boot-strict'/>
-+  <flag name='spiceport'/>
 +  <flag name='usb-kbd'/>
 +  <flag name='msg-timestamp'/>
 +  <flag name='active-commit'/>
@@ -23753,16 +23148,21 @@ index 0000000000..bdd339c54a
 +  <flag name='splash-timeout'/>
 +  <flag name='iothread'/>
 +  <flag name='migrate-rdma'/>
-+  <flag name='ivshmem'/>
 +  <flag name='drive-iotune-max'/>
 +  <flag name='VGA.vgamem_mb'/>
++  <flag name='vmware-svga.vgamem_mb'/>
 +  <flag name='pc-dimm'/>
 +  <flag name='machine-vmport-opt'/>
 +  <flag name='aes-key-wrap'/>
 +  <flag name='dea-key-wrap'/>
 +  <flag name='pci-serial'/>
++  <flag name='aarch64-off'/>
 +  <flag name='vhost-user-multiqueue'/>
 +  <flag name='migration-event'/>
++  <flag name='gpex-pcihost'/>
++  <flag name='ioh3420'/>
++  <flag name='x3130-upstream'/>
++  <flag name='xio3130-downstream'/>
 +  <flag name='rtl8139'/>
 +  <flag name='e1000'/>
 +  <flag name='virtio-net'/>
@@ -23780,7 +23180,6 @@ index 0000000000..bdd339c54a
 +  <flag name='chardev-logfile'/>
 +  <flag name='debug-threads'/>
 +  <flag name='secret'/>
-+  <flag name='device-tray-moved-event'/>
 +  <flag name='nec-usb-xhci-ports'/>
 +  <flag name='virtio-scsi-pci.iothread'/>
 +  <flag name='name-guest'/>
@@ -23790,7 +23189,6 @@ index 0000000000..bdd339c54a
 +  <flag name='virtio-pci-disable-legacy'/>
 +  <flag name='query-hotpluggable-cpus'/>
 +  <flag name='virtio-net.rx_queue_size'/>
-+  <flag name='virtio-vga'/>
 +  <flag name='drive-iotune-max-length'/>
 +  <flag name='ivshmem-plain'/>
 +  <flag name='ivshmem-doorbell'/>
@@ -23798,7 +23196,9 @@ index 0000000000..bdd339c54a
 +  <flag name='gluster.debug_level'/>
 +  <flag name='vhost-scsi'/>
 +  <flag name='drive-iotune-group'/>
++  <flag name='query-cpu-model-expansion'/>
 +  <flag name='virtio-net.host_mtu'/>
++  <flag name='pcie-root-port'/>
 +  <flag name='query-cpu-definitions'/>
 +  <flag name='block-write-threshold'/>
 +  <flag name='query-named-block-nodes'/>
@@ -23808,23 +23208,20 @@ index 0000000000..bdd339c54a
 +  <flag name='virtio.iommu_platform'/>
 +  <flag name='virtio.ats'/>
 +  <flag name='loadparm'/>
-+  <flag name='spapr-pci-host-bridge'/>
-+  <flag name='spapr-pci-host-bridge.numa_node'/>
 +  <flag name='vnc-multi-servers'/>
 +  <flag name='virtio-net.tx_queue_size'/>
 +  <flag name='chardev-reconnect'/>
 +  <flag name='virtio-gpu.max_outputs'/>
 +  <flag name='vxhs'/>
 +  <flag name='virtio-blk.num-queues'/>
-+  <flag name='machine.pseries.resize-hpt'/>
-+  <flag name='spapr-vty'/>
++  <flag name='vmcoreinfo'/>
 +  <flag name='numa.dist'/>
 +  <flag name='disk-share-rw'/>
 +  <flag name='iscsi.password-secret'/>
-+  <flag name='isa-serial'/>
-+  <flag name='machine.pseries.max-cpu-compat'/>
++  <flag name='pl011'/>
 +  <flag name='dump-completed'/>
 +  <flag name='qcow2-luks'/>
++  <flag name='pcie-pci-bridge'/>
 +  <flag name='seccomp-blacklist'/>
 +  <flag name='query-cpus-fast'/>
 +  <flag name='disk-write-cache'/>
@@ -23838,978 +23235,309 @@ index 0000000000..bdd339c54a
 +  <flag name='blockdev-del'/>
 +  <flag name='vhost-vsock'/>
 +  <flag name='chardev-fd-pass'/>
-+  <flag name='tpm-emulator'/>
-+  <flag name='machine.pseries.cap-hpt-max-page-size'/>
-+  <flag name='machine.pseries.cap-htm'/>
 +  <flag name='usb-storage.werror'/>
 +  <flag name='egl-headless'/>
 +  <flag name='vfio-pci.display'/>
-+  <version>3000091</version>
++  <flag name='blockdev'/>
++  <flag name='memory-backend-memfd'/>
++  <flag name='memory-backend-memfd.hugetlb'/>
++  <flag name='iothread.poll-max-ns'/>
++  <flag name='egl-headless.rendernode'/>
++  <flag name='memory-backend-file.align'/>
++  <flag name='memory-backend-file.pmem'/>
++  <flag name='scsi-disk.device_id'/>
++  <flag name='virtio-pci-non-transitional'/>
++  <flag name='overcommit'/>
++  <flag name='query-current-machine'/>
++  <flag name='machine.virt.iommu'/>
++  <flag name='bitmap-merge'/>
++  <flag name='nbd-bitmap'/>
++  <flag name='bochs-display'/>
++  <flag name='migration-file-drop-cache'/>
++  <flag name='dbus-vmstate'/>
++  <flag name='vhost-user-gpu'/>
++  <flag name='ramfb'/>
++  <flag name='arm-max-cpu'/>
++  <flag name='blockdev-file-dynamic-auto-read-only'/>
++  <flag name='savevm-monitor-nodes'/>
++  <flag name='drive-nvme'/>
++  <flag name='smp-dies'/>
++  <flag name='virtio-net.failover'/>
++  <version>4002050</version>
 +  <kvmVersion>0</kvmVersion>
-+  <microcodeVersion>439018</microcodeVersion>
-+  <package>v3.1.0-rc1-74-g3c035a41dc</package>
-+  <arch>ppc64</arch>
-+  <cpu type='kvm' name='default'/>
-+  <cpu type='kvm' name='ppc'/>
-+  <cpu type='kvm' name='ppc32'/>
-+  <cpu type='kvm' name='ppc64'/>
-+  <cpu type='kvm' name='power9'/>
-+  <cpu type='kvm' name='power8nvl'/>
-+  <cpu type='kvm' name='power8'/>
-+  <cpu type='kvm' name='power8e'/>
-+  <cpu type='kvm' name='power7+'/>
-+  <cpu type='kvm' name='power7'/>
-+  <cpu type='kvm' name='power5gs'/>
-+  <cpu type='kvm' name='power5+'/>
-+  <cpu type='kvm' name='970mp'/>
-+  <cpu type='kvm' name='970fx'/>
-+  <cpu type='kvm' name='970'/>
-+  <cpu type='kvm' name='apollo7pm'/>
-+  <cpu type='kvm' name='7457a'/>
-+  <cpu type='kvm' name='7447a'/>
-+  <cpu type='kvm' name='apollo7'/>
-+  <cpu type='kvm' name='7457'/>
-+  <cpu type='kvm' name='7447'/>
-+  <cpu type='kvm' name='apollo6'/>
-+  <cpu type='kvm' name='7455'/>
-+  <cpu type='kvm' name='7445'/>
-+  <cpu type='kvm' name='7451'/>
-+  <cpu type='kvm' name='7441'/>
-+  <cpu type='kvm' name='vger'/>
-+  <cpu type='kvm' name='7450'/>
-+  <cpu type='kvm' name='7448'/>
-+  <cpu type='kvm' name='nitro'/>
-+  <cpu type='kvm' name='7410'/>
-+  <cpu type='kvm' name='g4'/>
-+  <cpu type='kvm' name='max'/>
-+  <cpu type='kvm' name='7400'/>
-+  <cpu type='kvm' name='goldfinger'/>
-+  <cpu type='kvm' name='755'/>
-+  <cpu type='kvm' name='745'/>
-+  <cpu type='kvm' name='lonestar'/>
-+  <cpu type='kvm' name='750l'/>
-+  <cpu type='kvm' name='750gx'/>
-+  <cpu type='kvm' name='750fx'/>
-+  <cpu type='kvm' name='750cxe'/>
-+  <cpu type='kvm' name='750cx'/>
-+  <cpu type='kvm' name='750cl'/>
-+  <cpu type='kvm' name='conan/doyle'/>
-+  <cpu type='kvm' name='g3'/>
-+  <cpu type='kvm' name='typhoon'/>
-+  <cpu type='kvm' name='750'/>
-+  <cpu type='kvm' name='arthur'/>
-+  <cpu type='kvm' name='740'/>
-+  <cpu type='kvm' name='mach5'/>
-+  <cpu type='kvm' name='sirocco'/>
-+  <cpu type='kvm' name='604e'/>
-+  <cpu type='kvm' name='goldeneye'/>
-+  <cpu type='kvm' name='603r'/>
-+  <cpu type='kvm' name='vaillant'/>
-+  <cpu type='kvm' name='stretch'/>
-+  <cpu type='kvm' name='603e'/>
-+  <cpu type='kvm' name='vanilla'/>
-+  <cpu type='kvm' name='601v'/>
-+  <cpu type='kvm' name='601'/>
-+  <cpu type='kvm' name='mpc8560'/>
-+  <cpu type='kvm' name='mpc8555e'/>
-+  <cpu type='kvm' name='mpc8555'/>
-+  <cpu type='kvm' name='mpc8548e'/>
-+  <cpu type='kvm' name='mpc8548'/>
-+  <cpu type='kvm' name='mpc8547e'/>
-+  <cpu type='kvm' name='mpc8545e'/>
-+  <cpu type='kvm' name='mpc8545'/>
-+  <cpu type='kvm' name='mpc8544e'/>
-+  <cpu type='kvm' name='mpc8544'/>
-+  <cpu type='kvm' name='mpc8543e'/>
-+  <cpu type='kvm' name='mpc8543'/>
-+  <cpu type='kvm' name='mpc8541e'/>
-+  <cpu type='kvm' name='mpc8541'/>
-+  <cpu type='kvm' name='mpc8540'/>
-+  <cpu type='kvm' name='mpc8533e'/>
-+  <cpu type='kvm' name='mpc8533'/>
-+  <cpu type='kvm' name='e500v2'/>
-+  <cpu type='kvm' name='e500v1'/>
-+  <cpu type='kvm' name='e500'/>
-+  <cpu type='kvm' name='mpc8347ea'/>
-+  <cpu type='kvm' name='mpc8347e'/>
-+  <cpu type='kvm' name='mpc8347a'/>
-+  <cpu type='kvm' name='mpc8347'/>
-+  <cpu type='kvm' name='e300'/>
-+  <cpu type='kvm' name='e200'/>
-+  <cpu type='kvm' name='mpc8280'/>
-+  <cpu type='kvm' name='mpc8275'/>
-+  <cpu type='kvm' name='mpc8272'/>
-+  <cpu type='kvm' name='mpc8271'/>
-+  <cpu type='kvm' name='mpc8270'/>
-+  <cpu type='kvm' name='mpc8266_hip4'/>
-+  <cpu type='kvm' name='mpc8266_hip3'/>
-+  <cpu type='kvm' name='mpc8266'/>
-+  <cpu type='kvm' name='mpc8265_hip4'/>
-+  <cpu type='kvm' name='mpc8265_hip3'/>
-+  <cpu type='kvm' name='mpc8265'/>
-+  <cpu type='kvm' name='mpc8264_hip4'/>
-+  <cpu type='kvm' name='mpc8264_hip3'/>
-+  <cpu type='kvm' name='mpc8264'/>
-+  <cpu type='kvm' name='mpc8260_hip4'/>
-+  <cpu type='kvm' name='mpc8260_hip3'/>
-+  <cpu type='kvm' name='mpc8260'/>
-+  <cpu type='kvm' name='mpc8255_hip4'/>
-+  <cpu type='kvm' name='mpc8255_hip3'/>
-+  <cpu type='kvm' name='mpc8255'/>
-+  <cpu type='kvm' name='mpc8250_hip4'/>
-+  <cpu type='kvm' name='mpc8250_hip3'/>
-+  <cpu type='kvm' name='mpc8250'/>
-+  <cpu type='kvm' name='mpc8248'/>
-+  <cpu type='kvm' name='mpc8247'/>
-+  <cpu type='kvm' name='mpc8245'/>
-+  <cpu type='kvm' name='mpc8241'/>
-+  <cpu type='kvm' name='powerquicc-ii'/>
-+  <cpu type='kvm' name='mpc82xx'/>
-+  <cpu type='kvm' name='mpc5200b'/>
-+  <cpu type='kvm' name='mpc5200'/>
-+  <cpu type='kvm' name='mpc52xx'/>
-+  <cpu type='kvm' name='mpc8240'/>
-+  <cpu type='kvm' name='460ex'/>
-+  <cpu type='kvm' name='440ep'/>
-+  <cpu type='kvm' name='x2vp50'/>
-+  <cpu type='kvm' name='x2vp7'/>
-+  <cpu type='kvm' name='405gpe'/>
-+  <cpu type='kvm' name='405gp'/>
-+  <cpu type='kvm' name='405cr'/>
-+  <cpu type='kvm' name='405'/>
-+  <cpu type='kvm' name='403'/>
-+  <cpu type='kvm' name='mpc8547e_v21'/>
-+  <cpu type='kvm' name='750cl_v1.0'/>
-+  <cpu type='kvm' name='7457a_v1.1'/>
-+  <cpu type='kvm' name='g2gp'/>
-+  <cpu type='kvm' name='750cxe_v2.1'/>
-+  <cpu type='kvm' name='755_v2.7'/>
-+  <cpu type='kvm' name='750_v2.1'/>
-+  <cpu type='kvm' name='755_v2.2'/>
-+  <cpu type='kvm' name='745_v2.0'/>
-+  <cpu type='kvm' name='mpc8377'/>
-+  <cpu type='kvm' name='7455_v1.0'/>
-+  <cpu type='kvm' name='mpc8545_v21'/>
-+  <cpu type='kvm' name='mpc8548_v11'/>
-+  <cpu type='kvm' name='405d4'/>
-+  <cpu type='kvm' name='g2le'/>
-+  <cpu type='kvm' name='g2hip3'/>
-+  <cpu type='kvm' name='750e'/>
-+  <cpu type='kvm' name='mpc8572'/>
-+  <cpu type='kvm' name='970fx_v2.0'/>
-+  <cpu type='kvm' name='750fx_v2.0'/>
-+  <cpu type='kvm' name='603p'/>
-+  <cpu type='kvm' name='405gpb'/>
-+  <cpu type='kvm' name='7400_v2.7'/>
-+  <cpu type='kvm' name='mpc8544e_v10'/>
-+  <cpu type='kvm' name='e500v2_v10'/>
-+  <cpu type='kvm' name='e500mc'/>
-+  <cpu type='kvm' name='603e7v1'/>
-+  <cpu type='kvm' name='970mp_v1.0'/>
-+  <cpu type='kvm' name='740e'/>
-+  <cpu type='kvm' name='405crc'/>
-+  <cpu type='kvm' name='403ga'/>
-+  <cpu type='kvm' name='7447a_v1.0'/>
-+  <cpu type='kvm' name='7400_v2.2'/>
-+  <cpu type='kvm' name='e300c1'/>
-+  <cpu type='kvm' name='mpc8572e'/>
-+  <cpu type='kvm' name='e500v2_v21'/>
-+  <cpu type='kvm' name='970fx_v1.0'/>
-+  <cpu type='kvm' name='750gx_v1.2'/>
-+  <cpu type='kvm' name='750fx_v1.0'/>
-+  <cpu type='kvm' name='7457_v1.1'/>
-+  <cpu type='kvm' name='970fx_v3.0'/>
-+  <cpu type='kvm' name='604e_v2.2'/>
-+  <cpu type='kvm' name='755_v2.6'/>
-+  <cpu type='kvm' name='401a1'/>
-+  <cpu type='kvm' name='power9_v1.0'/>
-+  <cpu type='kvm' name='npe405h'/>
-+  <cpu type='kvm' name='g2ls'/>
-+  <cpu type='kvm' name='7410_v1.4'/>
-+  <cpu type='kvm' name='750_v2.0'/>
-+  <cpu type='kvm' name='401b2'/>
-+  <cpu type='kvm' name='mpc8349'/>
-+  <cpu type='kvm' name='mpc8347ep'/>
-+  <cpu type='kvm' name='7445_v3.2'/>
-+  <cpu type='kvm' name='mpc8540_v21'/>
-+  <cpu type='kvm' name='mpc8543_v11'/>
-+  <cpu type='kvm' name='403gcx'/>
-+  <cpu type='kvm' name='745_v2.4'/>
-+  <cpu type='kvm' name='mpc8548_v21'/>
-+  <cpu type='kvm' name='750l_v3.2'/>
-+  <cpu type='kvm' name='750_v1.0'/>
-+  <cpu type='kvm' name='755_v1.1'/>
-+  <cpu type='kvm' name='e500_v10'/>
-+  <cpu type='kvm' name='750cxe_v3.0'/>
-+  <cpu type='kvm' name='mpc8541e_v10'/>
-+  <cpu type='kvm' name='mpc8347p'/>
-+  <cpu type='kvm' name='mpc8555e_v10'/>
-+  <cpu type='kvm' name='power9_v2.0'/>
-+  <cpu type='kvm' name='power7_v2.3'/>
-+  <cpu type='kvm' name='603e7v'/>
-+  <cpu type='kvm' name='mpc8543e_v11'/>
-+  <cpu type='kvm' name='750_v3.0'/>
-+  <cpu type='kvm' name='7400_v2.6'/>
-+  <cpu type='kvm' name='405gpa'/>
-+  <cpu type='kvm' name='440epx'/>
-+  <cpu type='kvm' name='750l_v2.2'/>
-+  <cpu type='kvm' name='e200z6'/>
-+  <cpu type='kvm' name='mpc8547e_v20'/>
-+  <cpu type='kvm' name='7457a_v1.0'/>
-+  <cpu type='kvm' name='mpc8349ea'/>
-+  <cpu type='kvm' name='e500v2_v20'/>
-+  <cpu type='kvm' name='power8nvl_v1.0'/>
-+  <cpu type='kvm' name='mpc8540_v10'/>
-+  <cpu type='kvm' name='755_v2.1'/>
-+  <cpu type='kvm' name='745_v2.8'/>
-+  <cpu type='kvm' name='npe405l'/>
-+  <cpu type='kvm' name='mpc8343ea'/>
-+  <cpu type='kvm' name='mpc8545_v20'/>
-+  <cpu type='kvm' name='mpc8548_v10'/>
-+  <cpu type='kvm' name='7455_v3.4'/>
-+  <cpu type='kvm' name='740_v2.2'/>
-+  <cpu type='kvm' name='7448_v1.1'/>
-+  <cpu type='kvm' name='7400_v1.1'/>
-+  <cpu type='kvm' name='mpc8347et'/>
-+  <cpu type='kvm' name='7441_v2.10'/>
-+  <cpu type='kvm' name='603e_v1.4'/>
-+  <cpu type='kvm' name='mpc8543_v10'/>
-+  <cpu type='kvm' name='401c2'/>
-+  <cpu type='kvm' name='7451_v2.10'/>
-+  <cpu type='kvm' name='750cx_v2.2'/>
-+  <cpu type='kvm' name='mpc8543_v21'/>
-+  <cpu type='kvm' name='603e7'/>
-+  <cpu type='kvm' name='7448_v2.1'/>
-+  <cpu type='kvm' name='7441_v2.3'/>
-+  <cpu type='kvm' name='405crb'/>
-+  <cpu type='kvm' name='604'/>
-+  <cpu type='kvm' name='7400_v2.1'/>
-+  <cpu type='kvm' name='440-xilinx-w-dfpu'/>
-+  <cpu type='kvm' name='7445_v2.1'/>
-+  <cpu type='kvm' name='cobra'/>
-+  <cpu type='kvm' name='e500_v20'/>
-+  <cpu type='kvm' name='mpc8541_v11'/>
-+  <cpu type='kvm' name='750gx_v1.1'/>
-+  <cpu type='kvm' name='750cxe_v2.4'/>
-+  <cpu type='kvm' name='mpc8641d'/>
-+  <cpu type='kvm' name='mpc8543e_v21'/>
-+  <cpu type='kvm' name='750l_v2.1'/>
-+  <cpu type='kvm' name='7457_v1.0'/>
-+  <cpu type='kvm' name='7450_v1.2'/>
-+  <cpu type='kvm' name='755_v2.5'/>
-+  <cpu type='kvm' name='7410_v1.3'/>
-+  <cpu type='kvm' name='745_v2.3'/>
-+  <cpu type='kvm' name='755_v2.0'/>
-+  <cpu type='kvm' name='e500v2_v30'/>
-+  <cpu type='kvm' name='7455_v3.3'/>
-+  <cpu type='kvm' name='mpc8540_v20'/>
-+  <cpu type='kvm' name='405d2'/>
-+  <cpu type='kvm' name='mpc8560_v21'/>
-+  <cpu type='kvm' name='mpc8343'/>
-+  <cpu type='kvm' name='mpc8548_v20'/>
-+  <cpu type='kvm' name='mpc8347t'/>
-+  <cpu type='kvm' name='755_v1.0'/>
-+  <cpu type='kvm' name='603e_v1.3'/>
-+  <cpu type='kvm' name='host'/>
-+  <cpu type='kvm' name='mpc8543e_v10'/>
-+  <cpu type='kvm' name='mpc8347eap'/>
-+  <cpu type='kvm' name='mpc8548e_v11'/>
-+  <cpu type='kvm' name='mpc8543_v20'/>
-+  <cpu type='kvm' name='401d2'/>
-+  <cpu type='kvm' name='power8_v2.0'/>
-+  <cpu type='kvm' name='740_v3.1'/>
-+  <cpu type='kvm' name='e200z5'/>
-+  <cpu type='kvm' name='405cra'/>
-+  <cpu type='kvm' name='7400_v2.0'/>
-+  <cpu type='kvm' name='750cxe_v2.3'/>
-+  <cpu type='kvm' name='745_v2.7'/>
-+  <cpu type='kvm' name='mpc8560_v10'/>
-+  <cpu type='kvm' name='e5500'/>
-+  <cpu type='kvm' name='mpc8544_v11'/>
-+  <cpu type='kvm' name='7448_v1.0'/>
-+  <cpu type='kvm' name='401e2'/>
-+  <cpu type='kvm' name='740_v2.1'/>
-+  <cpu type='kvm' name='745_v2.2'/>
-+  <cpu type='kvm' name='7400_v1.0'/>
-+  <cpu type='kvm' name='7410_v1.2'/>
-+  <cpu type='kvm' name='x2vp4'/>
-+  <cpu type='kvm' name='mpc8347ap'/>
-+  <cpu type='kvm' name='mpc8533_v11'/>
-+  <cpu type='kvm' name='mpc5200b_v21'/>
-+  <cpu type='kvm' name='750fx_v2.3'/>
-+  <cpu type='kvm' name='601_v2'/>
-+  <cpu type='kvm' name='g2legp3'/>
-+  <cpu type='kvm' name='604e_v1.0'/>
-+  <cpu type='kvm' name='750cx_v2.1'/>
-+  <cpu type='kvm' name='mpc8610'/>
-+  <cpu type='kvm' name='g2h4'/>
-+  <cpu type='kvm' name='750l_v3.0'/>
-+  <cpu type='kvm' name='mpc8377e'/>
-+  <cpu type='kvm' name='e300c4'/>
-+  <cpu type='kvm' name='mpc5200_v12'/>
-+  <cpu type='kvm' name='7448_v2.0'/>
-+  <cpu type='kvm' name='7450_v2.1'/>
-+  <cpu type='kvm' name='750cxe_v3.1b'/>
-+  <cpu type='kvm' name='g2'/>
-+  <cpu type='kvm' name='7400_v2.9'/>
-+  <cpu type='kvm' name='405gpd'/>
-+  <cpu type='kvm' name='603'/>
-+  <cpu type='kvm' name='603e7t'/>
-+  <cpu type='kvm' name='mpc8555_v11'/>
-+  <cpu type='kvm' name='750gx_v1.0'/>
-+  <cpu type='kvm' name='mpc8541_v10'/>
-+  <cpu type='kvm' name='mpc8543e_v20'/>
-+  <cpu type='kvm' name='750fl'/>
-+  <cpu type='kvm' name='750l_v2.0'/>
-+  <cpu type='kvm' name='stb04'/>
-+  <cpu type='kvm' name='mpc8548e_v21'/>
-+  <cpu type='kvm' name='x2vp20'/>
-+  <cpu type='kvm' name='405ez'/>
-+  <cpu type='kvm' name='e600'/>
-+  <cpu type='kvm' name='7450_v1.1'/>
-+  <cpu type='kvm' name='755_v2.4'/>
-+  <cpu type='kvm' name='mpc8379'/>
-+  <cpu type='kvm' name='7445_v1.0'/>
-+  <cpu type='kvm' name='7447_v1.1'/>
-+  <cpu type='kvm' name='603e_v2.2'/>
-+  <cpu type='kvm' name='603e_v4'/>
-+  <cpu type='kvm' name='g2legp'/>
-+  <cpu type='kvm' name='7455_v3.2'/>
-+  <cpu type='kvm' name='740_v2.0'/>
-+  <cpu type='kvm' name='mpc8560_v20'/>
-+  <cpu type='kvm' name='440-xilinx'/>
-+  <cpu type='kvm' name='401f2'/>
-+  <cpu type='kvm' name='mpc8533_v10'/>
-+  <cpu type='kvm' name='mpc8349a'/>
-+  <cpu type='kvm' name='405gpr'/>
-+  <cpu type='kvm' name='stb25'/>
-+  <cpu type='kvm' name='603e_v1.2'/>
-+  <cpu type='kvm' name='mpc5200b_v20'/>
-+  <cpu type='kvm' name='750fx_v2.2'/>
-+  <cpu type='kvm' name='mpc8347eat'/>
-+  <cpu type='kvm' name='740_v1.0'/>
-+  <cpu type='kvm' name='601_v1'/>
-+  <cpu type='kvm' name='745_v1.1'/>
-+  <cpu type='kvm' name='750cx_v2.0'/>
-+  <cpu type='kvm' name='mpc8548e_v10'/>
-+  <cpu type='kvm' name='7447a_v1.2'/>
-+  <cpu type='kvm' name='403gc'/>
-+  <cpu type='kvm' name='e300c3'/>
-+  <cpu type='kvm' name='mpc5200_v11'/>
-+  <cpu type='kvm' name='7441_v2.1'/>
-+  <cpu type='kvm' name='740_v3.0'/>
-+  <cpu type='kvm' name='mpc8545e_v21'/>
-+  <cpu type='kvm' name='602'/>
-+  <cpu type='kvm' name='mpc8378e'/>
-+  <cpu type='kvm' name='mpc8343a'/>
-+  <cpu type='kvm' name='460exb'/>
-+  <cpu type='kvm' name='mpc8555_v10'/>
-+  <cpu type='kvm' name='mpc8568'/>
-+  <cpu type='kvm' name='7457a_v1.2'/>
-+  <cpu type='kvm' name='750cx_v1.0'/>
-+  <cpu type='kvm' name='750cxe_v2.2'/>
-+  <cpu type='kvm' name='604e_v2.4'/>
-+  <cpu type='kvm' name='755_v2.8'/>
-+  <cpu type='kvm' name='405lp'/>
-+  <cpu type='kvm' name='745_v2.6'/>
-+  <cpu type='kvm' name='stb03'/>
-+  <cpu type='kvm' name='405ep'/>
-+  <cpu type='kvm' name='mpc8544_v10'/>
-+  <cpu type='kvm' name='mpc8347at'/>
-+  <cpu type='kvm' name='750_v2.2'/>
-+  <cpu type='kvm' name='7450_v1.0'/>
-+  <cpu type='kvm' name='755_v2.3'/>
-+  <cpu type='kvm' name='7410_v1.1'/>
-+  <cpu type='kvm' name='745_v2.1'/>
-+  <cpu type='kvm' name='750gl'/>
-+  <cpu type='kvm' name='e6500'/>
-+  <cpu type='kvm' name='750p'/>
-+  <cpu type='kvm' name='7445_v3.4'/>
-+  <cpu type='kvm' name='440epb'/>
-+  <cpu type='kvm' name='npe4gs3'/>
-+  <cpu type='kvm' name='603e_v3'/>
-+  <cpu type='kvm' name='mpc8349e'/>
-+  <cpu type='kvm' name='970_v2.2'/>
-+  <cpu type='kvm' name='g2lels'/>
-+  <cpu type='kvm' name='g2hip4'/>
-+  <cpu type='kvm' name='740p'/>
-+  <cpu type='kvm' name='mpc8567e'/>
-+  <cpu type='kvm' name='mpc8533e_v11'/>
-+  <cpu type='kvm' name='7451_v2.3'/>
-+  <cpu type='kvm' name='603e_v1.1'/>
-+  <cpu type='kvm' name='401g2'/>
-+  <cpu type='kvm' name='7400_v2.8'/>
-+  <cpu type='kvm' name='7455_v2.1'/>
-+  <cpu type='kvm' name='405gpc'/>
-+  <cpu type='kvm' name='power7+_v2.1'/>
-+  <cpu type='kvm' name='mpc8544e_v11'/>
-+  <cpu type='kvm' name='7450_v2.0'/>
-+  <cpu type='kvm' name='970mp_v1.1'/>
-+  <cpu type='kvm' name='603e7v2'/>
-+  <cpu type='kvm' name='604r'/>
-+  <cpu type='kvm' name='e500v2_v22'/>
-+  <cpu type='kvm' name='mpc8548e_v20'/>
-+  <cpu type='kvm' name='mpc8545e_v20'/>
-+  <cpu type='kvm' name='mpc8378'/>
-+  <cpu type='kvm' name='mpc8567'/>
-+  <cpu type='kvm' name='7457_v1.2'/>
-+  <cpu type='kvm' name='7447_v1.0'/>
-+  <cpu type='kvm' name='970fx_v3.1'/>
-+  <cpu type='kvm' name='745_v2.5'/>
-+  <cpu type='kvm' name='mpc8379e'/>
-+  <cpu type='kvm' name='mpc8641'/>
-+  <cpu type='kvm' name='750cxe_v2.4b'/>
-+  <cpu type='kvm' name='7410_v1.0'/>
-+  <cpu type='kvm' name='mpc603'/>
-+  <cpu type='kvm' name='603e_v4.1'/>
-+  <cpu type='kvm' name='7445_v3.3'/>
-+  <cpu type='kvm' name='440epa'/>
-+  <cpu type='kvm' name='970fx_v2.1'/>
-+  <cpu type='kvm' name='iop480'/>
-+  <cpu type='kvm' name='750fx_v2.1'/>
-+  <cpu type='kvm' name='601_v0'/>
-+  <cpu type='kvm' name='g2legp1'/>
-+  <cpu type='kvm' name='745_v1.0'/>
-+  <cpu type='kvm' name='750cl_v2.0'/>
-+  <cpu type='kvm' name='750cxr'/>
-+  <cpu type='kvm' name='401'/>
-+  <cpu type='kvm' name='mpc8541e_v11'/>
-+  <cpu type='kvm' name='750cxe_v3.1'/>
-+  <cpu type='kvm' name='mpc8555e_v11'/>
-+  <cpu type='kvm' name='power8e_v2.1'/>
-+  <cpu type='kvm' name='7447a_v1.1'/>
-+  <cpu type='kvm' name='403gb'/>
-+  <cpu type='kvm' name='e300c2'/>
-+  <cpu type='kvm' name='npe405h2'/>
-+  <cpu type='kvm' name='mpc8343e'/>
-+  <cpu type='kvm' name='mpc8533e_v10'/>
-+  <cpu type='kvm' name='mpc5200_v10'/>
-+  <cpu type='kvm' name='750_v3.1'/>
-+  <cpu type='kvm' name='power5+_v2.1'/>
-+  <cpu type='kvm' name='mpc8568e'/>
-+  <cpu type='tcg' name='default'/>
-+  <cpu type='tcg' name='ppc'/>
-+  <cpu type='tcg' name='ppc32'/>
-+  <cpu type='tcg' name='ppc64'/>
-+  <cpu type='tcg' name='power9'/>
-+  <cpu type='tcg' name='power8nvl'/>
-+  <cpu type='tcg' name='power8'/>
-+  <cpu type='tcg' name='power8e'/>
-+  <cpu type='tcg' name='power7+'/>
-+  <cpu type='tcg' name='power7'/>
-+  <cpu type='tcg' name='power5gs'/>
-+  <cpu type='tcg' name='power5+'/>
-+  <cpu type='tcg' name='970mp'/>
-+  <cpu type='tcg' name='970fx'/>
-+  <cpu type='tcg' name='970'/>
-+  <cpu type='tcg' name='apollo7pm'/>
-+  <cpu type='tcg' name='7457a'/>
-+  <cpu type='tcg' name='7447a'/>
-+  <cpu type='tcg' name='apollo7'/>
-+  <cpu type='tcg' name='7457'/>
-+  <cpu type='tcg' name='7447'/>
-+  <cpu type='tcg' name='apollo6'/>
-+  <cpu type='tcg' name='7455'/>
-+  <cpu type='tcg' name='7445'/>
-+  <cpu type='tcg' name='7451'/>
-+  <cpu type='tcg' name='7441'/>
-+  <cpu type='tcg' name='vger'/>
-+  <cpu type='tcg' name='7450'/>
-+  <cpu type='tcg' name='7448'/>
-+  <cpu type='tcg' name='nitro'/>
-+  <cpu type='tcg' name='7410'/>
-+  <cpu type='tcg' name='g4'/>
-+  <cpu type='tcg' name='max'/>
-+  <cpu type='tcg' name='7400'/>
-+  <cpu type='tcg' name='goldfinger'/>
-+  <cpu type='tcg' name='755'/>
-+  <cpu type='tcg' name='745'/>
-+  <cpu type='tcg' name='lonestar'/>
-+  <cpu type='tcg' name='750l'/>
-+  <cpu type='tcg' name='750gx'/>
-+  <cpu type='tcg' name='750fx'/>
-+  <cpu type='tcg' name='750cxe'/>
-+  <cpu type='tcg' name='750cx'/>
-+  <cpu type='tcg' name='750cl'/>
-+  <cpu type='tcg' name='conan/doyle'/>
-+  <cpu type='tcg' name='g3'/>
-+  <cpu type='tcg' name='typhoon'/>
-+  <cpu type='tcg' name='750'/>
-+  <cpu type='tcg' name='arthur'/>
-+  <cpu type='tcg' name='740'/>
-+  <cpu type='tcg' name='mach5'/>
-+  <cpu type='tcg' name='sirocco'/>
-+  <cpu type='tcg' name='604e'/>
-+  <cpu type='tcg' name='goldeneye'/>
-+  <cpu type='tcg' name='603r'/>
-+  <cpu type='tcg' name='vaillant'/>
-+  <cpu type='tcg' name='stretch'/>
-+  <cpu type='tcg' name='603e'/>
-+  <cpu type='tcg' name='vanilla'/>
-+  <cpu type='tcg' name='601v'/>
-+  <cpu type='tcg' name='601'/>
-+  <cpu type='tcg' name='mpc8560'/>
-+  <cpu type='tcg' name='mpc8555e'/>
-+  <cpu type='tcg' name='mpc8555'/>
-+  <cpu type='tcg' name='mpc8548e'/>
-+  <cpu type='tcg' name='mpc8548'/>
-+  <cpu type='tcg' name='mpc8547e'/>
-+  <cpu type='tcg' name='mpc8545e'/>
-+  <cpu type='tcg' name='mpc8545'/>
-+  <cpu type='tcg' name='mpc8544e'/>
-+  <cpu type='tcg' name='mpc8544'/>
-+  <cpu type='tcg' name='mpc8543e'/>
-+  <cpu type='tcg' name='mpc8543'/>
-+  <cpu type='tcg' name='mpc8541e'/>
-+  <cpu type='tcg' name='mpc8541'/>
-+  <cpu type='tcg' name='mpc8540'/>
-+  <cpu type='tcg' name='mpc8533e'/>
-+  <cpu type='tcg' name='mpc8533'/>
-+  <cpu type='tcg' name='e500v2'/>
-+  <cpu type='tcg' name='e500v1'/>
-+  <cpu type='tcg' name='e500'/>
-+  <cpu type='tcg' name='mpc8347ea'/>
-+  <cpu type='tcg' name='mpc8347e'/>
-+  <cpu type='tcg' name='mpc8347a'/>
-+  <cpu type='tcg' name='mpc8347'/>
-+  <cpu type='tcg' name='e300'/>
-+  <cpu type='tcg' name='e200'/>
-+  <cpu type='tcg' name='mpc8280'/>
-+  <cpu type='tcg' name='mpc8275'/>
-+  <cpu type='tcg' name='mpc8272'/>
-+  <cpu type='tcg' name='mpc8271'/>
-+  <cpu type='tcg' name='mpc8270'/>
-+  <cpu type='tcg' name='mpc8266_hip4'/>
-+  <cpu type='tcg' name='mpc8266_hip3'/>
-+  <cpu type='tcg' name='mpc8266'/>
-+  <cpu type='tcg' name='mpc8265_hip4'/>
-+  <cpu type='tcg' name='mpc8265_hip3'/>
-+  <cpu type='tcg' name='mpc8265'/>
-+  <cpu type='tcg' name='mpc8264_hip4'/>
-+  <cpu type='tcg' name='mpc8264_hip3'/>
-+  <cpu type='tcg' name='mpc8264'/>
-+  <cpu type='tcg' name='mpc8260_hip4'/>
-+  <cpu type='tcg' name='mpc8260_hip3'/>
-+  <cpu type='tcg' name='mpc8260'/>
-+  <cpu type='tcg' name='mpc8255_hip4'/>
-+  <cpu type='tcg' name='mpc8255_hip3'/>
-+  <cpu type='tcg' name='mpc8255'/>
-+  <cpu type='tcg' name='mpc8250_hip4'/>
-+  <cpu type='tcg' name='mpc8250_hip3'/>
-+  <cpu type='tcg' name='mpc8250'/>
-+  <cpu type='tcg' name='mpc8248'/>
-+  <cpu type='tcg' name='mpc8247'/>
-+  <cpu type='tcg' name='mpc8245'/>
-+  <cpu type='tcg' name='mpc8241'/>
-+  <cpu type='tcg' name='powerquicc-ii'/>
-+  <cpu type='tcg' name='mpc82xx'/>
-+  <cpu type='tcg' name='mpc5200b'/>
-+  <cpu type='tcg' name='mpc5200'/>
-+  <cpu type='tcg' name='mpc52xx'/>
-+  <cpu type='tcg' name='mpc8240'/>
-+  <cpu type='tcg' name='460ex'/>
-+  <cpu type='tcg' name='440ep'/>
-+  <cpu type='tcg' name='x2vp50'/>
-+  <cpu type='tcg' name='x2vp7'/>
-+  <cpu type='tcg' name='405gpe'/>
-+  <cpu type='tcg' name='405gp'/>
-+  <cpu type='tcg' name='405cr'/>
-+  <cpu type='tcg' name='405'/>
-+  <cpu type='tcg' name='403'/>
-+  <cpu type='tcg' name='mpc8547e_v21'/>
-+  <cpu type='tcg' name='750cl_v1.0'/>
-+  <cpu type='tcg' name='7457a_v1.1'/>
-+  <cpu type='tcg' name='g2gp'/>
-+  <cpu type='tcg' name='750cxe_v2.1'/>
-+  <cpu type='tcg' name='755_v2.7'/>
-+  <cpu type='tcg' name='750_v2.1'/>
-+  <cpu type='tcg' name='755_v2.2'/>
-+  <cpu type='tcg' name='745_v2.0'/>
-+  <cpu type='tcg' name='mpc8377'/>
-+  <cpu type='tcg' name='7455_v1.0'/>
-+  <cpu type='tcg' name='mpc8545_v21'/>
-+  <cpu type='tcg' name='mpc8548_v11'/>
-+  <cpu type='tcg' name='405d4'/>
-+  <cpu type='tcg' name='g2le'/>
-+  <cpu type='tcg' name='g2hip3'/>
-+  <cpu type='tcg' name='750e'/>
-+  <cpu type='tcg' name='mpc8572'/>
-+  <cpu type='tcg' name='970fx_v2.0'/>
-+  <cpu type='tcg' name='750fx_v2.0'/>
-+  <cpu type='tcg' name='603p'/>
-+  <cpu type='tcg' name='405gpb'/>
-+  <cpu type='tcg' name='7400_v2.7'/>
-+  <cpu type='tcg' name='mpc8544e_v10'/>
-+  <cpu type='tcg' name='e500v2_v10'/>
-+  <cpu type='tcg' name='e500mc'/>
-+  <cpu type='tcg' name='603e7v1'/>
-+  <cpu type='tcg' name='970mp_v1.0'/>
-+  <cpu type='tcg' name='740e'/>
-+  <cpu type='tcg' name='405crc'/>
-+  <cpu type='tcg' name='403ga'/>
-+  <cpu type='tcg' name='7447a_v1.0'/>
-+  <cpu type='tcg' name='7400_v2.2'/>
-+  <cpu type='tcg' name='e300c1'/>
-+  <cpu type='tcg' name='mpc8572e'/>
-+  <cpu type='tcg' name='e500v2_v21'/>
-+  <cpu type='tcg' name='970fx_v1.0'/>
-+  <cpu type='tcg' name='750gx_v1.2'/>
-+  <cpu type='tcg' name='750fx_v1.0'/>
-+  <cpu type='tcg' name='7457_v1.1'/>
-+  <cpu type='tcg' name='970fx_v3.0'/>
-+  <cpu type='tcg' name='604e_v2.2'/>
-+  <cpu type='tcg' name='755_v2.6'/>
-+  <cpu type='tcg' name='401a1'/>
-+  <cpu type='tcg' name='power9_v1.0'/>
-+  <cpu type='tcg' name='npe405h'/>
-+  <cpu type='tcg' name='g2ls'/>
-+  <cpu type='tcg' name='7410_v1.4'/>
-+  <cpu type='tcg' name='750_v2.0'/>
-+  <cpu type='tcg' name='401b2'/>
-+  <cpu type='tcg' name='mpc8349'/>
-+  <cpu type='tcg' name='mpc8347ep'/>
-+  <cpu type='tcg' name='7445_v3.2'/>
-+  <cpu type='tcg' name='mpc8540_v21'/>
-+  <cpu type='tcg' name='mpc8543_v11'/>
-+  <cpu type='tcg' name='403gcx'/>
-+  <cpu type='tcg' name='745_v2.4'/>
-+  <cpu type='tcg' name='mpc8548_v21'/>
-+  <cpu type='tcg' name='750l_v3.2'/>
-+  <cpu type='tcg' name='750_v1.0'/>
-+  <cpu type='tcg' name='755_v1.1'/>
-+  <cpu type='tcg' name='e500_v10'/>
-+  <cpu type='tcg' name='750cxe_v3.0'/>
-+  <cpu type='tcg' name='mpc8541e_v10'/>
-+  <cpu type='tcg' name='mpc8347p'/>
-+  <cpu type='tcg' name='mpc8555e_v10'/>
-+  <cpu type='tcg' name='power9_v2.0'/>
-+  <cpu type='tcg' name='power7_v2.3'/>
-+  <cpu type='tcg' name='603e7v'/>
-+  <cpu type='tcg' name='mpc8543e_v11'/>
-+  <cpu type='tcg' name='750_v3.0'/>
-+  <cpu type='tcg' name='7400_v2.6'/>
-+  <cpu type='tcg' name='405gpa'/>
-+  <cpu type='tcg' name='440epx'/>
-+  <cpu type='tcg' name='750l_v2.2'/>
-+  <cpu type='tcg' name='e200z6'/>
-+  <cpu type='tcg' name='mpc8547e_v20'/>
-+  <cpu type='tcg' name='7457a_v1.0'/>
-+  <cpu type='tcg' name='mpc8349ea'/>
-+  <cpu type='tcg' name='e500v2_v20'/>
-+  <cpu type='tcg' name='power8nvl_v1.0'/>
-+  <cpu type='tcg' name='mpc8540_v10'/>
-+  <cpu type='tcg' name='755_v2.1'/>
-+  <cpu type='tcg' name='745_v2.8'/>
-+  <cpu type='tcg' name='npe405l'/>
-+  <cpu type='tcg' name='mpc8343ea'/>
-+  <cpu type='tcg' name='mpc8545_v20'/>
-+  <cpu type='tcg' name='mpc8548_v10'/>
-+  <cpu type='tcg' name='7455_v3.4'/>
-+  <cpu type='tcg' name='740_v2.2'/>
-+  <cpu type='tcg' name='7448_v1.1'/>
-+  <cpu type='tcg' name='7400_v1.1'/>
-+  <cpu type='tcg' name='mpc8347et'/>
-+  <cpu type='tcg' name='7441_v2.10'/>
-+  <cpu type='tcg' name='603e_v1.4'/>
-+  <cpu type='tcg' name='mpc8543_v10'/>
-+  <cpu type='tcg' name='401c2'/>
-+  <cpu type='tcg' name='7451_v2.10'/>
-+  <cpu type='tcg' name='750cx_v2.2'/>
-+  <cpu type='tcg' name='mpc8543_v21'/>
-+  <cpu type='tcg' name='603e7'/>
-+  <cpu type='tcg' name='7448_v2.1'/>
-+  <cpu type='tcg' name='7441_v2.3'/>
-+  <cpu type='tcg' name='405crb'/>
-+  <cpu type='tcg' name='604'/>
-+  <cpu type='tcg' name='7400_v2.1'/>
-+  <cpu type='tcg' name='440-xilinx-w-dfpu'/>
-+  <cpu type='tcg' name='7445_v2.1'/>
-+  <cpu type='tcg' name='cobra'/>
-+  <cpu type='tcg' name='e500_v20'/>
-+  <cpu type='tcg' name='mpc8541_v11'/>
-+  <cpu type='tcg' name='750gx_v1.1'/>
-+  <cpu type='tcg' name='750cxe_v2.4'/>
-+  <cpu type='tcg' name='mpc8641d'/>
-+  <cpu type='tcg' name='mpc8543e_v21'/>
-+  <cpu type='tcg' name='750l_v2.1'/>
-+  <cpu type='tcg' name='7457_v1.0'/>
-+  <cpu type='tcg' name='7450_v1.2'/>
-+  <cpu type='tcg' name='755_v2.5'/>
-+  <cpu type='tcg' name='7410_v1.3'/>
-+  <cpu type='tcg' name='745_v2.3'/>
-+  <cpu type='tcg' name='755_v2.0'/>
-+  <cpu type='tcg' name='e500v2_v30'/>
-+  <cpu type='tcg' name='7455_v3.3'/>
-+  <cpu type='tcg' name='mpc8540_v20'/>
-+  <cpu type='tcg' name='405d2'/>
-+  <cpu type='tcg' name='mpc8560_v21'/>
-+  <cpu type='tcg' name='mpc8343'/>
-+  <cpu type='tcg' name='mpc8548_v20'/>
-+  <cpu type='tcg' name='mpc8347t'/>
-+  <cpu type='tcg' name='755_v1.0'/>
-+  <cpu type='tcg' name='603e_v1.3'/>
-+  <cpu type='tcg' name='mpc8543e_v10'/>
-+  <cpu type='tcg' name='mpc8347eap'/>
-+  <cpu type='tcg' name='mpc8548e_v11'/>
-+  <cpu type='tcg' name='mpc8543_v20'/>
-+  <cpu type='tcg' name='401d2'/>
-+  <cpu type='tcg' name='power8_v2.0'/>
-+  <cpu type='tcg' name='740_v3.1'/>
-+  <cpu type='tcg' name='e200z5'/>
-+  <cpu type='tcg' name='405cra'/>
-+  <cpu type='tcg' name='7400_v2.0'/>
-+  <cpu type='tcg' name='750cxe_v2.3'/>
-+  <cpu type='tcg' name='745_v2.7'/>
-+  <cpu type='tcg' name='mpc8560_v10'/>
-+  <cpu type='tcg' name='e5500'/>
-+  <cpu type='tcg' name='mpc8544_v11'/>
-+  <cpu type='tcg' name='7448_v1.0'/>
-+  <cpu type='tcg' name='401e2'/>
-+  <cpu type='tcg' name='740_v2.1'/>
-+  <cpu type='tcg' name='745_v2.2'/>
-+  <cpu type='tcg' name='7400_v1.0'/>
-+  <cpu type='tcg' name='7410_v1.2'/>
-+  <cpu type='tcg' name='x2vp4'/>
-+  <cpu type='tcg' name='mpc8347ap'/>
-+  <cpu type='tcg' name='mpc8533_v11'/>
-+  <cpu type='tcg' name='mpc5200b_v21'/>
-+  <cpu type='tcg' name='750fx_v2.3'/>
-+  <cpu type='tcg' name='601_v2'/>
-+  <cpu type='tcg' name='g2legp3'/>
-+  <cpu type='tcg' name='604e_v1.0'/>
-+  <cpu type='tcg' name='750cx_v2.1'/>
-+  <cpu type='tcg' name='mpc8610'/>
-+  <cpu type='tcg' name='g2h4'/>
-+  <cpu type='tcg' name='750l_v3.0'/>
-+  <cpu type='tcg' name='mpc8377e'/>
-+  <cpu type='tcg' name='e300c4'/>
-+  <cpu type='tcg' name='mpc5200_v12'/>
-+  <cpu type='tcg' name='7448_v2.0'/>
-+  <cpu type='tcg' name='7450_v2.1'/>
-+  <cpu type='tcg' name='750cxe_v3.1b'/>
-+  <cpu type='tcg' name='g2'/>
-+  <cpu type='tcg' name='7400_v2.9'/>
-+  <cpu type='tcg' name='405gpd'/>
-+  <cpu type='tcg' name='603'/>
-+  <cpu type='tcg' name='603e7t'/>
-+  <cpu type='tcg' name='mpc8555_v11'/>
-+  <cpu type='tcg' name='750gx_v1.0'/>
-+  <cpu type='tcg' name='mpc8541_v10'/>
-+  <cpu type='tcg' name='mpc8543e_v20'/>
-+  <cpu type='tcg' name='750fl'/>
-+  <cpu type='tcg' name='750l_v2.0'/>
-+  <cpu type='tcg' name='stb04'/>
-+  <cpu type='tcg' name='mpc8548e_v21'/>
-+  <cpu type='tcg' name='x2vp20'/>
-+  <cpu type='tcg' name='405ez'/>
-+  <cpu type='tcg' name='e600'/>
-+  <cpu type='tcg' name='7450_v1.1'/>
-+  <cpu type='tcg' name='755_v2.4'/>
-+  <cpu type='tcg' name='mpc8379'/>
-+  <cpu type='tcg' name='7445_v1.0'/>
-+  <cpu type='tcg' name='7447_v1.1'/>
-+  <cpu type='tcg' name='603e_v2.2'/>
-+  <cpu type='tcg' name='603e_v4'/>
-+  <cpu type='tcg' name='g2legp'/>
-+  <cpu type='tcg' name='7455_v3.2'/>
-+  <cpu type='tcg' name='740_v2.0'/>
-+  <cpu type='tcg' name='mpc8560_v20'/>
-+  <cpu type='tcg' name='440-xilinx'/>
-+  <cpu type='tcg' name='401f2'/>
-+  <cpu type='tcg' name='mpc8533_v10'/>
-+  <cpu type='tcg' name='mpc8349a'/>
-+  <cpu type='tcg' name='405gpr'/>
-+  <cpu type='tcg' name='stb25'/>
-+  <cpu type='tcg' name='603e_v1.2'/>
-+  <cpu type='tcg' name='mpc5200b_v20'/>
-+  <cpu type='tcg' name='750fx_v2.2'/>
-+  <cpu type='tcg' name='mpc8347eat'/>
-+  <cpu type='tcg' name='740_v1.0'/>
-+  <cpu type='tcg' name='601_v1'/>
-+  <cpu type='tcg' name='745_v1.1'/>
-+  <cpu type='tcg' name='750cx_v2.0'/>
-+  <cpu type='tcg' name='mpc8548e_v10'/>
-+  <cpu type='tcg' name='7447a_v1.2'/>
-+  <cpu type='tcg' name='403gc'/>
-+  <cpu type='tcg' name='e300c3'/>
-+  <cpu type='tcg' name='mpc5200_v11'/>
-+  <cpu type='tcg' name='7441_v2.1'/>
-+  <cpu type='tcg' name='740_v3.0'/>
-+  <cpu type='tcg' name='mpc8545e_v21'/>
-+  <cpu type='tcg' name='602'/>
-+  <cpu type='tcg' name='mpc8378e'/>
-+  <cpu type='tcg' name='mpc8343a'/>
-+  <cpu type='tcg' name='460exb'/>
-+  <cpu type='tcg' name='mpc8555_v10'/>
-+  <cpu type='tcg' name='mpc8568'/>
-+  <cpu type='tcg' name='7457a_v1.2'/>
-+  <cpu type='tcg' name='750cx_v1.0'/>
-+  <cpu type='tcg' name='750cxe_v2.2'/>
-+  <cpu type='tcg' name='604e_v2.4'/>
-+  <cpu type='tcg' name='755_v2.8'/>
-+  <cpu type='tcg' name='405lp'/>
-+  <cpu type='tcg' name='745_v2.6'/>
-+  <cpu type='tcg' name='stb03'/>
-+  <cpu type='tcg' name='405ep'/>
-+  <cpu type='tcg' name='mpc8544_v10'/>
-+  <cpu type='tcg' name='mpc8347at'/>
-+  <cpu type='tcg' name='750_v2.2'/>
-+  <cpu type='tcg' name='7450_v1.0'/>
-+  <cpu type='tcg' name='755_v2.3'/>
-+  <cpu type='tcg' name='7410_v1.1'/>
-+  <cpu type='tcg' name='745_v2.1'/>
-+  <cpu type='tcg' name='750gl'/>
-+  <cpu type='tcg' name='e6500'/>
-+  <cpu type='tcg' name='750p'/>
-+  <cpu type='tcg' name='7445_v3.4'/>
-+  <cpu type='tcg' name='440epb'/>
-+  <cpu type='tcg' name='npe4gs3'/>
-+  <cpu type='tcg' name='603e_v3'/>
-+  <cpu type='tcg' name='mpc8349e'/>
-+  <cpu type='tcg' name='970_v2.2'/>
-+  <cpu type='tcg' name='g2lels'/>
-+  <cpu type='tcg' name='g2hip4'/>
-+  <cpu type='tcg' name='740p'/>
-+  <cpu type='tcg' name='mpc8567e'/>
-+  <cpu type='tcg' name='mpc8533e_v11'/>
-+  <cpu type='tcg' name='7451_v2.3'/>
-+  <cpu type='tcg' name='603e_v1.1'/>
-+  <cpu type='tcg' name='401g2'/>
-+  <cpu type='tcg' name='7400_v2.8'/>
-+  <cpu type='tcg' name='7455_v2.1'/>
-+  <cpu type='tcg' name='405gpc'/>
-+  <cpu type='tcg' name='power7+_v2.1'/>
-+  <cpu type='tcg' name='mpc8544e_v11'/>
-+  <cpu type='tcg' name='7450_v2.0'/>
-+  <cpu type='tcg' name='970mp_v1.1'/>
-+  <cpu type='tcg' name='603e7v2'/>
-+  <cpu type='tcg' name='604r'/>
-+  <cpu type='tcg' name='e500v2_v22'/>
-+  <cpu type='tcg' name='mpc8548e_v20'/>
-+  <cpu type='tcg' name='mpc8545e_v20'/>
-+  <cpu type='tcg' name='mpc8378'/>
-+  <cpu type='tcg' name='mpc8567'/>
-+  <cpu type='tcg' name='7457_v1.2'/>
-+  <cpu type='tcg' name='7447_v1.0'/>
-+  <cpu type='tcg' name='970fx_v3.1'/>
-+  <cpu type='tcg' name='745_v2.5'/>
-+  <cpu type='tcg' name='mpc8379e'/>
-+  <cpu type='tcg' name='mpc8641'/>
-+  <cpu type='tcg' name='750cxe_v2.4b'/>
-+  <cpu type='tcg' name='7410_v1.0'/>
-+  <cpu type='tcg' name='mpc603'/>
-+  <cpu type='tcg' name='603e_v4.1'/>
-+  <cpu type='tcg' name='7445_v3.3'/>
-+  <cpu type='tcg' name='440epa'/>
-+  <cpu type='tcg' name='970fx_v2.1'/>
-+  <cpu type='tcg' name='iop480'/>
-+  <cpu type='tcg' name='750fx_v2.1'/>
-+  <cpu type='tcg' name='601_v0'/>
-+  <cpu type='tcg' name='g2legp1'/>
-+  <cpu type='tcg' name='745_v1.0'/>
-+  <cpu type='tcg' name='750cl_v2.0'/>
-+  <cpu type='tcg' name='750cxr'/>
-+  <cpu type='tcg' name='401'/>
-+  <cpu type='tcg' name='mpc8541e_v11'/>
-+  <cpu type='tcg' name='750cxe_v3.1'/>
-+  <cpu type='tcg' name='mpc8555e_v11'/>
-+  <cpu type='tcg' name='power8e_v2.1'/>
-+  <cpu type='tcg' name='7447a_v1.1'/>
-+  <cpu type='tcg' name='403gb'/>
-+  <cpu type='tcg' name='e300c2'/>
-+  <cpu type='tcg' name='npe405h2'/>
-+  <cpu type='tcg' name='mpc8343e'/>
-+  <cpu type='tcg' name='mpc8533e_v10'/>
-+  <cpu type='tcg' name='mpc5200_v10'/>
-+  <cpu type='tcg' name='750_v3.1'/>
-+  <cpu type='tcg' name='power5+_v2.1'/>
-+  <cpu type='tcg' name='mpc8568e'/>
-+  <machine name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='ref405ep' maxCpus='1'/>
-+  <machine name='sam460ex' maxCpus='1'/>
-+  <machine name='virtex-ml507' maxCpus='1'/>
-+  <machine name='powernv' maxCpus='2048'/>
-+  <machine name='ppce500' maxCpus='32'/>
-+  <machine name='mpc8544ds' maxCpus='15'/>
-+  <machine name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='bamboo' maxCpus='1'/>
-+  <machine name='g3beige' maxCpus='1'/>
-+  <machine name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='prep' maxCpus='1'/>
-+  <machine name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='mac99' maxCpus='1'/>
-+  <machine name='pseries-2.6' maxCpus='1024'/>
-+  <machine name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
-+  <machine name='pseries-2.4' maxCpus='1024'/>
-+  <machine name='pseries-2.5' maxCpus='1024'/>
-+  <machine name='pseries-2.2' maxCpus='1024'/>
-+  <machine name='taihu' maxCpus='1'/>
-+  <machine name='pseries-2.3' maxCpus='1024'/>
-+  <machine name='pseries-2.1' maxCpus='1024'/>
-+  <machine name='40p' maxCpus='1'/>
++  <microcodeVersion>61700241</microcodeVersion>
++  <package>v4.2.0-1157-gadcd6e93b9</package>
++  <arch>aarch64</arch>
++  <hostCPU type='kvm' model='host' migratability='no'>
++    <property name='sve768' type='boolean' value='false'/>
++    <property name='sve128' type='boolean' value='false'/>
++    <property name='sve1024' type='boolean' value='false'/>
++    <property name='sve1280' type='boolean' value='false'/>
++    <property name='sve896' type='boolean' value='false'/>
++    <property name='sve256' type='boolean' value='false'/>
++    <property name='sve1536' type='boolean' value='false'/>
++    <property name='sve1792' type='boolean' value='false'/>
++    <property name='sve384' type='boolean' value='false'/>
++    <property name='sve' type='boolean' value='false'/>
++    <property name='sve2048' type='boolean' value='false'/>
++    <property name='kvm-no-adjvtime' type='boolean' value='false'/>
++    <property name='sve512' type='boolean' value='false'/>
++    <property name='aarch64' type='boolean' value='true'/>
++    <property name='pmu' type='boolean' value='true'/>
++    <property name='sve1920' type='boolean' value='false'/>
++    <property name='sve1152' type='boolean' value='false'/>
++    <property name='sve640' type='boolean' value='false'/>
++    <property name='sve1408' type='boolean' value='false'/>
++    <property name='sve1664' type='boolean' value='false'/>
++  </hostCPU>
++  <cpu type='kvm' name='pxa262' typename='pxa262-arm-cpu'/>
++  <cpu type='kvm' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
++  <cpu type='kvm' name='arm1136' typename='arm1136-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
++  <cpu type='kvm' name='pxa260' typename='pxa260-arm-cpu'/>
++  <cpu type='kvm' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
++  <cpu type='kvm' name='pxa261' typename='pxa261-arm-cpu'/>
++  <cpu type='kvm' name='pxa255' typename='pxa255-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
++  <cpu type='kvm' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
++  <cpu type='kvm' name='arm926' typename='arm926-arm-cpu'/>
++  <cpu type='kvm' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
++  <cpu type='kvm' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
++  <cpu type='kvm' name='pxa250' typename='pxa250-arm-cpu'/>
++  <cpu type='kvm' name='ti925t' typename='ti925t-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
++  <cpu type='kvm' name='sa1110' typename='sa1110-arm-cpu'/>
++  <cpu type='kvm' name='host' typename='host-arm-cpu'/>
++  <cpu type='kvm' name='arm1176' typename='arm1176-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
++  <cpu type='kvm' name='sa1100' typename='sa1100-arm-cpu'/>
++  <cpu type='kvm' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
++  <cpu type='kvm' name='cortex-m7' typename='cortex-m7-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
++  <cpu type='kvm' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
++  <cpu type='kvm' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
++  <cpu type='kvm' name='arm1026' typename='arm1026-arm-cpu'/>
++  <cpu type='kvm' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
++  <cpu type='kvm' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
++  <cpu type='kvm' name='max' typename='max-arm-cpu'/>
++  <cpu type='kvm' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
++  <cpu type='kvm' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
++  <cpu type='kvm' name='arm946' typename='arm946-arm-cpu'/>
++  <cpu type='kvm' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
++  <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
++  <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
++  <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
++  <machine type='kvm' name='integratorcp' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='kvm' name='nuri' maxCpus='2'/>
++  <machine type='kvm' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='kvm' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='kvm' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='ast2500-evb' maxCpus='2'/>
++  <machine type='kvm' name='smdkc210' maxCpus='2'/>
++  <machine type='kvm' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/>
++  <machine type='kvm' name='xlnx-versal-virt' maxCpus='2'/>
++  <machine type='kvm' name='imx25-pdk' maxCpus='1'/>
++  <machine type='kvm' name='spitz' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='kvm' name='musca-b1' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='kvm' name='realview-pbx-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='kvm' name='realview-eb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='kvm' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='kvm' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/>
++  <machine type='kvm' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/>
++  <machine type='kvm' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
++  <machine type='kvm' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='kzm' maxCpus='1'/>
++  <machine type='kvm' name='swift-bmc' maxCpus='2'/>
++  <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/>
++  <machine type='kvm' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
++  <machine type='kvm' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
++  <machine type='kvm' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
++  <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='highbank' maxCpus='4'/>
++  <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='raspi2' maxCpus='4'/>
++  <machine type='kvm' name='raspi3' maxCpus='4'/>
++  <machine type='kvm' name='netduino2' maxCpus='1'/>
++  <machine type='kvm' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
++  <machine type='kvm' name='n810' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
++  <machine type='kvm' name='mainstone' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
++  <machine type='kvm' name='palmetto-bmc' maxCpus='2'/>
++  <machine type='kvm' name='tacoma-bmc' maxCpus='2'/>
++  <machine type='kvm' name='sabrelite' maxCpus='4'/>
++  <machine type='kvm' name='netduinoplus2' maxCpus='1'/>
++  <machine type='kvm' name='midway' maxCpus='4'/>
++  <machine type='kvm' name='romulus-bmc' maxCpus='2'/>
++  <machine type='kvm' name='cheetah' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
++  <machine type='kvm' name='tosa' maxCpus='1'/>
++  <machine type='kvm' name='borzoi' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='kvm' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='kvm' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='kvm' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
++  <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='connex' maxCpus='1'/>
++  <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='microbit' maxCpus='1'/>
++  <machine type='kvm' name='witherspoon-bmc' maxCpus='2'/>
++  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='kvm' name='mps2-an385' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='kvm' name='ast2600-evb' maxCpus='2'/>
++  <machine type='kvm' name='vexpress-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='kvm' name='mps2-an521' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/>
++  <machine type='kvm' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
++  <machine type='kvm' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='kvm' name='canon-a1100' maxCpus='1'/>
++  <machine type='kvm' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <hostCPU type='tcg' model='max' migratability='no'>
++    <property name='sve768' type='boolean' value='true'/>
++    <property name='sve128' type='boolean' value='true'/>
++    <property name='sve1024' type='boolean' value='true'/>
++    <property name='sve1280' type='boolean' value='true'/>
++    <property name='sve896' type='boolean' value='true'/>
++    <property name='sve256' type='boolean' value='true'/>
++    <property name='sve1536' type='boolean' value='true'/>
++    <property name='sve1792' type='boolean' value='true'/>
++    <property name='sve384' type='boolean' value='true'/>
++    <property name='sve' type='boolean' value='true'/>
++    <property name='sve2048' type='boolean' value='true'/>
++    <property name='sve512' type='boolean' value='true'/>
++    <property name='aarch64' type='boolean' value='true'/>
++    <property name='pmu' type='boolean' value='true'/>
++    <property name='sve1920' type='boolean' value='true'/>
++    <property name='sve1152' type='boolean' value='true'/>
++    <property name='sve640' type='boolean' value='true'/>
++    <property name='sve1408' type='boolean' value='true'/>
++    <property name='sve1664' type='boolean' value='true'/>
++  </hostCPU>
++  <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
++  <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
++  <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a15' typename='cortex-a15-arm-cpu'/>
++  <cpu type='tcg' name='pxa260' typename='pxa260-arm-cpu'/>
++  <cpu type='tcg' name='arm1136-r2' typename='arm1136-r2-arm-cpu'/>
++  <cpu type='tcg' name='pxa261' typename='pxa261-arm-cpu'/>
++  <cpu type='tcg' name='pxa255' typename='pxa255-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a72' typename='cortex-a72-arm-cpu'/>
++  <cpu type='tcg' name='cortex-m33' typename='cortex-m33-arm-cpu'/>
++  <cpu type='tcg' name='arm926' typename='arm926-arm-cpu'/>
++  <cpu type='tcg' name='cortex-r5f' typename='cortex-r5f-arm-cpu'/>
++  <cpu type='tcg' name='arm11mpcore' typename='arm11mpcore-arm-cpu'/>
++  <cpu type='tcg' name='pxa250' typename='pxa250-arm-cpu'/>
++  <cpu type='tcg' name='ti925t' typename='ti925t-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a57' typename='cortex-a57-arm-cpu'/>
++  <cpu type='tcg' name='sa1110' typename='sa1110-arm-cpu'/>
++  <cpu type='tcg' name='host' typename='host-arm-cpu'/>
++  <cpu type='tcg' name='arm1176' typename='arm1176-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a53' typename='cortex-a53-arm-cpu'/>
++  <cpu type='tcg' name='sa1100' typename='sa1100-arm-cpu'/>
++  <cpu type='tcg' name='pxa270-c5' typename='pxa270-c5-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a9' typename='cortex-a9-arm-cpu'/>
++  <cpu type='tcg' name='cortex-m7' typename='cortex-m7-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a8' typename='cortex-a8-arm-cpu'/>
++  <cpu type='tcg' name='cortex-a7' typename='cortex-a7-arm-cpu'/>
++  <cpu type='tcg' name='pxa270-c0' typename='pxa270-c0-arm-cpu'/>
++  <cpu type='tcg' name='arm1026' typename='arm1026-arm-cpu'/>
++  <cpu type='tcg' name='pxa270-b1' typename='pxa270-b1-arm-cpu'/>
++  <cpu type='tcg' name='cortex-m3' typename='cortex-m3-arm-cpu'/>
++  <cpu type='tcg' name='max' typename='max-arm-cpu'/>
++  <cpu type='tcg' name='cortex-m4' typename='cortex-m4-arm-cpu'/>
++  <cpu type='tcg' name='pxa270-b0' typename='pxa270-b0-arm-cpu'/>
++  <cpu type='tcg' name='arm946' typename='arm946-arm-cpu'/>
++  <cpu type='tcg' name='cortex-m0' typename='cortex-m0-arm-cpu'/>
++  <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
++  <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
++  <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
++  <machine type='tcg' name='integratorcp' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='tcg' name='nuri' maxCpus='2'/>
++  <machine type='tcg' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='tcg' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='tcg' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='ast2500-evb' maxCpus='2'/>
++  <machine type='tcg' name='smdkc210' maxCpus='2'/>
++  <machine type='tcg' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/>
++  <machine type='tcg' name='xlnx-versal-virt' maxCpus='2'/>
++  <machine type='tcg' name='imx25-pdk' maxCpus='1'/>
++  <machine type='tcg' name='spitz' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='tcg' name='musca-b1' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='tcg' name='realview-pbx-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='tcg' name='realview-eb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='tcg' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='tcg' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/>
++  <machine type='tcg' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/>
++  <machine type='tcg' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
++  <machine type='tcg' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='kzm' maxCpus='1'/>
++  <machine type='tcg' name='swift-bmc' maxCpus='2'/>
++  <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/>
++  <machine type='tcg' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
++  <machine type='tcg' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
++  <machine type='tcg' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
++  <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='highbank' maxCpus='4'/>
++  <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='raspi2' maxCpus='4'/>
++  <machine type='tcg' name='raspi3' maxCpus='4'/>
++  <machine type='tcg' name='netduino2' maxCpus='1'/>
++  <machine type='tcg' name='terrier' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
++  <machine type='tcg' name='n810' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
++  <machine type='tcg' name='mainstone' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
++  <machine type='tcg' name='palmetto-bmc' maxCpus='2'/>
++  <machine type='tcg' name='tacoma-bmc' maxCpus='2'/>
++  <machine type='tcg' name='sabrelite' maxCpus='4'/>
++  <machine type='tcg' name='netduinoplus2' maxCpus='1'/>
++  <machine type='tcg' name='midway' maxCpus='4'/>
++  <machine type='tcg' name='romulus-bmc' maxCpus='2'/>
++  <machine type='tcg' name='cheetah' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
++  <machine type='tcg' name='tosa' maxCpus='1'/>
++  <machine type='tcg' name='borzoi' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
++  <machine type='tcg' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
++  <machine type='tcg' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='tcg' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
++  <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='connex' maxCpus='1'/>
++  <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='microbit' maxCpus='1'/>
++  <machine type='tcg' name='witherspoon-bmc' maxCpus='2'/>
++  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='tcg' name='mps2-an385' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <machine type='tcg' name='ast2600-evb' maxCpus='2'/>
++  <machine type='tcg' name='vexpress-a9' maxCpus='4' defaultCPU='cortex-a9-arm-cpu'/>
++  <machine type='tcg' name='mps2-an521' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
++  <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>
++  <machine type='tcg' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
++  <machine type='tcg' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
++  <machine type='tcg' name='canon-a1100' maxCpus='1'/>
++  <machine type='tcg' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
++  <gic version='3' kernel='yes' emulated='yes'/>
++  <gic version='2' kernel='no' emulated='yes'/>
 +</qemuCaps>
-diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
-index 828e3d106c..ccc4e45817 100644
---- a/tests/qemucapabilitiestest.c
-+++ b/tests/qemucapabilitiestest.c
-@@ -186,6 +186,7 @@ mymain(void)
-     DO_TEST("ppc64", "caps_2.10.0");
-     DO_TEST("ppc64", "caps_2.12.0");
-     DO_TEST("ppc64", "caps_3.0.0");
-+    DO_TEST("ppc64", "caps_3.1.0");
-     DO_TEST("s390x", "caps_2.7.0");
-     DO_TEST("s390x", "caps_2.8.0");
-     DO_TEST("s390x", "caps_2.9.0");
-diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
-new file mode 100644
-index 0000000000..74eaf3ba0e
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>ppc64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='ppc64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
-index cd951b2bb4..631b6ca2d4 100644
---- a/tests/qemucaps2xmltest.c
-+++ b/tests/qemucaps2xmltest.c
-@@ -210,6 +210,7 @@ mymain(void)
-     DO_TEST("ppc64", "caps_2.10.0");
-     DO_TEST("ppc64", "caps_2.12.0");
-     DO_TEST("ppc64", "caps_3.0.0");
-+    DO_TEST("ppc64", "caps_3.1.0");
-     DO_TEST("s390x", "caps_2.7.0");
-     DO_TEST("s390x", "caps_2.8.0");
-     DO_TEST("s390x", "caps_2.9.0");
 -- 
-2.20.1
+2.25.0
 
diff --git a/SOURCES/libvirt-tests-Add-domain-capabilities-case-for-QEMU-4.1.0.patch b/SOURCES/libvirt-tests-Add-domain-capabilities-case-for-QEMU-4.1.0.patch
deleted file mode 100644
index c38fdc0..0000000
--- a/SOURCES/libvirt-tests-Add-domain-capabilities-case-for-QEMU-4.1.0.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From d5a656f2fe0e7aea8f56a4b4c59dcc3d5e906411 Mon Sep 17 00:00:00 2001
-Message-Id: <d5a656f2fe0e7aea8f56a4b4c59dcc3d5e906411@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:49 +0200
-Subject: [PATCH] tests: Add domain capabilities case for QEMU 4.1.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 9ceee2f4bb5d6cefa24c3aedcb7addbe7907c60b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	tests/domaincapstest.c
-            - several cases are missing
-
-	tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-            - some capabilities are not reported in domaincaps
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <87edadf46f7d4d7ad161b2ab433632f9d0f66920.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../qemu_4.1.0.x86_64.xml                     | 148 ++++++++++++++++++
- tests/domaincapstest.c                        |   4 +
- 2 files changed, 152 insertions(+)
- create mode 100644 tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-
-diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-new file mode 100644
-index 0000000000..47aed6a43a
---- /dev/null
-+++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
-@@ -0,0 +1,148 @@
-+<domainCapabilities>
-+  <path>/usr/bin/qemu-system-x86_64</path>
-+  <domain>kvm</domain>
-+  <machine>pc-i440fx-4.1</machine>
-+  <arch>x86_64</arch>
-+  <vcpu max='255'/>
-+  <iothreads supported='yes'/>
-+  <os supported='yes'>
-+    <loader supported='yes'>
-+      <value>/usr/share/AAVMF/AAVMF_CODE.fd</value>
-+      <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value>
-+      <value>/usr/share/OVMF/OVMF_CODE.fd</value>
-+      <enum name='type'>
-+        <value>rom</value>
-+        <value>pflash</value>
-+      </enum>
-+      <enum name='readonly'>
-+        <value>yes</value>
-+        <value>no</value>
-+      </enum>
-+    </loader>
-+  </os>
-+  <cpu>
-+    <mode name='host-passthrough' supported='yes'/>
-+    <mode name='host-model' supported='yes'>
-+      <model fallback='forbid'>Skylake-Client</model>
-+      <vendor>Intel</vendor>
-+      <feature policy='require' name='ss'/>
-+      <feature policy='require' name='vmx'/>
-+      <feature policy='require' name='hypervisor'/>
-+      <feature policy='require' name='tsc_adjust'/>
-+      <feature policy='require' name='clflushopt'/>
-+      <feature policy='require' name='umip'/>
-+      <feature policy='require' name='arch-capabilities'/>
-+      <feature policy='require' name='xsaves'/>
-+      <feature policy='require' name='pdpe1gb'/>
-+    </mode>
-+    <mode name='custom' supported='yes'>
-+      <model usable='yes'>qemu64</model>
-+      <model usable='yes'>qemu32</model>
-+      <model usable='no'>phenom</model>
-+      <model usable='yes'>pentium3</model>
-+      <model usable='yes'>pentium2</model>
-+      <model usable='yes'>pentium</model>
-+      <model usable='yes'>n270</model>
-+      <model usable='yes'>kvm64</model>
-+      <model usable='yes'>kvm32</model>
-+      <model usable='yes'>coreduo</model>
-+      <model usable='yes'>core2duo</model>
-+      <model usable='no'>athlon</model>
-+      <model usable='no'>Westmere-IBRS</model>
-+      <model usable='yes'>Westmere</model>
-+      <model usable='no'>Skylake-Server-IBRS</model>
-+      <model usable='no'>Skylake-Server</model>
-+      <model usable='no'>Skylake-Client-IBRS</model>
-+      <model usable='yes'>Skylake-Client</model>
-+      <model usable='no'>SandyBridge-IBRS</model>
-+      <model usable='yes'>SandyBridge</model>
-+      <model usable='yes'>Penryn</model>
-+      <model usable='no'>Opteron_G5</model>
-+      <model usable='no'>Opteron_G4</model>
-+      <model usable='no'>Opteron_G3</model>
-+      <model usable='yes'>Opteron_G2</model>
-+      <model usable='yes'>Opteron_G1</model>
-+      <model usable='no'>Nehalem-IBRS</model>
-+      <model usable='yes'>Nehalem</model>
-+      <model usable='no'>IvyBridge-IBRS</model>
-+      <model usable='yes'>IvyBridge</model>
-+      <model usable='no'>Icelake-Server</model>
-+      <model usable='no'>Icelake-Client</model>
-+      <model usable='no'>Haswell-noTSX-IBRS</model>
-+      <model usable='yes'>Haswell-noTSX</model>
-+      <model usable='no'>Haswell-IBRS</model>
-+      <model usable='yes'>Haswell</model>
-+      <model usable='no'>EPYC-IBPB</model>
-+      <model usable='no'>EPYC</model>
-+      <model usable='yes'>Conroe</model>
-+      <model usable='no'>Cascadelake-Server</model>
-+      <model usable='no'>Broadwell-noTSX-IBRS</model>
-+      <model usable='yes'>Broadwell-noTSX</model>
-+      <model usable='no'>Broadwell-IBRS</model>
-+      <model usable='yes'>Broadwell</model>
-+      <model usable='yes'>486</model>
-+    </mode>
-+  </cpu>
-+  <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>
-+    </disk>
-+    <graphics supported='yes'>
-+      <enum name='type'>
-+        <value>sdl</value>
-+        <value>vnc</value>
-+        <value>spice</value>
-+      </enum>
-+    </graphics>
-+    <video supported='yes'>
-+      <enum name='modelType'>
-+        <value>vga</value>
-+        <value>cirrus</value>
-+        <value>vmvga</value>
-+        <value>qxl</value>
-+        <value>virtio</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>kvm</value>
-+        <value>vfio</value>
-+      </enum>
-+    </hostdev>
-+  </devices>
-+  <features>
-+    <gic supported='no'/>
-+    <vmcoreinfo supported='yes'/>
-+    <genid supported='yes'/>
-+    <sev supported='no'/>
-+  </features>
-+</domainCapabilities>
-diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
-index 06e77fd586..30e7eea3cb 100644
---- a/tests/domaincapstest.c
-+++ b/tests/domaincapstest.c
-@@ -504,6 +504,10 @@ mymain(void)
-                  "/usr/bin/qemu-system-s390x", NULL,
-                  "s390x", VIR_DOMAIN_VIRT_KVM);
- 
-+    DO_TEST_QEMU("4.1.0", "caps_4.1.0",
-+                 "/usr/bin/qemu-system-x86_64", NULL,
-+                 "x86_64", VIR_DOMAIN_VIRT_KVM);
-+
-     virObjectUnref(cfg);
- 
- #endif /* WITH_QEMU */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-tests-Add-linux-high-ids-test.patch b/SOURCES/libvirt-tests-Add-linux-high-ids-test.patch
deleted file mode 100644
index dbc1fea..0000000
--- a/SOURCES/libvirt-tests-Add-linux-high-ids-test.patch
+++ /dev/null
@@ -1,1112 +0,0 @@
-From d33bc0f72c87fbc0ac0cf4b56c2a62b552f6c6b0 Mon Sep 17 00:00:00 2001
-Message-Id: <d33bc0f72c87fbc0ac0cf4b56c2a62b552f6c6b0@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Wed, 15 Aug 2018 14:04:44 +0200
-Subject: [PATCH] tests: Add linux-high-ids test
-
-This proves libvirt can now handle high socket_id and
-core_id values correctly and ensures we won't introduce
-regressions in this area.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 1df3fb7ccbba938aed4ce43ff3ea10f8eec1490c)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1608479
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- .../linux-aarch64-high-ids.cpuinfo            | 143 ++++++++++++++++++
- .../linux-aarch64-high-ids.expected           |   1 +
- .../linux-high-ids/cpu/cpu0/online            |   1 +
- .../linux-high-ids/cpu/cpu0/topology/core_id  |   1 +
- .../cpu/cpu0/topology/core_siblings_list      |   1 +
- .../cpu/cpu0/topology/physical_package_id     |   1 +
- .../cpu/cpu0/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu1/online            |   1 +
- .../linux-high-ids/cpu/cpu1/topology/core_id  |   1 +
- .../cpu/cpu1/topology/core_siblings_list      |   1 +
- .../cpu/cpu1/topology/physical_package_id     |   1 +
- .../cpu/cpu1/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu10/online           |   1 +
- .../linux-high-ids/cpu/cpu10/topology/core_id |   1 +
- .../cpu/cpu10/topology/core_siblings_list     |   1 +
- .../cpu/cpu10/topology/physical_package_id    |   1 +
- .../cpu/cpu10/topology/thread_siblings_list   |   1 +
- .../linux-high-ids/cpu/cpu11/online           |   1 +
- .../linux-high-ids/cpu/cpu11/topology/core_id |   1 +
- .../cpu/cpu11/topology/core_siblings_list     |   1 +
- .../cpu/cpu11/topology/physical_package_id    |   1 +
- .../cpu/cpu11/topology/thread_siblings_list   |   1 +
- .../linux-high-ids/cpu/cpu12/online           |   1 +
- .../linux-high-ids/cpu/cpu12/topology/core_id |   1 +
- .../cpu/cpu12/topology/core_siblings_list     |   1 +
- .../cpu/cpu12/topology/physical_package_id    |   1 +
- .../cpu/cpu12/topology/thread_siblings_list   |   1 +
- .../linux-high-ids/cpu/cpu13/online           |   1 +
- .../linux-high-ids/cpu/cpu13/topology/core_id |   1 +
- .../cpu/cpu13/topology/core_siblings_list     |   1 +
- .../cpu/cpu13/topology/physical_package_id    |   1 +
- .../cpu/cpu13/topology/thread_siblings_list   |   1 +
- .../linux-high-ids/cpu/cpu14/online           |   1 +
- .../linux-high-ids/cpu/cpu14/topology/core_id |   1 +
- .../cpu/cpu14/topology/core_siblings_list     |   1 +
- .../cpu/cpu14/topology/physical_package_id    |   1 +
- .../cpu/cpu14/topology/thread_siblings_list   |   1 +
- .../linux-high-ids/cpu/cpu15/online           |   1 +
- .../linux-high-ids/cpu/cpu15/topology/core_id |   1 +
- .../cpu/cpu15/topology/core_siblings_list     |   1 +
- .../cpu/cpu15/topology/physical_package_id    |   1 +
- .../cpu/cpu15/topology/thread_siblings_list   |   1 +
- .../linux-high-ids/cpu/cpu2/online            |   1 +
- .../linux-high-ids/cpu/cpu2/topology/core_id  |   1 +
- .../cpu/cpu2/topology/core_siblings_list      |   1 +
- .../cpu/cpu2/topology/physical_package_id     |   1 +
- .../cpu/cpu2/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu3/online            |   1 +
- .../linux-high-ids/cpu/cpu3/topology/core_id  |   1 +
- .../cpu/cpu3/topology/core_siblings_list      |   1 +
- .../cpu/cpu3/topology/physical_package_id     |   1 +
- .../cpu/cpu3/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu4/online            |   1 +
- .../linux-high-ids/cpu/cpu4/topology/core_id  |   1 +
- .../cpu/cpu4/topology/core_siblings_list      |   1 +
- .../cpu/cpu4/topology/physical_package_id     |   1 +
- .../cpu/cpu4/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu5/online            |   1 +
- .../linux-high-ids/cpu/cpu5/topology/core_id  |   1 +
- .../cpu/cpu5/topology/core_siblings_list      |   1 +
- .../cpu/cpu5/topology/physical_package_id     |   1 +
- .../cpu/cpu5/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu6/online            |   1 +
- .../linux-high-ids/cpu/cpu6/topology/core_id  |   1 +
- .../cpu/cpu6/topology/core_siblings_list      |   1 +
- .../cpu/cpu6/topology/physical_package_id     |   1 +
- .../cpu/cpu6/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu7/online            |   1 +
- .../linux-high-ids/cpu/cpu7/topology/core_id  |   1 +
- .../cpu/cpu7/topology/core_siblings_list      |   1 +
- .../cpu/cpu7/topology/physical_package_id     |   1 +
- .../cpu/cpu7/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu8/online            |   1 +
- .../linux-high-ids/cpu/cpu8/topology/core_id  |   1 +
- .../cpu/cpu8/topology/core_siblings_list      |   1 +
- .../cpu/cpu8/topology/physical_package_id     |   1 +
- .../cpu/cpu8/topology/thread_siblings_list    |   1 +
- .../linux-high-ids/cpu/cpu9/online            |   1 +
- .../linux-high-ids/cpu/cpu9/topology/core_id  |   1 +
- .../cpu/cpu9/topology/core_siblings_list      |   1 +
- .../cpu/cpu9/topology/physical_package_id     |   1 +
- .../cpu/cpu9/topology/thread_siblings_list    |   1 +
- .../virhostcpudata/linux-high-ids/cpu/online  |   1 +
- .../virhostcpudata/linux-high-ids/cpu/present |   1 +
- .../linux-high-ids/node/node0/cpu0            |   1 +
- .../linux-high-ids/node/node0/cpu1            |   1 +
- .../linux-high-ids/node/node0/cpu2            |   1 +
- .../linux-high-ids/node/node0/cpu3            |   1 +
- .../linux-high-ids/node/node0/cpu4            |   1 +
- .../linux-high-ids/node/node0/cpu5            |   1 +
- .../linux-high-ids/node/node0/cpu6            |   1 +
- .../linux-high-ids/node/node0/cpu7            |   1 +
- .../linux-high-ids/node/node0/cpulist         |   1 +
- .../linux-high-ids/node/node1/cpu10           |   1 +
- .../linux-high-ids/node/node1/cpu11           |   1 +
- .../linux-high-ids/node/node1/cpu12           |   1 +
- .../linux-high-ids/node/node1/cpu13           |   1 +
- .../linux-high-ids/node/node1/cpu14           |   1 +
- .../linux-high-ids/node/node1/cpu15           |   1 +
- .../linux-high-ids/node/node1/cpu8            |   1 +
- .../linux-high-ids/node/node1/cpu9            |   1 +
- .../linux-high-ids/node/node1/cpulist         |   1 +
- tests/virhostcputest.c                        |   1 +
- 103 files changed, 245 insertions(+)
- create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
- create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.expected
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/online
- create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/present
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu0
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu1
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu2
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu3
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu4
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu5
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu6
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu7
- create mode 100644 tests/virhostcpudata/linux-high-ids/node/node0/cpulist
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu10
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu11
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu12
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu13
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu14
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu15
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu8
- create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu9
- create mode 100644 tests/virhostcpudata/linux-high-ids/node/node1/cpulist
-
-diff --git a/tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo b/tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
-new file mode 100644
-index 0000000000..a1ba0ebd73
---- /dev/null
-+++ b/tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
-@@ -0,0 +1,143 @@
-+processor	: 0
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 1
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 2
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 3
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 4
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 5
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 6
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 7
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 8
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 9
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 10
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 11
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 12
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 13
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 14
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-+
-+processor	: 15
-+BogoMIPS	: 100.00
-+Features	: fp asimd evtstrm cpuid
-+CPU implementer	: 0x50
-+CPU architecture: 8
-+CPU variant	: 0x0
-+CPU part	: 0x000
-+CPU revision	: 1
-diff --git a/tests/virhostcpudata/linux-aarch64-high-ids.expected b/tests/virhostcpudata/linux-aarch64-high-ids.expected
-new file mode 100644
-index 0000000000..27311eaf61
---- /dev/null
-+++ b/tests/virhostcpudata/linux-aarch64-high-ids.expected
-@@ -0,0 +1 @@
-+CPUs: 16/16, MHz: 0, Nodes: 2, Sockets: 2, Cores: 2, Threads: 2
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list
-new file mode 100644
-index 0000000000..40c7bb2f1a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list
-@@ -0,0 +1 @@
-+0-3
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..8b0fab869c
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+0-1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list
-new file mode 100644
-index 0000000000..40c7bb2f1a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list
-@@ -0,0 +1 @@
-+0-3
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..8b0fab869c
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+0-1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list
-new file mode 100644
-index 0000000000..6ae44fb498
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list
-@@ -0,0 +1 @@
-+8-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id
-new file mode 100644
-index 0000000000..3ad7f7faf5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id
-@@ -0,0 +1 @@
-+6143
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ac93dc4496
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+10-11
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list
-new file mode 100644
-index 0000000000..6ae44fb498
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list
-@@ -0,0 +1 @@
-+8-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id
-new file mode 100644
-index 0000000000..3ad7f7faf5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id
-@@ -0,0 +1 @@
-+6143
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ac93dc4496
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+10-11
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id
-new file mode 100644
-index 0000000000..3ad7f7faf5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id
-@@ -0,0 +1 @@
-+6143
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list
-new file mode 100644
-index 0000000000..5b8f3ea33e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list
-@@ -0,0 +1 @@
-+12-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id
-new file mode 100644
-index 0000000000..2b4009deaf
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id
-@@ -0,0 +1 @@
-+8191
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..a36c7a218d
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+12-13
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id
-new file mode 100644
-index 0000000000..3ad7f7faf5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id
-@@ -0,0 +1 @@
-+6143
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list
-new file mode 100644
-index 0000000000..5b8f3ea33e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list
-@@ -0,0 +1 @@
-+12-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id
-new file mode 100644
-index 0000000000..2b4009deaf
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id
-@@ -0,0 +1 @@
-+8191
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..a36c7a218d
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+12-13
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id
-new file mode 100644
-index 0000000000..2b4009deaf
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id
-@@ -0,0 +1 @@
-+8191
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list
-new file mode 100644
-index 0000000000..5b8f3ea33e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list
-@@ -0,0 +1 @@
-+12-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id
-new file mode 100644
-index 0000000000..2b4009deaf
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id
-@@ -0,0 +1 @@
-+8191
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..0c53584319
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+14-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id
-new file mode 100644
-index 0000000000..2b4009deaf
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id
-@@ -0,0 +1 @@
-+8191
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list
-new file mode 100644
-index 0000000000..5b8f3ea33e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list
-@@ -0,0 +1 @@
-+12-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id
-new file mode 100644
-index 0000000000..2b4009deaf
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id
-@@ -0,0 +1 @@
-+8191
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..0c53584319
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+14-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list
-new file mode 100644
-index 0000000000..40c7bb2f1a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list
-@@ -0,0 +1 @@
-+0-3
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..7a9857542a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+2-3
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list
-new file mode 100644
-index 0000000000..40c7bb2f1a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list
-@@ -0,0 +1 @@
-+0-3
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..7a9857542a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+2-3
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list
-new file mode 100644
-index 0000000000..93fccd3cc6
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list
-@@ -0,0 +1 @@
-+4-7
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..e66d883ade
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+4-5
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list
-new file mode 100644
-index 0000000000..93fccd3cc6
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list
-@@ -0,0 +1 @@
-+4-7
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..e66d883ade
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+4-5
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list
-new file mode 100644
-index 0000000000..93fccd3cc6
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list
-@@ -0,0 +1 @@
-+4-7
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..fdd9f37517
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+6-7
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list
-new file mode 100644
-index 0000000000..93fccd3cc6
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list
-@@ -0,0 +1 @@
-+4-7
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id
-new file mode 100644
-index 0000000000..50b0f79069
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id
-@@ -0,0 +1 @@
-+4095
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..fdd9f37517
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+6-7
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list
-new file mode 100644
-index 0000000000..6ae44fb498
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list
-@@ -0,0 +1 @@
-+8-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id
-new file mode 100644
-index 0000000000..3ad7f7faf5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id
-@@ -0,0 +1 @@
-+6143
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..63edceec1e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+8-9
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/online
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/online
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id
-new file mode 100644
-index 0000000000..b6ac305674
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id
-@@ -0,0 +1 @@
-+2047
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list
-new file mode 100644
-index 0000000000..6ae44fb498
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list
-@@ -0,0 +1 @@
-+8-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id
-new file mode 100644
-index 0000000000..3ad7f7faf5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id
-@@ -0,0 +1 @@
-+6143
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..63edceec1e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+8-9
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/online b/tests/virhostcpudata/linux-high-ids/cpu/online
-new file mode 100644
-index 0000000000..580a385a1d
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/online
-@@ -0,0 +1 @@
-+0-15
-diff --git a/tests/virhostcpudata/linux-high-ids/cpu/present b/tests/virhostcpudata/linux-high-ids/cpu/present
-new file mode 100644
-index 0000000000..580a385a1d
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/cpu/present
-@@ -0,0 +1 @@
-+0-15
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu0 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu0
-new file mode 120000
-index 0000000000..c841bea28b
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu0
-@@ -0,0 +1 @@
-+../../cpu/cpu0
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu1 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu1
-new file mode 120000
-index 0000000000..5f4536279e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu1
-@@ -0,0 +1 @@
-+../../cpu/cpu1
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu2 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu2
-new file mode 120000
-index 0000000000..2dcca332ce
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu2
-@@ -0,0 +1 @@
-+../../cpu/cpu2
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu3 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu3
-new file mode 120000
-index 0000000000..c7690e5aa6
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu3
-@@ -0,0 +1 @@
-+../../cpu/cpu3
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu4 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu4
-new file mode 120000
-index 0000000000..9e77a64eb4
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu4
-@@ -0,0 +1 @@
-+../../cpu/cpu4
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu5 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu5
-new file mode 120000
-index 0000000000..cc07c3b97b
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu5
-@@ -0,0 +1 @@
-+../../cpu/cpu5
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu6 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu6
-new file mode 120000
-index 0000000000..2e7576354f
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu6
-@@ -0,0 +1 @@
-+../../cpu/cpu6
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu7 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu7
-new file mode 120000
-index 0000000000..09e3f79b43
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu7
-@@ -0,0 +1 @@
-+../../cpu/cpu7
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpulist b/tests/virhostcpudata/linux-high-ids/node/node0/cpulist
-new file mode 100644
-index 0000000000..74fc2fb6b0
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpulist
-@@ -0,0 +1 @@
-+0-7
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu10 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu10
-new file mode 120000
-index 0000000000..a6dc6bb10e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu10
-@@ -0,0 +1 @@
-+../../cpu/cpu10
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu11 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu11
-new file mode 120000
-index 0000000000..e29d898284
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu11
-@@ -0,0 +1 @@
-+../../cpu/cpu11
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu12 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu12
-new file mode 120000
-index 0000000000..211519e8ab
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu12
-@@ -0,0 +1 @@
-+../../cpu/cpu12
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu13 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu13
-new file mode 120000
-index 0000000000..52d3b6970d
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu13
-@@ -0,0 +1 @@
-+../../cpu/cpu13
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu14 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu14
-new file mode 120000
-index 0000000000..24cb3b4569
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu14
-@@ -0,0 +1 @@
-+../../cpu/cpu14
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu15 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu15
-new file mode 120000
-index 0000000000..e905d85e46
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu15
-@@ -0,0 +1 @@
-+../../cpu/cpu15
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu8 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu8
-new file mode 120000
-index 0000000000..bda10cc343
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu8
-@@ -0,0 +1 @@
-+../../cpu/cpu8
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu9 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu9
-new file mode 120000
-index 0000000000..1ec1db255a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu9
-@@ -0,0 +1 @@
-+../../cpu/cpu9
-\ No newline at end of file
-diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpulist b/tests/virhostcpudata/linux-high-ids/node/node1/cpulist
-new file mode 100644
-index 0000000000..6ae44fb498
---- /dev/null
-+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpulist
-@@ -0,0 +1 @@
-+8-15
-diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
-index 091dd59b83..e9d237ae0e 100644
---- a/tests/virhostcputest.c
-+++ b/tests/virhostcputest.c
-@@ -240,6 +240,7 @@ mymain(void)
-         {"f21-mustang", VIR_ARCH_AARCH64},
-         {"rhelsa-3.19.0-mustang", VIR_ARCH_AARCH64},
-         {"rhel74-moonshot", VIR_ARCH_AARCH64},
-+        {"high-ids", VIR_ARCH_AARCH64},
-         {"deconf-cpus", VIR_ARCH_PPC64},
-         /* subcores, default configuration */
-         {"subcores1", VIR_ARCH_PPC64},
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-Add-missing-thread_siblings_list-files.patch b/SOURCES/libvirt-tests-Add-missing-thread_siblings_list-files.patch
deleted file mode 100644
index 2eac63b..0000000
--- a/SOURCES/libvirt-tests-Add-missing-thread_siblings_list-files.patch
+++ /dev/null
@@ -1,654 +0,0 @@
-From b8e703a31cf94fabecd9ce4a99e12259a7f499b2 Mon Sep 17 00:00:00 2001
-Message-Id: <b8e703a31cf94fabecd9ce4a99e12259a7f499b2@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Wed, 15 Aug 2018 14:04:41 +0200
-Subject: [PATCH] tests: Add missing thread_siblings_list files
-
-Some of the data dumps didn't include them; luckily,
-we're not actually missing any information since we
-can recreate them by looking at the corresponding
-thread_sibilings files.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 37e64f65083c858b4931ea0d2d08163bcca61651)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1608479
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- .../linux-test6/cpu/cpu0/topology/thread_siblings_list           | 1 +
- .../linux-test6/cpu/cpu1/topology/thread_siblings_list           | 1 +
- .../linux-test6/cpu/cpu2/topology/thread_siblings_list           | 1 +
- .../linux-test6/cpu/cpu3/topology/thread_siblings_list           | 1 +
- .../linux-test6/cpu/cpu4/topology/thread_siblings_list           | 1 +
- .../linux-test6/cpu/cpu6/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu0/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu1/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu10/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu11/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu12/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu13/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu14/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu15/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu16/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu17/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu18/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu19/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu2/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu20/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu21/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu22/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu23/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu24/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu25/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu26/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu27/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu28/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu29/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu3/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu30/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu31/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu32/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu33/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu34/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu35/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu36/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu37/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu38/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu39/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu4/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu40/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu41/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu42/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu43/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu44/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu45/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu46/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu47/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu48/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu49/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu5/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu50/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu51/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu52/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu53/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu54/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu55/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu56/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu57/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu58/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu59/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu6/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu60/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu61/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu62/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu63/topology/thread_siblings_list          | 1 +
- .../linux-test8/cpu/cpu7/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu8/topology/thread_siblings_list           | 1 +
- .../linux-test8/cpu/cpu9/topology/thread_siblings_list           | 1 +
- 70 files changed, 70 insertions(+)
- create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings_list
- create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings_list
-
-diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d41d18ba00
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+0,4
-diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d00491fd7e
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+1
-diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..62188ed84f
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+2,6
-diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..00750edc07
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+3
-diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d41d18ba00
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+0,4
-diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..62188ed84f
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+2,6
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d41d18ba00
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+0,4
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..cf141eb999
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+1,5
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..416645a8b7
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+10,14
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..15b4ef0285
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+11,15
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..88db7dc4e9
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+8,12
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..0b2ed19cc4
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+9,13
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..416645a8b7
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+10,14
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..15b4ef0285
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+11,15
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..dc08f98d76
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+16,20
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..3f291fe9cd
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+17,21
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..cbc41df4e4
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+18,22
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..f7bd0a03eb
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+19,23
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..62188ed84f
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+2,6
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..dc08f98d76
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+16,20
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..3f291fe9cd
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+17,21
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..cbc41df4e4
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+18,22
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..f7bd0a03eb
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+19,23
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..7a2045f9c8
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+24,28
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..df9601d5d0
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+25,29
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..3ef1545e28
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+26,30
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..bef1c937bb
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+27,31
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..7a2045f9c8
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+24,28
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..df9601d5d0
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+25,29
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..62dcd59765
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+3,7
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..3ef1545e28
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+26,30
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..bef1c937bb
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+27,31
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..1426303eac
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+32,36
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ab130ea012
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+33,37
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..41dc5486f0
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+34,38
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ad0bc77ce1
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+35,39
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..1426303eac
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+32,36
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ab130ea012
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+33,37
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..41dc5486f0
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+34,38
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ad0bc77ce1
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+35,39
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d41d18ba00
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+0,4
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ed4729e950
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+40,44
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..a0aeb17376
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+41,45
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ce9410e373
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+42,46
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..0296f6a37c
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+43,47
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ed4729e950
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+40,44
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..a0aeb17376
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+41,45
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..ce9410e373
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+42,46
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..0296f6a37c
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+43,47
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..b9e3c6870a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+48,52
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..61a95fd5b5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+49,53
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..cf141eb999
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+1,5
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..4e057eaaf1
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+50,54
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d541fb8a1c
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+51,55
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..b9e3c6870a
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+48,52
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..61a95fd5b5
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+49,53
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..4e057eaaf1
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+50,54
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..d541fb8a1c
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+51,55
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..21ac03e529
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+56,60
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..071eb77853
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+57,61
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..e49be8e926
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+58,62
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..c33c604dc1
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+59,63
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..62188ed84f
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+2,6
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..21ac03e529
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+56,60
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..071eb77853
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+57,61
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..e49be8e926
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+58,62
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..c33c604dc1
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+59,63
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..62dcd59765
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+3,7
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..88db7dc4e9
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+8,12
-diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings_list b/tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings_list
-new file mode 100644
-index 0000000000..0b2ed19cc4
---- /dev/null
-+++ b/tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings_list
-@@ -0,0 +1 @@
-+9,13
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-Add-more-tests-to-qemucaps2xml.patch b/SOURCES/libvirt-tests-Add-more-tests-to-qemucaps2xml.patch
deleted file mode 100644
index 3264c3c..0000000
--- a/SOURCES/libvirt-tests-Add-more-tests-to-qemucaps2xml.patch
+++ /dev/null
@@ -1,1089 +0,0 @@
-From 56c30b4dafd6484837b926455d7f1165467cc9f7 Mon Sep 17 00:00:00 2001
-Message-Id: <56c30b4dafd6484837b926455d7f1165467cc9f7@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:49 +0200
-Subject: [PATCH] tests: Add more tests to qemucaps2xml
-
-More specifically, everything that's tested by qemucapabilities
-now goes through qemucaps2xml as well.
-
-Ideally we'll rewrite both so that listing all test cases is
-unnecessary and they get picked up automatically by listing the
-contents of the input directory instead, but that's a refactor
-for another day :)
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit a3676f3763625d06778ee14dd6b006b3ba91846a)
-
-Changes from upstream:
-
-  * Removed references to RISC-V architectures.
-    Necessary for the test suite to pass because we never
-    picked up 869cb692fa1d downstream.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/qemucapabilitiestest.c                  |  1 +
- .../qemucaps2xmloutdata/caps_1.5.3.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 30 +++++++++++++++++++
- .../caps_2.10.0.aarch64.xml                   | 29 ++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.10.0.ppc64.xml | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.10.0.s390x.xml | 28 +++++++++++++++++
- .../caps_2.10.0.x86_64.xml                    | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 28 +++++++++++++++++
- .../caps_2.11.0.x86_64.xml                    | 30 +++++++++++++++++++
- .../caps_2.12.0.aarch64.xml                   | 29 ++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 28 +++++++++++++++++
- .../caps_2.12.0.x86_64.xml                    | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 30 +++++++++++++++++++
- .../caps_2.6.0.aarch64.xml                    | 29 ++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml  | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.7.0.s390x.xml  | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.8.0.s390x.xml  | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml  | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.9.0.s390x.xml  | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 30 +++++++++++++++++++
- .../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml  | 28 +++++++++++++++++
- .../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 30 +++++++++++++++++++
- tests/qemucaps2xmltest.c                      | 28 +++++++++++++++++
- 29 files changed, 814 insertions(+)
- create mode 100644 tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
- create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
-
-diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
-index 4aec175968..828e3d106c 100644
---- a/tests/qemucapabilitiestest.c
-+++ b/tests/qemucapabilitiestest.c
-@@ -163,6 +163,7 @@ mymain(void)
-             ret = -1; \
-     } while (0)
- 
-+    /* Keep this in sync with qemucaps2xmltest */
-     DO_TEST("x86_64", "caps_1.5.3");
-     DO_TEST("x86_64", "caps_1.6.0");
-     DO_TEST("x86_64", "caps_1.7.0");
-diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
-new file mode 100644
-index 0000000000..a879d67df3
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
-@@ -0,0 +1,29 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>aarch64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='aarch64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
-new file mode 100644
-index 0000000000..74eaf3ba0e
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>ppc64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='ppc64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
-new file mode 100644
-index 0000000000..20ef995d62
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>s390x</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='s390x'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
-new file mode 100644
-index 0000000000..20ef995d62
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>s390x</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='s390x'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
-new file mode 100644
-index 0000000000..a879d67df3
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
-@@ -0,0 +1,29 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>aarch64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='aarch64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
-new file mode 100644
-index 0000000000..74eaf3ba0e
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>ppc64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='ppc64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
-new file mode 100644
-index 0000000000..20ef995d62
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>s390x</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='s390x'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
-new file mode 100644
-index 0000000000..a879d67df3
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
-@@ -0,0 +1,29 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>aarch64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='aarch64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
-new file mode 100644
-index 0000000000..74eaf3ba0e
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>ppc64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='ppc64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
-new file mode 100644
-index 0000000000..20ef995d62
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>s390x</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='s390x'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
-new file mode 100644
-index 0000000000..20ef995d62
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>s390x</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='s390x'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
-new file mode 100644
-index 0000000000..74eaf3ba0e
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>ppc64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='ppc64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
-new file mode 100644
-index 0000000000..20ef995d62
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>s390x</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='s390x'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-s390x</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
-new file mode 100644
-index 0000000000..74eaf3ba0e
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
-@@ -0,0 +1,28 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>ppc64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='ppc64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
-new file mode 100644
-index 0000000000..b58f54fefd
---- /dev/null
-+++ b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
-@@ -0,0 +1,30 @@
-+<capabilities>
-+
-+  <host>
-+    <cpu>
-+      <arch>x86_64</arch>
-+    </cpu>
-+    <power_management/>
-+    <iommu support='no'/>
-+  </host>
-+
-+  <guest>
-+    <os_type>hvm</os_type>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      <domain type='qemu'/>
-+      <domain type='kvm'>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+      </domain>
-+    </arch>
-+    <features>
-+      <cpuselection/>
-+      <deviceboot/>
-+      <disksnapshot default='on' toggle='no'/>
-+      <acpi default='on' toggle='yes'/>
-+      <apic default='on' toggle='no'/>
-+    </features>
-+  </guest>
-+
-+</capabilities>
-diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
-index 65dd97c0a4..cd951b2bb4 100644
---- a/tests/qemucaps2xmltest.c
-+++ b/tests/qemucaps2xmltest.c
-@@ -187,7 +187,35 @@ mymain(void)
-     if (virTestRun(name "(" arch ")", testQemuCapsXML, &data) < 0) \
-         ret = -1
- 
-+    /* Keep this in sync with qemucapabilitiestest */
-+    DO_TEST("x86_64", "caps_1.5.3");
-     DO_TEST("x86_64", "caps_1.6.0");
-+    DO_TEST("x86_64", "caps_1.7.0");
-+    DO_TEST("x86_64", "caps_2.1.1");
-+    DO_TEST("x86_64", "caps_2.4.0");
-+    DO_TEST("x86_64", "caps_2.5.0");
-+    DO_TEST("x86_64", "caps_2.6.0");
-+    DO_TEST("x86_64", "caps_2.7.0");
-+    DO_TEST("x86_64", "caps_2.8.0");
-+    DO_TEST("x86_64", "caps_2.9.0");
-+    DO_TEST("x86_64", "caps_2.10.0");
-+    DO_TEST("x86_64", "caps_2.11.0");
-+    DO_TEST("x86_64", "caps_2.12.0");
-+    DO_TEST("x86_64", "caps_3.0.0");
-+    DO_TEST("aarch64", "caps_2.6.0");
-+    DO_TEST("aarch64", "caps_2.10.0");
-+    DO_TEST("aarch64", "caps_2.12.0");
-+    DO_TEST("ppc64", "caps_2.6.0");
-+    DO_TEST("ppc64", "caps_2.9.0");
-+    DO_TEST("ppc64", "caps_2.10.0");
-+    DO_TEST("ppc64", "caps_2.12.0");
-+    DO_TEST("ppc64", "caps_3.0.0");
-+    DO_TEST("s390x", "caps_2.7.0");
-+    DO_TEST("s390x", "caps_2.8.0");
-+    DO_TEST("s390x", "caps_2.9.0");
-+    DO_TEST("s390x", "caps_2.10.0");
-+    DO_TEST("s390x", "caps_2.11.0");
-+    DO_TEST("s390x", "caps_2.12.0");
- 
-     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
- }
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-tests-Add-test-case-for-the-armvtimer-timer.patch b/SOURCES/libvirt-tests-Add-test-case-for-the-armvtimer-timer.patch
new file mode 100644
index 0000000..4144d71
--- /dev/null
+++ b/SOURCES/libvirt-tests-Add-test-case-for-the-armvtimer-timer.patch
@@ -0,0 +1,136 @@
+From 18f28324129e34a486c5df049785d7ee04960f1d Mon Sep 17 00:00:00 2001
+Message-Id: <18f28324129e34a486c5df049785d7ee04960f1d@dist-git>
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 14 Feb 2020 14:14:51 +0100
+Subject: [PATCH] tests: Add test case for the armvtimer timer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 76121fc9c49d26c1ca4f596c3cac5c05eb02fc76)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1762634
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Message-Id: <20200214131451.707092-1-abologna@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ .../clock-timer-armvtimer.aarch64-latest.args | 32 +++++++++++++++++++
+ .../clock-timer-armvtimer.xml                 | 27 ++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  2 ++
+ .../clock-timer-armvtimer.aarch64-latest.xml  |  1 +
+ tests/qemuxml2xmltest.c                       |  1 +
+ 5 files changed, 63 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
+ create mode 100644 tests/qemuxml2argvdata/clock-timer-armvtimer.xml
+ create mode 120000 tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
+
+diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
+new file mode 100644
+index 0000000000..a1faa97b9f
+--- /dev/null
++++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
+@@ -0,0 +1,32 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-guest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-aarch64 \
++-name guest=guest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-guest/master-key.aes \
++-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
++-cpu host,kvm-no-adjvtime=on \
++-m 4096 \
++-overcommit mem-lock=off \
++-smp 4,sockets=4,cores=1,threads=1 \
++-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-boot strict=on \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.xml b/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
+new file mode 100644
+index 0000000000..295ab64d75
+--- /dev/null
++++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
+@@ -0,0 +1,27 @@
++<domain type='kvm'>
++  <name>guest</name>
++  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
++  <memory unit='KiB'>4194304</memory>
++  <currentMemory unit='KiB'>4194304</currentMemory>
++  <vcpu placement='static'>4</vcpu>
++  <os>
++    <type arch='aarch64' machine='virt'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <features>
++    <gic version='3'/>
++  </features>
++  <cpu mode='host-passthrough' check='none'/>
++  <clock offset='utc'>
++    <timer name='armvtimer' tickpolicy='discard'/>
++  </clock>
++  <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='usb' index='0' model='none'/>
++    <controller type='pci' index='0' model='pcie-root'/>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 4d26fe0b55..508dfee3fb 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -2721,6 +2721,8 @@ mymain(void)
+     /* SVE aarch64 CPU features work on modern QEMU */
+     DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64");
+ 
++    DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
++
+     qemuTestSetHostArch(&driver, VIR_ARCH_NONE);
+ 
+     DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY);
+diff --git a/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml b/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
+new file mode 120000
+index 0000000000..4bfddd6573
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/clock-timer-armvtimer.aarch64-latest.xml
+@@ -0,0 +1 @@
++../qemuxml2argvdata/clock-timer-armvtimer.xml
+\ No newline at end of file
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index e54c540ef6..6a8ae9f7eb 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -269,6 +269,7 @@ mymain(void)
+     DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
+     DO_TEST("kvmclock", NONE);
+     DO_TEST("clock-timer-hyperv-rtc", NONE);
++    DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
+ 
+     DO_TEST("cpu-eoi-disabled", NONE);
+     DO_TEST("cpu-eoi-enabled", NONE);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-Augment-vcgrouptest-to-add-virCgroupGetMemoryStat.patch b/SOURCES/libvirt-tests-Augment-vcgrouptest-to-add-virCgroupGetMemoryStat.patch
deleted file mode 100644
index ea4446e..0000000
--- a/SOURCES/libvirt-tests-Augment-vcgrouptest-to-add-virCgroupGetMemoryStat.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 356b50b2014aafc7c1555e11cf93650dad39f03a Mon Sep 17 00:00:00 2001
-Message-Id: <356b50b2014aafc7c1555e11cf93650dad39f03a@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:08 +0200
-Subject: [PATCH] tests: Augment vcgrouptest to add virCgroupGetMemoryStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a test to fetch the GetMemoryStat output. This only gets
-data for v1 only right now since the v2 data from commit 61ff6021
-is rather useless returning all 0's. The v1 data was originally
-added in commit d1452470.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 99b8ef7a98d6ad4a01549204195f5e17ee1984ee)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3c217939ce31a379e149865bc0f3342fc334ba42.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgrouptest.c | 64 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 64 insertions(+)
-
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 118b1bc246..e9cf792bdd 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -803,6 +803,67 @@ static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
-     return ret;
- }
- 
-+
-+static int
-+testCgroupGetMemoryStat(const void *args ATTRIBUTE_UNUSED)
-+{
-+    virCgroupPtr cgroup = NULL;
-+    int rv;
-+    int ret = -1;
-+    size_t i;
-+
-+    const unsigned long long expected_values[] = {
-+        1336619008ULL,
-+        67100672ULL,
-+        145887232ULL,
-+        661872640ULL,
-+        627400704UL,
-+        3690496ULL
-+    };
-+    const char* names[] = {
-+        "cache",
-+        "active_anon",
-+        "inactive_anon",
-+        "active_file",
-+        "inactive_file",
-+        "unevictable"
-+    };
-+    unsigned long long values[ARRAY_CARDINALITY(expected_values)];
-+
-+    if ((rv = virCgroupNewPartition("/virtualmachines", true,
-+                                    (1 << VIR_CGROUP_CONTROLLER_MEMORY),
-+                                    &cgroup)) < 0) {
-+        fprintf(stderr, "Could not create /virtualmachines cgroup: %d\n", -rv);
-+        goto cleanup;
-+    }
-+
-+    if ((rv = virCgroupGetMemoryStat(cgroup, &values[0],
-+                                     &values[1], &values[2],
-+                                     &values[3], &values[4],
-+                                     &values[5])) < 0) {
-+        fprintf(stderr, "Could not retrieve GetMemoryStat for /virtualmachines cgroup: %d\n", -rv);
-+        goto cleanup;
-+    }
-+
-+    for (i = 0; i < ARRAY_CARDINALITY(expected_values); i++) {
-+        /* NB: virCgroupGetMemoryStat returns a KiB scaled value */
-+        if ((expected_values[i] >> 10) != values[i]) {
-+            fprintf(stderr,
-+                    "Wrong value (%llu) for %s from virCgroupGetMemoryStat "
-+                    "(expected %llu)\n",
-+                    values[i], names[i], (expected_values[i] >> 10));
-+            goto cleanup;
-+        }
-+    }
-+
-+    ret = 0;
-+
-+ cleanup:
-+    virCgroupFree(&cgroup);
-+    return ret;
-+}
-+
-+
- static int testCgroupGetBlkioIoServiced(const void *args ATTRIBUTE_UNUSED)
- {
-     virCgroupPtr cgroup = NULL;
-@@ -1036,6 +1097,9 @@ mymain(void)
-     if (virTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
-         ret = -1;
- 
-+    if (virTestRun("virCgroupGetMemoryStat works", testCgroupGetMemoryStat, NULL) < 0)
-+        ret = -1;
-+
-     if (virTestRun("virCgroupGetPercpuStats works", testCgroupGetPercpuStats, NULL) < 0)
-         ret = -1;
-     cleanupFakeFS(fakerootdir);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-tests-Follow-up-on-qemucaps2xmldata-rename.patch b/SOURCES/libvirt-tests-Follow-up-on-qemucaps2xmldata-rename.patch
deleted file mode 100644
index 4452d69..0000000
--- a/SOURCES/libvirt-tests-Follow-up-on-qemucaps2xmldata-rename.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2af7e75f8501e8bf3f50ed1c4a3a794a89c9de6b Mon Sep 17 00:00:00 2001
-Message-Id: <2af7e75f8501e8bf3f50ed1c4a3a794a89c9de6b@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:54 +0200
-Subject: [PATCH] tests: Follow up on qemucaps2xmldata rename
-
-The directory has been renamed in 562990849a9d, but a
-reference to it was not updated at the same time, causing
-'make dist' to fail ever since. Fix it.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit d52dd5911b32a31bb17ee97bb9df5683741603b0)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index f5872fa42b..41905d1a4d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -122,7 +122,7 @@ EXTRA_DIST = \
- 	qemuargv2xmldata \
- 	qemublocktestdata \
- 	qemucapabilitiesdata \
--	qemucaps2xmldata \
-+	qemucaps2xmloutdata \
- 	qemuhotplugtestcpus \
- 	qemuhotplugtestdevices \
- 	qemuhotplugtestdomains \
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-tests-Resolve-possible-overrun.patch b/SOURCES/libvirt-tests-Resolve-possible-overrun.patch
deleted file mode 100644
index 097fd9c..0000000
--- a/SOURCES/libvirt-tests-Resolve-possible-overrun.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From c8e10c7f4644646194bbcb1514bbf110ec7374ad Mon Sep 17 00:00:00 2001
-Message-Id: <c8e10c7f4644646194bbcb1514bbf110ec7374ad@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:11 +0200
-Subject: [PATCH] tests: Resolve possible overrun
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Coverity noted that each of the fmemopen called used the strlen value
-in order to allocate space, but that neglected space for terminating
-null string. So just add 1 to the strlen.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 7eb56dcd9ef4c21f8f4bc5e639dc4dd01e6d572a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a0d52bead1b7e31bfa1c1938c7ae19fe0a7605d4.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupmock.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
-index 51861be38e..bae8304f6c 100644
---- a/tests/vircgroupmock.c
-+++ b/tests/vircgroupmock.c
-@@ -468,12 +468,13 @@ FILE *fopen(const char *path, const char *mode)
-         if (STREQ(mode, "r")) {
-             if (allinone)
-                 return fmemopen((void *)procmountsallinone,
--                                strlen(procmountsallinone), mode);
-+                                strlen(procmountsallinone) + 1, mode);
-             else if (logind)
-                 return fmemopen((void *)procmountslogind,
--                                strlen(procmountslogind), mode);
-+                                strlen(procmountslogind) + 1, mode);
-             else
--                return fmemopen((void *)procmounts, strlen(procmounts), mode);
-+                return fmemopen((void *)procmounts,
-+                                strlen(procmounts) + 1, mode);
-         } else {
-             errno = EACCES;
-             return NULL;
-@@ -483,12 +484,13 @@ FILE *fopen(const char *path, const char *mode)
-         if (STREQ(mode, "r")) {
-             if (allinone)
-                 return fmemopen((void *)proccgroupsallinone,
--                                strlen(proccgroupsallinone), mode);
-+                                strlen(proccgroupsallinone) + 1, mode);
-             else if (logind)
-                 return fmemopen((void *)proccgroupslogind,
--                                strlen(proccgroupslogind), mode);
-+                                strlen(proccgroupslogind) + 1, mode);
-             else
--                return fmemopen((void *)proccgroups, strlen(proccgroups), mode);
-+                return fmemopen((void *)proccgroups,
-+                                strlen(proccgroups) + 1, mode);
-         } else {
-             errno = EACCES;
-             return NULL;
-@@ -498,12 +500,13 @@ FILE *fopen(const char *path, const char *mode)
-         if (STREQ(mode, "r")) {
-             if (allinone)
-                 return fmemopen((void *)procselfcgroupsallinone,
--                                strlen(procselfcgroupsallinone), mode);
-+                                strlen(procselfcgroupsallinone) + 1, mode);
-             else if (logind)
-                 return fmemopen((void *)procselfcgroupslogind,
--                                strlen(procselfcgroupslogind), mode);
-+                                strlen(procselfcgroupslogind) + 1, mode);
-             else
--                return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode);
-+                return fmemopen((void *)procselfcgroups,
-+                                strlen(procselfcgroups) + 1, mode);
-         } else {
-             errno = EACCES;
-             return NULL;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-tests-Reuse-qemucapabilities-data-for-qemucaps2xml.patch b/SOURCES/libvirt-tests-Reuse-qemucapabilities-data-for-qemucaps2xml.patch
deleted file mode 100644
index a7c99b2..0000000
--- a/SOURCES/libvirt-tests-Reuse-qemucapabilities-data-for-qemucaps2xml.patch
+++ /dev/null
@@ -1,478 +0,0 @@
-From 9d253e5e4b691af1deaa5022fd2ec01af0054a3e Mon Sep 17 00:00:00 2001
-Message-Id: <9d253e5e4b691af1deaa5022fd2ec01af0054a3e@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Mon, 17 Sep 2018 18:00:48 +0200
-Subject: [PATCH] tests: Reuse qemucapabilities data for qemucaps2xml
-
-While qemucaps2xml has a meager two test cases to its name, we
-have plenty of data from qemucapabilities which is taken from
-actual QEMU binaries, covers pretty much all supported QEMU
-versions and architectures and is even in the right format already!
-
-Rewrite qemucaps2xml so that it uses qemucapabilities data as
-input. Right now we have a single test case, but we're going to
-add a lot more next.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 562990849a9de255b5fefa39be3f301b1bddfa6e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1629862
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/qemucaps2xmldata/all_1.6.0-1.caps       | 129 ------------------
- .../nodisksnapshot_1.6.0-1.caps               | 128 -----------------
- .../nodisksnapshot_1.6.0-1.xml                |  32 -----
- .../caps_1.6.0.x86_64.xml}                    |  12 +-
- tests/qemucaps2xmltest.c                      |  33 +++--
- 5 files changed, 23 insertions(+), 311 deletions(-)
- delete mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps
- delete mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
- delete mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml
- rename tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.6.0.x86_64.xml} (67%)
-
-diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps
-deleted file mode 100644
-index d39d0bebbf..0000000000
---- a/tests/qemucaps2xmldata/all_1.6.0-1.caps
-+++ /dev/null
-@@ -1,129 +0,0 @@
--  <qemuCaps>
--    <flag name='mem-path'/>
--    <flag name='drive-serial'/>
--    <flag name='chardev'/>
--    <flag name='enable-kvm'/>
--    <flag name='monitor-json'/>
--    <flag name='balloon'/>
--    <flag name='device'/>
--    <flag name='sdl'/>
--    <flag name='smp-topology'/>
--    <flag name='netdev'/>
--    <flag name='rtc'/>
--    <flag name='vhost-net'/>
--    <flag name='no-hpet'/>
--    <flag name='no-kvm-pit'/>
--    <flag name='pci-configfd'/>
--    <flag name='nodefconfig'/>
--    <flag name='boot-menu'/>
--    <flag name='fsdev'/>
--    <flag name='name-process'/>
--    <flag name='drive-readonly'/>
--    <flag name='smbios-type'/>
--    <flag name='vga-qxl'/>
--    <flag name='spice'/>
--    <flag name='vga-none'/>
--    <flag name='boot-index'/>
--    <flag name='hda-duplex'/>
--    <flag name='drive-aio'/>
--    <flag name='pci-multibus'/>
--    <flag name='pci-bootindex'/>
--    <flag name='ccid-emulated'/>
--    <flag name='ccid-passthru'/>
--    <flag name='chardev-spicevmc'/>
--    <flag name='virtio-tx-alg'/>
--    <flag name='device-qxl-vga'/>
--    <flag name='pci-multifunction'/>
--    <flag name='virtio-blk-pci.ioeventfd'/>
--    <flag name='sga'/>
--    <flag name='virtio-blk-pci.event_idx'/>
--    <flag name='virtio-net-pci.event_idx'/>
--    <flag name='cache-directsync'/>
--    <flag name='piix3-usb-uhci'/>
--    <flag name='piix4-usb-uhci'/>
--    <flag name='usb-ehci'/>
--    <flag name='ich9-usb-ehci1'/>
--    <flag name='vt82c686b-usb-uhci'/>
--    <flag name='pci-ohci'/>
--    <flag name='usb-hub'/>
--    <flag name='no-shutdown'/>
--    <flag name='cache-unsafe'/>
--    <flag name='rombar'/>
--    <flag name='ich9-ahci'/>
--    <flag name='no-acpi'/>
--    <flag name='fsdev-readonly'/>
--    <flag name='virtio-blk-pci.scsi'/>
--    <flag name='blk-sg-io'/>
--    <flag name='drive-copy-on-read'/>
--    <flag name='cpu-host'/>
--    <flag name='fsdev-writeout'/>
--    <flag name='drive-iotune'/>
--    <flag name='system_wakeup'/>
--    <flag name='scsi-disk.channel'/>
--    <flag name='scsi-block'/>
--    <flag name='transaction'/>
--    <flag name='block-job-async'/>
--    <flag name='scsi-cd'/>
--    <flag name='ide-cd'/>
--    <flag name='no-user-config'/>
--    <flag name='hda-micro'/>
--    <flag name='dump-guest-memory'/>
--    <flag name='nec-usb-xhci'/>
--    <flag name='balloon-event'/>
--    <flag name='bridge'/>
--    <flag name='lsi'/>
--    <flag name='virtio-scsi-pci'/>
--    <flag name='blockio'/>
--    <flag name='disable-s3'/>
--    <flag name='disable-s4'/>
--    <flag name='ide-drive.wwn'/>
--    <flag name='scsi-disk.wwn'/>
--    <flag name='seccomp-sandbox'/>
--    <flag name='dump-guest-core'/>
--    <flag name='seamless-migration'/>
--    <flag name='block-commit'/>
--    <flag name='vnc'/>
--    <flag name='drive-mirror'/>
--    <flag name='usb-host.bootindex'/>
--    <flag name='blockdev-snapshot-sync'/>
--    <flag name='qxl'/>
--    <flag name='VGA'/>
--    <flag name='cirrus-vga'/>
--    <flag name='vmware-svga'/>
--    <flag name='device-video-primary'/>
--    <flag name='usb-serial'/>
--    <flag name='usb-net'/>
--    <flag name='add-fd'/>
--    <flag name='nbd-server'/>
--    <flag name='virtio-rng'/>
--    <flag name='rng-random'/>
--    <flag name='rng-egd'/>
--    <flag name='dtb'/>
--    <flag name='megasas'/>
--    <flag name='ipv6-migration'/>
--    <flag name='machine-opt'/>
--    <flag name='machine-usb-opt'/>
--    <flag name='pci-bridge'/>
--    <flag name='vfio-pci'/>
--    <flag name='vfio-pci.bootindex'/>
--    <flag name='scsi-generic'/>
--    <flag name='scsi-generic.bootindex'/>
--    <flag name='mem-merge'/>
--    <flag name='vnc-websocket'/>
--    <flag name='mlock'/>
--    <flag name='vnc-share-policy'/>
--    <flag name='device-del-event'/>
--    <flag name='dmi-to-pci-bridge'/>
--    <flag name='i440fx-pci-hole64-size'/>
--    <flag name='q35-pci-hole64-size'/>
--    <flag name='usb-storage'/>
--    <flag name='usb-storage.removable'/>
--    <flag name='virtio-mmio'/>
--    <flag name='ich9-intel-hda'/>
--    <flag name='kvm-pit-lost-tick-policy'/>
--    <flag name='boot-strict'/>
--    <flag name='pvpanic'/>
--    <flag name='reboot-timeout'/>
--    <flag name='enable-fips'/>
--    <flag name='name-guest'/>
--  </qemuCaps>
-diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
-deleted file mode 100644
-index 5a0372c917..0000000000
---- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
-+++ /dev/null
-@@ -1,128 +0,0 @@
--  <qemuCaps>
--    <flag name='mem-path'/>
--    <flag name='drive-serial'/>
--    <flag name='chardev'/>
--    <flag name='enable-kvm'/>
--    <flag name='monitor-json'/>
--    <flag name='balloon'/>
--    <flag name='device'/>
--    <flag name='sdl'/>
--    <flag name='smp-topology'/>
--    <flag name='netdev'/>
--    <flag name='rtc'/>
--    <flag name='vhost-net'/>
--    <flag name='no-hpet'/>
--    <flag name='no-kvm-pit'/>
--    <flag name='pci-configfd'/>
--    <flag name='nodefconfig'/>
--    <flag name='boot-menu'/>
--    <flag name='fsdev'/>
--    <flag name='name-process'/>
--    <flag name='drive-readonly'/>
--    <flag name='smbios-type'/>
--    <flag name='vga-qxl'/>
--    <flag name='spice'/>
--    <flag name='vga-none'/>
--    <flag name='boot-index'/>
--    <flag name='hda-duplex'/>
--    <flag name='drive-aio'/>
--    <flag name='pci-multibus'/>
--    <flag name='pci-bootindex'/>
--    <flag name='ccid-emulated'/>
--    <flag name='ccid-passthru'/>
--    <flag name='chardev-spicevmc'/>
--    <flag name='virtio-tx-alg'/>
--    <flag name='device-qxl-vga'/>
--    <flag name='pci-multifunction'/>
--    <flag name='virtio-blk-pci.ioeventfd'/>
--    <flag name='sga'/>
--    <flag name='virtio-blk-pci.event_idx'/>
--    <flag name='virtio-net-pci.event_idx'/>
--    <flag name='cache-directsync'/>
--    <flag name='piix3-usb-uhci'/>
--    <flag name='piix4-usb-uhci'/>
--    <flag name='usb-ehci'/>
--    <flag name='ich9-usb-ehci1'/>
--    <flag name='vt82c686b-usb-uhci'/>
--    <flag name='pci-ohci'/>
--    <flag name='usb-hub'/>
--    <flag name='no-shutdown'/>
--    <flag name='cache-unsafe'/>
--    <flag name='rombar'/>
--    <flag name='ich9-ahci'/>
--    <flag name='no-acpi'/>
--    <flag name='fsdev-readonly'/>
--    <flag name='virtio-blk-pci.scsi'/>
--    <flag name='blk-sg-io'/>
--    <flag name='drive-copy-on-read'/>
--    <flag name='cpu-host'/>
--    <flag name='fsdev-writeout'/>
--    <flag name='drive-iotune'/>
--    <flag name='system_wakeup'/>
--    <flag name='scsi-disk.channel'/>
--    <flag name='scsi-block'/>
--    <flag name='transaction'/>
--    <flag name='block-job-async'/>
--    <flag name='scsi-cd'/>
--    <flag name='ide-cd'/>
--    <flag name='no-user-config'/>
--    <flag name='hda-micro'/>
--    <flag name='dump-guest-memory'/>
--    <flag name='nec-usb-xhci'/>
--    <flag name='balloon-event'/>
--    <flag name='bridge'/>
--    <flag name='lsi'/>
--    <flag name='virtio-scsi-pci'/>
--    <flag name='blockio'/>
--    <flag name='disable-s3'/>
--    <flag name='disable-s4'/>
--    <flag name='ide-drive.wwn'/>
--    <flag name='scsi-disk.wwn'/>
--    <flag name='seccomp-sandbox'/>
--    <flag name='dump-guest-core'/>
--    <flag name='seamless-migration'/>
--    <flag name='block-commit'/>
--    <flag name='vnc'/>
--    <flag name='drive-mirror'/>
--    <flag name='usb-host.bootindex'/>
--    <flag name='qxl'/>
--    <flag name='VGA'/>
--    <flag name='cirrus-vga'/>
--    <flag name='vmware-svga'/>
--    <flag name='device-video-primary'/>
--    <flag name='usb-serial'/>
--    <flag name='usb-net'/>
--    <flag name='add-fd'/>
--    <flag name='nbd-server'/>
--    <flag name='virtio-rng'/>
--    <flag name='rng-random'/>
--    <flag name='rng-egd'/>
--    <flag name='dtb'/>
--    <flag name='megasas'/>
--    <flag name='ipv6-migration'/>
--    <flag name='machine-opt'/>
--    <flag name='machine-usb-opt'/>
--    <flag name='pci-bridge'/>
--    <flag name='vfio-pci'/>
--    <flag name='vfio-pci.bootindex'/>
--    <flag name='scsi-generic'/>
--    <flag name='scsi-generic.bootindex'/>
--    <flag name='mem-merge'/>
--    <flag name='vnc-websocket'/>
--    <flag name='mlock'/>
--    <flag name='vnc-share-policy'/>
--    <flag name='device-del-event'/>
--    <flag name='dmi-to-pci-bridge'/>
--    <flag name='i440fx-pci-hole64-size'/>
--    <flag name='q35-pci-hole64-size'/>
--    <flag name='usb-storage'/>
--    <flag name='usb-storage.removable'/>
--    <flag name='virtio-mmio'/>
--    <flag name='ich9-intel-hda'/>
--    <flag name='kvm-pit-lost-tick-policy'/>
--    <flag name='boot-strict'/>
--    <flag name='pvpanic'/>
--    <flag name='reboot-timeout'/>
--    <flag name='enable-fips'/>
--    <flag name='name-guest'/>
--  </qemuCaps>
-diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml
-deleted file mode 100644
-index 981344e6fd..0000000000
---- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<capabilities>
--
--  <host>
--    <cpu>
--      <arch>i686</arch>
--    </cpu>
--    <power_management/>
--    <iommu support='no'/>
--  </host>
--
--  <guest>
--    <os_type>hvm</os_type>
--    <arch name='i686'>
--      <wordsize>32</wordsize>
--      <emulator>/usr/bin/qemu-system-i386</emulator>
--      <domain type='qemu'/>
--      <domain type='kvm'>
--        <emulator>/usr/bin/qemu-system-i386</emulator>
--      </domain>
--    </arch>
--    <features>
--      <cpuselection/>
--      <deviceboot/>
--      <disksnapshot default='off' toggle='no'/>
--      <acpi default='on' toggle='yes'/>
--      <apic default='on' toggle='no'/>
--      <pae/>
--      <nonpae/>
--    </features>
--  </guest>
--
--</capabilities>
-diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
-similarity index 67%
-rename from tests/qemucaps2xmldata/all_1.6.0-1.xml
-rename to tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
-index efe86b9a12..b58f54fefd 100644
---- a/tests/qemucaps2xmldata/all_1.6.0-1.xml
-+++ b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
-@@ -2,7 +2,7 @@
- 
-   <host>
-     <cpu>
--      <arch>i686</arch>
-+      <arch>x86_64</arch>
-     </cpu>
-     <power_management/>
-     <iommu support='no'/>
-@@ -10,12 +10,12 @@
- 
-   <guest>
-     <os_type>hvm</os_type>
--    <arch name='i686'>
--      <wordsize>32</wordsize>
--      <emulator>/usr/bin/qemu-system-i386</emulator>
-+    <arch name='x86_64'>
-+      <wordsize>64</wordsize>
-+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
-       <domain type='qemu'/>
-       <domain type='kvm'>
--        <emulator>/usr/bin/qemu-system-i386</emulator>
-+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-       </domain>
-     </arch>
-     <features>
-@@ -24,8 +24,6 @@
-       <disksnapshot default='on' toggle='no'/>
-       <acpi default='on' toggle='yes'/>
-       <apic default='on' toggle='no'/>
--      <pae/>
--      <nonpae/>
-     </features>
-   </guest>
- 
-diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
-index 5b9152b04d..65dd97c0a4 100644
---- a/tests/qemucaps2xmltest.c
-+++ b/tests/qemucaps2xmltest.c
-@@ -32,7 +32,7 @@ typedef struct _testQemuData testQemuData;
- typedef testQemuData *testQemuDataPtr;
- struct _testQemuData {
-     const char *base;
--    virArch guestarch;
-+    const char *archName;
- };
- 
- static virQEMUCapsPtr
-@@ -87,23 +87,28 @@ testGetCaps(char *capsData, const testQemuData *data)
- {
-     virQEMUCapsPtr qemuCaps = NULL;
-     virCapsPtr caps = NULL;
-+    virArch arch = virArchFromString(data->archName);
-+    char *binary = NULL;
-+
-+    if (virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName) < 0)
-+        goto error;
- 
-     if ((qemuCaps = testQemuGetCaps(capsData)) == NULL) {
-         fprintf(stderr, "failed to parse qemu capabilities flags");
-         goto error;
-     }
- 
--    if ((caps = virCapabilitiesNew(data->guestarch, false, false)) == NULL) {
-+    if ((caps = virCapabilitiesNew(arch, false, false)) == NULL) {
-         fprintf(stderr, "failed to create the fake capabilities");
-         goto error;
-     }
- 
-     if (virQEMUCapsInitGuestFromBinary(caps,
--                                       "/usr/bin/qemu-system-i386",
-+                                       binary,
-                                        qemuCaps,
-                                        NULL,
-                                        NULL,
--                                       data->guestarch) < 0) {
-+                                       arch) < 0) {
-         fprintf(stderr, "failed to create the capabilities from qemu");
-         goto error;
-     }
-@@ -114,6 +119,7 @@ testGetCaps(char *capsData, const testQemuData *data)
-  error:
-     virObjectUnref(qemuCaps);
-     virObjectUnref(caps);
-+    VIR_FREE(binary);
-     return NULL;
- }
- 
-@@ -127,12 +133,12 @@ testQemuCapsXML(const void *opaque)
-     char *capsXml = NULL;
-     virCapsPtr capsProvided = NULL;
- 
--    if (virAsprintf(&xmlFile, "%s/qemucaps2xmldata/%s.xml",
--                    abs_srcdir, data->base) < 0)
-+    if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/%s.%s.xml",
-+                    abs_srcdir, data->base, data->archName) < 0)
-         goto cleanup;
- 
--    if (virAsprintf(&capsFile, "%s/qemucaps2xmldata/%s.caps",
--                    abs_srcdir, data->base) < 0)
-+    if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml",
-+                    abs_srcdir, data->base, data->archName) < 0)
-         goto cleanup;
- 
-     if (virTestLoadFile(capsFile, &capsData) < 0)
-@@ -175,16 +181,13 @@ mymain(void)
- 
-     virEventRegisterDefaultImpl();
- 
--#define DO_TEST_FULL(name, guest) \
-+#define DO_TEST(arch, name) \
-+    data.archName = arch; \
-     data.base = name; \
--    data.guestarch = guest; \
--    if (virTestRun(name, testQemuCapsXML, &data) < 0) \
-+    if (virTestRun(name "(" arch ")", testQemuCapsXML, &data) < 0) \
-         ret = -1
- 
--#define DO_TEST(name) DO_TEST_FULL(name, VIR_ARCH_I686)
--
--    DO_TEST("all_1.6.0-1");
--    DO_TEST("nodisksnapshot_1.6.0-1");
-+    DO_TEST("x86_64", "caps_1.6.0");
- 
-     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
- }
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-tests-Update-capabilities-data-for-QEMU-3.0.0-x86_64.patch b/SOURCES/libvirt-tests-Update-capabilities-data-for-QEMU-3.0.0-x86_64.patch
deleted file mode 100644
index e5016f6..0000000
--- a/SOURCES/libvirt-tests-Update-capabilities-data-for-QEMU-3.0.0-x86_64.patch
+++ /dev/null
@@ -1,837 +0,0 @@
-From 09f31ebb94ef3290c79a1c336d9bdd4e61d359a7 Mon Sep 17 00:00:00 2001
-Message-Id: <09f31ebb94ef3290c79a1c336d9bdd4e61d359a7@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:55 +0200
-Subject: [PATCH] tests: Update capabilities data for QEMU 3.0.0 x86_64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The original capabilities didn't include a patched kernel for spectre,
-SPICE gl support and had xen support enabled which we already have
-dropped.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit aaf105da5997acf561cad23b3337c38324ba753b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../caps_3.0.0.x86_64.replies                 | 211 +++++++++---------
- .../caps_3.0.0.x86_64.xml                     |  57 ++---
- 2 files changed, 127 insertions(+), 141 deletions(-)
-
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-index 257f0ecbe2..b2f8377248 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-@@ -17,11 +17,11 @@
- {
-   "return": {
-     "qemu": {
--      "micro": 50,
-+      "micro": 90,
-       "minor": 12,
-       "major": 2
-     },
--    "package": "v2.12.0-2284-gab3257c281"
-+    "package": "v3.0.0-rc0-31-g633e824037"
-   },
-   "id": "libvirt-2"
- }
-@@ -818,10 +818,6 @@
-       "name": "virtio-keyboard-pci",
-       "parent": "virtio-input-hid-pci"
-     },
--    {
--      "name": "xen-sysbus",
--      "parent": "bus"
--    },
-     {
-       "name": "i440FX",
-       "parent": "pci-device"
-@@ -854,10 +850,6 @@
-       "name": "chardev-pty",
-       "parent": "chardev"
-     },
--    {
--      "name": "xen-apic",
--      "parent": "apic-common"
--    },
-     {
-       "name": "SUNW,fdtwo",
-       "parent": "base-sysbus-fdc"
-@@ -918,6 +910,10 @@
-       "name": "qemu64-x86_64-cpu",
-       "parent": "x86_64-cpu"
-     },
-+    {
-+      "name": "PIIX3-xen",
-+      "parent": "pci-piix3"
-+    },
-     {
-       "name": "virtio-input-host-pci",
-       "parent": "virtio-input-pci"
-@@ -935,16 +931,16 @@
-       "parent": "e1000-base"
-     },
-     {
--      "name": "PIIX3-xen",
--      "parent": "pci-piix3"
-+      "name": "ICH9-LPC",
-+      "parent": "pci-device"
-     },
-     {
-       "name": "pc-i440fx-1.4-machine",
-       "parent": "generic-pc-machine"
-     },
-     {
--      "name": "ICH9-LPC",
--      "parent": "pci-device"
-+      "name": "ich9-usb-uhci6",
-+      "parent": "pci-uhci-usb"
-     },
-     {
-       "name": "sysbus-ahci",
-@@ -954,10 +950,6 @@
-       "name": "ich9-usb-uhci4",
-       "parent": "pci-uhci-usb"
-     },
--    {
--      "name": "ich9-usb-uhci6",
--      "parent": "pci-uhci-usb"
--    },
-     {
-       "name": "pc-q35-2.6-machine",
-       "parent": "generic-pc-machine"
-@@ -966,6 +958,10 @@
-       "name": "usb-mtp",
-       "parent": "usb-device"
-     },
-+    {
-+      "name": "ccid-card-emulated",
-+      "parent": "ccid-card"
-+    },
-     {
-       "name": "ich9-usb-uhci5",
-       "parent": "pci-uhci-usb"
-@@ -1118,10 +1114,6 @@
-       "name": "pc-testdev",
-       "parent": "isa-device"
-     },
--    {
--      "name": "xen-backend",
--      "parent": "xen-sysdev"
--    },
-     {
-       "name": "Haswell-noTSX-IBRS-x86_64-cpu",
-       "parent": "x86_64-cpu"
-@@ -1206,6 +1198,10 @@
-       "name": "isa-cirrus-vga",
-       "parent": "isa-device"
-     },
-+    {
-+      "name": "qio-channel-rdma",
-+      "parent": "qio-channel"
-+    },
-     {
-       "name": "vhost-vsock-device",
-       "parent": "virtio-device"
-@@ -1322,14 +1318,14 @@
-       "name": "chardev-msmouse",
-       "parent": "chardev"
-     },
--    {
--      "name": "chardev-pipe",
--      "parent": "chardev-fd"
--    },
-     {
-       "name": "pc-q35-2.9-machine",
-       "parent": "generic-pc-machine"
-     },
-+    {
-+      "name": "chardev-pipe",
-+      "parent": "chardev-fd"
-+    },
-     {
-       "name": "pc-i440fx-1.7-machine",
-       "parent": "generic-pc-machine"
-@@ -1515,33 +1511,37 @@
-       "parent": "pci-uhci-usb"
-     },
-     {
--      "name": "chardev-file",
--      "parent": "chardev-fd"
-+      "name": "chardev-braille",
-+      "parent": "chardev"
-     },
-     {
--      "name": "pc-q35-2.10-machine",
--      "parent": "generic-pc-machine"
-+      "name": "chardev-file",
-+      "parent": "chardev-fd"
-     },
-     {
-       "name": "intel-iommu",
-       "parent": "x86-iommu"
-     },
-     {
--      "name": "PCIE",
--      "parent": "PCI"
-+      "name": "pc-q35-2.10-machine",
-+      "parent": "generic-pc-machine"
-     },
-     {
-       "name": "tpm-tis",
-       "parent": "isa-device"
-     },
-     {
--      "name": "xen-sysdev",
--      "parent": "sys-bus-device"
-+      "name": "PCIE",
-+      "parent": "PCI"
-     },
-     {
-       "name": "pcie-pci-bridge",
-       "parent": "base-pci-bridge"
-     },
-+    {
-+      "name": "ccid-card-passthru",
-+      "parent": "ccid-card"
-+    },
-     {
-       "name": "qio-dns-resolver",
-       "parent": "object"
-@@ -1582,10 +1582,6 @@
-       "name": "ccid-bus",
-       "parent": "bus"
-     },
--    {
--      "name": "xenpv-machine",
--      "parent": "machine"
--    },
-     {
-       "name": "EPYC-IBPB-x86_64-cpu",
-       "parent": "x86_64-cpu"
-@@ -1922,10 +1918,6 @@
-       "name": "pc-i440fx-2.2-machine",
-       "parent": "generic-pc-machine"
-     },
--    {
--      "name": "xen-pci-passthrough",
--      "parent": "pci-device"
--    },
-     {
-       "name": "cryptodev-backend",
-       "parent": "object"
-@@ -2058,18 +2050,10 @@
-       "name": "virtio-scsi-pci",
-       "parent": "virtio-pci"
-     },
--    {
--      "name": "piix3-ide",
--      "parent": "pci-ide"
--    },
-     {
-       "name": "ES1370",
-       "parent": "pci-device"
-     },
--    {
--      "name": "xen-pvdevice",
--      "parent": "pci-device"
--    },
-     {
-       "name": "virtio-pci-bus",
-       "parent": "virtio-bus"
-@@ -2079,8 +2063,8 @@
-       "parent": "pcie-port"
-     },
-     {
--      "name": "xenfv-machine",
--      "parent": "generic-pc-machine"
-+      "name": "piix3-ide",
-+      "parent": "pci-ide"
-     },
-     {
-       "name": "pci-testdev",
-@@ -2134,10 +2118,6 @@
-       "name": "pc-i440fx-2.6-machine",
-       "parent": "generic-pc-machine"
-     },
--    {
--      "name": "xen-platform",
--      "parent": "pci-device"
--    },
-     {
-       "name": "chardev-serial",
-       "parent": "chardev-fd"
-@@ -2230,10 +2210,6 @@
-       "name": "isa-applesmc",
-       "parent": "isa-device"
-     },
--    {
--      "name": "xen-accel",
--      "parent": "accel"
--    },
-     {
-       "name": "secret",
-       "parent": "object"
-@@ -2386,6 +2362,10 @@
-       "name": "generic-sdhci",
-       "parent": "sys-bus-device"
-     },
-+    {
-+      "name": "pvrdma",
-+      "parent": "pci-device"
-+    },
-     {
-       "name": "isa-pit",
-       "parent": "pit-common"
-@@ -5199,11 +5179,6 @@
-       "name": "pc-i440fx-2.7",
-       "cpu-max": 255
-     },
--    {
--      "hotpluggable-cpus": true,
--      "name": "xenfv",
--      "cpu-max": 128
--    },
-     {
-       "hotpluggable-cpus": true,
-       "name": "pc-i440fx-2.3",
-@@ -5250,11 +5225,6 @@
-       "cpu-max": 288,
-       "alias": "q35"
-     },
--    {
--      "hotpluggable-cpus": false,
--      "name": "xenpv",
--      "cpu-max": 1
--    },
-     {
-       "hotpluggable-cpus": true,
-       "name": "pc-q35-2.10",
-@@ -5506,7 +5476,6 @@
-       "name": "Westmere-IBRS",
-       "typename": "Westmere-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5529,7 +5498,6 @@
-         "avx512cd",
-         "avx512bw",
-         "avx512vl",
--        "spec-ctrl",
-         "avx512f",
-         "avx512f",
-         "avx512f"
-@@ -5558,7 +5526,6 @@
-       "name": "Skylake-Client-IBRS",
-       "typename": "Skylake-Client-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5575,7 +5542,6 @@
-       "name": "SandyBridge-IBRS",
-       "typename": "SandyBridge-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5651,7 +5617,6 @@
-       "name": "Nehalem-IBRS",
-       "typename": "Nehalem-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5686,7 +5651,6 @@
-       "name": "IvyBridge-IBRS",
-       "typename": "IvyBridge-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5703,7 +5667,6 @@
-       "name": "Haswell-noTSX-IBRS",
-       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5720,7 +5683,6 @@
-       "name": "Haswell-IBRS",
-       "typename": "Haswell-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5776,7 +5738,6 @@
-       "name": "Broadwell-noTSX-IBRS",
-       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5793,7 +5754,6 @@
-       "name": "Broadwell-IBRS",
-       "typename": "Broadwell-IBRS-x86_64-cpu",
-       "unavailable-features": [
--        "spec-ctrl"
-       ],
-       "static": false,
-       "migration-safe": true
-@@ -5977,6 +5937,14 @@
-     },
-     {
-       "parameters": [
-+        {
-+          "name": "rendernode",
-+          "type": "string"
-+        },
-+        {
-+          "name": "gl",
-+          "type": "boolean"
-+        },
-         {
-           "name": "head",
-           "type": "number"
-@@ -6903,6 +6871,36 @@
-           "help": "file name",
-           "type": "string"
-         },
-+        {
-+          "name": "serial",
-+          "help": "disk serial number",
-+          "type": "string"
-+        },
-+        {
-+          "name": "addr",
-+          "help": "pci address (virtio only)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "trans",
-+          "help": "chs translation (auto, lba, none)",
-+          "type": "string"
-+        },
-+        {
-+          "name": "secs",
-+          "help": "number of sectors (ide disk geometry)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "heads",
-+          "help": "number of heads (ide disk geometry)",
-+          "type": "number"
-+        },
-+        {
-+          "name": "cyls",
-+          "help": "number of cylinders (ide disk geometry)",
-+          "type": "number"
-+        },
-         {
-           "name": "if",
-           "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
-@@ -18406,6 +18404,11 @@
-           "name": "inactive-l2",
-           "default": null,
-           "type": "bool"
-+        },
-+        {
-+          "name": "bitmap-directory",
-+          "default": null,
-+          "type": "bool"
-         }
-       ],
-       "meta-type": "object"
-@@ -19557,7 +19560,7 @@
-         "osvw": false,
-         "apic": true,
-         "pmm": false,
--        "spec-ctrl": false,
-+        "spec-ctrl": true,
-         "tsc-adjust": true,
-         "kvm-steal-time": true,
-         "kvmclock": true,
-@@ -19578,7 +19581,7 @@
-         "vaes": false,
-         "xsaves": true,
-         "lm": true,
--        "umip": false,
-+        "umip": true,
-         "pse": true,
-         "avx2": true,
-         "sep": true,
-@@ -19610,12 +19613,12 @@
-         "rdseed": true,
-         "avx512-4vnniw": false,
-         "vme": true,
--        "vmx": false,
-+        "vmx": true,
-         "dtes64": false,
-         "mtrr": true,
-         "rdtscp": true,
-         "pse36": true,
--        "kvm-pv-tlb-flush": false,
-+        "kvm-pv-tlb-flush": true,
-         "tbm": false,
-         "wdt": false,
-         "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-@@ -19752,7 +19755,7 @@
-         "osvw": false,
-         "apic": true,
-         "pmm": false,
--        "spec-ctrl": false,
-+        "spec-ctrl": true,
-         "tsc-adjust": true,
-         "kvm-steal-time": true,
-         "kvmclock": true,
-@@ -19773,7 +19776,7 @@
-         "vaes": false,
-         "xsaves": true,
-         "lm": true,
--        "umip": false,
-+        "umip": true,
-         "pse": true,
-         "avx2": true,
-         "sep": true,
-@@ -19805,12 +19808,12 @@
-         "rdseed": true,
-         "avx512-4vnniw": false,
-         "vme": true,
--        "vmx": false,
-+        "vmx": true,
-         "dtes64": false,
-         "mtrr": true,
-         "rdtscp": true,
-         "pse36": true,
--        "kvm-pv-tlb-flush": false,
-+        "kvm-pv-tlb-flush": true,
-         "tbm": false,
-         "wdt": false,
-         "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-@@ -19992,7 +19995,7 @@
-         "pmu": false,
-         "pmm": false,
-         "apic": true,
--        "spec-ctrl": false,
-+        "spec-ctrl": true,
-         "min-xlevel2": 0,
-         "tsc-adjust": true,
-         "tsc_adjust": true,
-@@ -20019,7 +20022,7 @@
-         "xsaves": true,
-         "tcg-cpuid": true,
-         "lm": true,
--        "umip": false,
-+        "umip": true,
-         "pse": true,
-         "avx2": true,
-         "sep": true,
-@@ -20065,13 +20068,13 @@
-         "rdrand": true,
-         "rdseed": true,
-         "avx512-4vnniw": false,
--        "vmx": false,
-+        "vmx": true,
-         "vme": true,
-         "dtes64": false,
-         "mtrr": true,
-         "rdtscp": true,
-         "pse36": true,
--        "kvm-pv-tlb-flush": false,
-+        "kvm-pv-tlb-flush": true,
-         "tbm": false,
-         "wdt": false,
-         "pause_filter": false,
-@@ -20221,7 +20224,7 @@
-         "osvw": false,
-         "apic": true,
-         "pmm": false,
--        "spec-ctrl": false,
-+        "spec-ctrl": true,
-         "tsc-adjust": true,
-         "kvm-steal-time": true,
-         "kvmclock": true,
-@@ -20242,7 +20245,7 @@
-         "vaes": false,
-         "xsaves": true,
-         "lm": true,
--        "umip": false,
-+        "umip": true,
-         "pse": true,
-         "avx2": true,
-         "sep": true,
-@@ -20274,12 +20277,12 @@
-         "rdseed": true,
-         "avx512-4vnniw": false,
-         "vme": true,
--        "vmx": false,
-+        "vmx": true,
-         "dtes64": false,
-         "mtrr": true,
-         "rdtscp": true,
-         "pse36": true,
--        "kvm-pv-tlb-flush": false,
-+        "kvm-pv-tlb-flush": true,
-         "tbm": false,
-         "wdt": false,
-         "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-@@ -20416,7 +20419,7 @@
-         "osvw": false,
-         "apic": true,
-         "pmm": false,
--        "spec-ctrl": false,
-+        "spec-ctrl": true,
-         "tsc-adjust": true,
-         "kvm-steal-time": true,
-         "kvmclock": true,
-@@ -20437,7 +20440,7 @@
-         "vaes": false,
-         "xsaves": true,
-         "lm": true,
--        "umip": false,
-+        "umip": true,
-         "pse": true,
-         "avx2": true,
-         "sep": true,
-@@ -20469,12 +20472,12 @@
-         "rdseed": true,
-         "avx512-4vnniw": false,
-         "vme": true,
--        "vmx": false,
-+        "vmx": true,
-         "dtes64": false,
-         "mtrr": true,
-         "rdtscp": true,
-         "pse36": true,
--        "kvm-pv-tlb-flush": false,
-+        "kvm-pv-tlb-flush": true,
-         "tbm": false,
-         "wdt": false,
-         "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-@@ -20656,7 +20659,7 @@
-         "pmu": false,
-         "pmm": false,
-         "apic": true,
--        "spec-ctrl": false,
-+        "spec-ctrl": true,
-         "min-xlevel2": 0,
-         "tsc-adjust": true,
-         "tsc_adjust": true,
-@@ -20683,7 +20686,7 @@
-         "xsaves": true,
-         "tcg-cpuid": true,
-         "lm": true,
--        "umip": false,
-+        "umip": true,
-         "pse": true,
-         "avx2": true,
-         "sep": true,
-@@ -20729,13 +20732,13 @@
-         "rdrand": true,
-         "rdseed": true,
-         "avx512-4vnniw": false,
--        "vmx": false,
-+        "vmx": true,
-         "vme": true,
-         "dtes64": false,
-         "mtrr": true,
-         "rdtscp": true,
-         "pse36": true,
--        "kvm-pv-tlb-flush": false,
-+        "kvm-pv-tlb-flush": true,
-         "tbm": false,
-         "wdt": false,
-         "pause_filter": false,
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index d7c25c65dd..cd036d9323 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -8,6 +8,8 @@
-   <flag name='spice'/>
-   <flag name='boot-index'/>
-   <flag name='hda-duplex'/>
-+  <flag name='ccid-emulated'/>
-+  <flag name='ccid-passthru'/>
-   <flag name='virtio-tx-alg'/>
-   <flag name='virtio-blk-pci.ioeventfd'/>
-   <flag name='sga'/>
-@@ -131,6 +133,7 @@
-   <flag name='vserport-change-event'/>
-   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-   <flag name='mptsas1068'/>
-+  <flag name='spice-gl'/>
-   <flag name='qxl.vram64_size_mb'/>
-   <flag name='chardev-logfile'/>
-   <flag name='debug-threads'/>
-@@ -160,6 +163,7 @@
-   <flag name='drive-iotune-group'/>
-   <flag name='query-cpu-model-expansion'/>
-   <flag name='virtio-net.host_mtu'/>
-+  <flag name='spice-rendernode'/>
-   <flag name='nvdimm'/>
-   <flag name='pcie-root-port'/>
-   <flag name='query-cpu-definitions'/>
-@@ -210,10 +214,10 @@
-   <flag name='mch.extended-tseg-mbytes'/>
-   <flag name='sev-guest'/>
-   <flag name='usb-storage.werror'/>
--  <version>2012050</version>
-+  <version>2012090</version>
-   <kvmVersion>0</kvmVersion>
--  <microcodeVersion>437827</microcodeVersion>
--  <package>v2.12.0-2284-gab3257c281</package>
-+  <microcodeVersion>438109</microcodeVersion>
-+  <package>v3.0.0-rc0-31-g633e824037</package>
-   <arch>x86_64</arch>
-   <hostCPU type='kvm' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-@@ -379,7 +383,7 @@
-     <property name='pmu' type='boolean' value='false'/>
-     <property name='pmm' type='boolean' value='false'/>
-     <property name='apic' type='boolean' value='true' migratable='yes'/>
--    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/>
-     <property name='min-xlevel2' type='number' value='0'/>
-     <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-     <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
-@@ -406,7 +410,7 @@
-     <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-     <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-     <property name='lm' type='boolean' value='true' migratable='yes'/>
--    <property name='umip' type='boolean' value='false'/>
-+    <property name='umip' type='boolean' value='true' migratable='yes'/>
-     <property name='pse' type='boolean' value='true' migratable='yes'/>
-     <property name='avx2' type='boolean' value='true' migratable='yes'/>
-     <property name='sep' type='boolean' value='true' migratable='yes'/>
-@@ -452,13 +456,13 @@
-     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-     <property name='rdseed' type='boolean' value='true' migratable='yes'/>
-     <property name='avx512-4vnniw' type='boolean' value='false'/>
--    <property name='vmx' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='true' migratable='yes'/>
-     <property name='vme' type='boolean' value='true' migratable='yes'/>
-     <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='pse36' type='boolean' value='true' migratable='yes'/>
--    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/>
-     <property name='tbm' type='boolean' value='false'/>
-     <property name='wdt' type='boolean' value='false'/>
-     <property name='pause_filter' type='boolean' value='false'/>
-@@ -747,9 +751,7 @@
-     <blocker name='3dnowext'/>
-     <blocker name='3dnow'/>
-   </cpu>
--  <cpu type='kvm' name='Westmere-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Westmere' usable='yes'/>
-   <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
-     <blocker name='avx512f'/>
-@@ -758,7 +760,6 @@
-     <blocker name='avx512cd'/>
-     <blocker name='avx512bw'/>
-     <blocker name='avx512vl'/>
--    <blocker name='spec-ctrl'/>
-     <blocker name='avx512f'/>
-     <blocker name='avx512f'/>
-     <blocker name='avx512f'/>
-@@ -774,13 +775,9 @@
-     <blocker name='avx512f'/>
-     <blocker name='avx512f'/>
-   </cpu>
--  <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Skylake-Client' usable='yes'/>
--  <cpu type='kvm' name='SandyBridge-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
-   <cpu type='kvm' name='SandyBridge' usable='yes'/>
-   <cpu type='kvm' name='Penryn' usable='yes'/>
-   <cpu type='kvm' name='Opteron_G5' usable='no'>
-@@ -802,9 +799,7 @@
-   </cpu>
-   <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-   <cpu type='kvm' name='Opteron_G1' usable='yes'/>
--  <cpu type='kvm' name='Nehalem-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Nehalem' usable='yes'/>
-   <cpu type='kvm' name='KnightsMill' usable='no'>
-     <blocker name='avx512f'/>
-@@ -818,17 +813,11 @@
-     <blocker name='avx512f'/>
-     <blocker name='avx512f'/>
-   </cpu>
--  <cpu type='kvm' name='IvyBridge-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
-   <cpu type='kvm' name='IvyBridge' usable='yes'/>
--  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
--  <cpu type='kvm' name='Haswell-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Haswell' usable='yes'/>
-   <cpu type='kvm' name='EPYC-IBPB' usable='no'>
-     <blocker name='sha-ni'/>
-@@ -850,13 +839,9 @@
-     <blocker name='osvw'/>
-   </cpu>
-   <cpu type='kvm' name='Conroe' usable='yes'/>
--  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
--  <cpu type='kvm' name='Broadwell-IBRS' usable='no'>
--    <blocker name='spec-ctrl'/>
--  </cpu>
-+  <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
-   <cpu type='kvm' name='Broadwell' usable='yes'/>
-   <cpu type='kvm' name='486' usable='yes'/>
-   <cpu type='tcg' name='max' usable='yes'/>
-@@ -1180,7 +1165,6 @@
-   <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
-   <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
-@@ -1190,7 +1174,6 @@
-   <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
-   <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
-   <machine name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine name='xenpv' maxCpus='1'/>
-   <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
-   <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
-   <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-Use-correct-function-name-in-error-path.patch b/SOURCES/libvirt-tests-Use-correct-function-name-in-error-path.patch
deleted file mode 100644
index 73e3d8a..0000000
--- a/SOURCES/libvirt-tests-Use-correct-function-name-in-error-path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ef6054cc51d7a847e1d34b74b28b76fd1c1bb6da Mon Sep 17 00:00:00 2001
-Message-Id: <ef6054cc51d7a847e1d34b74b28b76fd1c1bb6da@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:06 +0200
-Subject: [PATCH] tests: Use correct function name in error path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit id 5eb61e6846 neglected to change the name in the wrong value
-output to virCgroupGetPercpuStats from virCgroupGetMemoryUsage.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 4608af30f9f9a4089b530d85d9b11c2f88424a09)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e1e0e9efc289cf396e173031d787e45f416dc474.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgrouptest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 7fde50b463..118b1bc246 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -757,7 +757,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
- 
-         if (params[i].value.ul != expected[i]) {
-             fprintf(stderr,
--                    "Wrong value from virCgroupGetMemoryUsage at %zu (expected %llu)\n",
-+                    "Wrong value from virCgroupGetPercpuStats at %zu (expected %llu)\n",
-                     i, params[i].value.ul);
-             goto cleanup;
-         }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-tests-add-host-CPU-data-files-for-validating-die_id.patch b/SOURCES/libvirt-tests-add-host-CPU-data-files-for-validating-die_id.patch
new file mode 100644
index 0000000..89c2fcb
--- /dev/null
+++ b/SOURCES/libvirt-tests-add-host-CPU-data-files-for-validating-die_id.patch
@@ -0,0 +1,2131 @@
+From a3d3caef97d7f052187fce8f81527f9a9f1ae74f Mon Sep 17 00:00:00 2001
+Message-Id: <a3d3caef97d7f052187fce8f81527f9a9f1ae74f@dist-git>
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 3 Feb 2020 18:07:26 +0000
+Subject: [PATCH] tests: add host CPU data files for validating die_id
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only Cascadelake-AP CPUs appear to report "die_id" values != 0 on Linux
+right now - AMD EPYC's don't report "die_id" (at least with Fedora 31
+kernel). Lacking access to Cascadelake-AP CPUs, this test data was from
+a Fedora 31 QEMU guest launched with
+
+ -cpu qemu64 -smp sockets=2,dies=3,cores=2,threads=1
+
+Ideally we'd replace this data with some from a real machine reporting
+"die_id", to ensure we're not mislead by QEMU's impl.
+
+Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 0169f5ecdeefb91463b07a2e6f3f3b40c84323e9)
+
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785207
+BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785211
+Message-Id: <20200203180726.2203691-6-berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ .../linux-basic-dies/system/cpu               |   1 +
+ .../linux-basic-dies/system/node              |   1 +
+ .../vircaps-x86_64-basic-dies.xml             |  35 ++
+ tests/vircaps2xmltest.c                       |   1 +
+ .../cpu/cpu0/topology/core_cpus               |   1 +
+ .../cpu/cpu0/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu0/topology/core_id  |   1 +
+ .../cpu/cpu0/topology/core_siblings           |   1 +
+ .../cpu/cpu0/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu0/topology/die_cpus |   1 +
+ .../cpu/cpu0/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu0/topology/die_id   |   1 +
+ .../cpu/cpu0/topology/package_cpus            |   1 +
+ .../cpu/cpu0/topology/package_cpus_list       |   1 +
+ .../cpu/cpu0/topology/physical_package_id     |   1 +
+ .../cpu/cpu0/topology/thread_siblings         |   1 +
+ .../cpu/cpu0/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu1/online            |   1 +
+ .../cpu/cpu1/topology/core_cpus               |   1 +
+ .../cpu/cpu1/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu1/topology/core_id  |   1 +
+ .../cpu/cpu1/topology/core_siblings           |   1 +
+ .../cpu/cpu1/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu1/topology/die_cpus |   1 +
+ .../cpu/cpu1/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu1/topology/die_id   |   1 +
+ .../cpu/cpu1/topology/package_cpus            |   1 +
+ .../cpu/cpu1/topology/package_cpus_list       |   1 +
+ .../cpu/cpu1/topology/physical_package_id     |   1 +
+ .../cpu/cpu1/topology/thread_siblings         |   1 +
+ .../cpu/cpu1/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu10/online           |   1 +
+ .../cpu/cpu10/topology/core_cpus              |   1 +
+ .../cpu/cpu10/topology/core_cpus_list         |   1 +
+ .../linux-with-die/cpu/cpu10/topology/core_id |   1 +
+ .../cpu/cpu10/topology/core_siblings          |   1 +
+ .../cpu/cpu10/topology/core_siblings_list     |   1 +
+ .../cpu/cpu10/topology/die_cpus               |   1 +
+ .../cpu/cpu10/topology/die_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu10/topology/die_id  |   1 +
+ .../cpu/cpu10/topology/package_cpus           |   1 +
+ .../cpu/cpu10/topology/package_cpus_list      |   1 +
+ .../cpu/cpu10/topology/physical_package_id    |   1 +
+ .../cpu/cpu10/topology/thread_siblings        |   1 +
+ .../cpu/cpu10/topology/thread_siblings_list   |   1 +
+ .../linux-with-die/cpu/cpu11/online           |   1 +
+ .../cpu/cpu11/topology/core_cpus              |   1 +
+ .../cpu/cpu11/topology/core_cpus_list         |   1 +
+ .../linux-with-die/cpu/cpu11/topology/core_id |   1 +
+ .../cpu/cpu11/topology/core_siblings          |   1 +
+ .../cpu/cpu11/topology/core_siblings_list     |   1 +
+ .../cpu/cpu11/topology/die_cpus               |   1 +
+ .../cpu/cpu11/topology/die_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu11/topology/die_id  |   1 +
+ .../cpu/cpu11/topology/package_cpus           |   1 +
+ .../cpu/cpu11/topology/package_cpus_list      |   1 +
+ .../cpu/cpu11/topology/physical_package_id    |   1 +
+ .../cpu/cpu11/topology/thread_siblings        |   1 +
+ .../cpu/cpu11/topology/thread_siblings_list   |   1 +
+ .../linux-with-die/cpu/cpu2/online            |   1 +
+ .../cpu/cpu2/topology/core_cpus               |   1 +
+ .../cpu/cpu2/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu2/topology/core_id  |   1 +
+ .../cpu/cpu2/topology/core_siblings           |   1 +
+ .../cpu/cpu2/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu2/topology/die_cpus |   1 +
+ .../cpu/cpu2/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu2/topology/die_id   |   1 +
+ .../cpu/cpu2/topology/package_cpus            |   1 +
+ .../cpu/cpu2/topology/package_cpus_list       |   1 +
+ .../cpu/cpu2/topology/physical_package_id     |   1 +
+ .../cpu/cpu2/topology/thread_siblings         |   1 +
+ .../cpu/cpu2/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu3/online            |   1 +
+ .../cpu/cpu3/topology/core_cpus               |   1 +
+ .../cpu/cpu3/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu3/topology/core_id  |   1 +
+ .../cpu/cpu3/topology/core_siblings           |   1 +
+ .../cpu/cpu3/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu3/topology/die_cpus |   1 +
+ .../cpu/cpu3/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu3/topology/die_id   |   1 +
+ .../cpu/cpu3/topology/package_cpus            |   1 +
+ .../cpu/cpu3/topology/package_cpus_list       |   1 +
+ .../cpu/cpu3/topology/physical_package_id     |   1 +
+ .../cpu/cpu3/topology/thread_siblings         |   1 +
+ .../cpu/cpu3/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu4/online            |   1 +
+ .../cpu/cpu4/topology/core_cpus               |   1 +
+ .../cpu/cpu4/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu4/topology/core_id  |   1 +
+ .../cpu/cpu4/topology/core_siblings           |   1 +
+ .../cpu/cpu4/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu4/topology/die_cpus |   1 +
+ .../cpu/cpu4/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu4/topology/die_id   |   1 +
+ .../cpu/cpu4/topology/package_cpus            |   1 +
+ .../cpu/cpu4/topology/package_cpus_list       |   1 +
+ .../cpu/cpu4/topology/physical_package_id     |   1 +
+ .../cpu/cpu4/topology/thread_siblings         |   1 +
+ .../cpu/cpu4/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu5/online            |   1 +
+ .../cpu/cpu5/topology/core_cpus               |   1 +
+ .../cpu/cpu5/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu5/topology/core_id  |   1 +
+ .../cpu/cpu5/topology/core_siblings           |   1 +
+ .../cpu/cpu5/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu5/topology/die_cpus |   1 +
+ .../cpu/cpu5/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu5/topology/die_id   |   1 +
+ .../cpu/cpu5/topology/package_cpus            |   1 +
+ .../cpu/cpu5/topology/package_cpus_list       |   1 +
+ .../cpu/cpu5/topology/physical_package_id     |   1 +
+ .../cpu/cpu5/topology/thread_siblings         |   1 +
+ .../cpu/cpu5/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu6/online            |   1 +
+ .../cpu/cpu6/topology/core_cpus               |   1 +
+ .../cpu/cpu6/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu6/topology/core_id  |   1 +
+ .../cpu/cpu6/topology/core_siblings           |   1 +
+ .../cpu/cpu6/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu6/topology/die_cpus |   1 +
+ .../cpu/cpu6/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu6/topology/die_id   |   1 +
+ .../cpu/cpu6/topology/package_cpus            |   1 +
+ .../cpu/cpu6/topology/package_cpus_list       |   1 +
+ .../cpu/cpu6/topology/physical_package_id     |   1 +
+ .../cpu/cpu6/topology/thread_siblings         |   1 +
+ .../cpu/cpu6/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu7/online            |   1 +
+ .../cpu/cpu7/topology/core_cpus               |   1 +
+ .../cpu/cpu7/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu7/topology/core_id  |   1 +
+ .../cpu/cpu7/topology/core_siblings           |   1 +
+ .../cpu/cpu7/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu7/topology/die_cpus |   1 +
+ .../cpu/cpu7/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu7/topology/die_id   |   1 +
+ .../cpu/cpu7/topology/package_cpus            |   1 +
+ .../cpu/cpu7/topology/package_cpus_list       |   1 +
+ .../cpu/cpu7/topology/physical_package_id     |   1 +
+ .../cpu/cpu7/topology/thread_siblings         |   1 +
+ .../cpu/cpu7/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu8/online            |   1 +
+ .../cpu/cpu8/topology/core_cpus               |   1 +
+ .../cpu/cpu8/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu8/topology/core_id  |   1 +
+ .../cpu/cpu8/topology/core_siblings           |   1 +
+ .../cpu/cpu8/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu8/topology/die_cpus |   1 +
+ .../cpu/cpu8/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu8/topology/die_id   |   1 +
+ .../cpu/cpu8/topology/package_cpus            |   1 +
+ .../cpu/cpu8/topology/package_cpus_list       |   1 +
+ .../cpu/cpu8/topology/physical_package_id     |   1 +
+ .../cpu/cpu8/topology/thread_siblings         |   1 +
+ .../cpu/cpu8/topology/thread_siblings_list    |   1 +
+ .../linux-with-die/cpu/cpu9/online            |   1 +
+ .../cpu/cpu9/topology/core_cpus               |   1 +
+ .../cpu/cpu9/topology/core_cpus_list          |   1 +
+ .../linux-with-die/cpu/cpu9/topology/core_id  |   1 +
+ .../cpu/cpu9/topology/core_siblings           |   1 +
+ .../cpu/cpu9/topology/core_siblings_list      |   1 +
+ .../linux-with-die/cpu/cpu9/topology/die_cpus |   1 +
+ .../cpu/cpu9/topology/die_cpus_list           |   1 +
+ .../linux-with-die/cpu/cpu9/topology/die_id   |   1 +
+ .../cpu/cpu9/topology/package_cpus            |   1 +
+ .../cpu/cpu9/topology/package_cpus_list       |   1 +
+ .../cpu/cpu9/topology/physical_package_id     |   1 +
+ .../cpu/cpu9/topology/thread_siblings         |   1 +
+ .../cpu/cpu9/topology/thread_siblings_list    |   1 +
+ .../virhostcpudata/linux-with-die/cpu/online  |   1 +
+ .../virhostcpudata/linux-with-die/cpu/present |   1 +
+ .../linux-with-die/node/node0/cpu0            |   1 +
+ .../linux-with-die/node/node0/cpu1            |   1 +
+ .../linux-with-die/node/node0/cpu10           |   1 +
+ .../linux-with-die/node/node0/cpu11           |   1 +
+ .../linux-with-die/node/node0/cpu2            |   1 +
+ .../linux-with-die/node/node0/cpu3            |   1 +
+ .../linux-with-die/node/node0/cpu4            |   1 +
+ .../linux-with-die/node/node0/cpu5            |   1 +
+ .../linux-with-die/node/node0/cpu6            |   1 +
+ .../linux-with-die/node/node0/cpu7            |   1 +
+ .../linux-with-die/node/node0/cpu8            |   1 +
+ .../linux-with-die/node/node0/cpu9            |   1 +
+ .../linux-with-die/node/node0/cpulist         |   1 +
+ .../virhostcpudata/linux-with-die/node/online |   1 +
+ .../linux-with-die/node/possible              |   1 +
+ .../linux-x86_64-with-die.cpuinfo             | 323 ++++++++++++++++++
+ .../linux-x86_64-with-die.expected            |   1 +
+ tests/virhostcputest.c                        |   1 +
+ 191 files changed, 547 insertions(+)
+ create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/cpu
+ create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/node
+ create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/cpu/present
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu0
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu1
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu10
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu11
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu2
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu3
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu4
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu5
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu6
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu7
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu8
+ create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu9
+ create mode 100644 tests/virhostcpudata/linux-with-die/node/node0/cpulist
+ create mode 100644 tests/virhostcpudata/linux-with-die/node/online
+ create mode 100644 tests/virhostcpudata/linux-with-die/node/possible
+ create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
+ create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.expected
+
+diff --git a/tests/vircaps2xmldata/linux-basic-dies/system/cpu b/tests/vircaps2xmldata/linux-basic-dies/system/cpu
+new file mode 120000
+index 0000000000..af158a7097
+--- /dev/null
++++ b/tests/vircaps2xmldata/linux-basic-dies/system/cpu
+@@ -0,0 +1 @@
++../../../virhostcpudata/linux-with-die/cpu
+\ No newline at end of file
+diff --git a/tests/vircaps2xmldata/linux-basic-dies/system/node b/tests/vircaps2xmldata/linux-basic-dies/system/node
+new file mode 120000
+index 0000000000..68bc88ea14
+--- /dev/null
++++ b/tests/vircaps2xmldata/linux-basic-dies/system/node
+@@ -0,0 +1 @@
++../../../virhostcpudata/linux-with-die/node
+\ No newline at end of file
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
+new file mode 100644
+index 0000000000..8a3ca2d13c
+--- /dev/null
++++ b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
+@@ -0,0 +1,35 @@
++<capabilities>
++
++  <host>
++    <cpu>
++      <arch>x86_64</arch>
++    </cpu>
++    <power_management/>
++    <iommu support='no'/>
++    <topology>
++      <cells num='1'>
++        <cell id='0'>
++          <memory unit='KiB'>1048576</memory>
++          <pages unit='KiB' size='4'>2048</pages>
++          <pages unit='KiB' size='2048'>4096</pages>
++          <pages unit='KiB' size='1048576'>6144</pages>
++          <cpus num='12'>
++            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
++            <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/>
++            <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/>
++            <cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/>
++            <cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/>
++            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
++            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
++            <cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/>
++            <cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/>
++            <cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/>
++            <cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/>
++          </cpus>
++        </cell>
++      </cells>
++    </topology>
++  </host>
++
++</capabilities>
+diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
+index 6c08a26ec4..17cd600a7a 100644
+--- a/tests/vircaps2xmltest.c
++++ b/tests/vircaps2xmltest.c
+@@ -102,6 +102,7 @@ mymain(void)
+ 
+     DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
+     DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
++    DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false);
+ 
+     DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
+ 
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
+new file mode 100644
+index 0000000000..5325a8dff7
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
+@@ -0,0 +1 @@
++001
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
+new file mode 100644
+index 0000000000..d7887218f9
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
+@@ -0,0 +1 @@
++003
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
+new file mode 100644
+index 0000000000..5325a8dff7
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
+@@ -0,0 +1 @@
++001
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/online b/tests/virhostcpudata/linux-with-die/cpu/cpu1/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
+new file mode 100644
+index 0000000000..5902f77e7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
+@@ -0,0 +1 @@
++002
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
+new file mode 100644
+index 0000000000..d7887218f9
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
+@@ -0,0 +1 @@
++003
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
+new file mode 100644
+index 0000000000..5902f77e7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
+@@ -0,0 +1 @@
++002
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/online b/tests/virhostcpudata/linux-with-die/cpu/cpu10/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
+new file mode 100644
+index 0000000000..d411bb7c1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
+@@ -0,0 +1 @@
++400
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
+new file mode 100644
+index 0000000000..f599e28b8a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
+@@ -0,0 +1 @@
++10
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
+new file mode 100644
+index 0000000000..a94266dd91
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
+@@ -0,0 +1 @@
++c00
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
+new file mode 100644
+index 0000000000..ac93dc4496
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
+@@ -0,0 +1 @@
++10-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
+new file mode 100644
+index 0000000000..0cfbf08886
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
+@@ -0,0 +1 @@
++2
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
+new file mode 100644
+index 0000000000..d411bb7c1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
+@@ -0,0 +1 @@
++400
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..f599e28b8a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
+@@ -0,0 +1 @@
++10
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/online b/tests/virhostcpudata/linux-with-die/cpu/cpu11/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
+new file mode 100644
+index 0000000000..5ae5aef844
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
+@@ -0,0 +1 @@
++800
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
+new file mode 100644
+index 0000000000..b4de394767
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
+@@ -0,0 +1 @@
++11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
+new file mode 100644
+index 0000000000..a94266dd91
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
+@@ -0,0 +1 @@
++c00
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
+new file mode 100644
+index 0000000000..ac93dc4496
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
+@@ -0,0 +1 @@
++10-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
+new file mode 100644
+index 0000000000..0cfbf08886
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
+@@ -0,0 +1 @@
++2
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
+new file mode 100644
+index 0000000000..5ae5aef844
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
+@@ -0,0 +1 @@
++800
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..b4de394767
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
+@@ -0,0 +1 @@
++11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/online b/tests/virhostcpudata/linux-with-die/cpu/cpu2/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
+new file mode 100644
+index 0000000000..8f3cca4f01
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
+@@ -0,0 +1 @@
++004
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
+new file mode 100644
+index 0000000000..0cfbf08886
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
+@@ -0,0 +1 @@
++2
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
+new file mode 100644
+index 0000000000..3138e83a00
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
+@@ -0,0 +1 @@
++00c
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
+new file mode 100644
+index 0000000000..8f3cca4f01
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
+@@ -0,0 +1 @@
++004
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..0cfbf08886
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
+@@ -0,0 +1 @@
++2
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/online b/tests/virhostcpudata/linux-with-die/cpu/cpu3/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
+new file mode 100644
+index 0000000000..e195199bee
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
+@@ -0,0 +1 @@
++008
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
+new file mode 100644
+index 0000000000..00750edc07
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
+@@ -0,0 +1 @@
++3
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
+new file mode 100644
+index 0000000000..3138e83a00
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
+@@ -0,0 +1 @@
++00c
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
+new file mode 100644
+index 0000000000..e195199bee
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
+@@ -0,0 +1 @@
++008
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..00750edc07
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
+@@ -0,0 +1 @@
++3
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/online b/tests/virhostcpudata/linux-with-die/cpu/cpu4/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
+new file mode 100644
+index 0000000000..9e8493eaee
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
+@@ -0,0 +1 @@
++010
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
+new file mode 100644
+index 0000000000..b8626c4cff
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
+@@ -0,0 +1 @@
++4
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
+new file mode 100644
+index 0000000000..cadb715e0d
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
+@@ -0,0 +1 @@
++030
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
+new file mode 100644
+index 0000000000..0cfbf08886
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
+@@ -0,0 +1 @@
++2
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
+new file mode 100644
+index 0000000000..9e8493eaee
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
+@@ -0,0 +1 @@
++010
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..b8626c4cff
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
+@@ -0,0 +1 @@
++4
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/online b/tests/virhostcpudata/linux-with-die/cpu/cpu5/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
+new file mode 100644
+index 0000000000..fb6187e9e0
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
+@@ -0,0 +1 @@
++020
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
+new file mode 100644
+index 0000000000..7ed6ff82de
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
+@@ -0,0 +1 @@
++5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
+new file mode 100644
+index 0000000000..cadb715e0d
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
+@@ -0,0 +1 @@
++030
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
+new file mode 100644
+index 0000000000..0cfbf08886
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
+@@ -0,0 +1 @@
++2
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
+new file mode 100644
+index 0000000000..d37ac748bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
+@@ -0,0 +1 @@
++03f
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
+new file mode 100644
+index 0000000000..82a99f2907
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
+new file mode 100644
+index 0000000000..fb6187e9e0
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
+@@ -0,0 +1 @@
++020
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..7ed6ff82de
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
+@@ -0,0 +1 @@
++5
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/online b/tests/virhostcpudata/linux-with-die/cpu/cpu6/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
+new file mode 100644
+index 0000000000..9070bc3017
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
+@@ -0,0 +1 @@
++040
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
+new file mode 100644
+index 0000000000..1e8b314962
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
+@@ -0,0 +1 @@
++6
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
+new file mode 100644
+index 0000000000..8f0552ead0
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
+@@ -0,0 +1 @@
++0c0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
+new file mode 100644
+index 0000000000..9070bc3017
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
+@@ -0,0 +1 @@
++040
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..1e8b314962
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
+@@ -0,0 +1 @@
++6
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/online b/tests/virhostcpudata/linux-with-die/cpu/cpu7/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
+new file mode 100644
+index 0000000000..fa5c7835bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
+@@ -0,0 +1 @@
++080
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
+new file mode 100644
+index 0000000000..7f8f011eb7
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
+@@ -0,0 +1 @@
++7
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
+new file mode 100644
+index 0000000000..8f0552ead0
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
+@@ -0,0 +1 @@
++0c0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
+new file mode 100644
+index 0000000000..fa5c7835bd
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
+@@ -0,0 +1 @@
++080
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..7f8f011eb7
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
+@@ -0,0 +1 @@
++7
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/online b/tests/virhostcpudata/linux-with-die/cpu/cpu8/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
+new file mode 100644
+index 0000000000..29d6383b52
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
+@@ -0,0 +1 @@
++100
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
+new file mode 100644
+index 0000000000..45a4fb75db
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
+@@ -0,0 +1 @@
++8
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
+new file mode 100644
+index 0000000000..697cb3a26d
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
+@@ -0,0 +1 @@
++300
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
+new file mode 100644
+index 0000000000..63edceec1e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
+@@ -0,0 +1 @@
++8-9
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
+new file mode 100644
+index 0000000000..29d6383b52
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
+@@ -0,0 +1 @@
++100
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..45a4fb75db
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
+@@ -0,0 +1 @@
++8
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/online b/tests/virhostcpudata/linux-with-die/cpu/cpu9/online
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/online
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
+new file mode 100644
+index 0000000000..08839f6bb2
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
+@@ -0,0 +1 @@
++200
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
+new file mode 100644
+index 0000000000..ec635144f6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
+@@ -0,0 +1 @@
++9
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
+new file mode 100644
+index 0000000000..697cb3a26d
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
+@@ -0,0 +1 @@
++300
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
+new file mode 100644
+index 0000000000..63edceec1e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
+@@ -0,0 +1 @@
++8-9
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
+new file mode 100644
+index 0000000000..6c3274debe
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
+@@ -0,0 +1 @@
++fc0
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
+new file mode 100644
+index 0000000000..fd6c445982
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
+@@ -0,0 +1 @@
++6-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
+new file mode 100644
+index 0000000000..08839f6bb2
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
+@@ -0,0 +1 @@
++200
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..ec635144f6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
+@@ -0,0 +1 @@
++9
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/online b/tests/virhostcpudata/linux-with-die/cpu/online
+new file mode 100644
+index 0000000000..536e621dcc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/online
+@@ -0,0 +1 @@
++0-11
+diff --git a/tests/virhostcpudata/linux-with-die/cpu/present b/tests/virhostcpudata/linux-with-die/cpu/present
+new file mode 100644
+index 0000000000..536e621dcc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/cpu/present
+@@ -0,0 +1 @@
++0-11
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu0 b/tests/virhostcpudata/linux-with-die/node/node0/cpu0
+new file mode 120000
+index 0000000000..c841bea28b
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu0
+@@ -0,0 +1 @@
++../../cpu/cpu0
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu1 b/tests/virhostcpudata/linux-with-die/node/node0/cpu1
+new file mode 120000
+index 0000000000..5f4536279e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu1
+@@ -0,0 +1 @@
++../../cpu/cpu1
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu10 b/tests/virhostcpudata/linux-with-die/node/node0/cpu10
+new file mode 120000
+index 0000000000..a6dc6bb10e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu10
+@@ -0,0 +1 @@
++../../cpu/cpu10
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu11 b/tests/virhostcpudata/linux-with-die/node/node0/cpu11
+new file mode 120000
+index 0000000000..e29d898284
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu11
+@@ -0,0 +1 @@
++../../cpu/cpu11
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu2 b/tests/virhostcpudata/linux-with-die/node/node0/cpu2
+new file mode 120000
+index 0000000000..2dcca332ce
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu2
+@@ -0,0 +1 @@
++../../cpu/cpu2
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu3 b/tests/virhostcpudata/linux-with-die/node/node0/cpu3
+new file mode 120000
+index 0000000000..c7690e5aa6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu3
+@@ -0,0 +1 @@
++../../cpu/cpu3
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu4 b/tests/virhostcpudata/linux-with-die/node/node0/cpu4
+new file mode 120000
+index 0000000000..9e77a64eb4
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu4
+@@ -0,0 +1 @@
++../../cpu/cpu4
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu5 b/tests/virhostcpudata/linux-with-die/node/node0/cpu5
+new file mode 120000
+index 0000000000..cc07c3b97b
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu5
+@@ -0,0 +1 @@
++../../cpu/cpu5
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu6 b/tests/virhostcpudata/linux-with-die/node/node0/cpu6
+new file mode 120000
+index 0000000000..2e7576354f
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu6
+@@ -0,0 +1 @@
++../../cpu/cpu6
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu7 b/tests/virhostcpudata/linux-with-die/node/node0/cpu7
+new file mode 120000
+index 0000000000..09e3f79b43
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu7
+@@ -0,0 +1 @@
++../../cpu/cpu7
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu8 b/tests/virhostcpudata/linux-with-die/node/node0/cpu8
+new file mode 120000
+index 0000000000..bda10cc343
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu8
+@@ -0,0 +1 @@
++../../cpu/cpu8
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu9 b/tests/virhostcpudata/linux-with-die/node/node0/cpu9
+new file mode 120000
+index 0000000000..1ec1db255a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu9
+@@ -0,0 +1 @@
++../../cpu/cpu9
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpulist b/tests/virhostcpudata/linux-with-die/node/node0/cpulist
+new file mode 100644
+index 0000000000..536e621dcc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/node0/cpulist
+@@ -0,0 +1 @@
++0-11
+diff --git a/tests/virhostcpudata/linux-with-die/node/online b/tests/virhostcpudata/linux-with-die/node/online
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/online
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-die/node/possible b/tests/virhostcpudata/linux-with-die/node/possible
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-die/node/possible
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
+new file mode 100644
+index 0000000000..f57be77f0c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
+@@ -0,0 +1,323 @@
++processor	: 0
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 0
++siblings	: 6
++core id		: 0
++cpu cores	: 6
++apicid		: 0
++initial apicid	: 0
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 1
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 0
++siblings	: 6
++core id		: 1
++cpu cores	: 6
++apicid		: 1
++initial apicid	: 1
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 2
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 0
++siblings	: 6
++core id		: 0
++cpu cores	: 6
++apicid		: 2
++initial apicid	: 2
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 3
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 0
++siblings	: 6
++core id		: 1
++cpu cores	: 6
++apicid		: 3
++initial apicid	: 3
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 4
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 0
++siblings	: 6
++core id		: 0
++cpu cores	: 6
++apicid		: 4
++initial apicid	: 4
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 5
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 0
++siblings	: 6
++core id		: 1
++cpu cores	: 6
++apicid		: 5
++initial apicid	: 5
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 6
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 1
++siblings	: 6
++core id		: 0
++cpu cores	: 6
++apicid		: 8
++initial apicid	: 8
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 7
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 1
++siblings	: 6
++core id		: 1
++cpu cores	: 6
++apicid		: 9
++initial apicid	: 9
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 8
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 1
++siblings	: 6
++core id		: 0
++cpu cores	: 6
++apicid		: 10
++initial apicid	: 10
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 9
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 1
++siblings	: 6
++core id		: 1
++cpu cores	: 6
++apicid		: 11
++initial apicid	: 11
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 10
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 1
++siblings	: 6
++core id		: 0
++cpu cores	: 6
++apicid		: 12
++initial apicid	: 12
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
++
++processor	: 11
++vendor_id	: GenuineIntel
++cpu family	: 6
++model		: 6
++model name	: QEMU Virtual CPU version 2.5+
++stepping	: 3
++microcode	: 0x1
++cpu MHz		: 1897.801
++cache size	: 16384 KB
++physical id	: 1
++siblings	: 6
++core id		: 1
++cpu cores	: 6
++apicid		: 13
++initial apicid	: 13
++fpu		: yes
++fpu_exception	: yes
++cpuid level	: 31
++wp		: yes
++flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
++bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
++bogomips	: 3795.60
++clflush size	: 64
++cache_alignment	: 64
++address sizes	: 40 bits physical, 48 bits virtual
++power management:
+diff --git a/tests/virhostcpudata/linux-x86_64-with-die.expected b/tests/virhostcpudata/linux-x86_64-with-die.expected
+new file mode 100644
+index 0000000000..3c045f483a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-x86_64-with-die.expected
+@@ -0,0 +1 @@
++CPUs: 12/12, MHz: 1897, Nodes: 1, Sockets: 1, Cores: 12, Threads: 1
+diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
+index 05c6f5acfb..7865b61578 100644
+--- a/tests/virhostcputest.c
++++ b/tests/virhostcputest.c
+@@ -248,6 +248,7 @@ mymain(void)
+         /* subcores, invalid configuration */
+         {"subcores3", VIR_ARCH_PPC64},
+         {"with-frequency", VIR_ARCH_S390X},
++        {"with-die", VIR_ARCH_X86_64},
+     };
+ 
+     if (virInitialize() < 0)
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-extract-hugepages-numa-default-dimm-out-of-hugepages-numa.patch b/SOURCES/libvirt-tests-extract-hugepages-numa-default-dimm-out-of-hugepages-numa.patch
deleted file mode 100644
index f75d6e3..0000000
--- a/SOURCES/libvirt-tests-extract-hugepages-numa-default-dimm-out-of-hugepages-numa.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From b25627269a94eb7fca6336bd97f4484818897f76 Mon Sep 17 00:00:00 2001
-Message-Id: <b25627269a94eb7fca6336bd97f4484818897f76@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:37 +0200
-Subject: [PATCH] tests: extract hugepages-numa-default-dimm out of
- hugepages-numa
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit c8a8c7ebbabb0d96bf18a7e75e99efbd8ccc6d50)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../hugepages-numa-default-dimm.args          | 31 +++++++++++++
- .../hugepages-numa-default-dimm.xml           | 45 +++++++++++++++++++
- tests/qemuxml2argvdata/hugepages-numa.args    |  6 +--
- tests/qemuxml2argvdata/hugepages-numa.xml     | 11 -----
- tests/qemuxml2argvtest.c                      |  2 +
- .../hugepages-numa-default-dimm.xml           |  1 +
- tests/qemuxml2xmltest.c                       |  1 +
- 7 files changed, 81 insertions(+), 16 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
- create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
- create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-new file mode 100644
-index 0000000000..855966a137
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-@@ -0,0 +1,31 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-x86_64 \
-+-name fedora \
-+-S \
-+-machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-+-m size=1048576k,slots=16,maxmem=1099511627776k \
-+-smp 2,sockets=2,cores=1,threads=1 \
-+-mem-prealloc \
-+-mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
-+-numa node,nodeid=0,cpus=0-1,mem=1024 \
-+-object memory-backend-file,id=memdimm0,prealloc=yes,\
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\
-+host-nodes=1-3,policy=bind \
-+-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
-new file mode 100644
-index 0000000000..14a3368678
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
-@@ -0,0 +1,45 @@
-+<domain type='qemu'>
-+  <name>fedora</name>
-+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-+  <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory>
-+  <memory unit='KiB'>1572863</memory>
-+  <currentMemory unit='KiB'>1048576</currentMemory>
-+  <memoryBacking>
-+    <hugepages/>
-+  </memoryBacking>
-+  <vcpu placement='static'>2</vcpu>
-+  <os>
-+    <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu>
-+    <numa>
-+      <cell id='0' cpus='0-1' memory='1048576' 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-x86_64</emulator>
-+    <controller type='usb' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <memballoon model='none'/>
-+    <memory model='dimm'>
-+      <source>
-+        <nodemask>1-3</nodemask>
-+        <pagesize unit='KiB'>1048576</pagesize>
-+      </source>
-+      <target>
-+        <size unit='KiB'>1048576</size>
-+        <node>0</node>
-+      </target>
-+      <address type='dimm' slot='0'/>
-+    </memory>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/hugepages-numa.args b/tests/qemuxml2argvdata/hugepages-numa.args
-index aa834f5511..20c7802fd8 100644
---- a/tests/qemuxml2argvdata/hugepages-numa.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa.args
-@@ -8,15 +8,11 @@ QEMU_AUDIO_DRV=spice \
- -name fedora \
- -S \
- -machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
---m size=1048576k,slots=16,maxmem=1099511627776k \
-+-m 1024 \
- -smp 2,sockets=2,cores=1,threads=1 \
- -mem-prealloc \
- -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
- -numa node,nodeid=0,cpus=0-1,mem=1024 \
---object memory-backend-file,id=memdimm0,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\
--host-nodes=1-3,policy=bind \
---device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
- -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
- -no-user-config \
- -nodefaults \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa.xml b/tests/qemuxml2argvdata/hugepages-numa.xml
-index eef471b4ec..d3c6308be0 100644
---- a/tests/qemuxml2argvdata/hugepages-numa.xml
-+++ b/tests/qemuxml2argvdata/hugepages-numa.xml
-@@ -1,7 +1,6 @@
- <domain type='qemu'>
-   <name>fedora</name>
-   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
--  <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory>
-   <memory unit='KiB'>1572863</memory>
-   <currentMemory unit='KiB'>1048576</currentMemory>
-   <memoryBacking>
-@@ -97,15 +96,5 @@
-     <memballoon model='virtio'>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
-     </memballoon>
--    <memory model='dimm'>
--      <source>
--        <nodemask>1-3</nodemask>
--        <pagesize unit='KiB'>1048576</pagesize>
--      </source>
--      <target>
--        <size unit='KiB'>1048576</size>
--        <node>0</node>
--      </target>
--    </memory>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 01553ada38..a97b48525a 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -953,6 +953,8 @@ mymain(void)
-             QEMU_CAPS_SPICE,
-             QEMU_CAPS_DEVICE_QXL,
-             QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE);
-+    DO_TEST("hugepages-numa-default-dimm",
-             QEMU_CAPS_DEVICE_PC_DIMM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages",
-diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml
-new file mode 120000
-index 0000000000..8fa2b323aa
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/hugepages-numa-default-dimm.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index f0cabc422d..5900f4de61 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -331,6 +331,7 @@ mymain(void)
-     DO_TEST("pmu-feature-off", NONE);
- 
-     DO_TEST("hugepages-default", NONE);
-+    DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-pages", NONE);
-     DO_TEST("hugepages-pages2", NONE);
-     DO_TEST("hugepages-pages3", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-extract-pages-discard-hugepages-out-of-hugepages-pages3.patch b/SOURCES/libvirt-tests-extract-pages-discard-hugepages-out-of-hugepages-pages3.patch
deleted file mode 100644
index 28a4dfe..0000000
--- a/SOURCES/libvirt-tests-extract-pages-discard-hugepages-out-of-hugepages-pages3.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 75affd738b5f6024066cf8023ccd7fa145828144 Mon Sep 17 00:00:00 2001
-Message-Id: <75affd738b5f6024066cf8023ccd7fa145828144@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:43 +0200
-Subject: [PATCH] tests: extract pages-discard-hugepages out of
- hugepages-pages3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Similar thing happens as for pages-discard, it is not passed to QEMU.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 9a6674c0ff5c5857fcf9b8e5aded1f524cf75d44)
-
-Conflicts:
-    tests/qemuxml2argvdata/pages-discard-hugepages.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/qemuxml2argvdata/hugepages-pages3.args  |  3 +-
- tests/qemuxml2argvdata/hugepages-pages3.xml   |  4 +--
- .../pages-discard-hugepages.args              | 28 +++++++++++++++
- .../pages-discard-hugepages.xml               | 34 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  7 ++--
- tests/qemuxml2xmloutdata/hugepages-pages3.xml |  4 +--
- .../pages-discard-hugepages.xml               |  1 +
- tests/qemuxml2xmltest.c                       |  1 +
- 8 files changed, 74 insertions(+), 8 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.args
- create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.xml
- create mode 120000 tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages3.args b/tests/qemuxml2argvdata/hugepages-pages3.args
-index d55265cdd8..2fc701ca22 100644
---- a/tests/qemuxml2argvdata/hugepages-pages3.args
-+++ b/tests/qemuxml2argvdata/hugepages-pages3.args
-@@ -13,8 +13,7 @@ QEMU_AUDIO_DRV=none \
- -object memory-backend-ram,id=ram-node0,size=268435456 \
- -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
- -object memory-backend-file,id=ram-node1,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,\
--discard-data=yes,size=805306368 \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,size=805306368 \
- -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
- -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
- -display none \
-diff --git a/tests/qemuxml2argvdata/hugepages-pages3.xml b/tests/qemuxml2argvdata/hugepages-pages3.xml
-index 147acc4c95..3d3b3f3cc3 100644
---- a/tests/qemuxml2argvdata/hugepages-pages3.xml
-+++ b/tests/qemuxml2argvdata/hugepages-pages3.xml
-@@ -15,8 +15,8 @@
-   </os>
-   <cpu>
-     <numa>
--      <cell id='0' cpus='0' memory='262144' unit='KiB' discard='no'/>
--      <cell id='1' cpus='1' memory='786432' unit='KiB' discard='yes'/>
-+      <cell id='0' cpus='0' memory='262144' unit='KiB'/>
-+      <cell id='1' cpus='1' memory='786432' unit='KiB'/>
-     </numa>
-   </cpu>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
-new file mode 100644
-index 0000000000..2dfacefe4a
---- /dev/null
-+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
-@@ -0,0 +1,28 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name SomeDummyHugepagesGuest \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 1024 \
-+-smp 2,sockets=2,cores=1,threads=1 \
-+-mem-prealloc \
-+-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
-+-numa node,nodeid=0,cpus=0,mem=256 \
-+-numa node,nodeid=1,cpus=1,mem=768 \
-+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,\
-+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb
-diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
-new file mode 100644
-index 0000000000..d1620d1946
---- /dev/null
-+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
-@@ -0,0 +1,34 @@
-+<domain type='qemu'>
-+  <name>SomeDummyHugepagesGuest</name>
-+  <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <currentMemory unit='KiB'>1048576</currentMemory>
-+  <memoryBacking>
-+    <hugepages/>
-+  </memoryBacking>
-+  <vcpu placement='static'>2</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu>
-+    <numa>
-+      <cell id='0' cpus='0' memory='262144' unit='KiB' discard='no'/>
-+      <cell id='1' cpus='1' memory='786432' unit='KiB' discard='yes'/>
-+    </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-i686</emulator>
-+    <controller type='usb' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 6a79918f67..a95d2c1915 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -948,6 +948,10 @@ mymain(void)
-     DO_TEST("pages-discard",
-             QEMU_CAPS_OBJECT_MEMORY_FILE,
-             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-+    DO_TEST("pages-discard-hugepages",
-+            QEMU_CAPS_OBJECT_MEMORY_RAM,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-@@ -961,8 +965,7 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
--            QEMU_CAPS_OBJECT_MEMORY_FILE,
--            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-+            QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-shared",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
-index 90e6efa5ea..be21c3eddd 100644
---- a/tests/qemuxml2xmloutdata/hugepages-pages3.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-pages3.xml
-@@ -15,8 +15,8 @@
-   </os>
-   <cpu>
-     <numa>
--      <cell id='0' cpus='0' memory='262144' unit='KiB' discard='no'/>
--      <cell id='1' cpus='1' memory='786432' unit='KiB' discard='yes'/>
-+      <cell id='0' cpus='0' memory='262144' unit='KiB'/>
-+      <cell id='1' cpus='1' memory='786432' unit='KiB'/>
-     </numa>
-   </cpu>
-   <clock offset='utc'/>
-diff --git a/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml b/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
-new file mode 120000
-index 0000000000..3d2f0682dc
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/pages-discard-hugepages.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index a4448ff168..83c0ffdfe2 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -331,6 +331,7 @@ mymain(void)
-     DO_TEST("pmu-feature-off", NONE);
- 
-     DO_TEST("pages-discard", NONE);
-+    DO_TEST("pages-discard-hugepages", NONE);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-extract-pages-discard-out-of-hugepages-pages.patch b/SOURCES/libvirt-tests-extract-pages-discard-out-of-hugepages-pages.patch
deleted file mode 100644
index 7b4d2ec..0000000
--- a/SOURCES/libvirt-tests-extract-pages-discard-out-of-hugepages-pages.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From d4bb90f58723489d9e25c09f4b709130d59d0274 Mon Sep 17 00:00:00 2001
-Message-Id: <d4bb90f58723489d9e25c09f4b709130d59d0274@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:40 +0200
-Subject: [PATCH] tests: extract pages-discard out of hugepages-pages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
->From the args output you can see that the 'discard' feature is not
-honored if you don't use hugepages, that is a bug, following patche
-will fix it.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit aa6a5e09953fea6d379dcb3a330a3fb6d0cf0a0b)
-
-Conflicts:
-    tests/qemuxml2argvdata/pages-discard.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/qemuxml2argvdata/hugepages-pages.args  | 12 +++----
- tests/qemuxml2argvdata/hugepages-pages.xml   |  3 +-
- tests/qemuxml2argvdata/pages-discard.args    | 28 +++++++++++++++
- tests/qemuxml2argvdata/pages-discard.xml     | 36 ++++++++++++++++++++
- tests/qemuxml2argvtest.c                     |  6 ++--
- tests/qemuxml2xmloutdata/hugepages-pages.xml |  3 +-
- tests/qemuxml2xmloutdata/pages-discard.xml   |  1 +
- tests/qemuxml2xmltest.c                      |  1 +
- 8 files changed, 78 insertions(+), 12 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/pages-discard.args
- create mode 100644 tests/qemuxml2argvdata/pages-discard.xml
- create mode 120000 tests/qemuxml2xmloutdata/pages-discard.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages.args b/tests/qemuxml2argvdata/hugepages-pages.args
-index b52cd581d5..7ece0272a0 100644
---- a/tests/qemuxml2argvdata/hugepages-pages.args
-+++ b/tests/qemuxml2argvdata/hugepages-pages.args
-@@ -11,20 +11,20 @@ QEMU_AUDIO_DRV=none \
- -m 4096 \
- -smp 4,sockets=4,cores=1,threads=1 \
- -object memory-backend-file,id=ram-node0,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=yes,\
--size=1073741824,host-nodes=0-3,policy=bind \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
-+host-nodes=0-3,policy=bind \
- -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
- -object memory-backend-file,id=ram-node1,prealloc=yes,\
- mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
- host-nodes=0-3,policy=bind \
- -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
- -object memory-backend-file,id=ram-node2,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=yes,\
--size=1073741824,host-nodes=0-3,policy=bind \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
-+host-nodes=0-3,policy=bind \
- -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
- -object memory-backend-file,id=ram-node3,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,discard-data=yes,\
--size=1073741824,host-nodes=3,policy=bind \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
-+host-nodes=3,policy=bind \
- -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
- -display none \
-diff --git a/tests/qemuxml2argvdata/hugepages-pages.xml b/tests/qemuxml2argvdata/hugepages-pages.xml
-index cba83e754c..f9270782d4 100644
---- a/tests/qemuxml2argvdata/hugepages-pages.xml
-+++ b/tests/qemuxml2argvdata/hugepages-pages.xml
-@@ -8,7 +8,6 @@
-       <page size='2048' unit='KiB' nodeset='1'/>
-       <page size='1048576' unit='KiB' nodeset='0,2-3'/>
-     </hugepages>
--    <discard/>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
-   <numatune>
-@@ -22,7 +21,7 @@
-   <cpu>
-     <numa>
-       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
--      <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
-+      <cell id='1' cpus='1' memory='1048576' unit='KiB'/>
-       <cell id='2' cpus='2' memory='1048576' unit='KiB'/>
-       <cell id='3' cpus='3' memory='1048576' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
-new file mode 100644
-index 0000000000..9db8c72a22
---- /dev/null
-+++ b/tests/qemuxml2argvdata/pages-discard.args
-@@ -0,0 +1,28 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 4096 \
-+-smp 4,sockets=4,cores=1,threads=1 \
-+-numa node,nodeid=0,cpus=0,mem=1024 \
-+-numa node,nodeid=1,cpus=1,mem=1024 \
-+-numa node,nodeid=2,cpus=2,mem=1024 \
-+-numa node,nodeid=3,cpus=3,mem=1024 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb
-diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml
-new file mode 100644
-index 0000000000..a8c6b74d95
---- /dev/null
-+++ b/tests/qemuxml2argvdata/pages-discard.xml
-@@ -0,0 +1,36 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>4194304</memory>
-+  <currentMemory unit='KiB'>4194304</currentMemory>
-+  <memoryBacking>
-+    <discard/>
-+  </memoryBacking>
-+  <vcpu placement='static'>4</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu>
-+    <numa>
-+      <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
-+      <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
-+      <cell id='2' cpus='2' memory='1048576' unit='KiB'/>
-+      <cell id='3' cpus='3' memory='1048576' 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-i686</emulator>
-+    <controller type='usb' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 19fb7a0931..ea26d17a63 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -945,6 +945,9 @@ mymain(void)
-     DO_TEST("pmu-feature", NONE);
-     DO_TEST("pmu-feature-off", NONE);
- 
-+    DO_TEST("pages-discard",
-+            QEMU_CAPS_OBJECT_MEMORY_FILE,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-@@ -953,8 +956,7 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
--            QEMU_CAPS_OBJECT_MEMORY_FILE,
--            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-+            QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages.xml b/tests/qemuxml2xmloutdata/hugepages-pages.xml
-index 292454588e..498610a217 100644
---- a/tests/qemuxml2xmloutdata/hugepages-pages.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-pages.xml
-@@ -8,7 +8,6 @@
-       <page size='2048' unit='KiB' nodeset='1'/>
-       <page size='1048576' unit='KiB' nodeset='0,2-3'/>
-     </hugepages>
--    <discard/>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
-   <numatune>
-@@ -22,7 +21,7 @@
-   <cpu>
-     <numa>
-       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
--      <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
-+      <cell id='1' cpus='1' memory='1048576' unit='KiB'/>
-       <cell id='2' cpus='2' memory='1048576' unit='KiB'/>
-       <cell id='3' cpus='3' memory='1048576' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/pages-discard.xml b/tests/qemuxml2xmloutdata/pages-discard.xml
-new file mode 120000
-index 0000000000..4d22fef81f
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/pages-discard.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/pages-discard.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 5900f4de61..b4bd9ebc4c 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -330,6 +330,7 @@ mymain(void)
-     DO_TEST("pmu-feature", NONE);
-     DO_TEST("pmu-feature-off", NONE);
- 
-+    DO_TEST("pages-discard", NONE);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-pages", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-fix-TLS-handshake-failure-with-TLS-1.3.patch b/SOURCES/libvirt-tests-fix-TLS-handshake-failure-with-TLS-1.3.patch
deleted file mode 100644
index d31c821..0000000
--- a/SOURCES/libvirt-tests-fix-TLS-handshake-failure-with-TLS-1.3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1e693fc723a8309b243b74c5baa7b7f0682d52f7 Mon Sep 17 00:00:00 2001
-Message-Id: <1e693fc723a8309b243b74c5baa7b7f0682d52f7@dist-git>
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 18 Jul 2018 19:21:06 +0100
-Subject: [PATCH] tests: fix TLS handshake failure with TLS 1.3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When gnutls negotiates TLS 1.3 instead of 1.2, the order of messages
-sent by the handshake changes. This exposed a logic bug in the test
-suite which caused us to wait for the server to see handshake
-completion, but not wait for the client to see completion. The result
-was the client didn't receive the certificate for verification and the
-test failed.
-
-This is exposed in Fedora 29 rawhide which has just enabled TLS 1.3 in
-its GNUTLS builds.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit cf92b90e3537631d5235a564f917a7a0fadac3e1)
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/virnettlssessiontest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
-index 7e85607181..375cc1bb02 100644
---- a/tests/virnettlssessiontest.c
-+++ b/tests/virnettlssessiontest.c
-@@ -180,7 +180,7 @@ static int testTLSSessionInit(const void *opaque)
-             if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE)
-                 clientShake = true;
-         }
--    } while (!clientShake && !serverShake);
-+    } while (!clientShake || !serverShake);
- 
- 
-     /* Finally make sure the server validation does what
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-hash-Test-case-for-adding-duplicate-hash-entry.patch b/SOURCES/libvirt-tests-hash-Test-case-for-adding-duplicate-hash-entry.patch
new file mode 100644
index 0000000..53106c2
--- /dev/null
+++ b/SOURCES/libvirt-tests-hash-Test-case-for-adding-duplicate-hash-entry.patch
@@ -0,0 +1,68 @@
+From cbdb97e438e9e45b4c0219e95a1d638d03faa8ae Mon Sep 17 00:00:00 2001
+Message-Id: <cbdb97e438e9e45b4c0219e95a1d638d03faa8ae@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:44 +0100
+Subject: [PATCH] tests: hash: Test case for adding duplicate hash entry
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Test that adding a duplicate entry is rejected properly. This also
+allows to see the error message of the duplicate key addition in verbose
+mode.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 7134f26b73162536b8bea2af860b32bad6a7f965)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <9bec2f7b4dc1be3ec963efa667c93ff225e9a0b6.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virhashtest.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/tests/virhashtest.c b/tests/virhashtest.c
+index 66fa3a428e..4d05cbb0f8 100644
+--- a/tests/virhashtest.c
++++ b/tests/virhashtest.c
+@@ -510,6 +510,28 @@ testHashEqual(const void *data G_GNUC_UNUSED)
+ }
+ 
+ 
++static int
++testHashDuplicate(const void *data G_GNUC_UNUSED)
++{
++    g_autoptr(virHashTable) hash = NULL;
++
++    if (!(hash = virHashCreate(0, NULL)))
++        return -1;
++
++    if (virHashAddEntry(hash, "a", NULL) < 0) {
++        VIR_TEST_VERBOSE("\nfailed to add key 'a' to hash");
++        return -1;
++    }
++
++    if (virHashAddEntry(hash, "a", NULL) >= 0) {
++        VIR_TEST_VERBOSE("\nadding of key 'a' should have failed");
++        return -1;
++    }
++
++    return 0;
++}
++
++
+ static int
+ mymain(void)
+ {
+@@ -546,6 +568,7 @@ mymain(void)
+     DO_TEST("Search", Search);
+     DO_TEST("GetItems", GetItems);
+     DO_TEST("Equal", Equal);
++    DO_TEST("Duplicate entry", Duplicate);
+ 
+     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-introduce-hugepages-default-1G-nodeset-2M.patch b/SOURCES/libvirt-tests-introduce-hugepages-default-1G-nodeset-2M.patch
deleted file mode 100644
index 4e98d97..0000000
--- a/SOURCES/libvirt-tests-introduce-hugepages-default-1G-nodeset-2M.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From b1ad796106c4f1e889312c67164cce53b01cbc17 Mon Sep 17 00:00:00 2001
-Message-Id: <b1ad796106c4f1e889312c67164cce53b01cbc17@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:50 +0200
-Subject: [PATCH] tests: introduce hugepages-default-1G-nodeset-2M
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This test case is currently working but it uncovers existing issue
-in our code that the generated QEMU commandline uses the default 1G
-hugepage instead of the 2M hugepage specified for exact node.
-
-The issue in our code is that for non-numa guests we take into account
-only the first hugepage.  This will be fixed as invalid configuration
-since it doesn't make any sense to set default and specific hugepage
-for non-numa guest.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 6ff69e936e4185983fc331c45b76d3b3d8b717ae)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../hugepages-default-1G-nodeset-2M.args      | 26 ++++++++++++++++
- .../hugepages-default-1G-nodeset-2M.xml       | 31 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  1 +
- .../hugepages-default-1G-nodeset-2M.xml       |  1 +
- tests/qemuxml2xmltest.c                       |  1 +
- 5 files changed, 60 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.args
- create mode 100644 tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
- create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.args b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.args
-new file mode 100644
-index 0000000000..d1f8974032
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.args
-@@ -0,0 +1,26 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name SomeDummyHugepagesGuest \
-+-S \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 1024 \
-+-mem-prealloc \
-+-mem-path /dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu \
-+-smp 2,sockets=2,cores=1,threads=1 \
-+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,\
-+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot c \
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
-new file mode 100644
-index 0000000000..eb0943b105
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
-@@ -0,0 +1,31 @@
-+<domain type='qemu'>
-+  <name>SomeDummyHugepagesGuest</name>
-+  <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <currentMemory unit='KiB'>1048576</currentMemory>
-+  <memoryBacking>
-+    <hugepages>
-+      <page size='1048576' unit='KiB'/>
-+      <page size='2048' unit='KiB' nodeset='0'/>
-+    </hugepages>
-+  </memoryBacking>
-+  <vcpu placement='static'>2</vcpu>
-+  <os>
-+    <type arch='i686' 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-i686</emulator>
-+    <controller type='usb' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index d4251eff3e..f92c46cec5 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -959,6 +959,7 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-+    DO_TEST("hugepages-default-1G-nodeset-2M", NONE);
-     DO_TEST_FAILURE("hugepages-nodeset-nonexist",
-                     QEMU_CAPS_DEVICE_PC_DIMM,
-                     QEMU_CAPS_OBJECT_MEMORY_FILE,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml
-new file mode 120000
-index 0000000000..3d8eb7616e
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-default-1G-nodeset-2M.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 6afc48f98e..6ba8f97e20 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -336,6 +336,7 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-+    DO_TEST("hugepages-default-1G-nodeset-2M", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-introduce-hugepages-nodeset.patch b/SOURCES/libvirt-tests-introduce-hugepages-nodeset.patch
deleted file mode 100644
index 874f18b..0000000
--- a/SOURCES/libvirt-tests-introduce-hugepages-nodeset.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From becdbd9b2155dccde29cfa859c4948cf9f8cab8a Mon Sep 17 00:00:00 2001
-Message-Id: <becdbd9b2155dccde29cfa859c4948cf9f8cab8a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:51 +0200
-Subject: [PATCH] tests: introduce hugepages-nodeset
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This use-case was broken by commit
-<fa6bdf6afa878b8d7c5ed71664ee72be8967cdc5>.
-
-We allowed this configuration and it was working as expected therefore
-we can consider it as regression.  We should have never allowed such
-configuration so now the best solution is in case of non-numa guest
-silently ignore the 'nodeset' attribute if it's set to '0'.
-
-That will be fixed by following patches.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 154b08a3a7b1f16fefefcc106982a062c065eacd)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/qemuxml2argvdata/hugepages-nodeset.xml  | 30 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  1 +
- .../qemuxml2xmloutdata/hugepages-nodeset.xml  |  1 +
- tests/qemuxml2xmltest.c                       |  1 +
- 4 files changed, 33 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/hugepages-nodeset.xml
- create mode 120000 tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2argvdata/hugepages-nodeset.xml
-new file mode 100644
-index 0000000000..4a85ddffad
---- /dev/null
-+++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml
-@@ -0,0 +1,30 @@
-+<domain type='qemu'>
-+  <name>SomeDummyHugepagesGuest</name>
-+  <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <currentMemory unit='KiB'>1048576</currentMemory>
-+  <memoryBacking>
-+    <hugepages>
-+      <page size='2048' unit='KiB' nodeset='0'/>
-+    </hugepages>
-+  </memoryBacking>
-+  <vcpu placement='static'>2</vcpu>
-+  <os>
-+    <type arch='i686' 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-i686</emulator>
-+    <controller type='usb' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index f92c46cec5..bd5fdf9412 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -960,6 +960,7 @@ mymain(void)
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-     DO_TEST("hugepages-default-1G-nodeset-2M", NONE);
-+    DO_TEST_FAILURE("hugepages-nodeset", NONE);
-     DO_TEST_FAILURE("hugepages-nodeset-nonexist",
-                     QEMU_CAPS_DEVICE_PC_DIMM,
-                     QEMU_CAPS_OBJECT_MEMORY_FILE,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-new file mode 120000
-index 0000000000..b55838b780
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/hugepages-nodeset.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 6ba8f97e20..acbe2f7133 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -337,6 +337,7 @@ mymain(void)
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-     DO_TEST("hugepages-default-1G-nodeset-2M", NONE);
-+    DO_TEST("hugepages-nodeset", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-qemu-Add-test-data-for-the-new-slice-element.patch b/SOURCES/libvirt-tests-qemu-Add-test-data-for-the-new-slice-element.patch
new file mode 100644
index 0000000..2666454
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemu-Add-test-data-for-the-new-slice-element.patch
@@ -0,0 +1,232 @@
+From 6e2efb5b67a6d1a65c4e4facb7013f5e24622591 Mon Sep 17 00:00:00 2001
+Message-Id: <6e2efb5b67a6d1a65c4e4facb7013f5e24622591@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:25 +0100
+Subject: [PATCH] tests: qemu: Add test data for the new <slice> element
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 293e7750c9c26ac19ed4fafa9c9f1fe3e90d5078)
+
+ Changes:
+  tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
+  tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
+
+ Due to missing backport of changes related to CPU detection there is
+ difference in the XML files in unrelated parts.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Message-Id: <21b28fdf8e4fc8aaf9a68b8c32be5d5a1fdedacc.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ .../disk-slices.x86_64-latest.args            | 52 ++++++++++++++++++
+ tests/qemuxml2argvdata/disk-slices.xml        | 45 ++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  2 +
+ .../disk-slices.x86_64-latest.xml             | 53 +++++++++++++++++++
+ tests/qemuxml2xmltest.c                       |  2 +
+ 5 files changed, 154 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
+ create mode 100644 tests/qemuxml2argvdata/disk-slices.xml
+ create mode 100644 tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
+
+diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
+new file mode 100644
+index 0000000000..661b3f7ea1
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
+@@ -0,0 +1,52 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-i386 \
++-name guest=QEMUGuest1,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
++-machine pc,accel=tcg,usb=off,dump-guest-core=off \
++-m 214 \
++-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,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-no-acpi \
++-boot strict=on \
++-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
++-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\
++"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
++"offset":1234,"size":321,"file":"libvirt-3-storage"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-3-format,\
++id=virtio-disk0,bootindex=1 \
++-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\
++"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"driver":"raw","node-name":"libvirt-2-slice-sto","offset":9876,\
++"size":123456789,"file":"libvirt-2-storage","auto-read-only":true,\
++"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow2",\
++"file":"libvirt-2-slice-sto","backing":null}' \
++-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/overlay.qcow2",\
++"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
++-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
++"file":"libvirt-1-storage","backing":"libvirt-2-format"}' \
++-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-1-format,\
++id=virtio-disk1 \
++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/disk-slices.xml b/tests/qemuxml2argvdata/disk-slices.xml
+new file mode 100644
+index 0000000000..cff7cc7ee4
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-slices.xml
+@@ -0,0 +1,45 @@
++<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='i686' 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-i386</emulator>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source file='/var/lib/libvirt/images/raw.img'>
++        <slices>
++          <slice type='storage' offset='1234' size='321'/>
++        </slices>
++      </source>
++      <backingStore/>
++      <target dev='vda' bus='virtio'/>
++    </disk>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2'/>
++      <source file='/var/lib/libvirt/images/overlay.qcow2'/>
++      <backingStore type='file'>
++        <format type='qcow2'/>
++        <source file='/var/lib/libvirt/images/raw.img'>
++          <slices>
++            <slice type='storage' offset='9876' size='123456789'/>
++          </slices>
++        </source>
++        <backingStore/>
++      </backingStore>
++      <target dev='vdb' bus='virtio'/>
++    </disk>
++    <controller type='usb'/>
++    <controller type='pci' model='pci-root'/>
++    <memballoon model='virtio'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 508dfee3fb..8215935bab 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1162,6 +1162,8 @@ mymain(void)
+     DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0");
+     DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
+ 
++    DO_TEST_CAPS_LATEST("disk-slices");
++
+     DO_TEST("graphics-egl-headless",
+             QEMU_CAPS_EGL_HEADLESS,
+             QEMU_CAPS_DEVICE_CIRRUS_VGA);
+diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
+new file mode 100644
+index 0000000000..8a56936910
+--- /dev/null
++++ b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
+@@ -0,0 +1,53 @@
++<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='i686' 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-i386</emulator>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='raw'/>
++      <source file='/var/lib/libvirt/images/raw.img'>
++        <slices>
++          <slice type='storage' offset='1234' size='321'/>
++        </slices>
++      </source>
++      <backingStore/>
++      <target dev='vda' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
++    </disk>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2'/>
++      <source file='/var/lib/libvirt/images/overlay.qcow2'/>
++      <backingStore type='file'>
++        <format type='qcow2'/>
++        <source file='/var/lib/libvirt/images/raw.img'>
++          <slices>
++            <slice type='storage' offset='9876' size='123456789'/>
++          </slices>
++        </source>
++        <backingStore/>
++      </backingStore>
++      <target dev='vdb' bus='virtio'/>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
++    </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'/>
++    <input type='mouse' bus='ps2'/>
++    <input type='keyboard' bus='ps2'/>
++    <memballoon model='virtio'>
++      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
++    </memballoon>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index 6a8ae9f7eb..a3c7f8fd47 100644
+--- a/tests/qemuxml2xmltest.c
++++ b/tests/qemuxml2xmltest.c
+@@ -527,6 +527,8 @@ mymain(void)
+     DO_TEST("pci-rom-disabled-invalid", NONE);
+     DO_TEST("pci-serial-dev-chardev", NONE);
+ 
++    DO_TEST_CAPS_LATEST("disk-slices");
++
+     DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
+     DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
+     DO_TEST("luks-disks", NONE);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemu-Remove-disk-from-graphics-vnc-tls.patch b/SOURCES/libvirt-tests-qemu-Remove-disk-from-graphics-vnc-tls.patch
deleted file mode 100644
index 78ccd29..0000000
--- a/SOURCES/libvirt-tests-qemu-Remove-disk-from-graphics-vnc-tls.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 6000c0194fe724e18bc0a61d69ae2899de8fe355 Mon Sep 17 00:00:00 2001
-Message-Id: <6000c0194fe724e18bc0a61d69ae2899de8fe355@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 28 Aug 2018 12:46:43 +0200
-Subject: [PATCH] tests: qemu: Remove disk from graphics-vnc-tls
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The disk command line is tested elsewhere.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a37d832c9179fa7fef2e54f596258fd4712146ab)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1598167
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- tests/qemuxml2argvdata/graphics-vnc-tls.args  | 2 --
- tests/qemuxml2argvdata/graphics-vnc-tls.xml   | 6 ------
- tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 6 ------
- 3 files changed, 14 deletions(-)
-
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
-index b87c2116a3..3668fa889d 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
-@@ -22,7 +22,5 @@ server,nowait \
- -no-acpi \
- -boot c \
- -usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
- -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
- -vga cirrus
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.xml b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
-index d0729e830d..079f6241c4 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls.xml
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
-@@ -14,12 +14,6 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'/>
-     <controller type='ide' index='0'/>
-     <controller type='pci' index='0' model='pci-root'/>
-diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
-index 7b53c2ae1f..dcbc4bcf1d 100644
---- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
-+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
-@@ -14,12 +14,6 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-     </controller>
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-qemu-add-disk-error-policy-tests-for-s390x.patch b/SOURCES/libvirt-tests-qemu-add-disk-error-policy-tests-for-s390x.patch
new file mode 100644
index 0000000..b37307a
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemu-add-disk-error-policy-tests-for-s390x.patch
@@ -0,0 +1,185 @@
+From 0e378fc059e8fc52e665910b6c87719750cb6dbe Mon Sep 17 00:00:00 2001
+Message-Id: <0e378fc059e8fc52e665910b6c87719750cb6dbe@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 1 Apr 2020 17:19:25 +0200
+Subject: [PATCH] tests: qemu: add disk-error-policy tests for s390x
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To demonstrate the move of these attributes from -drive to -device.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 248d205171c9927b6d0e0077d2f3d9996c5540d9)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1819250
+
+Conflicts: the -latest.args file has an extra "-cpu qemu" upstream
+Message-Id: <5bec690d10f7d452d47fbf2db7dd24e7e855fe1b.1585754141.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ .../disk-error-policy-s390x.s390x-2.12.0.args | 42 +++++++++++++++++++
+ .../disk-error-policy-s390x.s390x-latest.args | 42 +++++++++++++++++++
+ .../disk-error-policy-s390x.xml               | 37 ++++++++++++++++
+ tests/qemuxml2argvtest.c                      |  2 +
+ 4 files changed, 123 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
+ create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+ create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.xml
+
+diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
+new file mode 100644
+index 0000000000..cf932d1fad
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
+@@ -0,0 +1,42 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-guest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-s390x \
++-name guest=guest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-guest/master-key.aes \
++-machine s390-ccw-virtio-2.12,accel=tcg,usb=off,dump-guest-core=off \
++-m 214 \
++-realtime mlock=off \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,\
++werror=stop,rerror=stop,cache=none \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
++id=virtio-disk0,bootindex=1,write-cache=on \
++-drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,\
++werror=enospc,cache=none \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,\
++id=virtio-disk1,write-cache=on \
++-drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,\
++werror=report,rerror=ignore,cache=none \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,\
++id=virtio-disk2,write-cache=on \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+new file mode 100644
+index 0000000000..5748ad7823
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+@@ -0,0 +1,42 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/tmp/lib/domain--1-guest \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
++XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
++XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
++QEMU_AUDIO_DRV=none \
++/usr/bin/qemu-system-s390x \
++-name guest=guest,debug-threads=on \
++-S \
++-object secret,id=masterKey0,format=raw,\
++file=/tmp/lib/domain--1-guest/master-key.aes \
++-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
++-m 214 \
++-overcommit mem-lock=off \
++-smp 1,sockets=1,cores=1,threads=1 \
++-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
++-display none \
++-no-user-config \
++-nodefaults \
++-chardev socket,id=charmonitor,fd=1729,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=control \
++-rtc base=utc \
++-no-shutdown \
++-boot strict=on \
++-drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,\
++werror=stop,rerror=stop,cache=none \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
++id=virtio-disk0,bootindex=1,write-cache=on \
++-drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,\
++werror=enospc,cache=none \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,\
++id=virtio-disk1,write-cache=on \
++-drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,\
++werror=report,rerror=ignore,cache=none \
++-device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,\
++id=virtio-disk2,write-cache=on \
++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
++resourcecontrol=deny \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.xml b/tests/qemuxml2argvdata/disk-error-policy-s390x.xml
+new file mode 100644
+index 0000000000..7149e66d70
+--- /dev/null
++++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.xml
+@@ -0,0 +1,37 @@
++<domain type='qemu'>
++  <name>guest</name>
++  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
++  <memory unit='KiB'>219136</memory>
++  <currentMemory unit='KiB'>219136</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='s390x' machine='s390-ccw-virtio'>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-s390x</emulator>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2' cache='none' error_policy='stop'/>
++      <source file='/var/images/image1'/>
++      <target dev='vda' bus='virtio'/>
++      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
++    </disk>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2' cache='none' error_policy='enospace'/>
++      <source file='/var/images/image2'/>
++      <target dev='vdb' bus='virtio'/>
++      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
++    </disk>
++    <disk type='file' device='disk'>
++      <driver name='qemu' type='qcow2' cache='none' error_policy='report' rerror_policy='ignore'/>
++      <source file='/var/images/image3'/>
++      <target dev='vdc' bus='virtio'/>
++      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
++    </disk>
++    <memballoon model='none'/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 7bc01d55d5..d6c5f436ae 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1051,6 +1051,8 @@ mymain(void)
+     DO_TEST("disk-error-policy", NONE);
+     DO_TEST_CAPS_VER("disk-error-policy", "2.12.0");
+     DO_TEST_CAPS_LATEST("disk-error-policy");
++    DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0");
++    DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x");
+     DO_TEST_CAPS_VER("disk-cache", "1.5.3");
+     DO_TEST_CAPS_VER("disk-cache", "2.6.0");
+     DO_TEST_CAPS_VER("disk-cache", "2.7.0");
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-tests-qemu-test-more-versions-for-graphics-vnc-tls.patch b/SOURCES/libvirt-tests-qemu-test-more-versions-for-graphics-vnc-tls.patch
deleted file mode 100644
index d8f98f7..0000000
--- a/SOURCES/libvirt-tests-qemu-test-more-versions-for-graphics-vnc-tls.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0f5bad99762f92f7b7a0e65e68fbb83bad787a4a Mon Sep 17 00:00:00 2001
-Message-Id: <0f5bad99762f92f7b7a0e65e68fbb83bad787a4a@dist-git>
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 28 Aug 2018 12:46:44 +0200
-Subject: [PATCH] tests: qemu: test more versions for graphics-vnc-tls
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a test with QEMU 2.4.0 capabilites, as well as the latest caps.
-
-The code paths for formatting TLS options will be altered and
-2.4.0 is the newest version where QEMU_CAPS_OBJECT_TLS_CREDS_X509
-is not supported.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 11b5396ceabe2ca91d8110f172f3ccf0d3901111)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1598167
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- .../graphics-vnc-tls.x86_64-2.4.0.args        | 28 +++++++++++++++++
- .../graphics-vnc-tls.x86_64-latest.args       | 31 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  2 ++
- 3 files changed, 61 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
- create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
-new file mode 100644
-index 0000000000..7b8e3a4aa6
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
-@@ -0,0 +1,28 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+SASL_CONF_PATH=/root/.sasl2 \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-machine pc-i440fx-2.4,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
-+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-new file mode 100644
-index 0000000000..01743eff2a
---- /dev/null
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-@@ -0,0 +1,31 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+SASL_CONF_PATH=/root/.sasl2 \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i686 \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
-+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 02bb9889ee..608a2b6ce3 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1207,6 +1207,8 @@ mymain(void)
-     driver.config->vncTLS = 1;
-     driver.config->vncTLSx509verify = 1;
-     DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
-+    DO_TEST_CAPS_VER("graphics-vnc-tls", "2.4.0");
-+    DO_TEST_CAPS_LATEST("graphics-vnc-tls");
-     driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0;
-     VIR_FREE(driver.config->vncSASLdir);
-     VIR_FREE(driver.config->vncTLSx509certdir);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-qemublock-Add-cases-for-creating-image-overlays-on-top-of-disks-with-slice.patch b/SOURCES/libvirt-tests-qemublock-Add-cases-for-creating-image-overlays-on-top-of-disks-with-slice.patch
new file mode 100644
index 0000000..a678628
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-cases-for-creating-image-overlays-on-top-of-disks-with-slice.patch
@@ -0,0 +1,151 @@
+From 54c8ab3178409f52113c99dca660c1024573ef7e Mon Sep 17 00:00:00 2001
+Message-Id: <54c8ab3178409f52113c99dca660c1024573ef7e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:23 +0100
+Subject: [PATCH] tests: qemublock: Add cases for creating image overlays on
+ top of disks with <slice>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a set of test data to see whether the backing store strings are
+formatted reasonably. Note that we don't support direct creation of such
+images so those tests are not enabled.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9b804ef5efcd3b1e91bbf75f4e94a35630c062c5)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <6639bab2e1e9dbdf13471057a1cb3accd1c30549.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                             |  2 ++
+ .../imagecreate/qcow2-backing-qcow2-slice.json    | 15 +++++++++++++++
+ .../imagecreate/qcow2-backing-qcow2-slice.xml     |  1 +
+ .../imagecreate/qcow2-backing-raw-slice.json      | 15 +++++++++++++++
+ .../imagecreate/qcow2-backing-raw-slice.xml       |  1 +
+ .../qemublocktestdata/imagecreate/qcow2-slice.xml | 14 ++++++++++++++
+ tests/qemublocktestdata/imagecreate/raw-slice.xml | 14 ++++++++++++++
+ 7 files changed, 62 insertions(+)
+ create mode 100644 tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json
+ create mode 120000 tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml
+ create mode 100644 tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json
+ create mode 120000 tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml
+ create mode 100644 tests/qemublocktestdata/imagecreate/qcow2-slice.xml
+ create mode 100644 tests/qemublocktestdata/imagecreate/raw-slice.xml
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index f66d894aed..29af0781fc 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1060,6 +1060,8 @@ mymain(void)
+     TEST_IMAGE_CREATE("qcow2-backing-raw-nbd", "raw-nbd");
+     TEST_IMAGE_CREATE("qcow2-backing-luks", "luks-noopts");
+     TEST_IMAGE_CREATE("qcow2-luks-encopts-backing", "qcow2");
++    TEST_IMAGE_CREATE("qcow2-backing-raw-slice", "raw-slice");
++    TEST_IMAGE_CREATE("qcow2-backing-qcow2-slice", "qcow2-slice");
+ 
+     TEST_IMAGE_CREATE("network-gluster-qcow2", NULL);
+     TEST_IMAGE_CREATE("network-rbd-qcow2", NULL);
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json
+new file mode 100644
+index 0000000000..2fa27c1933
+--- /dev/null
++++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.json
+@@ -0,0 +1,15 @@
++protocol:
++{
++  "driver": "file",
++  "filename": "/var/lib/libvirt/images/i.qcow2",
++  "size": 4294967296
++}
++
++format:
++{
++  "driver": "qcow2",
++  "file": "0123456789ABCDEF0123456789ABCDE",
++  "size": 8589934590,
++  "backing-file": "json:{\"driver\":\"raw\",\"offset\":1234,\"size\":5768,\"file\":{\"driver\":\"file\",\"filename\":\"/var/lib/libvirt/images/i.qcow2\"}}",
++  "backing-fmt": "qcow2"
++}
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml b/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml
+new file mode 120000
+index 0000000000..5769c2c866
+--- /dev/null
++++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml
+@@ -0,0 +1 @@
++qcow2.xml
+\ No newline at end of file
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json
+new file mode 100644
+index 0000000000..761002afd9
+--- /dev/null
++++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.json
+@@ -0,0 +1,15 @@
++protocol:
++{
++  "driver": "file",
++  "filename": "/var/lib/libvirt/images/i.qcow2",
++  "size": 4294967296
++}
++
++format:
++{
++  "driver": "qcow2",
++  "file": "0123456789ABCDEF0123456789ABCDE",
++  "size": 8589934590,
++  "backing-file": "json:{\"driver\":\"raw\",\"offset\":9876,\"size\":54321,\"file\":{\"driver\":\"file\",\"filename\":\"/var/lib/libvirt/images/i.img\"}}",
++  "backing-fmt": "raw"
++}
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml
+new file mode 120000
+index 0000000000..5769c2c866
+--- /dev/null
++++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-slice.xml
+@@ -0,0 +1 @@
++qcow2.xml
+\ No newline at end of file
+diff --git a/tests/qemublocktestdata/imagecreate/qcow2-slice.xml b/tests/qemublocktestdata/imagecreate/qcow2-slice.xml
+new file mode 100644
+index 0000000000..6c5ae3107b
+--- /dev/null
++++ b/tests/qemublocktestdata/imagecreate/qcow2-slice.xml
+@@ -0,0 +1,14 @@
++<disk device='disk' name='vda'>
++  <driver type='qcow2'/>
++  <source file='/var/lib/libvirt/images/i.qcow2'>
++    <slices>
++      <slice type='storage' offset='1234' size='5768'/>
++    </slices>
++    <privateData>
++      <nodenames>
++        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
++        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
++      </nodenames>
++    </privateData>
++  </source>
++</disk>
+diff --git a/tests/qemublocktestdata/imagecreate/raw-slice.xml b/tests/qemublocktestdata/imagecreate/raw-slice.xml
+new file mode 100644
+index 0000000000..adc7a175ce
+--- /dev/null
++++ b/tests/qemublocktestdata/imagecreate/raw-slice.xml
+@@ -0,0 +1,14 @@
++<disk device='disk' name='vda'>
++  <driver type='raw'/>
++  <source file='/var/lib/libvirt/images/i.img'>
++    <slices>
++      <slice type='storage' offset='9876' size='54321'/>
++    </slices>
++    <privateData>
++      <nodenames>
++        <nodename type='storage' name='0123456789ABCDEF0123456789ABCDE'/>
++        <nodename type='format' name='0123456789ABCDEF0123456789ABCDE'/>
++      </nodenames>
++    </privateData>
++  </source>
++</disk>
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-test-for-deep-backing-chain.patch b/SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-test-for-deep-backing-chain.patch
new file mode 100644
index 0000000..cdbf03f
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-test-for-deep-backing-chain.patch
@@ -0,0 +1,276 @@
+From 5694a24b527b812e7236a7316271f4ae316e4caa Mon Sep 17 00:00:00 2001
+Message-Id: <5694a24b527b812e7236a7316271f4ae316e4caa@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:13 +0100
+Subject: [PATCH] tests: qemublock: Add checkpoint deletion test for deep
+ backing chain
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add test cases for merging various pairs of bitmaps when snapshots were
+created together with checkpoints.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3c1c35bada75052b73d224d80fb5c3747a664823)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <06d3c8ebd023583de6c9d5033fc38a2757ecf8e2.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  6 ++
+ .../snapshots-current-out.json                | 29 +++++++++
+ .../snapshots-intermediate1-out.json          | 22 +++++++
+ .../snapshots-intermediate2-out.json          | 59 +++++++++++++++++++
+ .../snapshots-intermediate3-out.json          | 59 +++++++++++++++++++
+ .../snapshots-noparent-out.json               | 23 ++++++++
+ 6 files changed, 198 insertions(+)
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index e56f813424..897b86f970 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1015,6 +1015,12 @@ mymain(void)
+     TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c", "basic");
+     TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d", "basic");
+ 
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-noparent", "a", NULL, "snapshots");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate1", "b", "a", "snapshots");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate2", "c", "b", "snapshots");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate3", "d", "c", "snapshots");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-current", "current", "d", "snapshots");
++
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+new file mode 100644
+index 0000000000..1b607567e8
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json
+@@ -0,0 +1,29 @@
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "current"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+new file mode 100644
+index 0000000000..29fefeea63
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json
+@@ -0,0 +1,22 @@
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+new file mode 100644
+index 0000000000..4da21a9df7
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json
+@@ -0,0 +1,59 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "c"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+new file mode 100644
+index 0000000000..dc87dd60b8
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json
+@@ -0,0 +1,59 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+new file mode 100644
+index 0000000000..45a84b47c2
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json
+@@ -0,0 +1,23 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-tests-for-some-special-cases.patch b/SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-tests-for-some-special-cases.patch
new file mode 100644
index 0000000..354178a
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-checkpoint-deletion-tests-for-some-special-cases.patch
@@ -0,0 +1,257 @@
+From 686c7592b99c1e2c4831f14c4e101a4ab039c45e Mon Sep 17 00:00:00 2001
+Message-Id: <686c7592b99c1e2c4831f14c4e101a4ab039c45e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:14 +0100
+Subject: [PATCH] tests: qemublock: Add checkpoint deletion tests for some
+ special cases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the synthetic test data to verify that the algorithm correctly picks
+bitmaps to merge when the bitmap is changed along with the image itself.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 065e548ebf0e39c8f9d30d0637ecfa84803d8f98)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <c34b7a28b9943b6cf7546eb2ac4d4bf95a164f11.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  7 +++
+ ...hots-synthetic-checkpoint-current-out.json | 29 +++++++++
+ ...ynthetic-checkpoint-intermediate1-out.json | 29 +++++++++
+ ...ynthetic-checkpoint-intermediate2-out.json | 32 ++++++++++
+ ...ynthetic-checkpoint-intermediate3-out.json | 59 +++++++++++++++++++
+ ...ots-synthetic-checkpoint-noparent-out.json | 23 ++++++++
+ 6 files changed, 179 insertions(+)
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 897b86f970..2e5927f3c1 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1021,6 +1021,13 @@ mymain(void)
+     TEST_CHECKPOINT_DELETE_MERGE("snapshots-intermediate3", "d", "c", "snapshots");
+     TEST_CHECKPOINT_DELETE_MERGE("snapshots-current", "current", "d", "snapshots");
+ 
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-noparent", "a", NULL, "snapshots-synthetic-checkpoint");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate1", "b", "a", "snapshots-synthetic-checkpoint");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate2", "c", "b", "snapshots-synthetic-checkpoint");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-intermediate3", "d", "c", "snapshots-synthetic-checkpoint");
++    TEST_CHECKPOINT_DELETE_MERGE("snapshots-synthetic-checkpoint-current", "current", "d", "snapshots-synthetic-checkpoint");
++
++
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
+new file mode 100644
+index 0000000000..1b607567e8
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json
+@@ -0,0 +1,29 @@
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "current"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+new file mode 100644
+index 0000000000..e979691e6f
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json
+@@ -0,0 +1,29 @@
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-3-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "b"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+new file mode 100644
+index 0000000000..e82098918a
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json
+@@ -0,0 +1,32 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+new file mode 100644
+index 0000000000..dc87dd60b8
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json
+@@ -0,0 +1,59 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "c"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-2-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-2-format",
++      "name": "d"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+new file mode 100644
+index 0000000000..45a84b47c2
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json
+@@ -0,0 +1,23 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-3-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-4-format",
++      "name": "a"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-5-format",
++      "name": "a"
++    }
++  }
++]
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublock-Add-few-more-test-cases-for-checkpoint-deletion.patch b/SOURCES/libvirt-tests-qemublock-Add-few-more-test-cases-for-checkpoint-deletion.patch
new file mode 100644
index 0000000..3116da7
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-few-more-test-cases-for-checkpoint-deletion.patch
@@ -0,0 +1,169 @@
+From 06865f5dd0f1616a7f3ac8bc8edd259b362718ce Mon Sep 17 00:00:00 2001
+Message-Id: <06865f5dd0f1616a7f3ac8bc8edd259b362718ce@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:10 +0100
+Subject: [PATCH] tests: qemublock: Add few more test cases for checkpoint
+ deletion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add all intermediate steps and deletion of the current checkpoint on a
+flat (single-image) disk image.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 0cf33ab8f178846c0b961fbc4cc6a4e92d351310)a
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <4b1466cba585cb4125ffda7fd2af4ab01d714f79.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  4 +++
+ .../checkpointdelete/basic-current-out.json   | 29 +++++++++++++++++++
+ .../basic-intermediate1-out.json              | 22 ++++++++++++++
+ .../basic-intermediate2-out.json              | 22 ++++++++++++++
+ .../basic-intermediate3-out.json              | 22 ++++++++++++++
+ 5 files changed, 99 insertions(+)
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 80355d1340..f48e4ce4b2 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -999,6 +999,10 @@ mymain(void)
+     } while (0)
+ 
+     TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL);
++    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate1", "b", "a");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate2", "c", "b");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-intermediate3", "d", "c");
++    TEST_CHECKPOINT_DELETE_MERGE("basic-current", "current", "d");
+ 
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-current-out.json b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+new file mode 100644
+index 0000000000..1b607567e8
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-current-out.json
+@@ -0,0 +1,29 @@
++[
++  {
++    "type": "block-dirty-bitmap-enable",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "current"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+new file mode 100644
+index 0000000000..eccb7ed15f
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json
+@@ -0,0 +1,22 @@
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "b"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+new file mode 100644
+index 0000000000..de40e4b5b0
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json
+@@ -0,0 +1,22 @@
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "c"
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+new file mode 100644
+index 0000000000..b5d85f43f0
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json
+@@ -0,0 +1,22 @@
++[
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "libvirt-1-format",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "d"
++    }
++  }
++]
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublock-Add-synthetic-snapshot-checkpoint-test-data.patch b/SOURCES/libvirt-tests-qemublock-Add-synthetic-snapshot-checkpoint-test-data.patch
new file mode 100644
index 0000000..1d03e68
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-synthetic-snapshot-checkpoint-test-data.patch
@@ -0,0 +1,896 @@
+From e79ccc88c3668567bf656cd0113ca46058ef8f00 Mon Sep 17 00:00:00 2001
+Message-Id: <e79ccc88c3668567bf656cd0113ca46058ef8f00@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:11 +0100
+Subject: [PATCH] tests: qemublock: Add synthetic snapshot+checkpoint test data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a faked qemu output which would simulate scenario where libvirt
+would take a snapshot and checkpoint simultaneously. This is visible in
+libvirt-2-format node where bitmap 'c' appears, but bitmap 'b' which is
+active in the previous layer is not present.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit d7d97e87afe00b58e23291cafb0ddb8aec3894d6)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <16c6b0162647c59d81b2b0ceb5ebc5f03c029285.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |   1 +
+ .../snapshots-synthetic-checkpoint.json       | 827 ++++++++++++++++++
+ .../bitmap/snapshots-synthetic-checkpoint.out |  13 +
+ 3 files changed, 841 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
+ create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index f48e4ce4b2..edaf82053d 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -966,6 +966,7 @@ mymain(void)
+     TEST_BITMAP_DETECT("basic");
+     TEST_BITMAP_DETECT("synthetic");
+     TEST_BITMAP_DETECT("snapshots");
++    TEST_BITMAP_DETECT("snapshots-synthetic-checkpoint");
+ 
+ #define TEST_BACKUP_BITMAP_CALCULATE(testname, source, incrbackup, named) \
+     do { \
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
+new file mode 100644
+index 0000000000..25cc150d67
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json
+@@ -0,0 +1,827 @@
++[
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "backing-image": {
++                    "backing-image": {
++                        "backing-image": {
++                            "virtual-size": 10485760,
++                            "filename": "/tmp/pull4.qcow2",
++                            "cluster-size": 65536,
++                            "format": "qcow2",
++                            "actual-size": 208896,
++                            "format-specific": {
++                                "type": "qcow2",
++                                "data": {
++                                    "compat": "1.1",
++                                    "lazy-refcounts": false,
++                                    "bitmaps": [
++                                        {
++                                            "flags": [
++                                                "auto"
++                                            ],
++                                            "name": "a",
++                                            "granularity": 65536
++                                        }
++                                    ],
++                                    "refcount-bits": 16,
++                                    "corrupt": false
++                                }
++                            },
++                            "dirty-flag": false
++                        },
++                        "backing-filename-format": "qcow2",
++                        "virtual-size": 10485760,
++                        "filename": "/tmp/pull4.1575911522",
++                        "cluster-size": 65536,
++                        "format": "qcow2",
++                        "actual-size": 208896,
++                        "format-specific": {
++                            "type": "qcow2",
++                            "data": {
++                                "compat": "1.1",
++                                "lazy-refcounts": false,
++                                "bitmaps": [
++                                    {
++                                        "flags": [
++                                            "auto"
++                                        ],
++                                        "name": "a",
++                                        "granularity": 65536
++                                    }
++                                ],
++                                "refcount-bits": 16,
++                                "corrupt": false
++                            }
++                        },
++                        "full-backing-filename": "/tmp/pull4.qcow2",
++                        "backing-filename": "/tmp/pull4.qcow2",
++                        "dirty-flag": false
++                    },
++                    "backing-filename-format": "qcow2",
++                    "virtual-size": 10485760,
++                    "filename": "/tmp/pull4.1575911527",
++                    "cluster-size": 65536,
++                    "format": "qcow2",
++                    "actual-size": 217088,
++                    "format-specific": {
++                        "type": "qcow2",
++                        "data": {
++                            "compat": "1.1",
++                            "lazy-refcounts": false,
++                            "bitmaps": [
++                                {
++                                    "flags": [
++                                        "auto"
++                                    ],
++                                    "name": "c",
++                                    "granularity": 65536
++                                },
++                                {
++                                    "flags": [
++
++                                    ],
++                                    "name": "b",
++                                    "granularity": 65536
++                                },
++                                {
++                                    "flags": [
++
++                                    ],
++                                    "name": "a",
++                                    "granularity": 65536
++                                }
++                            ],
++                            "refcount-bits": 16,
++                            "corrupt": false
++                        }
++                    },
++                    "full-backing-filename": "/tmp/pull4.1575911522",
++                    "backing-filename": "/tmp/pull4.1575911522",
++                    "dirty-flag": false
++                },
++                "backing-filename-format": "qcow2",
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.1575911540",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 212992,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "d",
++                                "granularity": 65536
++                            },
++                            {
++                                "flags": [
++
++                                ],
++                                "name": "c",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "full-backing-filename": "/tmp/pull4.1575911527",
++                "backing-filename": "/tmp/pull4.1575911527",
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911550",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 212992,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "in-use",
++                                "auto"
++                            ],
++                            "name": "current",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++                                "in-use"
++                            ],
++                            "name": "d",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.1575911540",
++            "backing-filename": "/tmp/pull4.1575911540",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-1-format",
++        "backing_file_depth": 4,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.1575911540",
++        "dirty-bitmaps": [
++            {
++                "name": "d",
++                "recording": false,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "current",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911550",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 393728,
++            "filename": "/tmp/pull4.1575911550",
++            "format": "file",
++            "actual-size": 212992,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-1-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911550",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "backing-image": {
++                    "backing-image": {
++                        "virtual-size": 10485760,
++                        "filename": "/tmp/pull4.qcow2",
++                        "cluster-size": 65536,
++                        "format": "qcow2",
++                        "actual-size": 208896,
++                        "format-specific": {
++                            "type": "qcow2",
++                            "data": {
++                                "compat": "1.1",
++                                "lazy-refcounts": false,
++                                "bitmaps": [
++                                    {
++                                        "flags": [
++                                            "auto"
++                                        ],
++                                        "name": "a",
++                                        "granularity": 65536
++                                    }
++                                ],
++                                "refcount-bits": 16,
++                                "corrupt": false
++                            }
++                        },
++                        "dirty-flag": false
++                    },
++                    "backing-filename-format": "qcow2",
++                    "virtual-size": 10485760,
++                    "filename": "/tmp/pull4.1575911522",
++                    "cluster-size": 65536,
++                    "format": "qcow2",
++                    "actual-size": 208896,
++                    "format-specific": {
++                        "type": "qcow2",
++                        "data": {
++                            "compat": "1.1",
++                            "lazy-refcounts": false,
++                            "bitmaps": [
++                                {
++                                    "flags": [
++                                        "auto"
++                                    ],
++                                    "name": "a",
++                                    "granularity": 65536
++                                }
++                            ],
++                            "refcount-bits": 16,
++                            "corrupt": false
++                        }
++                    },
++                    "full-backing-filename": "/tmp/pull4.qcow2",
++                    "backing-filename": "/tmp/pull4.qcow2",
++                    "dirty-flag": false
++                },
++                "backing-filename-format": "qcow2",
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.1575911527",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 217088,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "c",
++                                "granularity": 65536
++                            },
++                            {
++                                "flags": [
++
++                                ],
++                                "name": "b",
++                                "granularity": 65536
++                            },
++                            {
++                                "flags": [
++
++                                ],
++                                "name": "a",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "full-backing-filename": "/tmp/pull4.1575911522",
++                "backing-filename": "/tmp/pull4.1575911522",
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911540",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 212992,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "d",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++
++                            ],
++                            "name": "c",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.1575911527",
++            "backing-filename": "/tmp/pull4.1575911527",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-2-format",
++        "backing_file_depth": 3,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.1575911527",
++        "dirty-bitmaps": [
++            {
++                "name": "c",
++                "recording": false,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "d",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911540",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 393728,
++            "filename": "/tmp/pull4.1575911540",
++            "format": "file",
++            "actual-size": 212992,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-2-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911540",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "backing-image": {
++                    "virtual-size": 10485760,
++                    "filename": "/tmp/pull4.qcow2",
++                    "cluster-size": 65536,
++                    "format": "qcow2",
++                    "actual-size": 208896,
++                    "format-specific": {
++                        "type": "qcow2",
++                        "data": {
++                            "compat": "1.1",
++                            "lazy-refcounts": false,
++                            "bitmaps": [
++                                {
++                                    "flags": [
++                                        "auto"
++                                    ],
++                                    "name": "a",
++                                    "granularity": 65536
++                                }
++                            ],
++                            "refcount-bits": 16,
++                            "corrupt": false
++                        }
++                    },
++                    "dirty-flag": false
++                },
++                "backing-filename-format": "qcow2",
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.1575911522",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 208896,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "a",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "full-backing-filename": "/tmp/pull4.qcow2",
++                "backing-filename": "/tmp/pull4.qcow2",
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911527",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 217088,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "c",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++
++                            ],
++                            "name": "b",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++
++                            ],
++                            "name": "a",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.1575911522",
++            "backing-filename": "/tmp/pull4.1575911522",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-3-format",
++        "backing_file_depth": 2,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.1575911522",
++        "dirty-bitmaps": [
++            {
++                "name": "a",
++                "recording": false,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "b",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911527",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 459264,
++            "filename": "/tmp/pull4.1575911527",
++            "format": "file",
++            "actual-size": 217088,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-3-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911527",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.qcow2",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 208896,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "a",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911522",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 208896,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "a",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.qcow2",
++            "backing-filename": "/tmp/pull4.qcow2",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-4-format",
++        "backing_file_depth": 1,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.qcow2",
++        "dirty-bitmaps": [
++            {
++                "name": "a",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911522",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 328192,
++            "filename": "/tmp/pull4.1575911522",
++            "format": "file",
++            "actual-size": 208896,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-4-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911522",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.qcow2",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 208896,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "a",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-5-format",
++        "backing_file_depth": 0,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "dirty-bitmaps": [
++            {
++                "name": "a",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.qcow2",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 328192,
++            "filename": "/tmp/pull4.qcow2",
++            "format": "file",
++            "actual-size": 208896,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-5-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.qcow2",
++        "encryption_key_missing": false
++    }
++]
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
+new file mode 100644
+index 0000000000..0270657001
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out
+@@ -0,0 +1,13 @@
++libvirt-1-format:
++        d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++  current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-2-format:
++        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-format:
++        a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++        b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-4-format:
++        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-5-format:
++        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublock-Add-test-for-checkpoint-deletion-bitmap-merge.patch b/SOURCES/libvirt-tests-qemublock-Add-test-for-checkpoint-deletion-bitmap-merge.patch
new file mode 100644
index 0000000..097acec
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-test-for-checkpoint-deletion-bitmap-merge.patch
@@ -0,0 +1,134 @@
+From c71d50132b3ac8dcfefc1acc11ab5d5bd7bc024a Mon Sep 17 00:00:00 2001
+Message-Id: <c71d50132b3ac8dcfefc1acc11ab5d5bd7bc024a@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:09 +0100
+Subject: [PATCH] tests: qemublock: Add test for checkpoint deletion bitmap
+ merge
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add test infrastructure and a basic test for bitmap deletion.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 25f74899720afce52dcf01f230da5c816deaea71)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <50b8789a34b762114b6ea2f87bba1a130be206de.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         | 59 +++++++++++++++++++
+ .../checkpointdelete/basic-noparent-out.json  |  9 +++
+ 2 files changed, 68 insertions(+)
+ create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 7ff6a6b17b..80355d1340 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -27,6 +27,7 @@
+ #include "qemu/qemu_qapi.h"
+ #include "qemu/qemu_monitor_json.h"
+ #include "qemu/qemu_backup.h"
++#include "qemu/qemu_checkpoint.h"
+ 
+ #include "qemu/qemu_command.h"
+ 
+@@ -696,6 +697,50 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
+ }
+ 
+ 
++static const char *checkpointDeletePrefix = "qemublocktestdata/checkpointdelete/";
++
++struct testQemuCheckpointDeleteMergeData {
++    const char *name;
++    virStorageSourcePtr chain;
++    const char *deletebitmap;
++    const char *parentbitmap;
++};
++
++
++static int
++testQemuCheckpointDeleteMerge(const void *opaque)
++{
++    const struct testQemuCheckpointDeleteMergeData *data = opaque;
++    g_autofree char *actual = NULL;
++    g_autofree char *expectpath = NULL;
++    g_autoptr(virJSONValue) actions = NULL;
++    bool currentcheckpoint;
++
++    expectpath = g_strdup_printf("%s/%s%s-out.json", abs_srcdir,
++                                 checkpointDeletePrefix, data->name);
++
++    if (!(actions = virJSONValueNewArray()))
++        return -1;
++
++    /* hack to get the 'current' state until the function stops accepting it */
++    currentcheckpoint = STREQ("current", data->deletebitmap);
++
++    if (qemuCheckpointDiscardDiskBitmaps(data->chain,
++                                         data->deletebitmap,
++                                         data->parentbitmap,
++                                         currentcheckpoint,
++                                         actions) < 0) {
++        VIR_TEST_VERBOSE("failed to generate checkpoint delete transaction\n");
++        return -1;
++    }
++
++    if (!(actual = virJSONValueToString(actions, true)))
++        return -1;
++
++    return virTestCompareToFile(actual, expectpath);
++}
++
++
+ static int
+ mymain(void)
+ {
+@@ -705,6 +750,7 @@ mymain(void)
+     struct testQemuDiskXMLToJSONData diskxmljsondata;
+     struct testQemuImageCreateData imagecreatedata;
+     struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
++    struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
+     char *capslatest_x86_64 = NULL;
+     virQEMUCapsPtr caps_x86_64 = NULL;
+     g_autoptr(virStorageSource) bitmapSourceChain = NULL;
+@@ -941,6 +987,19 @@ mymain(void)
+     TEST_BACKUP_BITMAP_CALCULATE("snapshot-intermediate", bitmapSourceChain, "d", "snapshots");
+     TEST_BACKUP_BITMAP_CALCULATE("snapshot-deep", bitmapSourceChain, "a", "snapshots");
+ 
++#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, parbmp) \
++    do { \
++        checkpointdeletedata.name = testname; \
++        checkpointdeletedata.chain = bitmapSourceChain; \
++        checkpointdeletedata.deletebitmap = delbmp; \
++        checkpointdeletedata.parentbitmap = parbmp; \
++        if (virTestRun("checkpoint delete " testname, \
++                       testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \
++        ret = -1; \
++    } while (0)
++
++    TEST_CHECKPOINT_DELETE_MERGE("basic-noparent", "a", NULL);
++
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+diff --git a/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+new file mode 100644
+index 0000000000..e87382fdb4
+--- /dev/null
++++ b/tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json
+@@ -0,0 +1,9 @@
++[
++  {
++    "type": "block-dirty-bitmap-remove",
++    "data": {
++      "node": "libvirt-1-format",
++      "name": "a"
++    }
++  }
++]
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublock-Add-tests-for-qemuBlockBitmapsHandleBlockcopy.patch b/SOURCES/libvirt-tests-qemublock-Add-tests-for-qemuBlockBitmapsHandleBlockcopy.patch
new file mode 100644
index 0000000..8523a0b
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublock-Add-tests-for-qemuBlockBitmapsHandleBlockcopy.patch
@@ -0,0 +1,577 @@
+From 736c0d3748605b553f065332855b61291503ac25 Mon Sep 17 00:00:00 2001
+Message-Id: <736c0d3748605b553f065332855b61291503ac25@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:26 +0100
+Subject: [PATCH] tests: qemublock: Add tests for
+ qemuBlockBitmapsHandleBlockcopy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use some of the existing bitmap data to add tests for
+qemuBlockBitmapsHandleBlockcopy.
+
+As the output depends on the ordering in the hash table we must also
+install the "virdeterministichash" mock preload library.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 9b13af73ac336fb1d93ef15e30204fbf9c7e536f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <095e8e63f87edfd7924a8e8d8a4a8def04022d77.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |  71 +++++++++-
+ .../bitmapblockcopy/basic-deep-out.json       | 117 +++++++++++++++
+ .../bitmapblockcopy/basic-shallow-out.json    | 117 +++++++++++++++
+ .../bitmapblockcopy/snapshots-deep-out.json   | 133 ++++++++++++++++++
+ .../snapshots-shallow-out.json                |  48 +++++++
+ 5 files changed, 485 insertions(+), 1 deletion(-)
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+ create mode 100644 tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 3208e90e41..f66d894aed 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -799,6 +799,56 @@ testQemuBlockBitmapValidate(const void *opaque)
+ }
+ 
+ 
++static const char *blockcopyPrefix = "qemublocktestdata/bitmapblockcopy/";
++
++struct testQemuBlockBitmapBlockcopyData {
++    const char *name;
++    bool shallow;
++    virStorageSourcePtr chain;
++    const char *nodedatafile;
++};
++
++
++static int
++testQemuBlockBitmapBlockcopy(const void *opaque)
++{
++    const struct testQemuBlockBitmapBlockcopyData *data = opaque;
++    g_autofree char *actual = NULL;
++    g_autofree char *expectpath = NULL;
++    g_autoptr(virJSONValue) actions = NULL;
++    g_autoptr(virJSONValue) nodedatajson = NULL;
++    g_autoptr(virHashTable) nodedata = NULL;
++    g_autoptr(virStorageSource) fakemirror = virStorageSourceNew();
++
++    if (!fakemirror)
++        return -1;
++
++    fakemirror->nodeformat = g_strdup("mirror-format-node");
++
++    expectpath = g_strdup_printf("%s/%s%s-out.json", abs_srcdir,
++                                 blockcopyPrefix, data->name);
++
++    if (!(nodedatajson = virTestLoadFileJSON(bitmapDetectPrefix, data->nodedatafile,
++                                             ".json", NULL)))
++        return -1;
++
++    if (!(nodedata = qemuMonitorJSONBlockGetNamedNodeDataJSON(nodedatajson))) {
++        VIR_TEST_VERBOSE("failed to load nodedata JSON\n");
++        return -1;
++    }
++
++    if (qemuBlockBitmapsHandleBlockcopy(data->chain, fakemirror, nodedata,
++                                        data->shallow, &actions) < 0)
++        return -1;
++
++    if (actions &&
++        !(actual = virJSONValueToString(actions, true)))
++        return -1;
++
++    return virTestCompareToFile(actual, expectpath);
++}
++
++
+ static int
+ mymain(void)
+ {
+@@ -810,6 +860,7 @@ mymain(void)
+     struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
+     struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
+     struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
++    struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
+     char *capslatest_x86_64 = NULL;
+     virQEMUCapsPtr caps_x86_64 = NULL;
+     g_autoptr(virStorageSource) bitmapSourceChain = NULL;
+@@ -1120,6 +1171,24 @@ mymain(void)
+     TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "d", false);
+     TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "current", true);
+ 
++#define TEST_BITMAP_BLOCKCOPY(testname, shllw, ndf) \
++    do { \
++        blockbitmapblockcopydata.name = testname; \
++        blockbitmapblockcopydata.shallow = shllw; \
++        blockbitmapblockcopydata.nodedatafile = ndf; \
++        blockbitmapblockcopydata.chain = bitmapSourceChain;\
++        if (virTestRun("bitmap block copy " testname, \
++                       testQemuBlockBitmapBlockcopy, \
++                       &blockbitmapblockcopydata) < 0) \
++            ret = -1; \
++    } while (0)
++
++    TEST_BITMAP_BLOCKCOPY("basic-shallow", true, "basic");
++    TEST_BITMAP_BLOCKCOPY("basic-deep", false, "basic");
++
++    TEST_BITMAP_BLOCKCOPY("snapshots-shallow", true, "snapshots");
++    TEST_BITMAP_BLOCKCOPY("snapshots-deep", false, "snapshots");
++
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+@@ -1129,4 +1198,4 @@ mymain(void)
+     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+ 
+-VIR_TEST_MAIN(mymain)
++VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdeterministichash"))
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+new file mode 100644
+index 0000000000..4ed2b97e95
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/basic-deep-out.json
+@@ -0,0 +1,117 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+new file mode 100644
+index 0000000000..4ed2b97e95
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/basic-shallow-out.json
+@@ -0,0 +1,117 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+new file mode 100644
+index 0000000000..5456553d78
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/snapshots-deep-out.json
+@@ -0,0 +1,133 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "a",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "a",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-4-format",
++          "name": "a"
++        },
++        {
++          "node": "libvirt-5-format",
++          "name": "a"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "b",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "b",
++      "bitmaps": [
++        {
++          "node": "libvirt-3-format",
++          "name": "b"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "c",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "c",
++      "bitmaps": [
++        {
++          "node": "libvirt-2-format",
++          "name": "c"
++        },
++        {
++          "node": "libvirt-3-format",
++          "name": "c"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        },
++        {
++          "node": "libvirt-2-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+diff --git a/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json b/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+new file mode 100644
+index 0000000000..ddd47f7ee1
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmapblockcopy/snapshots-shallow-out.json
+@@ -0,0 +1,48 @@
++[
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "current",
++      "persistent": true,
++      "disabled": false,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "current",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "current"
++        }
++      ]
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-add",
++    "data": {
++      "node": "mirror-format-node",
++      "name": "d",
++      "persistent": true,
++      "disabled": true,
++      "granularity": 65536
++    }
++  },
++  {
++    "type": "block-dirty-bitmap-merge",
++    "data": {
++      "node": "mirror-format-node",
++      "target": "d",
++      "bitmaps": [
++        {
++          "node": "libvirt-1-format",
++          "name": "d"
++        }
++      ]
++    }
++  }
++]
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemublocktest-Add-another-synthetic-test-case-for-broken-bitmaps.patch b/SOURCES/libvirt-tests-qemublocktest-Add-another-synthetic-test-case-for-broken-bitmaps.patch
new file mode 100644
index 0000000..8fa3519
--- /dev/null
+++ b/SOURCES/libvirt-tests-qemublocktest-Add-another-synthetic-test-case-for-broken-bitmaps.patch
@@ -0,0 +1,900 @@
+From 51214acf9b65be8575eac8ff82d63e5c260a48fe Mon Sep 17 00:00:00 2001
+Message-Id: <51214acf9b65be8575eac8ff82d63e5c260a48fe@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:24 +0100
+Subject: [PATCH] tests: qemublocktest: Add another synthetic test case for
+ broken bitmaps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a case where a bitmap spanning multiple images is missing one of the
+intermediate components.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 8e29a8b151f59a53d2bb57bb58074185088f38f0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <0a1a64d620d9770afda50efc0e82c67dd3c2ae19.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/qemublocktest.c                         |   8 +
+ .../bitmap/snapshots-synthetic-broken.json    | 819 ++++++++++++++++++
+ .../bitmap/snapshots-synthetic-broken.out     |  12 +
+ 3 files changed, 839 insertions(+)
+ create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+ create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 6a7b07cfee..3208e90e41 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -1026,6 +1026,7 @@ mymain(void)
+     TEST_BITMAP_DETECT("synthetic");
+     TEST_BITMAP_DETECT("snapshots");
+     TEST_BITMAP_DETECT("snapshots-synthetic-checkpoint");
++    TEST_BITMAP_DETECT("snapshots-synthetic-broken");
+ 
+ #define TEST_BACKUP_BITMAP_CALCULATE(testname, source, incrbackup, named) \
+     do { \
+@@ -1112,6 +1113,13 @@ mymain(void)
+     TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "c", true);
+     TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "d", true);
+     TEST_BITMAP_VALIDATE("snapshots-synthetic-checkpoint", "current", true);
++
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "a", false);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "b", true);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "c", true);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "d", false);
++    TEST_BITMAP_VALIDATE("snapshots-synthetic-broken", "current", true);
++
+  cleanup:
+     virHashFree(diskxmljsondata.schema);
+     qemuTestDriverFree(&driver);
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+new file mode 100644
+index 0000000000..bf4963494f
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
+@@ -0,0 +1,819 @@
++[
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "backing-image": {
++                    "backing-image": {
++                        "backing-image": {
++                            "virtual-size": 10485760,
++                            "filename": "/tmp/pull4.qcow2",
++                            "cluster-size": 65536,
++                            "format": "qcow2",
++                            "actual-size": 208896,
++                            "format-specific": {
++                                "type": "qcow2",
++                                "data": {
++                                    "compat": "1.1",
++                                    "lazy-refcounts": false,
++                                    "bitmaps": [
++                                        {
++                                            "flags": [
++                                                "auto"
++                                            ],
++                                            "name": "a",
++                                            "granularity": 65536
++                                        }
++                                    ],
++                                    "refcount-bits": 16,
++                                    "corrupt": false
++                                }
++                            },
++                            "dirty-flag": false
++                        },
++                        "backing-filename-format": "qcow2",
++                        "virtual-size": 10485760,
++                        "filename": "/tmp/pull4.1575911522",
++                        "cluster-size": 65536,
++                        "format": "qcow2",
++                        "actual-size": 208896,
++                        "format-specific": {
++                            "type": "qcow2",
++                            "data": {
++                                "compat": "1.1",
++                                "lazy-refcounts": false,
++                                "bitmaps": [
++                                    {
++                                        "flags": [
++                                            "auto"
++                                        ],
++                                        "name": "a",
++                                        "granularity": 65536
++                                    }
++                                ],
++                                "refcount-bits": 16,
++                                "corrupt": false
++                            }
++                        },
++                        "full-backing-filename": "/tmp/pull4.qcow2",
++                        "backing-filename": "/tmp/pull4.qcow2",
++                        "dirty-flag": false
++                    },
++                    "backing-filename-format": "qcow2",
++                    "virtual-size": 10485760,
++                    "filename": "/tmp/pull4.1575911527",
++                    "cluster-size": 65536,
++                    "format": "qcow2",
++                    "actual-size": 217088,
++                    "format-specific": {
++                        "type": "qcow2",
++                        "data": {
++                            "compat": "1.1",
++                            "lazy-refcounts": false,
++                            "bitmaps": [
++                                {
++                                    "flags": [
++                                        "auto"
++                                    ],
++                                    "name": "c",
++                                    "granularity": 65536
++                                },
++                                {
++                                    "flags": [
++
++                                    ],
++                                    "name": "b",
++                                    "granularity": 65536
++                                },
++                                {
++                                    "flags": [
++
++                                    ],
++                                    "name": "a",
++                                    "granularity": 65536
++                                }
++                            ],
++                            "refcount-bits": 16,
++                            "corrupt": false
++                        }
++                    },
++                    "full-backing-filename": "/tmp/pull4.1575911522",
++                    "backing-filename": "/tmp/pull4.1575911522",
++                    "dirty-flag": false
++                },
++                "backing-filename-format": "qcow2",
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.1575911540",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 212992,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "d",
++                                "granularity": 65536
++                            },
++                            {
++                                "flags": [
++
++                                ],
++                                "name": "c",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "full-backing-filename": "/tmp/pull4.1575911527",
++                "backing-filename": "/tmp/pull4.1575911527",
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911550",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 212992,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "in-use",
++                                "auto"
++                            ],
++                            "name": "current",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++                                "in-use"
++                            ],
++                            "name": "d",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.1575911540",
++            "backing-filename": "/tmp/pull4.1575911540",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-1-format",
++        "backing_file_depth": 4,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.1575911540",
++        "dirty-bitmaps": [
++            {
++                "name": "d",
++                "recording": false,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "current",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911550",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 393728,
++            "filename": "/tmp/pull4.1575911550",
++            "format": "file",
++            "actual-size": 212992,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-1-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911550",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "backing-image": {
++                    "backing-image": {
++                        "virtual-size": 10485760,
++                        "filename": "/tmp/pull4.qcow2",
++                        "cluster-size": 65536,
++                        "format": "qcow2",
++                        "actual-size": 208896,
++                        "format-specific": {
++                            "type": "qcow2",
++                            "data": {
++                                "compat": "1.1",
++                                "lazy-refcounts": false,
++                                "bitmaps": [
++                                    {
++                                        "flags": [
++                                            "auto"
++                                        ],
++                                        "name": "a",
++                                        "granularity": 65536
++                                    }
++                                ],
++                                "refcount-bits": 16,
++                                "corrupt": false
++                            }
++                        },
++                        "dirty-flag": false
++                    },
++                    "backing-filename-format": "qcow2",
++                    "virtual-size": 10485760,
++                    "filename": "/tmp/pull4.1575911522",
++                    "cluster-size": 65536,
++                    "format": "qcow2",
++                    "actual-size": 208896,
++                    "format-specific": {
++                        "type": "qcow2",
++                        "data": {
++                            "compat": "1.1",
++                            "lazy-refcounts": false,
++                            "bitmaps": [
++                                {
++                                    "flags": [
++                                        "auto"
++                                    ],
++                                    "name": "a",
++                                    "granularity": 65536
++                                }
++                            ],
++                            "refcount-bits": 16,
++                            "corrupt": false
++                        }
++                    },
++                    "full-backing-filename": "/tmp/pull4.qcow2",
++                    "backing-filename": "/tmp/pull4.qcow2",
++                    "dirty-flag": false
++                },
++                "backing-filename-format": "qcow2",
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.1575911527",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 217088,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "c",
++                                "granularity": 65536
++                            },
++                            {
++                                "flags": [
++
++                                ],
++                                "name": "b",
++                                "granularity": 65536
++                            },
++                            {
++                                "flags": [
++
++                                ],
++                                "name": "a",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "full-backing-filename": "/tmp/pull4.1575911522",
++                "backing-filename": "/tmp/pull4.1575911522",
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911540",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 212992,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "d",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++
++                            ],
++                            "name": "c",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.1575911527",
++            "backing-filename": "/tmp/pull4.1575911527",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-2-format",
++        "backing_file_depth": 3,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.1575911527",
++        "dirty-bitmaps": [
++            {
++                "name": "c",
++                "recording": false,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "d",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "inconsistent": true,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911540",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 393728,
++            "filename": "/tmp/pull4.1575911540",
++            "format": "file",
++            "actual-size": 212992,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-2-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911540",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "backing-image": {
++                    "virtual-size": 10485760,
++                    "filename": "/tmp/pull4.qcow2",
++                    "cluster-size": 65536,
++                    "format": "qcow2",
++                    "actual-size": 208896,
++                    "format-specific": {
++                        "type": "qcow2",
++                        "data": {
++                            "compat": "1.1",
++                            "lazy-refcounts": false,
++                            "bitmaps": [
++                                {
++                                    "flags": [
++                                        "auto"
++                                    ],
++                                    "name": "a",
++                                    "granularity": 65536
++                                }
++                            ],
++                            "refcount-bits": 16,
++                            "corrupt": false
++                        }
++                    },
++                    "dirty-flag": false
++                },
++                "backing-filename-format": "qcow2",
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.1575911522",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 208896,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "a",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "full-backing-filename": "/tmp/pull4.qcow2",
++                "backing-filename": "/tmp/pull4.qcow2",
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911527",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 217088,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "c",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++
++                            ],
++                            "name": "b",
++                            "granularity": 65536
++                        },
++                        {
++                            "flags": [
++
++                            ],
++                            "name": "a",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.1575911522",
++            "backing-filename": "/tmp/pull4.1575911522",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-3-format",
++        "backing_file_depth": 2,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.1575911522",
++        "dirty-bitmaps": [
++            {
++                "name": "a",
++                "recording": false,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            },
++            {
++                "name": "b",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "disabled",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911527",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 459264,
++            "filename": "/tmp/pull4.1575911527",
++            "format": "file",
++            "actual-size": 217088,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-3-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911527",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "backing-image": {
++                "virtual-size": 10485760,
++                "filename": "/tmp/pull4.qcow2",
++                "cluster-size": 65536,
++                "format": "qcow2",
++                "actual-size": 208896,
++                "format-specific": {
++                    "type": "qcow2",
++                    "data": {
++                        "compat": "1.1",
++                        "lazy-refcounts": false,
++                        "bitmaps": [
++                            {
++                                "flags": [
++                                    "auto"
++                                ],
++                                "name": "a",
++                                "granularity": 65536
++                            }
++                        ],
++                        "refcount-bits": 16,
++                        "corrupt": false
++                    }
++                },
++                "dirty-flag": false
++            },
++            "backing-filename-format": "qcow2",
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.1575911522",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 208896,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "a",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "full-backing-filename": "/tmp/pull4.qcow2",
++            "backing-filename": "/tmp/pull4.qcow2",
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-4-format",
++        "backing_file_depth": 1,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "backing_file": "/tmp/pull4.qcow2",
++        "dirty-bitmaps": [
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911522",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 328192,
++            "filename": "/tmp/pull4.1575911522",
++            "format": "file",
++            "actual-size": 208896,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-4-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.1575911522",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 10485760,
++            "filename": "/tmp/pull4.qcow2",
++            "cluster-size": 65536,
++            "format": "qcow2",
++            "actual-size": 208896,
++            "format-specific": {
++                "type": "qcow2",
++                "data": {
++                    "compat": "1.1",
++                    "lazy-refcounts": false,
++                    "bitmaps": [
++                        {
++                            "flags": [
++                                "auto"
++                            ],
++                            "name": "a",
++                            "granularity": 65536
++                        }
++                    ],
++                    "refcount-bits": 16,
++                    "corrupt": false
++                }
++            },
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": true,
++        "node-name": "libvirt-5-format",
++        "backing_file_depth": 0,
++        "drv": "qcow2",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "dirty-bitmaps": [
++            {
++                "name": "a",
++                "recording": true,
++                "persistent": true,
++                "busy": false,
++                "status": "active",
++                "granularity": 65536,
++                "count": 0
++            }
++        ],
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.qcow2",
++        "encryption_key_missing": false
++    },
++    {
++        "iops_rd": 0,
++        "detect_zeroes": "off",
++        "image": {
++            "virtual-size": 328192,
++            "filename": "/tmp/pull4.qcow2",
++            "format": "file",
++            "actual-size": 208896,
++            "dirty-flag": false
++        },
++        "iops_wr": 0,
++        "ro": false,
++        "node-name": "libvirt-5-storage",
++        "backing_file_depth": 0,
++        "drv": "file",
++        "iops": 0,
++        "bps_wr": 0,
++        "write_threshold": 0,
++        "encrypted": false,
++        "bps": 0,
++        "bps_rd": 0,
++        "cache": {
++            "no-flush": false,
++            "direct": false,
++            "writeback": true
++        },
++        "file": "/tmp/pull4.qcow2",
++        "encryption_key_missing": false
++    }
++]
+diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+new file mode 100644
+index 0000000000..022630bd76
+--- /dev/null
++++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
+@@ -0,0 +1,12 @@
++libvirt-1-format:
++        d: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++  current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-2-format:
++        c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++        d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
++libvirt-3-format:
++        a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++        b: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
++libvirt-4-format:
++libvirt-5-format:
++        a: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-qemucaps-Add-test-data-for-upcoming-qemu-3.0.0.patch b/SOURCES/libvirt-tests-qemucaps-Add-test-data-for-upcoming-qemu-3.0.0.patch
deleted file mode 100644
index ab2c9ed..0000000
--- a/SOURCES/libvirt-tests-qemucaps-Add-test-data-for-upcoming-qemu-3.0.0.patch
+++ /dev/null
@@ -1,23984 +0,0 @@
-From 1c37b8a68fd26d854eb4b657a4706fbb5b9095d4 Mon Sep 17 00:00:00 2001
-Message-Id: <1c37b8a68fd26d854eb4b657a4706fbb5b9095d4@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 19 Jul 2018 15:03:47 +0200
-Subject: [PATCH] tests: qemucaps: Add test data for upcoming qemu 3.0.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Based on qemu commit ab3257c281c1a1a91da1090ac9e38ddd8f860c63
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 8b4a31efc0ae4a31ebd3df995dac4a262883186b)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1475770
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../caps_3.0.0.x86_64.replies                 | 22718 ++++++++++++++++
- .../caps_3.0.0.x86_64.xml                     |  1213 +
- tests/qemucapabilitiestest.c                  |     1 +
- 3 files changed, 23932 insertions(+)
- create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
- create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-new file mode 100644
-index 0000000000..257f0ecbe2
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
-@@ -0,0 +1,22718 @@
-+{
-+  "execute": "qmp_capabilities",
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "return": {
-+  },
-+  "id": "libvirt-1"
-+}
-+
-+{
-+  "execute": "query-version",
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "return": {
-+    "qemu": {
-+      "micro": 50,
-+      "minor": 12,
-+      "major": 2
-+    },
-+    "package": "v2.12.0-2284-gab3257c281"
-+  },
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-target",
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "arch": "x86_64"
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-commands",
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "netdev_add"
-+    },
-+    {
-+      "name": "device_add"
-+    },
-+    {
-+      "name": "query-qmp-schema"
-+    },
-+    {
-+      "name": "set-numa-node"
-+    },
-+    {
-+      "name": "query-sev-capabilities"
-+    },
-+    {
-+      "name": "query-sev-launch-measure"
-+    },
-+    {
-+      "name": "query-sev"
-+    },
-+    {
-+      "name": "query-vm-generation-id"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus"
-+    },
-+    {
-+      "name": "xen-load-devices-state"
-+    },
-+    {
-+      "name": "rtc-reset-reinjection"
-+    },
-+    {
-+      "name": "query-acpi-ospm-status"
-+    },
-+    {
-+      "name": "query-memory-devices"
-+    },
-+    {
-+      "name": "query-memdev"
-+    },
-+    {
-+      "name": "query-command-line-options"
-+    },
-+    {
-+      "name": "query-target"
-+    },
-+    {
-+      "name": "query-fdsets"
-+    },
-+    {
-+      "name": "remove-fd"
-+    },
-+    {
-+      "name": "add-fd"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion"
-+    },
-+    {
-+      "name": "query-cpu-definitions"
-+    },
-+    {
-+      "name": "query-memory-size-summary"
-+    },
-+    {
-+      "name": "query-machines"
-+    },
-+    {
-+      "name": "closefd"
-+    },
-+    {
-+      "name": "getfd"
-+    },
-+    {
-+      "name": "object-del"
-+    },
-+    {
-+      "name": "object-add"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability"
-+    },
-+    {
-+      "name": "query-dump"
-+    },
-+    {
-+      "name": "dump-guest-memory"
-+    },
-+    {
-+      "name": "device_del"
-+    },
-+    {
-+      "name": "xen-set-global-dirty-log"
-+    },
-+    {
-+      "name": "qom-list-properties"
-+    },
-+    {
-+      "name": "device-list-properties"
-+    },
-+    {
-+      "name": "qom-list-types"
-+    },
-+    {
-+      "name": "change"
-+    },
-+    {
-+      "name": "qom-set"
-+    },
-+    {
-+      "name": "qom-get"
-+    },
-+    {
-+      "name": "qom-list"
-+    },
-+    {
-+      "name": "human-monitor-command"
-+    },
-+    {
-+      "name": "balloon"
-+    },
-+    {
-+      "name": "inject-nmi"
-+    },
-+    {
-+      "name": "system_wakeup"
-+    },
-+    {
-+      "name": "exit-preconfig"
-+    },
-+    {
-+      "name": "cont"
-+    },
-+    {
-+      "name": "pmemsave"
-+    },
-+    {
-+      "name": "memsave"
-+    },
-+    {
-+      "name": "cpu-add"
-+    },
-+    {
-+      "name": "system_powerdown"
-+    },
-+    {
-+      "name": "system_reset"
-+    },
-+    {
-+      "name": "stop"
-+    },
-+    {
-+      "name": "quit"
-+    },
-+    {
-+      "name": "query-pci"
-+    },
-+    {
-+      "name": "query-balloon"
-+    },
-+    {
-+      "name": "query-iothreads"
-+    },
-+    {
-+      "name": "query-cpus-fast"
-+    },
-+    {
-+      "name": "query-cpus"
-+    },
-+    {
-+      "name": "query-events"
-+    },
-+    {
-+      "name": "query-uuid"
-+    },
-+    {
-+      "name": "query-kvm"
-+    },
-+    {
-+      "name": "query-name"
-+    },
-+    {
-+      "name": "add_client"
-+    },
-+    {
-+      "name": "query-commands"
-+    },
-+    {
-+      "name": "query-version"
-+    },
-+    {
-+      "name": "qmp_capabilities"
-+    },
-+    {
-+      "name": "trace-event-set-state"
-+    },
-+    {
-+      "name": "trace-event-get-state"
-+    },
-+    {
-+      "name": "transaction"
-+    },
-+    {
-+      "name": "migrate-pause"
-+    },
-+    {
-+      "name": "migrate-recover"
-+    },
-+    {
-+      "name": "xen-colo-do-checkpoint"
-+    },
-+    {
-+      "name": "query-xen-replication-status"
-+    },
-+    {
-+      "name": "xen-set-replication"
-+    },
-+    {
-+      "name": "xen-save-devices-state"
-+    },
-+    {
-+      "name": "migrate-incoming"
-+    },
-+    {
-+      "name": "migrate"
-+    },
-+    {
-+      "name": "query-migrate-cache-size"
-+    },
-+    {
-+      "name": "migrate-set-cache-size"
-+    },
-+    {
-+      "name": "migrate_set_speed"
-+    },
-+    {
-+      "name": "migrate_set_downtime"
-+    },
-+    {
-+      "name": "migrate-continue"
-+    },
-+    {
-+      "name": "migrate_cancel"
-+    },
-+    {
-+      "name": "x-colo-lost-heartbeat"
-+    },
-+    {
-+      "name": "migrate-start-postcopy"
-+    },
-+    {
-+      "name": "client_migrate_info"
-+    },
-+    {
-+      "name": "query-migrate-parameters"
-+    },
-+    {
-+      "name": "migrate-set-parameters"
-+    },
-+    {
-+      "name": "query-migrate-capabilities"
-+    },
-+    {
-+      "name": "migrate-set-capabilities"
-+    },
-+    {
-+      "name": "query-migrate"
-+    },
-+    {
-+      "name": "input-send-event"
-+    },
-+    {
-+      "name": "send-key"
-+    },
-+    {
-+      "name": "query-mice"
-+    },
-+    {
-+      "name": "change-vnc-password"
-+    },
-+    {
-+      "name": "query-vnc-servers"
-+    },
-+    {
-+      "name": "query-vnc"
-+    },
-+    {
-+      "name": "query-spice"
-+    },
-+    {
-+      "name": "screendump"
-+    },
-+    {
-+      "name": "expire_password"
-+    },
-+    {
-+      "name": "set_password"
-+    },
-+    {
-+      "name": "query-tpm"
-+    },
-+    {
-+      "name": "query-tpm-types"
-+    },
-+    {
-+      "name": "query-tpm-models"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-groups"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-flows"
-+    },
-+    {
-+      "name": "query-rocker-ports"
-+    },
-+    {
-+      "name": "query-rocker"
-+    },
-+    {
-+      "name": "query-rx-filter"
-+    },
-+    {
-+      "name": "netdev_del"
-+    },
-+    {
-+      "name": "set_link"
-+    },
-+    {
-+      "name": "chardev-send-break"
-+    },
-+    {
-+      "name": "chardev-remove"
-+    },
-+    {
-+      "name": "chardev-change"
-+    },
-+    {
-+      "name": "chardev-add"
-+    },
-+    {
-+      "name": "ringbuf-read"
-+    },
-+    {
-+      "name": "ringbuf-write"
-+    },
-+    {
-+      "name": "query-chardev-backends"
-+    },
-+    {
-+      "name": "query-chardev"
-+    },
-+    {
-+      "name": "nbd-server-stop"
-+    },
-+    {
-+      "name": "x-nbd-server-add-bitmap"
-+    },
-+    {
-+      "name": "nbd-server-remove"
-+    },
-+    {
-+      "name": "nbd-server-add"
-+    },
-+    {
-+      "name": "nbd-server-start"
-+    },
-+    {
-+      "name": "eject"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync"
-+    },
-+    {
-+      "name": "query-pr-managers"
-+    },
-+    {
-+      "name": "x-blockdev-set-iothread"
-+    },
-+    {
-+      "name": "x-blockdev-change"
-+    },
-+    {
-+      "name": "block-set-write-threshold"
-+    },
-+    {
-+      "name": "blockdev-change-medium"
-+    },
-+    {
-+      "name": "blockdev-insert-medium"
-+    },
-+    {
-+      "name": "blockdev-remove-medium"
-+    },
-+    {
-+      "name": "blockdev-close-tray"
-+    },
-+    {
-+      "name": "blockdev-open-tray"
-+    },
-+    {
-+      "name": "blockdev-create"
-+    },
-+    {
-+      "name": "blockdev-del"
-+    },
-+    {
-+      "name": "blockdev-add"
-+    },
-+    {
-+      "name": "block-job-finalize"
-+    },
-+    {
-+      "name": "block-job-dismiss"
-+    },
-+    {
-+      "name": "block-job-complete"
-+    },
-+    {
-+      "name": "block-job-resume"
-+    },
-+    {
-+      "name": "block-job-pause"
-+    },
-+    {
-+      "name": "block-job-cancel"
-+    },
-+    {
-+      "name": "block-job-set-speed"
-+    },
-+    {
-+      "name": "block-stream"
-+    },
-+    {
-+      "name": "block_set_io_throttle"
-+    },
-+    {
-+      "name": "blockdev-mirror"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-merge"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-disable"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-enable"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add"
-+    },
-+    {
-+      "name": "drive-mirror"
-+    },
-+    {
-+      "name": "query-named-block-nodes"
-+    },
-+    {
-+      "name": "blockdev-backup"
-+    },
-+    {
-+      "name": "drive-backup"
-+    },
-+    {
-+      "name": "block-commit"
-+    },
-+    {
-+      "name": "change-backing-file"
-+    },
-+    {
-+      "name": "blockdev-snapshot"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync"
-+    },
-+    {
-+      "name": "block_resize"
-+    },
-+    {
-+      "name": "block_passwd"
-+    },
-+    {
-+      "name": "query-block-jobs"
-+    },
-+    {
-+      "name": "query-blockstats"
-+    },
-+    {
-+      "name": "query-block"
-+    },
-+    {
-+      "name": "x-block-latency-histogram-set"
-+    },
-+    {
-+      "name": "query-jobs"
-+    },
-+    {
-+      "name": "job-finalize"
-+    },
-+    {
-+      "name": "job-dismiss"
-+    },
-+    {
-+      "name": "job-complete"
-+    },
-+    {
-+      "name": "job-cancel"
-+    },
-+    {
-+      "name": "job-resume"
-+    },
-+    {
-+      "name": "job-pause"
-+    },
-+    {
-+      "name": "watchdog-set-action"
-+    },
-+    {
-+      "name": "query-status"
-+    }
-+  ],
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "add-fd",
-+  "arguments": {
-+    "fdset-id": 0,
-+    "opaque": "/dev/null"
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "fd": 17,
-+    "fdset-id": 0
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "block-commit",
-+  "arguments": {
-+    "device": "bogus"
-+  },
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "id": "libvirt-6",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'bogus' not found"
-+  }
-+}
-+
-+{
-+  "execute": "query-kvm",
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "return": {
-+    "enabled": true,
-+    "present": true
-+  },
-+  "id": "libvirt-7"
-+}
-+
-+{
-+  "execute": "query-events",
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "COMMAND_DROPPED"
-+    },
-+    {
-+      "name": "RTC_CHANGE"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST"
-+    },
-+    {
-+      "name": "MEM_UNPLUG_ERROR"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED"
-+    },
-+    {
-+      "name": "DEVICE_DELETED"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE"
-+    },
-+    {
-+      "name": "MIGRATION_PASS"
-+    },
-+    {
-+      "name": "MIGRATION"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED"
-+    },
-+    {
-+      "name": "VNC_CONNECTED"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD"
-+    },
-+    {
-+      "name": "QUORUM_FAILURE"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED"
-+    },
-+    {
-+      "name": "JOB_STATUS_CHANGE"
-+    },
-+    {
-+      "name": "GUEST_PANICKED"
-+    },
-+    {
-+      "name": "WATCHDOG"
-+    },
-+    {
-+      "name": "WAKEUP"
-+    },
-+    {
-+      "name": "SUSPEND_DISK"
-+    },
-+    {
-+      "name": "SUSPEND"
-+    },
-+    {
-+      "name": "RESUME"
-+    },
-+    {
-+      "name": "STOP"
-+    },
-+    {
-+      "name": "RESET"
-+    },
-+    {
-+      "name": "POWERDOWN"
-+    },
-+    {
-+      "name": "SHUTDOWN"
-+    }
-+  ],
-+  "id": "libvirt-8"
-+}
-+
-+{
-+  "execute": "qom-list-types",
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "vhost-vsock-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "scsi-generic",
-+      "parent": "scsi-device"
-+    },
-+    {
-+      "name": "qio-channel-tls",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "scsi-hd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "pc-0.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "usb-bot",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "chardev-null",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-parallel",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "qemu-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "lsi53c895a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "kvm-ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "virtio-keyboard-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "xen-sysbus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "i440FX",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ide-hd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "Opteron_G1-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "kvm64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-net-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "kvm-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "at24c-eeprom",
-+      "parent": "i2c-slave"
-+    },
-+    {
-+      "name": "chardev-pty",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "xen-apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "SUNW,fdtwo",
-+      "parent": "base-sysbus-fdc"
-+    },
-+    {
-+      "name": "isa-pcspk",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "Haswell-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "loader",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "filter-rewriter",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "virtio-serial-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "Nehalem-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-0.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pcie-root-port",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "virtio-crypto-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "usb-host",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "pc-0.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "usb-bt-dongle",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "igd-passthrough-isa-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qemu64-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-input-host-pci",
-+      "parent": "virtio-input-pci"
-+    },
-+    {
-+      "name": "pc-i440fx-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "phenom-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "e1000",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "PIIX3-xen",
-+      "parent": "pci-piix3"
-+    },
-+    {
-+      "name": "pc-i440fx-1.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ICH9-LPC",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sysbus-ahci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci4",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "ich9-usb-uhci6",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pc-q35-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "usb-mtp",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ich9-usb-uhci5",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "chardev-spicevmc",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "ich9-usb-uhci3",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "ich9-usb-uhci2",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "ich9-usb-uhci1",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "tls-creds-psk",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "tpci200",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "memory-backend-file",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "pc-q35-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "AMDVI-PCI",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "rtl8139",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-hci",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pc-q35-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "megasas",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "base-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "container",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qxl-vga",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "scsi-block",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "Opteron_G2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "unimplemented-device",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pc-i440fx-3.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "scsi-cd",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "pxb-bus",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "pc-0.14-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "accel",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "pc-i440fx-2.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "floppy-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "usb-audio",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "virtio-vga",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "vmware-svga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "isa-serial",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-0.13-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "vhost-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "virtio-serial-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "isa-debug-exit",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "chardev-gdb",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "fdc37m81x-superio",
-+      "parent": "isa-superio"
-+    },
-+    {
-+      "name": "pc-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "xen-backend",
-+      "parent": "xen-sysdev"
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pr-manager-helper",
-+      "parent": "pr-manager"
-+    },
-+    {
-+      "name": "fw_cfg_mem",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "tls-creds-anon",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "pc-q35-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ide-cd",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "usb-uas",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-1.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-socket",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-balloon-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "iothread",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "filter-redirector",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "sb16",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "486-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-1.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-mux",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "bochs-display",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-ccid",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "isa-cirrus-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vhost-vsock-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "sdhci-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-input-host-device",
-+      "parent": "virtio-input-device"
-+    },
-+    {
-+      "name": "i82559er",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "cs4231a",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "ivshmem-doorbell",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "chardev-udp",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-rng-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "isa-parallel",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "piix4-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "adlib",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-0.15-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "kvmvapic",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "hda-micro",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "pci-bridge-seat",
-+      "parent": "pci-bridge"
-+    },
-+    {
-+      "name": "dc390",
-+      "parent": "am53c974"
-+    },
-+    {
-+      "name": "qemu,register",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "IDE",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "fw_cfg_io",
-+      "parent": "fw_cfg"
-+    },
-+    {
-+      "name": "tpm-crb",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "memory-backend-ram",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "am53c974",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-blk-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "nvdimm",
-+      "parent": "pc-dimm"
-+    },
-+    {
-+      "name": "mc146818rtc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qio-channel-websock",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "qio-channel-file",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "chardev-msmouse",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "chardev-pipe",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "pc-q35-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pc-i440fx-1.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "cryptodev-backend-builtin",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "hda-output",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "mmio_interface",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "chardev-spiceport",
-+      "parent": "chardev-spice"
-+    },
-+    {
-+      "name": "VGA",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "KnightsMill-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "sga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "i8257",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "qio-net-listener",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "port92",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "mptsas1068",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "edu",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-mouse-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "Skylake-Client-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ICH9 SMB",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Broadwell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "vfio-pci-igd-lpc-bridge",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "HDA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "n270-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pcm3680_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-redir",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "floppy",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "qemu:memory-region",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "mioe3680_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "sysbus-ohci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "chardev-ringbuf",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "max-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "can-bus",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "qtest-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "qio-channel-command",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "pxb-host",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "IvyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "xio3130-downstream",
-+      "parent": "pcie-slot"
-+    },
-+    {
-+      "name": "virtio-gpu-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "virtio-blk-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "cirrus-vga",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "isa-ipmi-kcs",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "kvmclock",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "cryptodev-vhost-user",
-+      "parent": "cryptodev-backend"
-+    },
-+    {
-+      "name": "Opteron_G3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "lsi53c810",
-+      "parent": "lsi53c895a"
-+    },
-+    {
-+      "name": "System",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Westmere-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-serial",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "vt82c686b-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "chardev-file",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "pc-q35-2.10-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "intel-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "PCIE",
-+      "parent": "PCI"
-+    },
-+    {
-+      "name": "tpm-tis",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "xen-sysdev",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pcie-pci-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "qio-dns-resolver",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "vhost-user-blk-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "virtio-serial-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "kvm-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "secondary-vga",
-+      "parent": "pci-vga"
-+    },
-+    {
-+      "name": "vhost-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "pci-ohci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cfi.pflash01",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "usb-hub",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "ccid-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "xenpv-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "EPYC-IBPB-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "input-linux",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "piix3-ide-xen",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "vmgenid",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "pc-q35-3.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pci-serial",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmport",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "vhost-user-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "ipmi-bmc-extern",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "PIIX4_PM",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i8042",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "coreduo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82559c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82559b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82559a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-q35-2.12-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SCSI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "rocker",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pcnet",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "rng-egd",
-+      "parent": "rng-backend"
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Opteron_G4-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-q35-2.11-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "chardev-testdev",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "PIIX3",
-+      "parent": "pci-piix3"
-+    },
-+    {
-+      "name": "filter-dump",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "migration",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "vmmouse",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "i82558b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82558a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ioapic",
-+      "parent": "ioapic-common"
-+    },
-+    {
-+      "name": "smbus-eeprom",
-+      "parent": "smbus-device"
-+    },
-+    {
-+      "name": "Haswell-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "i82801",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "tls-creds-x509",
-+      "parent": "tls-creds"
-+    },
-+    {
-+      "name": "virtio-net-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "virtio-keyboard-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "i82562",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Haswell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-net",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "tpm-passthrough",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "q35-pcihost",
-+      "parent": "pcie-host-bridge"
-+    },
-+    {
-+      "name": "amd-iommu",
-+      "parent": "x86-iommu"
-+    },
-+    {
-+      "name": "i440FX-pcihost",
-+      "parent": "pci-host-bridge"
-+    },
-+    {
-+      "name": "i82557c",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82557b",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i82557a",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-memory",
-+      "parent": "chardev-ringbuf"
-+    },
-+    {
-+      "name": "isa-i8259",
-+      "parent": "pic-common"
-+    },
-+    {
-+      "name": "virtio-gpu-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "i82551",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "SandyBridge-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "split-irq",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "usb-mouse",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "sdhci-bus",
-+      "parent": "sd-bus"
-+    },
-+    {
-+      "name": "i82550",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "host-x86_64-cpu",
-+      "parent": "max-x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-crypto-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "ich9-usb-ehci1",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "ich9-usb-ehci2",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "vfio-pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "filter-mirror",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "isa-ide",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "irq",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "throttle-group",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "IvyBridge-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "memory-backend-memfd",
-+      "parent": "memory-backend"
-+    },
-+    {
-+      "name": "can-host-socketcan",
-+      "parent": "can-host"
-+    },
-+    {
-+      "name": "nec-usb-xhci",
-+      "parent": "base-xhci"
-+    },
-+    {
-+      "name": "qio-channel-socket",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "pvscsi",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "piix3-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "virtserialport",
-+      "parent": "virtio-serial-port"
-+    },
-+    {
-+      "name": "sd-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "Opteron_G5-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ich9-ahci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-stdio",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-dimm",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "gus",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "hyperv-testdev",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "isa-vga",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "xen-pci-passthrough",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "cryptodev-backend",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "IndustryPack",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "pc-i440fx-2.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "or-irq",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "ipmi-bmc-sim",
-+      "parent": "ipmi-bmc"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-ehci",
-+      "parent": "pci-ehci-usb"
-+    },
-+    {
-+      "name": "pentium2-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "chardev-vc",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "virtio-rng-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "filter-replay",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "e1000-82545em",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "chardev-wctablet",
-+      "parent": "chardev"
-+    },
-+    {
-+      "name": "pc-i440fx-2.5-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "e1000-82544gc",
-+      "parent": "e1000-base"
-+    },
-+    {
-+      "name": "hpet",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ioh3420",
-+      "parent": "pcie-root-port-base"
-+    },
-+    {
-+      "name": "pc-i440fx-2.4-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-9p-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "vmcoreinfo",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "filter-buffer",
-+      "parent": "netfilter"
-+    },
-+    {
-+      "name": "pci-serial-4x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "athlon-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ich9-intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "pc-i440fx-2.3-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "virtio-9p-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "ivshmem",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "imx-usdhc",
-+      "parent": "generic-sdhci"
-+    },
-+    {
-+      "name": "isa-ipmi-bt",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "ipoctal232",
-+      "parent": "ipack-device"
-+    },
-+    {
-+      "name": "virtio-tablet-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "virtio-scsi-pci",
-+      "parent": "virtio-pci"
-+    },
-+    {
-+      "name": "piix3-ide",
-+      "parent": "pci-ide"
-+    },
-+    {
-+      "name": "ES1370",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "xen-pvdevice",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-pci-bus",
-+      "parent": "virtio-bus"
-+    },
-+    {
-+      "name": "x3130-upstream",
-+      "parent": "pcie-port"
-+    },
-+    {
-+      "name": "xenfv-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "pci-testdev",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "qemu-console",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "ISA",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "piix4-usb-uhci",
-+      "parent": "pci-uhci-usb"
-+    },
-+    {
-+      "name": "pc-i440fx-2.7-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "tcg-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "virtconsole",
-+      "parent": "virtserialport"
-+    },
-+    {
-+      "name": "pentium3-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pci-serial-2x",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ne2k_isa",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "Nehalem-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "isa-fdc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.6-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "xen-platform",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "chardev-serial",
-+      "parent": "chardev-fd"
-+    },
-+    {
-+      "name": "igd-passthrough-i440FX",
-+      "parent": "i440FX"
-+    },
-+    {
-+      "name": "colo-compare",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "e1000e",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "virtio-tablet-pci",
-+      "parent": "virtio-input-hid-pci"
-+    },
-+    {
-+      "name": "usb-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "smc37c669-superio",
-+      "parent": "isa-superio"
-+    },
-+    {
-+      "name": "i82801b11-bridge",
-+      "parent": "base-pci-bridge"
-+    },
-+    {
-+      "name": "PCI",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "usb-storage",
-+      "parent": "usb-storage-dev"
-+    },
-+    {
-+      "name": "vhost-user-scsi",
-+      "parent": "vhost-scsi-common"
-+    },
-+    {
-+      "name": "mch",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "ib700",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "esp",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isabus-bridge",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "vhost-user-blk",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "qemu32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "ne2k_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Broadwell-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "tpm-emulator",
-+      "parent": "tpm-backend"
-+    },
-+    {
-+      "name": "ivshmem-plain",
-+      "parent": "ivshmem-common"
-+    },
-+    {
-+      "name": "usb-kbd",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "isa-applesmc",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "xen-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "secret",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "hda-duplex",
-+      "parent": "hda-audio"
-+    },
-+    {
-+      "name": "kvm32-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pc-i440fx-2.9-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "kvm-apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "sev-guest",
-+      "parent": "object"
-+    },
-+    {
-+      "name": "virtio-balloon-device",
-+      "parent": "virtio-device"
-+    },
-+    {
-+      "name": "none-machine",
-+      "parent": "machine"
-+    },
-+    {
-+      "name": "sysbus-fdc",
-+      "parent": "base-sysbus-fdc"
-+    },
-+    {
-+      "name": "megasas-gen2",
-+      "parent": "megasas-base"
-+    },
-+    {
-+      "name": "pc-1.0-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "core2duo-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "qxl",
-+      "parent": "pci-qxl"
-+    },
-+    {
-+      "name": "ramfb",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "pc-i440fx-2.8-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "nvme",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "isa-debugcon",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "SandyBridge-IBRS-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "Skylake-Server-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pentium-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "usb-tablet",
-+      "parent": "usb-hid"
-+    },
-+    {
-+      "name": "qio-channel-buffer",
-+      "parent": "qio-channel"
-+    },
-+    {
-+      "name": "scsi-disk",
-+      "parent": "scsi-disk-base"
-+    },
-+    {
-+      "name": "usb-braille",
-+      "parent": "usb-serial-dev"
-+    },
-+    {
-+      "name": "intel-hda",
-+      "parent": "intel-hda-generic"
-+    },
-+    {
-+      "name": "kvm-accel",
-+      "parent": "accel"
-+    },
-+    {
-+      "name": "pxb-pcie-bus",
-+      "parent": "PCIE"
-+    },
-+    {
-+      "name": "virtio-scsi-device",
-+      "parent": "virtio-scsi-common"
-+    },
-+    {
-+      "name": "AC97",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "usb-wacom-tablet",
-+      "parent": "usb-device"
-+    },
-+    {
-+      "name": "i2c-bus",
-+      "parent": "bus"
-+    },
-+    {
-+      "name": "EPYC-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "virtio-mouse-device",
-+      "parent": "virtio-input-hid-device"
-+    },
-+    {
-+      "name": "Conroe-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "pxb-pcie",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-1.3-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "ide-drive",
-+      "parent": "ide-device"
-+    },
-+    {
-+      "name": "generic-sdhci",
-+      "parent": "sys-bus-device"
-+    },
-+    {
-+      "name": "isa-pit",
-+      "parent": "pit-common"
-+    },
-+    {
-+      "name": "pxb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "pc-1.2-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "intel-iommu-iommu-memory-region",
-+      "parent": "qemu:iommu-memory-region"
-+    },
-+    {
-+      "name": "pc-1.1-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "sd-card",
-+      "parent": "device"
-+    },
-+    {
-+      "name": "kvaser_pci",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "vmxnet3",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "i6300esb",
-+      "parent": "pci-device"
-+    },
-+    {
-+      "name": "Westmere-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "amd-iommu-iommu-memory-region",
-+      "parent": "qemu:iommu-memory-region"
-+    },
-+    {
-+      "name": "pvpanic",
-+      "parent": "isa-device"
-+    },
-+    {
-+      "name": "Penryn-x86_64-cpu",
-+      "parent": "x86_64-cpu"
-+    },
-+    {
-+      "name": "apic",
-+      "parent": "apic-common"
-+    },
-+    {
-+      "name": "isapc-machine",
-+      "parent": "generic-pc-machine"
-+    },
-+    {
-+      "name": "rng-random",
-+      "parent": "rng-backend"
-+    }
-+  ],
-+  "id": "libvirt-9"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-blk-pci"
-+  },
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "secs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "request-merging",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "heads",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "scsi",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cyls",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "queue-size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "config-wce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-blk-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "num-queues",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-10"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-pci"
-+  },
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "ctrl_mac_addr",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "status",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "speed",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "ctrl_rx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mrg_rxbuf",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txtimer",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "host_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ctrl_rx_extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gso",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-txburst",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_mtu",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "ctrl_vlan",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-net-device>"
-+    },
-+    {
-+      "name": "guest_announce",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "guest_tso4",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "duplex",
-+      "type": "str"
-+    },
-+    {
-+      "name": "guest_tso6",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ctrl_guest_offloads",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "csum",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ecn",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest_ufo",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mac",
-+      "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56",
-+      "type": "str"
-+    },
-+    {
-+      "name": "tx_queue_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "tx",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-mtu-bypass-backend",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "netdev",
-+      "description": "ID of a netdev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rx_queue_size",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-11"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-pci"
-+  },
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virtqueue_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cmd_per_lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "num_queues",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hotplug",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_sectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "param_change",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iothread",
-+      "type": "link<iothread>"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-scsi-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-12"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-ccw"
-+  },
-+  "id": "libvirt-13"
-+}
-+
-+{
-+  "id": "libvirt-13",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-net-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-scsi-ccw"
-+  },
-+  "id": "libvirt-14"
-+}
-+
-+{
-+  "id": "libvirt-14",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-scsi-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-net-s390"
-+  },
-+  "id": "libvirt-15"
-+}
-+
-+{
-+  "id": "libvirt-15",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-net-s390' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "pci-assign"
-+  },
-+  "id": "libvirt-16"
-+}
-+
-+{
-+  "id": "libvirt-16",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "kvm-pci-assign"
-+  },
-+  "id": "libvirt-17"
-+}
-+
-+{
-+  "id": "libvirt-17",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'kvm-pci-assign' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vfio-pci"
-+  },
-+  "id": "libvirt-18"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "x-igd-opregion",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pci-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pci-sub-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-kvm-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-req",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-no-kvm-msi",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-no-vfio-ioeventfd",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-no-kvm-intx",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host",
-+      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-no-kvm-msix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pci-sub-vendor-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pci-device-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-no-geforce-quirks",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "display",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "x-igd-gms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-nv-gpudirect-clique",
-+      "description": "NVIDIA GPUDirect Clique ID (0 - 15)",
-+      "type": "uint4"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "x-msix-relocation",
-+      "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5",
-+      "type": "OffAutoPCIBAR"
-+    },
-+    {
-+      "name": "x-intx-mmap-timeout-ms",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-no-mmap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "sysfsdev",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-vga",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-18"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-disk"
-+  },
-+  "id": "libvirt-19"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "dpofua",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "scsi_version",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "port_wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "max_unmap_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "max_io_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "product",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vendor",
-+      "type": "str"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "port_index",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-19"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ide-drive"
-+  },
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "unit",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "wwn",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "model",
-+      "type": "str"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "ver",
-+      "type": "str"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-20"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "PIIX4_PM"
-+  },
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi-pci-hotplug-with-bridge-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "smb_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-21"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-redir"
-+  },
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "filter",
-+      "type": "str"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "debug",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "streams",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "chardev",
-+      "description": "ID of a chardev to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-22"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-host"
-+  },
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "isobufs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostaddr",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "productid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "isobsize",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vendorid",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pipeline",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "hostport",
-+      "type": "str"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "loglevel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "hostbus",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-23"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "scsi-generic"
-+  },
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "lun",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "channel",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "scsi-id",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-24"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "i440FX-pcihost"
-+  },
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "short_root_bus",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pci-conf-idx[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-end",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole-end",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pci-hole-start",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pci-hole64-start",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole64-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "pci-conf-data[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "x-pci-hole64-fix",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-25"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "q35-pcihost"
-+  },
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "short_root_bus",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "system-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-conf-idx[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pcie-mmcfg-mmio[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-start",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "io-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole64-end",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "pci-hole-end",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "above-4g-mem-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "below-4g-mem-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "ram-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-hole-start",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "MCFG",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "mch",
-+      "type": "child<mch>"
-+    },
-+    {
-+      "name": "pci-hole64-size",
-+      "type": "size"
-+    },
-+    {
-+      "name": "pci-mem",
-+      "type": "link<qemu:memory-region>"
-+    },
-+    {
-+      "name": "pci-conf-data[0]",
-+      "type": "child<qemu:memory-region>"
-+    },
-+    {
-+      "name": "x-pci-hole64-fix",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mcfg_size",
-+      "type": "uint64"
-+    }
-+  ],
-+  "id": "libvirt-26"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "usb-storage"
-+  },
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "serial",
-+      "type": "str"
-+    },
-+    {
-+      "name": "msos-desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "logical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "discard_granularity",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "drive",
-+      "description": "Node name or ID of a block device to use as a backend",
-+      "type": "str"
-+    },
-+    {
-+      "name": "bootindex",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "write-cache",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "share-rw",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "opt_io_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "min_io_size",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "port",
-+      "type": "str"
-+    },
-+    {
-+      "name": "attached",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "werror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "full-path",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rerror",
-+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-+      "type": "BlockdevOnError"
-+    },
-+    {
-+      "name": "removable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "physical_block_size",
-+      "description": "A power of two between 512 and 32768",
-+      "type": "uint16"
-+    }
-+  ],
-+  "id": "libvirt-27"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "kvm-pit"
-+  },
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "iobase",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "lost_tick_policy",
-+      "type": "LostTickPolicy"
-+    }
-+  ],
-+  "id": "libvirt-28"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "VGA"
-+  },
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "mmio",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "qemu-extended-regs",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "big-endian-framebuffer",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-29"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "vmware-svga"
-+  },
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-30"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "qxl"
-+  },
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "global-vmstate",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vgamem_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "debug",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "revision",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ram_size",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram64_size_mb",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "guestdebug",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "vram_size",
-+      "type": "uint64"
-+    },
-+    {
-+      "name": "surfaces",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "cmdlog",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-31"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-pci"
-+  },
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "ioeventfd",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "vectors",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-gpu-device>"
-+    },
-+    {
-+      "name": "max_hostmem",
-+      "type": "size"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "stats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virgl",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-32"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-gpu-device"
-+  },
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "yres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "stats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "xres",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "max_outputs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "virgl",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "max_hostmem",
-+      "type": "size"
-+    }
-+  ],
-+  "id": "libvirt-33"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "ICH9-LPC"
-+  },
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "memory-hotplug-support",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "sci_int",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "gpe0_blk_len",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pm_io_base",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "noreboot",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "cpu-hotplug-legacy",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "acpi_disable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-smi-broadcast",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable_s3",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "acpi_enable_cmd",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "s4_val",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "enable_tco",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable_s4",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "gpe0_blk",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-34"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-pci"
-+  },
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-disable-pcie",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-modern",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "disable-legacy",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnkctl-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "page-per-vq",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-deverr-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-pm-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "class",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "migrate-extra",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "modern-pio-notify",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-backend",
-+      "type": "child<virtio-balloon-device>"
-+    },
-+    {
-+      "name": "x-ignore-backend-features",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "ats",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "virtio-pci-bus-master-bug-migration",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    }
-+  ],
-+  "id": "libvirt-35"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-ccw"
-+  },
-+  "id": "libvirt-36"
-+}
-+
-+{
-+  "id": "libvirt-36",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Device 'virtio-balloon-ccw' not found"
-+  }
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "virtio-balloon-device"
-+  },
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "notify_on_empty",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "any_layout",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "indirect_desc",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "guest-stats",
-+      "type": "guest statistics"
-+    },
-+    {
-+      "name": "guest-stats-polling-interval",
-+      "type": "int"
-+    },
-+    {
-+      "name": "event_idx",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "iommu_platform",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "deflate-on-oom",
-+      "description": "on/off",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-37"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "nec-usb-xhci"
-+  },
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "intrs",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msix",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "msi",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "superspeed-ports-first",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "streams",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "force-pcie-endcap",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    },
-+    {
-+      "name": "p3",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "p2",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "slots",
-+      "type": "uint32"
-+    }
-+  ],
-+  "id": "libvirt-38"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "intel-iommu"
-+  },
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "eim",
-+      "description": "on/off/auto",
-+      "type": "OnOffAuto"
-+    },
-+    {
-+      "name": "x-aw-bits",
-+      "type": "uint8"
-+    },
-+    {
-+      "name": "x-buggy-eim",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "intremap",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "version",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "pt",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "device-iotlb",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "caching-mode",
-+      "type": "bool"
-+    }
-+  ],
-+  "id": "libvirt-39"
-+}
-+
-+{
-+  "execute": "device-list-properties",
-+  "arguments": {
-+    "typename": "mch"
-+  },
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "rombar",
-+      "type": "uint32"
-+    },
-+    {
-+      "name": "x-pcie-lnksta-dllla",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "multifunction",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "extended-tseg-mbytes",
-+      "type": "uint16"
-+    },
-+    {
-+      "name": "romfile",
-+      "type": "str"
-+    },
-+    {
-+      "name": "x-pcie-extcap-init",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "command_serr_enable",
-+      "description": "on/off",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "addr",
-+      "description": "Slot and optional function number, example: 06.0 or 06",
-+      "type": "int32"
-+    }
-+  ],
-+  "id": "libvirt-40"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "memory-backend-file"
-+  },
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "policy",
-+      "type": "HostMemPolicy"
-+    },
-+    {
-+      "name": "share",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "host-nodes",
-+      "type": "int"
-+    },
-+    {
-+      "name": "prealloc",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "dump",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "size",
-+      "type": "int"
-+    },
-+    {
-+      "name": "merge",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "align",
-+      "type": "int"
-+    },
-+    {
-+      "name": "mem-path",
-+      "type": "string"
-+    },
-+    {
-+      "name": "discard-data",
-+      "type": "bool"
-+    },
-+    {
-+      "name": "type",
-+      "type": "string"
-+    }
-+  ],
-+  "id": "libvirt-41"
-+}
-+
-+{
-+  "execute": "qom-list-properties",
-+  "arguments": {
-+    "typename": "spapr-machine"
-+  },
-+  "id": "libvirt-42"
-+}
-+
-+{
-+  "id": "libvirt-42",
-+  "error": {
-+    "class": "DeviceNotFound",
-+    "desc": "Class 'spapr-machine' not found"
-+  }
-+}
-+
-+{
-+  "execute": "query-machines",
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "isapc",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.1",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.2",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.3",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.8",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-1.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "none",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.9",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "xenfv",
-+      "cpu-max": 128
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.3",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.1",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.2",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.0",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.11",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.12",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-3.0",
-+      "cpu-max": 288,
-+      "alias": "q35"
-+    },
-+    {
-+      "hotpluggable-cpus": false,
-+      "name": "xenpv",
-+      "cpu-max": 1
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.10",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.9",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.15",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.7",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.11",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.8",
-+      "cpu-max": 288
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.13",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.12",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.14",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-3.0",
-+      "is-default": true,
-+      "cpu-max": 255,
-+      "alias": "pc"
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.5",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-q35-2.6",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-1.4",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-i440fx-2.10",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.11",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.12",
-+      "cpu-max": 255
-+    },
-+    {
-+      "hotpluggable-cpus": true,
-+      "name": "pc-0.10",
-+      "cpu-max": 255
-+    }
-+  ],
-+  "id": "libvirt-43"
-+}
-+
-+{
-+  "execute": "query-cpu-definitions",
-+  "id": "libvirt-44"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "KnightsMill",
-+      "typename": "KnightsMill-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw",
-+        "ibpb"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "libvirt-44"
-+}
-+
-+{
-+  "execute": "query-tpm-models",
-+  "id": "libvirt-45"
-+}
-+
-+{
-+  "return": [
-+    "tpm-crb",
-+    "tpm-tis"
-+  ],
-+  "id": "libvirt-45"
-+}
-+
-+{
-+  "execute": "query-tpm-types",
-+  "id": "libvirt-46"
-+}
-+
-+{
-+  "return": [
-+    "passthrough",
-+    "emulator"
-+  ],
-+  "id": "libvirt-46"
-+}
-+
-+{
-+  "execute": "query-command-line-options",
-+  "id": "libvirt-47"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "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": "non-adaptive",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "lossy",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "acl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "x509verify",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "sasl",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "key-delay-ms",
-+          "type": "number"
-+        },
-+        {
-+          "name": "lock-key-sync",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reverse",
-+          "type": "boolean"
-+        },
-+        {
-+          "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": "x509",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "string"
-+        },
-+        {
-+          "name": "vnc",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "vnc"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "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",
-+          "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": [
-+      ],
-+      "option": "smbios"
-+    },
-+    {
-+      "parameters": [
-+      ],
-+      "option": "acpi"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "dmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "fmode",
-+          "type": "number"
-+        },
-+        {
-+          "name": "sock_fd",
-+          "type": "number"
-+        },
-+        {
-+          "name": "socket",
-+          "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": "readonly",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "writeout",
-+          "type": "string"
-+        },
-+        {
-+          "name": "security_model",
-+          "type": "string"
-+        },
-+        {
-+          "name": "path",
-+          "type": "string"
-+        },
-+        {
-+          "name": "fsdriver",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "fsdev"
-+    },
-+    {
-+      "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": "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\nthe 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": [
-+        {
-+          "name": "arg",
-+          "type": "string"
-+        },
-+        {
-+          "name": "target",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "semihosting-config"
-+    },
-+    {
-+      "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": "timestamp",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "msg"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "mlock",
-+          "type": "boolean"
-+        }
-+      ],
-+      "option": "realtime"
-+    },
-+    {
-+      "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": "string"
-+        },
-+        {
-+          "name": "splash-time",
-+          "type": "string"
-+        },
-+        {
-+          "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": "sockets",
-+          "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": [
-+        {
-+          "name": "thread",
-+          "help": "Enable/disable multi-threaded TCG",
-+          "type": "string"
-+        },
-+        {
-+          "name": "accel",
-+          "help": "Select the type of accelerator",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "accel"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "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": "dea-key-wrap",
-+          "help": "enable/disable DEA key wrapping using the CPACF wrapping key",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "aes-key-wrap",
-+          "help": "enable/disable AES key wrapping using the CPACF wrapping key",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "suppress-vmdesc",
-+          "help": "Set on to disable self-describing migration",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "iommu",
-+          "help": "Set on/off to enable/disable Intel IOMMU (VT-d)",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "firmware",
-+          "help": "firmware image",
-+          "type": "string"
-+        },
-+        {
-+          "name": "usb",
-+          "help": "Set on/off to enable/disable usb",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "mem-merge",
-+          "help": "enable/disable memory merge support",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dump-guest-core",
-+          "help": "Include guest memory in  a core dump",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "dt_compatible",
-+          "help": "Overrides the \"compatible\" property of the dt root node",
-+          "type": "string"
-+        },
-+        {
-+          "name": "phandle_start",
-+          "help": "The first phandle ID we may generate dynamically",
-+          "type": "number"
-+        },
-+        {
-+          "name": "dumpdtb",
-+          "help": "Dump current dtb to a file and quit",
-+          "type": "string"
-+        },
-+        {
-+          "name": "dtb",
-+          "help": "Linux kernel device tree file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "append",
-+          "help": "Linux kernel command line",
-+          "type": "string"
-+        },
-+        {
-+          "name": "initrd",
-+          "help": "Linux initial ramdisk file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "kernel",
-+          "help": "Linux kernel image file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "kvm_shadow_mem",
-+          "help": "KVM shadow MMU size",
-+          "type": "size"
-+        },
-+        {
-+          "name": "kernel_irqchip",
-+          "help": "use KVM in-kernel irqchip",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "accel",
-+          "help": "accelerator list",
-+          "type": "string"
-+        },
-+        {
-+          "name": "type",
-+          "help": "emulated machine",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "machine"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "romfile",
-+          "type": "string"
-+        },
-+        {
-+          "name": "bootindex",
-+          "type": "number"
-+        }
-+      ],
-+      "option": "option-rom"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "file",
-+          "type": "string"
-+        },
-+        {
-+          "name": "events",
-+          "type": "string"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "string"
-+        }
-+      ],
-+      "option": "trace"
-+    },
-+    {
-+      "parameters": [
-+        {
-+          "name": "x-oob",
-+          "type": "boolean"
-+        },
-+        {
-+          "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": "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": "tls-creds",
-+          "type": "string"
-+        },
-+        {
-+          "name": "tn3270",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "telnet",
-+          "type": "boolean"
-+        },
-+        {
-+          "name": "reconnect",
-+          "type": "number"
-+        },
-+        {
-+          "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": "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)",
-+          "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": "read-only",
-+          "help": "Node is opened in read-only mode",
-+          "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-47"
-+}
-+
-+{
-+  "execute": "query-migrate-capabilities",
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "state": false,
-+      "capability": "xbzrle"
-+    },
-+    {
-+      "state": false,
-+      "capability": "rdma-pin-all"
-+    },
-+    {
-+      "state": false,
-+      "capability": "auto-converge"
-+    },
-+    {
-+      "state": false,
-+      "capability": "zero-blocks"
-+    },
-+    {
-+      "state": false,
-+      "capability": "compress"
-+    },
-+    {
-+      "state": false,
-+      "capability": "events"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-colo"
-+    },
-+    {
-+      "state": false,
-+      "capability": "release-ram"
-+    },
-+    {
-+      "state": false,
-+      "capability": "block"
-+    },
-+    {
-+      "state": false,
-+      "capability": "return-path"
-+    },
-+    {
-+      "state": false,
-+      "capability": "pause-before-switchover"
-+    },
-+    {
-+      "state": false,
-+      "capability": "x-multifd"
-+    },
-+    {
-+      "state": false,
-+      "capability": "dirty-bitmaps"
-+    },
-+    {
-+      "state": false,
-+      "capability": "postcopy-blocktime"
-+    },
-+    {
-+      "state": false,
-+      "capability": "late-block-activate"
-+    }
-+  ],
-+  "id": "libvirt-48"
-+}
-+
-+{
-+  "execute": "query-qmp-schema",
-+  "id": "libvirt-49"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "query-status",
-+      "ret-type": "1",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "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",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "5"
-+    },
-+    {
-+      "name": "GUEST_PANICKED",
-+      "meta-type": "event",
-+      "arg-type": "6"
-+    },
-+    {
-+      "name": "JOB_STATUS_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "7"
-+    },
-+    {
-+      "name": "job-pause",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "8"
-+    },
-+    {
-+      "name": "job-resume",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "9"
-+    },
-+    {
-+      "name": "job-cancel",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "10"
-+    },
-+    {
-+      "name": "job-complete",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "11"
-+    },
-+    {
-+      "name": "job-dismiss",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "12"
-+    },
-+    {
-+      "name": "job-finalize",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "13"
-+    },
-+    {
-+      "name": "query-jobs",
-+      "ret-type": "[14]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "x-block-latency-histogram-set",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "15"
-+    },
-+    {
-+      "name": "query-block",
-+      "ret-type": "[16]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-blockstats",
-+      "ret-type": "[18]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "17"
-+    },
-+    {
-+      "name": "query-block-jobs",
-+      "ret-type": "[19]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "block_passwd",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "20"
-+    },
-+    {
-+      "name": "block_resize",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "21"
-+    },
-+    {
-+      "name": "blockdev-snapshot-sync",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "22"
-+    },
-+    {
-+      "name": "blockdev-snapshot",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "23"
-+    },
-+    {
-+      "name": "change-backing-file",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "24"
-+    },
-+    {
-+      "name": "block-commit",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "25"
-+    },
-+    {
-+      "name": "drive-backup",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "26"
-+    },
-+    {
-+      "name": "blockdev-backup",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "27"
-+    },
-+    {
-+      "name": "query-named-block-nodes",
-+      "ret-type": "[28]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "drive-mirror",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "29"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "30"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-remove",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "block-dirty-bitmap-clear",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-enable",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-disable",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "x-block-dirty-bitmap-merge",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "32"
-+    },
-+    {
-+      "name": "x-debug-block-dirty-bitmap-sha256",
-+      "ret-type": "33",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "31"
-+    },
-+    {
-+      "name": "blockdev-mirror",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "34"
-+    },
-+    {
-+      "name": "block_set_io_throttle",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "35"
-+    },
-+    {
-+      "name": "block-stream",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "36"
-+    },
-+    {
-+      "name": "block-job-set-speed",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "37"
-+    },
-+    {
-+      "name": "block-job-cancel",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "38"
-+    },
-+    {
-+      "name": "block-job-pause",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "39"
-+    },
-+    {
-+      "name": "block-job-resume",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "40"
-+    },
-+    {
-+      "name": "block-job-complete",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "41"
-+    },
-+    {
-+      "name": "block-job-dismiss",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "42"
-+    },
-+    {
-+      "name": "block-job-finalize",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "43"
-+    },
-+    {
-+      "name": "blockdev-add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "44"
-+    },
-+    {
-+      "name": "blockdev-del",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "45"
-+    },
-+    {
-+      "name": "blockdev-create",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "46"
-+    },
-+    {
-+      "name": "blockdev-open-tray",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "47"
-+    },
-+    {
-+      "name": "blockdev-close-tray",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "48"
-+    },
-+    {
-+      "name": "blockdev-remove-medium",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "49"
-+    },
-+    {
-+      "name": "blockdev-insert-medium",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "50"
-+    },
-+    {
-+      "name": "blockdev-change-medium",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "51"
-+    },
-+    {
-+      "name": "BLOCK_IMAGE_CORRUPTED",
-+      "meta-type": "event",
-+      "arg-type": "52"
-+    },
-+    {
-+      "name": "BLOCK_IO_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "53"
-+    },
-+    {
-+      "name": "BLOCK_JOB_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "54"
-+    },
-+    {
-+      "name": "BLOCK_JOB_CANCELLED",
-+      "meta-type": "event",
-+      "arg-type": "55"
-+    },
-+    {
-+      "name": "BLOCK_JOB_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "56"
-+    },
-+    {
-+      "name": "BLOCK_JOB_READY",
-+      "meta-type": "event",
-+      "arg-type": "57"
-+    },
-+    {
-+      "name": "BLOCK_JOB_PENDING",
-+      "meta-type": "event",
-+      "arg-type": "58"
-+    },
-+    {
-+      "name": "BLOCK_WRITE_THRESHOLD",
-+      "meta-type": "event",
-+      "arg-type": "59"
-+    },
-+    {
-+      "name": "block-set-write-threshold",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "60"
-+    },
-+    {
-+      "name": "x-blockdev-change",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "61"
-+    },
-+    {
-+      "name": "x-blockdev-set-iothread",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "62"
-+    },
-+    {
-+      "name": "query-pr-managers",
-+      "ret-type": "[63]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "blockdev-snapshot-internal-sync",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "64"
-+    },
-+    {
-+      "name": "blockdev-snapshot-delete-internal-sync",
-+      "ret-type": "66",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "65"
-+    },
-+    {
-+      "name": "eject",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "67"
-+    },
-+    {
-+      "name": "nbd-server-start",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "68"
-+    },
-+    {
-+      "name": "nbd-server-add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "69"
-+    },
-+    {
-+      "name": "nbd-server-remove",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "70"
-+    },
-+    {
-+      "name": "x-nbd-server-add-bitmap",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "71"
-+    },
-+    {
-+      "name": "nbd-server-stop",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "DEVICE_TRAY_MOVED",
-+      "meta-type": "event",
-+      "arg-type": "72"
-+    },
-+    {
-+      "name": "PR_MANAGER_STATUS_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "73"
-+    },
-+    {
-+      "name": "QUORUM_FAILURE",
-+      "meta-type": "event",
-+      "arg-type": "74"
-+    },
-+    {
-+      "name": "QUORUM_REPORT_BAD",
-+      "meta-type": "event",
-+      "arg-type": "75"
-+    },
-+    {
-+      "name": "query-chardev",
-+      "ret-type": "[76]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-chardev-backends",
-+      "ret-type": "[77]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "ringbuf-write",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "78"
-+    },
-+    {
-+      "name": "ringbuf-read",
-+      "ret-type": "str",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "79"
-+    },
-+    {
-+      "name": "chardev-add",
-+      "ret-type": "81",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "80"
-+    },
-+    {
-+      "name": "chardev-change",
-+      "ret-type": "81",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "82"
-+    },
-+    {
-+      "name": "chardev-remove",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "83"
-+    },
-+    {
-+      "name": "chardev-send-break",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "84"
-+    },
-+    {
-+      "name": "VSERPORT_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "85"
-+    },
-+    {
-+      "name": "set_link",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "86"
-+    },
-+    {
-+      "name": "netdev_add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "87"
-+    },
-+    {
-+      "name": "netdev_del",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "88"
-+    },
-+    {
-+      "name": "query-rx-filter",
-+      "ret-type": "[90]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "89"
-+    },
-+    {
-+      "name": "NIC_RX_FILTER_CHANGED",
-+      "meta-type": "event",
-+      "arg-type": "91"
-+    },
-+    {
-+      "name": "query-rocker",
-+      "ret-type": "93",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "92"
-+    },
-+    {
-+      "name": "query-rocker-ports",
-+      "ret-type": "[95]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "94"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-flows",
-+      "ret-type": "[97]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "96"
-+    },
-+    {
-+      "name": "query-rocker-of-dpa-groups",
-+      "ret-type": "[99]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "98"
-+    },
-+    {
-+      "name": "query-tpm-models",
-+      "ret-type": "[100]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-tpm-types",
-+      "ret-type": "[101]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-tpm",
-+      "ret-type": "[102]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "set_password",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "103"
-+    },
-+    {
-+      "name": "expire_password",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "104"
-+    },
-+    {
-+      "name": "screendump",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "105"
-+    },
-+    {
-+      "name": "query-spice",
-+      "ret-type": "106",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "SPICE_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "107"
-+    },
-+    {
-+      "name": "SPICE_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "108"
-+    },
-+    {
-+      "name": "SPICE_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "109"
-+    },
-+    {
-+      "name": "SPICE_MIGRATE_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vnc",
-+      "ret-type": "110",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vnc-servers",
-+      "ret-type": "[111]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "change-vnc-password",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "112"
-+    },
-+    {
-+      "name": "VNC_CONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "113"
-+    },
-+    {
-+      "name": "VNC_INITIALIZED",
-+      "meta-type": "event",
-+      "arg-type": "114"
-+    },
-+    {
-+      "name": "VNC_DISCONNECTED",
-+      "meta-type": "event",
-+      "arg-type": "115"
-+    },
-+    {
-+      "name": "query-mice",
-+      "ret-type": "[116]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "send-key",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "117"
-+    },
-+    {
-+      "name": "input-send-event",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "118"
-+    },
-+    {
-+      "name": "query-migrate",
-+      "ret-type": "119",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-set-capabilities",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "120"
-+    },
-+    {
-+      "name": "query-migrate-capabilities",
-+      "ret-type": "[121]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-set-parameters",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "122"
-+    },
-+    {
-+      "name": "query-migrate-parameters",
-+      "ret-type": "123",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "client_migrate_info",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "124"
-+    },
-+    {
-+      "name": "migrate-start-postcopy",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MIGRATION",
-+      "meta-type": "event",
-+      "arg-type": "125"
-+    },
-+    {
-+      "name": "MIGRATION_PASS",
-+      "meta-type": "event",
-+      "arg-type": "126"
-+    },
-+    {
-+      "name": "x-colo-lost-heartbeat",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate_cancel",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-continue",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "127"
-+    },
-+    {
-+      "name": "migrate_set_downtime",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "128"
-+    },
-+    {
-+      "name": "migrate_set_speed",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "129"
-+    },
-+    {
-+      "name": "migrate-set-cache-size",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "130"
-+    },
-+    {
-+      "name": "query-migrate-cache-size",
-+      "ret-type": "int",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "131"
-+    },
-+    {
-+      "name": "migrate-incoming",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "132"
-+    },
-+    {
-+      "name": "xen-save-devices-state",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "133"
-+    },
-+    {
-+      "name": "xen-set-replication",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "134"
-+    },
-+    {
-+      "name": "query-xen-replication-status",
-+      "ret-type": "135",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "xen-colo-do-checkpoint",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "migrate-recover",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "136"
-+    },
-+    {
-+      "name": "migrate-pause",
-+      "ret-type": "0",
-+      "allow-oob": true,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "transaction",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "137"
-+    },
-+    {
-+      "name": "trace-event-get-state",
-+      "ret-type": "[139]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "138"
-+    },
-+    {
-+      "name": "trace-event-set-state",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "140"
-+    },
-+    {
-+      "name": "query-qmp-schema",
-+      "ret-type": "[141]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "qmp_capabilities",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "142"
-+    },
-+    {
-+      "name": "query-version",
-+      "ret-type": "143",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-commands",
-+      "ret-type": "[144]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "add_client",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "145"
-+    },
-+    {
-+      "name": "query-name",
-+      "ret-type": "146",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-kvm",
-+      "ret-type": "147",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-uuid",
-+      "ret-type": "148",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-events",
-+      "ret-type": "[149]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpus",
-+      "ret-type": "[150]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpus-fast",
-+      "ret-type": "[151]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-iothreads",
-+      "ret-type": "[152]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-balloon",
-+      "ret-type": "153",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "BALLOON_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "154"
-+    },
-+    {
-+      "name": "query-pci",
-+      "ret-type": "[155]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "quit",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "stop",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_reset",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_powerdown",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "cpu-add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "156"
-+    },
-+    {
-+      "name": "memsave",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "157"
-+    },
-+    {
-+      "name": "pmemsave",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "158"
-+    },
-+    {
-+      "name": "cont",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "exit-preconfig",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "system_wakeup",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "inject-nmi",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "balloon",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "159"
-+    },
-+    {
-+      "name": "human-monitor-command",
-+      "ret-type": "str",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "160"
-+    },
-+    {
-+      "name": "qom-list",
-+      "ret-type": "[162]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "161"
-+    },
-+    {
-+      "name": "qom-get",
-+      "ret-type": "any",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "163"
-+    },
-+    {
-+      "name": "qom-set",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "164"
-+    },
-+    {
-+      "name": "change",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "165"
-+    },
-+    {
-+      "name": "qom-list-types",
-+      "ret-type": "[167]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "166"
-+    },
-+    {
-+      "name": "device-list-properties",
-+      "ret-type": "[162]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "168"
-+    },
-+    {
-+      "name": "qom-list-properties",
-+      "ret-type": "[162]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "169"
-+    },
-+    {
-+      "name": "xen-set-global-dirty-log",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "170"
-+    },
-+    {
-+      "name": "device_add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "171"
-+    },
-+    {
-+      "name": "device_del",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "172"
-+    },
-+    {
-+      "name": "DEVICE_DELETED",
-+      "meta-type": "event",
-+      "arg-type": "173"
-+    },
-+    {
-+      "name": "dump-guest-memory",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "174"
-+    },
-+    {
-+      "name": "query-dump",
-+      "ret-type": "175",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "DUMP_COMPLETED",
-+      "meta-type": "event",
-+      "arg-type": "176"
-+    },
-+    {
-+      "name": "query-dump-guest-memory-capability",
-+      "ret-type": "177",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "dump-skeys",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "178"
-+    },
-+    {
-+      "name": "object-add",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "179"
-+    },
-+    {
-+      "name": "object-del",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "180"
-+    },
-+    {
-+      "name": "getfd",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "181"
-+    },
-+    {
-+      "name": "closefd",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "182"
-+    },
-+    {
-+      "name": "query-machines",
-+      "ret-type": "[183]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-memory-size-summary",
-+      "ret-type": "184",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpu-definitions",
-+      "ret-type": "[185]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-cpu-model-expansion",
-+      "ret-type": "187",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "186"
-+    },
-+    {
-+      "name": "query-cpu-model-comparison",
-+      "ret-type": "189",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "188"
-+    },
-+    {
-+      "name": "query-cpu-model-baseline",
-+      "ret-type": "191",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "190"
-+    },
-+    {
-+      "name": "add-fd",
-+      "ret-type": "193",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "192"
-+    },
-+    {
-+      "name": "remove-fd",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "194"
-+    },
-+    {
-+      "name": "query-fdsets",
-+      "ret-type": "[195]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-target",
-+      "ret-type": "196",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-command-line-options",
-+      "ret-type": "[198]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "197"
-+    },
-+    {
-+      "name": "query-memdev",
-+      "ret-type": "[199]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-memory-devices",
-+      "ret-type": "[200]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "MEM_UNPLUG_ERROR",
-+      "meta-type": "event",
-+      "arg-type": "201"
-+    },
-+    {
-+      "name": "query-acpi-ospm-status",
-+      "ret-type": "[202]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "ACPI_DEVICE_OST",
-+      "meta-type": "event",
-+      "arg-type": "203"
-+    },
-+    {
-+      "name": "rtc-reset-reinjection",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "RTC_CHANGE",
-+      "meta-type": "event",
-+      "arg-type": "204"
-+    },
-+    {
-+      "name": "xen-load-devices-state",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "205"
-+    },
-+    {
-+      "name": "query-gic-capabilities",
-+      "ret-type": "[206]",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-hotpluggable-cpus",
-+      "ret-type": "[207]",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-vm-generation-id",
-+      "ret-type": "208",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev",
-+      "ret-type": "209",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev-launch-measure",
-+      "ret-type": "210",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "query-sev-capabilities",
-+      "ret-type": "211",
-+      "allow-oob": false,
-+      "allow-preconfig": false,
-+      "meta-type": "command",
-+      "arg-type": "0"
-+    },
-+    {
-+      "name": "COMMAND_DROPPED",
-+      "meta-type": "event",
-+      "arg-type": "212"
-+    },
-+    {
-+      "name": "set-numa-node",
-+      "ret-type": "0",
-+      "allow-oob": false,
-+      "allow-preconfig": true,
-+      "meta-type": "command",
-+      "arg-type": "213"
-+    },
-+    {
-+      "name": "0",
-+      "members": [
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "1",
-+      "members": [
-+        {
-+          "name": "running",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "singlestep",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "214"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "2",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "3",
-+      "members": [
-+        {
-+          "name": "guest",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "4",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "215"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "5",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "215"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "6",
-+      "members": [
-+        {
-+          "name": "action",
-+          "type": "216"
-+        },
-+        {
-+          "name": "info",
-+          "default": null,
-+          "type": "217"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "7",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "status",
-+          "type": "218"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "8",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "9",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "10",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "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]",
-+      "element-type": "14",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "14",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "219"
-+        },
-+        {
-+          "name": "status",
-+          "type": "218"
-+        },
-+        {
-+          "name": "current-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total-progress",
-+          "type": "int"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "15",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "boundaries",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-read",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-write",
-+          "default": null,
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "boundaries-flush",
-+          "default": null,
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[16]",
-+      "element-type": "16",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "16",
-+      "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": "28"
-+        },
-+        {
-+          "name": "tray_open",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "io-status",
-+          "default": null,
-+          "type": "220"
-+        },
-+        {
-+          "name": "dirty-bitmaps",
-+          "default": null,
-+          "type": "[221]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "17",
-+      "members": [
-+        {
-+          "name": "query-nodes",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[18]",
-+      "element-type": "18",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "18",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "stats",
-+          "type": "222"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "18"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "18"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[19]",
-+      "element-type": "19",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "19",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "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": "220"
-+        },
-+        {
-+          "name": "ready",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "status",
-+          "type": "218"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "20",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "password",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "21",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "22",
-+      "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": "223"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "23",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "overlay",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "24",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "image-node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "25",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "base",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "top",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "26",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "224"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "223"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "bitmap",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "27",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "sync",
-+          "type": "224"
-+        },
-+        {
-+          "name": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compress",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "on-source-error",
-+          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "auto-finalize",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auto-dismiss",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[28]",
-+      "element-type": "28",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "28",
-+      "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": "encryption_key_missing",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect_zeroes",
-+          "type": "226"
-+        },
-+        {
-+          "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": "227"
-+        },
-+        {
-+          "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": "228"
-+        },
-+        {
-+          "name": "write_threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "29",
-+      "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": "224"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "223"
-+        },
-+        {
-+          "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": "225"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "unmap",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "copy-mode",
-+          "default": null,
-+          "type": "229"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "30",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "granularity",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "persistent",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "autoload",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-disabled",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "31",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "32",
-+      "members": [
-+        {
-+          "name": "node",
-+          "type": "str"
-+        },
-+        {
-+          "name": "dst_name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "src_name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "33",
-+      "members": [
-+        {
-+          "name": "sha256",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "34",
-+      "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": "224"
-+        },
-+        {
-+          "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": "225"
-+        },
-+        {
-+          "name": "on-target-error",
-+          "default": null,
-+          "type": "225"
-+        },
-+        {
-+          "name": "filter-node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "copy-mode",
-+          "default": null,
-+          "type": "229"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "35",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "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": "36",
-+      "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": "speed",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "on-error",
-+          "default": null,
-+          "type": "225"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "37",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "38",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "39",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "40",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "41",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "42",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "43",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "44",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "blkdebug",
-+          "type": "233"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "234"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "235"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "236"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "236"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "236"
-+        },
-+        {
-+          "case": "dmg",
-+          "type": "236"
-+        },
-+        {
-+          "case": "file",
-+          "type": "237"
-+        },
-+        {
-+          "case": "ftp",
-+          "type": "238"
-+        },
-+        {
-+          "case": "ftps",
-+          "type": "239"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "240"
-+        },
-+        {
-+          "case": "host_cdrom",
-+          "type": "237"
-+        },
-+        {
-+          "case": "host_device",
-+          "type": "237"
-+        },
-+        {
-+          "case": "http",
-+          "type": "241"
-+        },
-+        {
-+          "case": "https",
-+          "type": "242"
-+        },
-+        {
-+          "case": "iscsi",
-+          "type": "243"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "244"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "245"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "246"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "247"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "247"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "248"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "236"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "249"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "250"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "251"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "252"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "253"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "254"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "255"
-+        },
-+        {
-+          "case": "sheepdog",
-+          "type": "256"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "257"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "258"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "236"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "236"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "251"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "236"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "259"
-+        },
-+        {
-+          "case": "vxhs",
-+          "type": "260"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "230"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "discard",
-+          "default": null,
-+          "type": "231"
-+        },
-+        {
-+          "name": "cache",
-+          "default": null,
-+          "type": "232"
-+        },
-+        {
-+          "name": "read-only",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "force-share",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detect-zeroes",
-+          "default": null,
-+          "type": "226"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "45",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "46",
-+      "members": [
-+        {
-+          "name": "job-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "options",
-+          "type": "261"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "47",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "48",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "49",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "50",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "51",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "read-only-mode",
-+          "default": null,
-+          "type": "262"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "52",
-+      "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": "53",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "node-name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "263"
-+        },
-+        {
-+          "name": "action",
-+          "type": "264"
-+        },
-+        {
-+          "name": "nospace",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "54",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "219"
-+        },
-+        {
-+          "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": "55",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "219"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "56",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "operation",
-+          "type": "263"
-+        },
-+        {
-+          "name": "action",
-+          "type": "264"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "57",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "219"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "len",
-+          "type": "int"
-+        },
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "58",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "219"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "59",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "amount-exceeded",
-+          "type": "int"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "60",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "write-threshold",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "61",
-+      "members": [
-+        {
-+          "name": "parent",
-+          "type": "str"
-+        },
-+        {
-+          "name": "child",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "node",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "62",
-+      "members": [
-+        {
-+          "name": "node-name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "iothread",
-+          "type": "265"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[63]",
-+      "element-type": "63",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "63",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "64",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "65",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "66",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "67",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "force",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "68",
-+      "members": [
-+        {
-+          "name": "addr",
-+          "type": "266"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "69",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "writable",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "70",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "mode",
-+          "default": null,
-+          "type": "267"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "71",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bitmap-export-name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "72",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tray-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "73",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "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": "268"
-+        },
-+        {
-+          "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]",
-+      "element-type": "76",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "76",
-+      "members": [
-+        {
-+          "name": "label",
-+          "type": "str"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "frontend-open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[77]",
-+      "element-type": "77",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "77",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "78",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "data",
-+          "type": "str"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "269"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "79",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "format",
-+          "default": null,
-+          "type": "269"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "str",
-+      "json-type": "string",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "80",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "270"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "81",
-+      "members": [
-+        {
-+          "name": "pty",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "82",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "backend",
-+          "type": "270"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "83",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "84",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "85",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "open",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "86",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "up",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "87",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "88",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "89",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[90]",
-+      "element-type": "90",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "90",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "promiscuous",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "multicast",
-+          "type": "271"
-+        },
-+        {
-+          "name": "unicast",
-+          "type": "271"
-+        },
-+        {
-+          "name": "vlan",
-+          "type": "271"
-+        },
-+        {
-+          "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": "91",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "92",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "93",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "ports",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "94",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[95]",
-+      "element-type": "95",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "95",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "link-up",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "speed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplex",
-+          "type": "272"
-+        },
-+        {
-+          "name": "autoneg",
-+          "type": "273"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "96",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "tbl-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[97]",
-+      "element-type": "97",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "97",
-+      "members": [
-+        {
-+          "name": "cookie",
-+          "type": "int"
-+        },
-+        {
-+          "name": "hits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "key",
-+          "type": "274"
-+        },
-+        {
-+          "name": "mask",
-+          "type": "275"
-+        },
-+        {
-+          "name": "action",
-+          "type": "276"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "98",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[99]",
-+      "element-type": "99",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "99",
-+      "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": "[100]",
-+      "element-type": "100",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "100",
-+      "meta-type": "enum",
-+      "values": [
-+        "tpm-tis",
-+        "tpm-crb"
-+      ]
-+    },
-+    {
-+      "name": "[101]",
-+      "element-type": "101",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "101",
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "[102]",
-+      "element-type": "102",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "102",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "model",
-+          "type": "100"
-+        },
-+        {
-+          "name": "options",
-+          "type": "277"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "103",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "password",
-+          "type": "str"
-+        },
-+        {
-+          "name": "connected",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "104",
-+      "members": [
-+        {
-+          "name": "protocol",
-+          "type": "str"
-+        },
-+        {
-+          "name": "time",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "105",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "106",
-+      "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": "278"
-+        },
-+        {
-+          "name": "channels",
-+          "default": null,
-+          "type": "[279]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "107",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "280"
-+        },
-+        {
-+          "name": "client",
-+          "type": "280"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "108",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "281"
-+        },
-+        {
-+          "name": "client",
-+          "type": "279"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "109",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "280"
-+        },
-+        {
-+          "name": "client",
-+          "type": "280"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "110",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "default": null,
-+          "type": "282"
-+        },
-+        {
-+          "name": "service",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "clients",
-+          "default": null,
-+          "type": "[283]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[111]",
-+      "element-type": "111",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "111",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[284]"
-+        },
-+        {
-+          "name": "clients",
-+          "type": "[283]"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "285"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "286"
-+        },
-+        {
-+          "name": "display",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "112",
-+      "members": [
-+        {
-+          "name": "password",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "113",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "287"
-+        },
-+        {
-+          "name": "client",
-+          "type": "288"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "114",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "287"
-+        },
-+        {
-+          "name": "client",
-+          "type": "283"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "115",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "287"
-+        },
-+        {
-+          "name": "client",
-+          "type": "283"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[116]",
-+      "element-type": "116",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "116",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "index",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "absolute",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "117",
-+      "members": [
-+        {
-+          "name": "keys",
-+          "type": "[289]"
-+        },
-+        {
-+          "name": "hold-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "118",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "head",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "events",
-+          "type": "[290]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "119",
-+      "members": [
-+        {
-+          "name": "status",
-+          "default": null,
-+          "type": "291"
-+        },
-+        {
-+          "name": "ram",
-+          "default": null,
-+          "type": "292"
-+        },
-+        {
-+          "name": "disk",
-+          "default": null,
-+          "type": "292"
-+        },
-+        {
-+          "name": "xbzrle-cache",
-+          "default": null,
-+          "type": "293"
-+        },
-+        {
-+          "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": "postcopy-blocktime",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "postcopy-vcpu-blocktime",
-+          "default": null,
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "120",
-+      "members": [
-+        {
-+          "name": "capabilities",
-+          "type": "[121]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[121]",
-+      "element-type": "121",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "121",
-+      "members": [
-+        {
-+          "name": "capability",
-+          "type": "294"
-+        },
-+        {
-+          "name": "state",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "122",
-+      "members": [
-+        {
-+          "name": "compress-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "decompress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "265"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "265"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-incremental",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-multifd-page-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-postcopy-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "123",
-+      "members": [
-+        {
-+          "name": "compress-level",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "compress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "decompress-threads",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-initial",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "cpu-throttle-increment",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-hostname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "max-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "downtime-limit",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-checkpoint-delay",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-incremental",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x-multifd-channels",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "x-multifd-page-count",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "xbzrle-cache-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "max-postcopy-bandwidth",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "124",
-+      "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": "125",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "291"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "126",
-+      "members": [
-+        {
-+          "name": "pass",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "127",
-+      "members": [
-+        {
-+          "name": "state",
-+          "type": "291"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "128",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "number"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "129",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "130",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "int",
-+      "json-type": "int",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "131",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        },
-+        {
-+          "name": "blk",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "inc",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "detach",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "resume",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "132",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "133",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "live",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "134",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "primary",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "failover",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "135",
-+      "members": [
-+        {
-+          "name": "error",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "136",
-+      "members": [
-+        {
-+          "name": "uri",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "137",
-+      "members": [
-+        {
-+          "name": "actions",
-+          "type": "[295]"
-+        },
-+        {
-+          "name": "properties",
-+          "default": null,
-+          "type": "296"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "138",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpu",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[139]",
-+      "element-type": "139",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "139",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "state",
-+          "type": "297"
-+        },
-+        {
-+          "name": "vcpu",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "140",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "ignore-unavailable",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "vcpu",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[141]",
-+      "element-type": "141",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "141",
-+      "tag": "meta-type",
-+      "variants": [
-+        {
-+          "case": "builtin",
-+          "type": "299"
-+        },
-+        {
-+          "case": "enum",
-+          "type": "300"
-+        },
-+        {
-+          "case": "array",
-+          "type": "301"
-+        },
-+        {
-+          "case": "object",
-+          "type": "302"
-+        },
-+        {
-+          "case": "alternate",
-+          "type": "303"
-+        },
-+        {
-+          "case": "command",
-+          "type": "304"
-+        },
-+        {
-+          "case": "event",
-+          "type": "305"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "meta-type",
-+          "type": "298"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "142",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "default": null,
-+          "type": "[306]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "143",
-+      "members": [
-+        {
-+          "name": "qemu",
-+          "type": "307"
-+        },
-+        {
-+          "name": "package",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[144]",
-+      "element-type": "144",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "144",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "145",
-+      "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": "146",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "147",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "present",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "148",
-+      "members": [
-+        {
-+          "name": "UUID",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[149]",
-+      "element-type": "149",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "149",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[150]",
-+      "element-type": "150",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "150",
-+      "tag": "arch",
-+      "variants": [
-+        {
-+          "case": "x86",
-+          "type": "310"
-+        },
-+        {
-+          "case": "sparc",
-+          "type": "311"
-+        },
-+        {
-+          "case": "ppc",
-+          "type": "312"
-+        },
-+        {
-+          "case": "mips",
-+          "type": "313"
-+        },
-+        {
-+          "case": "tricore",
-+          "type": "314"
-+        },
-+        {
-+          "case": "s390",
-+          "type": "315"
-+        },
-+        {
-+          "case": "riscv",
-+          "type": "316"
-+        },
-+        {
-+          "case": "other",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "CPU",
-+          "type": "int"
-+        },
-+        {
-+          "name": "current",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "halted",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "qom_path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "thread_id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "308"
-+        },
-+        {
-+          "name": "arch",
-+          "type": "309"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[151]",
-+      "element-type": "151",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "151",
-+      "tag": "target",
-+      "variants": [
-+        {
-+          "case": "s390x",
-+          "type": "315"
-+        },
-+        {
-+          "case": "aarch64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "alpha",
-+          "type": "0"
-+        },
-+        {
-+          "case": "arm",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cris",
-+          "type": "0"
-+        },
-+        {
-+          "case": "hppa",
-+          "type": "0"
-+        },
-+        {
-+          "case": "i386",
-+          "type": "0"
-+        },
-+        {
-+          "case": "lm32",
-+          "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": "moxie",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nios2",
-+          "type": "0"
-+        },
-+        {
-+          "case": "or1k",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppc64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "ppcemb",
-+          "type": "0"
-+        },
-+        {
-+          "case": "riscv32",
-+          "type": "0"
-+        },
-+        {
-+          "case": "riscv64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sh4",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sh4eb",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sparc",
-+          "type": "0"
-+        },
-+        {
-+          "case": "sparc64",
-+          "type": "0"
-+        },
-+        {
-+          "case": "tricore",
-+          "type": "0"
-+        },
-+        {
-+          "case": "unicore32",
-+          "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": "308"
-+        },
-+        {
-+          "name": "arch",
-+          "type": "309"
-+        },
-+        {
-+          "name": "target",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[152]",
-+      "element-type": "152",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "152",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "153",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "154",
-+      "members": [
-+        {
-+          "name": "actual",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[155]",
-+      "element-type": "155",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "155",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "devices",
-+          "type": "[318]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "156",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "157",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "158",
-+      "members": [
-+        {
-+          "name": "val",
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "159",
-+      "members": [
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "160",
-+      "members": [
-+        {
-+          "name": "command-line",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cpu-index",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "161",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[162]",
-+      "element-type": "162",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "162",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "description",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "163",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "any",
-+      "json-type": "value",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "164",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "property",
-+          "type": "str"
-+        },
-+        {
-+          "name": "value",
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "165",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "target",
-+          "type": "str"
-+        },
-+        {
-+          "name": "arg",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "166",
-+      "members": [
-+        {
-+          "name": "implements",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[167]",
-+      "element-type": "167",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "167",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "abstract",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "parent",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "168",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "169",
-+      "members": [
-+        {
-+          "name": "typename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "170",
-+      "members": [
-+        {
-+          "name": "enable",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "171",
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "str"
-+        },
-+        {
-+          "name": "bus",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "172",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "173",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "174",
-+      "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": "319"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "175",
-+      "members": [
-+        {
-+          "name": "status",
-+          "type": "320"
-+        },
-+        {
-+          "name": "completed",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "176",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "175"
-+        },
-+        {
-+          "name": "error",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "177",
-+      "members": [
-+        {
-+          "name": "formats",
-+          "type": "[319]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "178",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "179",
-+      "members": [
-+        {
-+          "name": "qom-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "180",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "181",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "182",
-+      "members": [
-+        {
-+          "name": "fdname",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[183]",
-+      "element-type": "183",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "183",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "184",
-+      "members": [
-+        {
-+          "name": "base-memory",
-+          "type": "int"
-+        },
-+        {
-+          "name": "plugged-memory",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[185]",
-+      "element-type": "185",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "185",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "186",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "321"
-+        },
-+        {
-+          "name": "model",
-+          "type": "322"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "187",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "322"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "188",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "322"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "322"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "189",
-+      "members": [
-+        {
-+          "name": "result",
-+          "type": "323"
-+        },
-+        {
-+          "name": "responsible-properties",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "190",
-+      "members": [
-+        {
-+          "name": "modela",
-+          "type": "322"
-+        },
-+        {
-+          "name": "modelb",
-+          "type": "322"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "191",
-+      "members": [
-+        {
-+          "name": "model",
-+          "type": "322"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "192",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "193",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "194",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fd",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[195]",
-+      "element-type": "195",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "195",
-+      "members": [
-+        {
-+          "name": "fdset-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "fds",
-+          "type": "[324]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "196",
-+      "members": [
-+        {
-+          "name": "arch",
-+          "type": "317"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "197",
-+      "members": [
-+        {
-+          "name": "option",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[198]",
-+      "element-type": "198",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "198",
-+      "members": [
-+        {
-+          "name": "option",
-+          "type": "str"
-+        },
-+        {
-+          "name": "parameters",
-+          "type": "[325]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[199]",
-+      "element-type": "199",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "199",
-+      "members": [
-+        {
-+          "name": "id",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "merge",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "dump",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "prealloc",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "host-nodes",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "326"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[200]",
-+      "element-type": "200",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "200",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "dimm",
-+          "type": "328"
-+        },
-+        {
-+          "case": "nvdimm",
-+          "type": "328"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "327"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "201",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "msg",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[202]",
-+      "element-type": "202",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "202",
-+      "members": [
-+        {
-+          "name": "device",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slot-type",
-+          "type": "329"
-+        },
-+        {
-+          "name": "source",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "203",
-+      "members": [
-+        {
-+          "name": "info",
-+          "type": "202"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "204",
-+      "members": [
-+        {
-+          "name": "offset",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "205",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[206]",
-+      "element-type": "206",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "206",
-+      "members": [
-+        {
-+          "name": "version",
-+          "type": "int"
-+        },
-+        {
-+          "name": "emulated",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "kernel",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[207]",
-+      "element-type": "207",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "207",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "vcpus-count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "props",
-+          "type": "308"
-+        },
-+        {
-+          "name": "qom-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "208",
-+      "members": [
-+        {
-+          "name": "guid",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "209",
-+      "members": [
-+        {
-+          "name": "enabled",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "api-major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "api-minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "build-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "policy",
-+          "type": "int"
-+        },
-+        {
-+          "name": "state",
-+          "type": "330"
-+        },
-+        {
-+          "name": "handle",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "210",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "211",
-+      "members": [
-+        {
-+          "name": "pdh",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cert-chain",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cbitpos",
-+          "type": "int"
-+        },
-+        {
-+          "name": "reduced-phys-bits",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "212",
-+      "members": [
-+        {
-+          "name": "id",
-+          "type": "any"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "331"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "213",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "node",
-+          "type": "333"
-+        },
-+        {
-+          "case": "dist",
-+          "type": "334"
-+        },
-+        {
-+          "case": "cpu",
-+          "type": "335"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "332"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "bool",
-+      "json-type": "boolean",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "214",
-+      "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",
-+        "preconfig"
-+      ]
-+    },
-+    {
-+      "name": "215",
-+      "meta-type": "enum",
-+      "values": [
-+        "reset",
-+        "shutdown",
-+        "poweroff",
-+        "pause",
-+        "debug",
-+        "none",
-+        "inject-nmi"
-+      ]
-+    },
-+    {
-+      "name": "216",
-+      "meta-type": "enum",
-+      "values": [
-+        "pause",
-+        "poweroff"
-+      ]
-+    },
-+    {
-+      "name": "217",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "hyper-v",
-+          "type": "337"
-+        },
-+        {
-+          "case": "s390",
-+          "type": "338"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "336"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "218",
-+      "meta-type": "enum",
-+      "values": [
-+        "undefined",
-+        "created",
-+        "running",
-+        "paused",
-+        "ready",
-+        "standby",
-+        "waiting",
-+        "pending",
-+        "aborting",
-+        "concluded",
-+        "null"
-+      ]
-+    },
-+    {
-+      "name": "219",
-+      "meta-type": "enum",
-+      "values": [
-+        "commit",
-+        "stream",
-+        "mirror",
-+        "backup",
-+        "create"
-+      ]
-+    },
-+    {
-+      "name": "[int]",
-+      "element-type": "int",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "220",
-+      "meta-type": "enum",
-+      "values": [
-+        "ok",
-+        "failed",
-+        "nospace"
-+      ]
-+    },
-+    {
-+      "name": "[221]",
-+      "element-type": "221",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "221",
-+      "members": [
-+        {
-+          "name": "name",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "count",
-+          "type": "int"
-+        },
-+        {
-+          "name": "granularity",
-+          "type": "int"
-+        },
-+        {
-+          "name": "status",
-+          "type": "339"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "222",
-+      "members": [
-+        {
-+          "name": "rd_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_bytes",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "flush_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_total_time_ns",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_highest_offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rd_merged",
-+          "type": "int"
-+        },
-+        {
-+          "name": "wr_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_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_rd_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_wr_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "invalid_flush_operations",
-+          "type": "int"
-+        },
-+        {
-+          "name": "account_invalid",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "account_failed",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "timed_stats",
-+          "type": "[340]"
-+        },
-+        {
-+          "name": "x_rd_latency_histogram",
-+          "default": null,
-+          "type": "341"
-+        },
-+        {
-+          "name": "x_wr_latency_histogram",
-+          "default": null,
-+          "type": "341"
-+        },
-+        {
-+          "name": "x_flush_latency_histogram",
-+          "default": null,
-+          "type": "341"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "223",
-+      "meta-type": "enum",
-+      "values": [
-+        "existing",
-+        "absolute-paths"
-+      ]
-+    },
-+    {
-+      "name": "224",
-+      "meta-type": "enum",
-+      "values": [
-+        "top",
-+        "full",
-+        "none",
-+        "incremental"
-+      ]
-+    },
-+    {
-+      "name": "225",
-+      "meta-type": "enum",
-+      "values": [
-+        "report",
-+        "ignore",
-+        "enospc",
-+        "stop",
-+        "auto"
-+      ]
-+    },
-+    {
-+      "name": "226",
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "227",
-+      "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": "[66]"
-+        },
-+        {
-+          "name": "backing-image",
-+          "default": null,
-+          "type": "227"
-+        },
-+        {
-+          "name": "format-specific",
-+          "default": null,
-+          "type": "342"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "228",
-+      "members": [
-+        {
-+          "name": "writeback",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "direct",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "229",
-+      "meta-type": "enum",
-+      "values": [
-+        "background",
-+        "write-blocking"
-+      ]
-+    },
-+    {
-+      "name": "230",
-+      "meta-type": "enum",
-+      "values": [
-+        "blkdebug",
-+        "blklogwrites",
-+        "blkverify",
-+        "bochs",
-+        "cloop",
-+        "copy-on-read",
-+        "dmg",
-+        "file",
-+        "ftp",
-+        "ftps",
-+        "gluster",
-+        "host_cdrom",
-+        "host_device",
-+        "http",
-+        "https",
-+        "iscsi",
-+        "luks",
-+        "nbd",
-+        "nfs",
-+        "null-aio",
-+        "null-co",
-+        "nvme",
-+        "parallels",
-+        "qcow",
-+        "qcow2",
-+        "qed",
-+        "quorum",
-+        "raw",
-+        "rbd",
-+        "replication",
-+        "sheepdog",
-+        "ssh",
-+        "throttle",
-+        "vdi",
-+        "vhdx",
-+        "vmdk",
-+        "vpc",
-+        "vvfat",
-+        "vxhs"
-+      ]
-+    },
-+    {
-+      "name": "231",
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "unmap"
-+      ]
-+    },
-+    {
-+      "name": "232",
-+      "members": [
-+        {
-+          "name": "direct",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "no-flush",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "233",
-+      "members": [
-+        {
-+          "name": "image",
-+          "type": "343"
-+        },
-+        {
-+          "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": "[344]"
-+        },
-+        {
-+          "name": "set-state",
-+          "default": null,
-+          "type": "[345]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "234",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "log",
-+          "type": "343"
-+        },
-+        {
-+          "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": "235",
-+      "members": [
-+        {
-+          "name": "test",
-+          "type": "343"
-+        },
-+        {
-+          "name": "raw",
-+          "type": "343"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "236",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "237",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pr-manager",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "locking",
-+          "default": null,
-+          "type": "346"
-+        },
-+        {
-+          "name": "aio",
-+          "default": null,
-+          "type": "347"
-+        },
-+        {
-+          "name": "x-check-cache-dropped",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "238",
-+      "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": "239",
-+      "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": "240",
-+      "members": [
-+        {
-+          "name": "volume",
-+          "type": "str"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "[348]"
-+        },
-+        {
-+          "name": "debug",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "241",
-+      "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": "242",
-+      "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": "243",
-+      "members": [
-+        {
-+          "name": "transport",
-+          "type": "349"
-+        },
-+        {
-+          "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": "350"
-+        },
-+        {
-+          "name": "timeout",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "244",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "245",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "348"
-+        },
-+        {
-+          "name": "export",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "x-dirty-bitmap",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "246",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "351"
-+        },
-+        {
-+          "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": "247",
-+      "members": [
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "latency-ns",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "248",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "str"
-+        },
-+        {
-+          "name": "namespace",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "249",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "352"
-+        },
-+        {
-+          "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": "overlap-check",
-+          "default": null,
-+          "type": "353"
-+        },
-+        {
-+          "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": "354"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "250",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "352"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "355"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "251",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "backing",
-+          "default": null,
-+          "type": "352"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "252",
-+      "members": [
-+        {
-+          "name": "blkverify",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "children",
-+          "type": "[343]"
-+        },
-+        {
-+          "name": "vote-threshold",
-+          "type": "int"
-+        },
-+        {
-+          "name": "rewrite-corrupted",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "read-pattern",
-+          "default": null,
-+          "type": "356"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "253",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "offset",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "254",
-+      "members": [
-+        {
-+          "name": "pool",
-+          "type": "str"
-+        },
-+        {
-+          "name": "image",
-+          "type": "str"
-+        },
-+        {
-+          "name": "conf",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "snapshot",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "auth-client-required",
-+          "default": null,
-+          "type": "[357]"
-+        },
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "default": null,
-+          "type": "[358]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "255",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "mode",
-+          "type": "359"
-+        },
-+        {
-+          "name": "top-id",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "256",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "348"
-+        },
-+        {
-+          "name": "vdi",
-+          "type": "str"
-+        },
-+        {
-+          "name": "snap-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "257",
-+      "members": [
-+        {
-+          "name": "server",
-+          "type": "360"
-+        },
-+        {
-+          "name": "path",
-+          "type": "str"
-+        },
-+        {
-+          "name": "user",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "host-key-check",
-+          "default": null,
-+          "type": "361"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "258",
-+      "members": [
-+        {
-+          "name": "throttle-group",
-+          "type": "str"
-+        },
-+        {
-+          "name": "file",
-+          "type": "343"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "259",
-+      "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": "260",
-+      "members": [
-+        {
-+          "name": "vdisk-id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "server",
-+          "type": "358"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "261",
-+      "tag": "driver",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "362"
-+        },
-+        {
-+          "case": "gluster",
-+          "type": "363"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "364"
-+        },
-+        {
-+          "case": "nfs",
-+          "type": "365"
-+        },
-+        {
-+          "case": "parallels",
-+          "type": "366"
-+        },
-+        {
-+          "case": "qcow",
-+          "type": "367"
-+        },
-+        {
-+          "case": "qcow2",
-+          "type": "368"
-+        },
-+        {
-+          "case": "qed",
-+          "type": "369"
-+        },
-+        {
-+          "case": "rbd",
-+          "type": "370"
-+        },
-+        {
-+          "case": "sheepdog",
-+          "type": "371"
-+        },
-+        {
-+          "case": "ssh",
-+          "type": "372"
-+        },
-+        {
-+          "case": "vdi",
-+          "type": "373"
-+        },
-+        {
-+          "case": "vhdx",
-+          "type": "374"
-+        },
-+        {
-+          "case": "vpc",
-+          "type": "375"
-+        },
-+        {
-+          "case": "blkdebug",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blklogwrites",
-+          "type": "0"
-+        },
-+        {
-+          "case": "blkverify",
-+          "type": "0"
-+        },
-+        {
-+          "case": "bochs",
-+          "type": "0"
-+        },
-+        {
-+          "case": "cloop",
-+          "type": "0"
-+        },
-+        {
-+          "case": "copy-on-read",
-+          "type": "0"
-+        },
-+        {
-+          "case": "dmg",
-+          "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": "iscsi",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nbd",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-aio",
-+          "type": "0"
-+        },
-+        {
-+          "case": "null-co",
-+          "type": "0"
-+        },
-+        {
-+          "case": "nvme",
-+          "type": "0"
-+        },
-+        {
-+          "case": "quorum",
-+          "type": "0"
-+        },
-+        {
-+          "case": "raw",
-+          "type": "0"
-+        },
-+        {
-+          "case": "replication",
-+          "type": "0"
-+        },
-+        {
-+          "case": "throttle",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vvfat",
-+          "type": "0"
-+        },
-+        {
-+          "case": "vxhs",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "driver",
-+          "type": "230"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "262",
-+      "meta-type": "enum",
-+      "values": [
-+        "retain",
-+        "read-only",
-+        "read-write"
-+      ]
-+    },
-+    {
-+      "name": "263",
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write"
-+      ]
-+    },
-+    {
-+      "name": "264",
-+      "meta-type": "enum",
-+      "values": [
-+        "ignore",
-+        "report",
-+        "stop"
-+      ]
-+    },
-+    {
-+      "name": "265",
-+      "members": [
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "266",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "377"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "378"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "379"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "380"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "376"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "267",
-+      "meta-type": "enum",
-+      "values": [
-+        "safe",
-+        "hard"
-+      ]
-+    },
-+    {
-+      "name": "268",
-+      "meta-type": "enum",
-+      "values": [
-+        "read",
-+        "write",
-+        "flush"
-+      ]
-+    },
-+    {
-+      "name": "269",
-+      "meta-type": "enum",
-+      "values": [
-+        "utf8",
-+        "base64"
-+      ]
-+    },
-+    {
-+      "name": "270",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "file",
-+          "type": "382"
-+        },
-+        {
-+          "case": "serial",
-+          "type": "383"
-+        },
-+        {
-+          "case": "parallel",
-+          "type": "383"
-+        },
-+        {
-+          "case": "pipe",
-+          "type": "383"
-+        },
-+        {
-+          "case": "socket",
-+          "type": "384"
-+        },
-+        {
-+          "case": "udp",
-+          "type": "385"
-+        },
-+        {
-+          "case": "pty",
-+          "type": "386"
-+        },
-+        {
-+          "case": "null",
-+          "type": "386"
-+        },
-+        {
-+          "case": "mux",
-+          "type": "387"
-+        },
-+        {
-+          "case": "msmouse",
-+          "type": "386"
-+        },
-+        {
-+          "case": "wctablet",
-+          "type": "386"
-+        },
-+        {
-+          "case": "braille",
-+          "type": "386"
-+        },
-+        {
-+          "case": "testdev",
-+          "type": "386"
-+        },
-+        {
-+          "case": "stdio",
-+          "type": "388"
-+        },
-+        {
-+          "case": "console",
-+          "type": "386"
-+        },
-+        {
-+          "case": "spicevmc",
-+          "type": "389"
-+        },
-+        {
-+          "case": "spiceport",
-+          "type": "390"
-+        },
-+        {
-+          "case": "vc",
-+          "type": "391"
-+        },
-+        {
-+          "case": "ringbuf",
-+          "type": "392"
-+        },
-+        {
-+          "case": "memory",
-+          "type": "392"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "381"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "271",
-+      "meta-type": "enum",
-+      "values": [
-+        "normal",
-+        "none",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "[str]",
-+      "element-type": "str",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "272",
-+      "meta-type": "enum",
-+      "values": [
-+        "half",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "273",
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "on"
-+      ]
-+    },
-+    {
-+      "name": "274",
-+      "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": "275",
-+      "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": "276",
-+      "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": "277",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "passthrough",
-+          "type": "394"
-+        },
-+        {
-+          "case": "emulator",
-+          "type": "395"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "393"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "278",
-+      "meta-type": "enum",
-+      "values": [
-+        "client",
-+        "server",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[279]",
-+      "element-type": "279",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "279",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        },
-+        {
-+          "name": "connection-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "channel-type",
-+          "type": "int"
-+        },
-+        {
-+          "name": "channel-id",
-+          "type": "int"
-+        },
-+        {
-+          "name": "tls",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "280",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "281",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "282",
-+      "meta-type": "enum",
-+      "values": [
-+        "ipv4",
-+        "ipv6",
-+        "unix",
-+        "vsock",
-+        "unknown"
-+      ]
-+    },
-+    {
-+      "name": "[283]",
-+      "element-type": "283",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "283",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "x509_dname",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "sasl_username",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[284]",
-+      "element-type": "284",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "284",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "type": "285"
-+        },
-+        {
-+          "name": "vencrypt",
-+          "default": null,
-+          "type": "286"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "285",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "vnc",
-+        "ra2",
-+        "ra2ne",
-+        "tight",
-+        "ultra",
-+        "tls",
-+        "vencrypt",
-+        "sasl"
-+      ]
-+    },
-+    {
-+      "name": "286",
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "tls-none",
-+        "x509-none",
-+        "tls-vnc",
-+        "x509-vnc",
-+        "tls-plain",
-+        "x509-plain",
-+        "tls-sasl",
-+        "x509-sasl"
-+      ]
-+    },
-+    {
-+      "name": "287",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "auth",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "288",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "service",
-+          "type": "str"
-+        },
-+        {
-+          "name": "family",
-+          "type": "282"
-+        },
-+        {
-+          "name": "websocket",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[289]",
-+      "element-type": "289",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "289",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "number",
-+          "type": "397"
-+        },
-+        {
-+          "case": "qcode",
-+          "type": "398"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "396"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[290]",
-+      "element-type": "290",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "290",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "key",
-+          "type": "400"
-+        },
-+        {
-+          "case": "btn",
-+          "type": "401"
-+        },
-+        {
-+          "case": "rel",
-+          "type": "402"
-+        },
-+        {
-+          "case": "abs",
-+          "type": "402"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "399"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "291",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "setup",
-+        "cancelling",
-+        "cancelled",
-+        "active",
-+        "postcopy-active",
-+        "postcopy-paused",
-+        "postcopy-recover",
-+        "completed",
-+        "failed",
-+        "colo",
-+        "pre-switchover",
-+        "device"
-+      ]
-+    },
-+    {
-+      "name": "292",
-+      "members": [
-+        {
-+          "name": "transferred",
-+          "type": "int"
-+        },
-+        {
-+          "name": "remaining",
-+          "type": "int"
-+        },
-+        {
-+          "name": "total",
-+          "type": "int"
-+        },
-+        {
-+          "name": "duplicate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "skipped",
-+          "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "293",
-+      "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": "overflow",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "294",
-+      "meta-type": "enum",
-+      "values": [
-+        "xbzrle",
-+        "rdma-pin-all",
-+        "auto-converge",
-+        "zero-blocks",
-+        "compress",
-+        "events",
-+        "postcopy-ram",
-+        "x-colo",
-+        "release-ram",
-+        "block",
-+        "return-path",
-+        "pause-before-switchover",
-+        "x-multifd",
-+        "dirty-bitmaps",
-+        "postcopy-blocktime",
-+        "late-block-activate"
-+      ]
-+    },
-+    {
-+      "name": "number",
-+      "json-type": "number",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "[295]",
-+      "element-type": "295",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "295",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "abort",
-+          "type": "404"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-add",
-+          "type": "405"
-+        },
-+        {
-+          "case": "block-dirty-bitmap-clear",
-+          "type": "406"
-+        },
-+        {
-+          "case": "x-block-dirty-bitmap-enable",
-+          "type": "406"
-+        },
-+        {
-+          "case": "x-block-dirty-bitmap-disable",
-+          "type": "406"
-+        },
-+        {
-+          "case": "blockdev-backup",
-+          "type": "407"
-+        },
-+        {
-+          "case": "blockdev-snapshot",
-+          "type": "408"
-+        },
-+        {
-+          "case": "blockdev-snapshot-internal-sync",
-+          "type": "409"
-+        },
-+        {
-+          "case": "blockdev-snapshot-sync",
-+          "type": "410"
-+        },
-+        {
-+          "case": "drive-backup",
-+          "type": "411"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "403"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "296",
-+      "members": [
-+        {
-+          "name": "completion-mode",
-+          "default": null,
-+          "type": "412"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "297",
-+      "meta-type": "enum",
-+      "values": [
-+        "unavailable",
-+        "disabled",
-+        "enabled"
-+      ]
-+    },
-+    {
-+      "name": "298",
-+      "meta-type": "enum",
-+      "values": [
-+        "builtin",
-+        "enum",
-+        "array",
-+        "object",
-+        "alternate",
-+        "command",
-+        "event"
-+      ]
-+    },
-+    {
-+      "name": "299",
-+      "members": [
-+        {
-+          "name": "json-type",
-+          "type": "413"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "300",
-+      "members": [
-+        {
-+          "name": "values",
-+          "type": "[str]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "301",
-+      "members": [
-+        {
-+          "name": "element-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "302",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[414]"
-+        },
-+        {
-+          "name": "tag",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "variants",
-+          "default": null,
-+          "type": "[415]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "303",
-+      "members": [
-+        {
-+          "name": "members",
-+          "type": "[416]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "304",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "ret-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "allow-oob",
-+          "type": "bool"
-+        },
-+        {
-+          "name": "allow-preconfig",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "305",
-+      "members": [
-+        {
-+          "name": "arg-type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[306]",
-+      "element-type": "306",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "306",
-+      "meta-type": "enum",
-+      "values": [
-+        "oob"
-+      ]
-+    },
-+    {
-+      "name": "307",
-+      "members": [
-+        {
-+          "name": "major",
-+          "type": "int"
-+        },
-+        {
-+          "name": "minor",
-+          "type": "int"
-+        },
-+        {
-+          "name": "micro",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "308",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "309",
-+      "meta-type": "enum",
-+      "values": [
-+        "x86",
-+        "sparc",
-+        "ppc",
-+        "mips",
-+        "tricore",
-+        "s390",
-+        "riscv",
-+        "other"
-+      ]
-+    },
-+    {
-+      "name": "310",
-+      "members": [
-+        {
-+          "name": "pc",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "311",
-+      "members": [
-+        {
-+          "name": "pc",
-+          "type": "int"
-+        },
-+        {
-+          "name": "npc",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "312",
-+      "members": [
-+        {
-+          "name": "nip",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "313",
-+      "members": [
-+        {
-+          "name": "PC",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "314",
-+      "members": [
-+        {
-+          "name": "PC",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "315",
-+      "members": [
-+        {
-+          "name": "cpu-state",
-+          "type": "417"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "316",
-+      "members": [
-+        {
-+          "name": "pc",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "317",
-+      "meta-type": "enum",
-+      "values": [
-+        "aarch64",
-+        "alpha",
-+        "arm",
-+        "cris",
-+        "hppa",
-+        "i386",
-+        "lm32",
-+        "m68k",
-+        "microblaze",
-+        "microblazeel",
-+        "mips",
-+        "mips64",
-+        "mips64el",
-+        "mipsel",
-+        "moxie",
-+        "nios2",
-+        "or1k",
-+        "ppc",
-+        "ppc64",
-+        "ppcemb",
-+        "riscv32",
-+        "riscv64",
-+        "s390x",
-+        "sh4",
-+        "sh4eb",
-+        "sparc",
-+        "sparc64",
-+        "tricore",
-+        "unicore32",
-+        "x86_64",
-+        "xtensa",
-+        "xtensaeb"
-+      ]
-+    },
-+    {
-+      "name": "[318]",
-+      "element-type": "318",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "318",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "int"
-+        },
-+        {
-+          "name": "slot",
-+          "type": "int"
-+        },
-+        {
-+          "name": "function",
-+          "type": "int"
-+        },
-+        {
-+          "name": "class_info",
-+          "type": "418"
-+        },
-+        {
-+          "name": "id",
-+          "type": "419"
-+        },
-+        {
-+          "name": "irq",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "qdev_id",
-+          "type": "str"
-+        },
-+        {
-+          "name": "pci_bridge",
-+          "default": null,
-+          "type": "420"
-+        },
-+        {
-+          "name": "regions",
-+          "type": "[421]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "319",
-+      "meta-type": "enum",
-+      "values": [
-+        "elf",
-+        "kdump-zlib",
-+        "kdump-lzo",
-+        "kdump-snappy",
-+        "win-dmp"
-+      ]
-+    },
-+    {
-+      "name": "320",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "active",
-+        "completed",
-+        "failed"
-+      ]
-+    },
-+    {
-+      "name": "[319]",
-+      "element-type": "319",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "321",
-+      "meta-type": "enum",
-+      "values": [
-+        "static",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "322",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "props",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "323",
-+      "meta-type": "enum",
-+      "values": [
-+        "incompatible",
-+        "identical",
-+        "superset",
-+        "subset"
-+      ]
-+    },
-+    {
-+      "name": "[324]",
-+      "element-type": "324",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "324",
-+      "members": [
-+        {
-+          "name": "fd",
-+          "type": "int"
-+        },
-+        {
-+          "name": "opaque",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[325]",
-+      "element-type": "325",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "325",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "422"
-+        },
-+        {
-+          "name": "help",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "326",
-+      "meta-type": "enum",
-+      "values": [
-+        "default",
-+        "preferred",
-+        "bind",
-+        "interleave"
-+      ]
-+    },
-+    {
-+      "name": "327",
-+      "meta-type": "enum",
-+      "values": [
-+        "dimm",
-+        "nvdimm"
-+      ]
-+    },
-+    {
-+      "name": "328",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "423"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "329",
-+      "meta-type": "enum",
-+      "values": [
-+        "DIMM",
-+        "CPU"
-+      ]
-+    },
-+    {
-+      "name": "330",
-+      "meta-type": "enum",
-+      "values": [
-+        "uninit",
-+        "launch-update",
-+        "launch-secret",
-+        "running",
-+        "send-update",
-+        "receive-update"
-+      ]
-+    },
-+    {
-+      "name": "331",
-+      "meta-type": "enum",
-+      "values": [
-+        "queue-full"
-+      ]
-+    },
-+    {
-+      "name": "332",
-+      "meta-type": "enum",
-+      "values": [
-+        "node",
-+        "dist",
-+        "cpu"
-+      ]
-+    },
-+    {
-+      "name": "333",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "334",
-+      "members": [
-+        {
-+          "name": "src",
-+          "type": "int"
-+        },
-+        {
-+          "name": "dst",
-+          "type": "int"
-+        },
-+        {
-+          "name": "val",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "335",
-+      "members": [
-+        {
-+          "name": "node-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "socket-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "core-id",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "thread-id",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "336",
-+      "meta-type": "enum",
-+      "values": [
-+        "hyper-v",
-+        "s390"
-+      ]
-+    },
-+    {
-+      "name": "337",
-+      "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": "338",
-+      "members": [
-+        {
-+          "name": "core",
-+          "type": "int"
-+        },
-+        {
-+          "name": "psw-mask",
-+          "type": "int"
-+        },
-+        {
-+          "name": "psw-addr",
-+          "type": "int"
-+        },
-+        {
-+          "name": "reason",
-+          "type": "424"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "339",
-+      "meta-type": "enum",
-+      "values": [
-+        "active",
-+        "disabled",
-+        "frozen",
-+        "locked"
-+      ]
-+    },
-+    {
-+      "name": "[340]",
-+      "element-type": "340",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "340",
-+      "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_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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "341",
-+      "members": [
-+        {
-+          "name": "boundaries",
-+          "type": "[int]"
-+        },
-+        {
-+          "name": "bins",
-+          "type": "[int]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[66]",
-+      "element-type": "66",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "342",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "qcow2",
-+          "type": "426"
-+        },
-+        {
-+          "case": "vmdk",
-+          "type": "427"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "428"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "425"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "343",
-+      "members": [
-+        {
-+          "type": "44"
-+        },
-+        {
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "[344]",
-+      "element-type": "344",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "344",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "429"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "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": "[345]",
-+      "element-type": "345",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "345",
-+      "members": [
-+        {
-+          "name": "event",
-+          "type": "429"
-+        },
-+        {
-+          "name": "state",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "new_state",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "346",
-+      "meta-type": "enum",
-+      "values": [
-+        "auto",
-+        "on",
-+        "off"
-+      ]
-+    },
-+    {
-+      "name": "347",
-+      "meta-type": "enum",
-+      "values": [
-+        "threads",
-+        "native"
-+      ]
-+    },
-+    {
-+      "name": "[348]",
-+      "element-type": "348",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "348",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "inet",
-+          "type": "360"
-+        },
-+        {
-+          "case": "unix",
-+          "type": "431"
-+        },
-+        {
-+          "case": "vsock",
-+          "type": "432"
-+        },
-+        {
-+          "case": "fd",
-+          "type": "433"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "430"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "349",
-+      "meta-type": "enum",
-+      "values": [
-+        "tcp",
-+        "iser"
-+      ]
-+    },
-+    {
-+      "name": "350",
-+      "meta-type": "enum",
-+      "values": [
-+        "crc32c",
-+        "none",
-+        "crc32c-none",
-+        "none-crc32c"
-+      ]
-+    },
-+    {
-+      "name": "351",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "434"
-+        },
-+        {
-+          "name": "host",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "352",
-+      "members": [
-+        {
-+          "type": "44"
-+        },
-+        {
-+          "type": "str"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "353",
-+      "members": [
-+        {
-+          "type": "435"
-+        },
-+        {
-+          "type": "436"
-+        }
-+      ],
-+      "meta-type": "alternate"
-+    },
-+    {
-+      "name": "354",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "438"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "439"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "437"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "355",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "aes",
-+          "type": "438"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "440"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[343]",
-+      "element-type": "343",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "356",
-+      "meta-type": "enum",
-+      "values": [
-+        "quorum",
-+        "fifo"
-+      ]
-+    },
-+    {
-+      "name": "[357]",
-+      "element-type": "357",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "357",
-+      "meta-type": "enum",
-+      "values": [
-+        "cephx",
-+        "none"
-+      ]
-+    },
-+    {
-+      "name": "[358]",
-+      "element-type": "358",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "358",
-+      "members": [
-+        {
-+          "name": "host",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "359",
-+      "meta-type": "enum",
-+      "values": [
-+        "primary",
-+        "secondary"
-+      ]
-+    },
-+    {
-+      "name": "360",
-+      "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "361",
-+      "tag": "mode",
-+      "variants": [
-+        {
-+          "case": "hash",
-+          "type": "442"
-+        },
-+        {
-+          "case": "none",
-+          "type": "0"
-+        },
-+        {
-+          "case": "known_hosts",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "mode",
-+          "type": "441"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "362",
-+      "members": [
-+        {
-+          "name": "filename",
-+          "type": "str"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "443"
-+        },
-+        {
-+          "name": "nocow",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "363",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "240"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "443"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "364",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "444"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "default": null,
-+          "type": "445"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "default": null,
-+          "type": "446"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "447"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "default": null,
-+          "type": "447"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "365",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "246"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "366",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "367",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "448"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "368",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "version",
-+          "default": null,
-+          "type": "449"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-fmt",
-+          "default": null,
-+          "type": "230"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "448"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "443"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "369",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "backing-fmt",
-+          "default": null,
-+          "type": "230"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "table-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "370",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "254"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "cluster-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "371",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "256"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "backing-file",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "443"
-+        },
-+        {
-+          "name": "redundancy",
-+          "default": null,
-+          "type": "450"
-+        },
-+        {
-+          "name": "object-size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "372",
-+      "members": [
-+        {
-+          "name": "location",
-+          "type": "257"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "373",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "preallocation",
-+          "default": null,
-+          "type": "443"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "374",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "log-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "block-size",
-+          "default": null,
-+          "type": "int"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "451"
-+        },
-+        {
-+          "name": "block-state-zero",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "375",
-+      "members": [
-+        {
-+          "name": "file",
-+          "type": "343"
-+        },
-+        {
-+          "name": "size",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subformat",
-+          "default": null,
-+          "type": "452"
-+        },
-+        {
-+          "name": "force-size",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "null",
-+      "json-type": "null",
-+      "meta-type": "builtin"
-+    },
-+    {
-+      "name": "376",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "377",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "360"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "378",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "431"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "379",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "432"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "380",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "433"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "381",
-+      "meta-type": "enum",
-+      "values": [
-+        "file",
-+        "serial",
-+        "parallel",
-+        "pipe",
-+        "socket",
-+        "udp",
-+        "pty",
-+        "null",
-+        "mux",
-+        "msmouse",
-+        "wctablet",
-+        "braille",
-+        "testdev",
-+        "stdio",
-+        "console",
-+        "spicevmc",
-+        "spiceport",
-+        "vc",
-+        "ringbuf",
-+        "memory"
-+      ]
-+    },
-+    {
-+      "name": "382",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "453"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "383",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "454"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "384",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "455"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "385",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "456"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "386",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "457"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "387",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "458"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "388",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "459"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "389",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "460"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "390",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "461"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "391",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "462"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "392",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "463"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "393",
-+      "meta-type": "enum",
-+      "values": [
-+        "passthrough",
-+        "emulator"
-+      ]
-+    },
-+    {
-+      "name": "394",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "464"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "395",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "465"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "396",
-+      "meta-type": "enum",
-+      "values": [
-+        "number",
-+        "qcode"
-+      ]
-+    },
-+    {
-+      "name": "397",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "398",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "466"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "399",
-+      "meta-type": "enum",
-+      "values": [
-+        "key",
-+        "btn",
-+        "rel",
-+        "abs"
-+      ]
-+    },
-+    {
-+      "name": "400",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "467"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "401",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "468"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "402",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "469"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "403",
-+      "meta-type": "enum",
-+      "values": [
-+        "abort",
-+        "block-dirty-bitmap-add",
-+        "block-dirty-bitmap-clear",
-+        "x-block-dirty-bitmap-enable",
-+        "x-block-dirty-bitmap-disable",
-+        "blockdev-backup",
-+        "blockdev-snapshot",
-+        "blockdev-snapshot-internal-sync",
-+        "blockdev-snapshot-sync",
-+        "drive-backup"
-+      ]
-+    },
-+    {
-+      "name": "404",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "470"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "405",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "30"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "406",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "31"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "407",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "27"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "408",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "23"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "409",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "64"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "410",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "22"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "411",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "26"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "412",
-+      "meta-type": "enum",
-+      "values": [
-+        "individual",
-+        "grouped"
-+      ]
-+    },
-+    {
-+      "name": "413",
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "number",
-+        "int",
-+        "boolean",
-+        "null",
-+        "object",
-+        "array",
-+        "value"
-+      ]
-+    },
-+    {
-+      "name": "[414]",
-+      "element-type": "414",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "414",
-+      "members": [
-+        {
-+          "name": "name",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "default",
-+          "default": null,
-+          "type": "any"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[415]",
-+      "element-type": "415",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "415",
-+      "members": [
-+        {
-+          "name": "case",
-+          "type": "str"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[416]",
-+      "element-type": "416",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "416",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "417",
-+      "meta-type": "enum",
-+      "values": [
-+        "uninitialized",
-+        "stopped",
-+        "check-stop",
-+        "operating",
-+        "load"
-+      ]
-+    },
-+    {
-+      "name": "418",
-+      "members": [
-+        {
-+          "name": "desc",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "class",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "419",
-+      "members": [
-+        {
-+          "name": "device",
-+          "type": "int"
-+        },
-+        {
-+          "name": "vendor",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "420",
-+      "members": [
-+        {
-+          "name": "bus",
-+          "type": "471"
-+        },
-+        {
-+          "name": "devices",
-+          "default": null,
-+          "type": "[318]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[421]",
-+      "element-type": "421",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "421",
-+      "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": "422",
-+      "meta-type": "enum",
-+      "values": [
-+        "string",
-+        "boolean",
-+        "number",
-+        "size"
-+      ]
-+    },
-+    {
-+      "name": "423",
-+      "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": "424",
-+      "meta-type": "enum",
-+      "values": [
-+        "unknown",
-+        "disabled-wait",
-+        "extint-loop",
-+        "pgmint-loop",
-+        "opint-loop"
-+      ]
-+    },
-+    {
-+      "name": "425",
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow2",
-+        "vmdk",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "426",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "472"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "427",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "473"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "428",
-+      "members": [
-+        {
-+          "name": "data",
-+          "type": "474"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "429",
-+      "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"
-+      ]
-+    },
-+    {
-+      "name": "430",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet",
-+        "unix",
-+        "vsock",
-+        "fd"
-+      ]
-+    },
-+    {
-+      "name": "431",
-+      "members": [
-+        {
-+          "name": "path",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "432",
-+      "members": [
-+        {
-+          "name": "cid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "port",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "433",
-+      "members": [
-+        {
-+          "name": "str",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "434",
-+      "meta-type": "enum",
-+      "values": [
-+        "inet"
-+      ]
-+    },
-+    {
-+      "name": "435",
-+      "members": [
-+        {
-+          "name": "template",
-+          "default": null,
-+          "type": "436"
-+        },
-+        {
-+          "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"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "436",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "constant",
-+        "cached",
-+        "all"
-+      ]
-+    },
-+    {
-+      "name": "437",
-+      "meta-type": "enum",
-+      "values": [
-+        "aes",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "438",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "439",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "440",
-+      "meta-type": "enum",
-+      "values": [
-+        "aes"
-+      ]
-+    },
-+    {
-+      "name": "441",
-+      "meta-type": "enum",
-+      "values": [
-+        "none",
-+        "hash",
-+        "known_hosts"
-+      ]
-+    },
-+    {
-+      "name": "442",
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "475"
-+        },
-+        {
-+          "name": "hash",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "443",
-+      "meta-type": "enum",
-+      "values": [
-+        "off",
-+        "metadata",
-+        "falloc",
-+        "full"
-+      ]
-+    },
-+    {
-+      "name": "444",
-+      "meta-type": "enum",
-+      "values": [
-+        "aes-128",
-+        "aes-192",
-+        "aes-256",
-+        "des-rfb",
-+        "3des",
-+        "cast5-128",
-+        "serpent-128",
-+        "serpent-192",
-+        "serpent-256",
-+        "twofish-128",
-+        "twofish-192",
-+        "twofish-256"
-+      ]
-+    },
-+    {
-+      "name": "445",
-+      "meta-type": "enum",
-+      "values": [
-+        "ecb",
-+        "cbc",
-+        "xts",
-+        "ctr"
-+      ]
-+    },
-+    {
-+      "name": "446",
-+      "meta-type": "enum",
-+      "values": [
-+        "plain",
-+        "plain64",
-+        "essiv"
-+      ]
-+    },
-+    {
-+      "name": "447",
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1",
-+        "sha224",
-+        "sha256",
-+        "sha384",
-+        "sha512",
-+        "ripemd160"
-+      ]
-+    },
-+    {
-+      "name": "448",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "qcow",
-+          "type": "438"
-+        },
-+        {
-+          "case": "luks",
-+          "type": "477"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "476"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "449",
-+      "meta-type": "enum",
-+      "values": [
-+        "v2",
-+        "v3"
-+      ]
-+    },
-+    {
-+      "name": "450",
-+      "tag": "type",
-+      "variants": [
-+        {
-+          "case": "full",
-+          "type": "479"
-+        },
-+        {
-+          "case": "erasure-coded",
-+          "type": "480"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "type",
-+          "type": "478"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "451",
-+      "meta-type": "enum",
-+      "values": [
-+        "dynamic",
-+        "fixed"
-+      ]
-+    },
-+    {
-+      "name": "452",
-+      "meta-type": "enum",
-+      "values": [
-+        "dynamic",
-+        "fixed"
-+      ]
-+    },
-+    {
-+      "name": "453",
-+      "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": "454",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "device",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "455",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "addr",
-+          "type": "266"
-+        },
-+        {
-+          "name": "tls-creds",
-+          "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": "reconnect",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "456",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "remote",
-+          "type": "266"
-+        },
-+        {
-+          "name": "local",
-+          "default": null,
-+          "type": "266"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "457",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "458",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "459",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "signal",
-+          "default": null,
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "460",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "type",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "461",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "fqdn",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "462",
-+      "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": "463",
-+      "members": [
-+        {
-+          "name": "logfile",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "logappend",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "size",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "464",
-+      "members": [
-+        {
-+          "name": "path",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cancel-path",
-+          "default": null,
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "465",
-+      "members": [
-+        {
-+          "name": "chardev",
-+          "type": "str"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "466",
-+      "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"
-+      ]
-+    },
-+    {
-+      "name": "467",
-+      "members": [
-+        {
-+          "name": "key",
-+          "type": "289"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "468",
-+      "members": [
-+        {
-+          "name": "button",
-+          "type": "481"
-+        },
-+        {
-+          "name": "down",
-+          "type": "bool"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "469",
-+      "members": [
-+        {
-+          "name": "axis",
-+          "type": "482"
-+        },
-+        {
-+          "name": "value",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "470",
-+      "members": [
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "471",
-+      "members": [
-+        {
-+          "name": "number",
-+          "type": "int"
-+        },
-+        {
-+          "name": "secondary",
-+          "type": "int"
-+        },
-+        {
-+          "name": "subordinate",
-+          "type": "int"
-+        },
-+        {
-+          "name": "io_range",
-+          "type": "483"
-+        },
-+        {
-+          "name": "memory_range",
-+          "type": "483"
-+        },
-+        {
-+          "name": "prefetchable_range",
-+          "type": "483"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "472",
-+      "members": [
-+        {
-+          "name": "compat",
-+          "type": "str"
-+        },
-+        {
-+          "name": "lazy-refcounts",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "corrupt",
-+          "default": null,
-+          "type": "bool"
-+        },
-+        {
-+          "name": "refcount-bits",
-+          "type": "int"
-+        },
-+        {
-+          "name": "encrypt",
-+          "default": null,
-+          "type": "484"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "473",
-+      "members": [
-+        {
-+          "name": "create-type",
-+          "type": "str"
-+        },
-+        {
-+          "name": "cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "parent-cid",
-+          "type": "int"
-+        },
-+        {
-+          "name": "extents",
-+          "type": "[227]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "474",
-+      "members": [
-+        {
-+          "name": "cipher-alg",
-+          "type": "444"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "type": "445"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "type": "446"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "447"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "type": "447"
-+        },
-+        {
-+          "name": "payload-offset",
-+          "type": "int"
-+        },
-+        {
-+          "name": "master-key-iters",
-+          "type": "int"
-+        },
-+        {
-+          "name": "uuid",
-+          "type": "str"
-+        },
-+        {
-+          "name": "slots",
-+          "type": "[485]"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "475",
-+      "meta-type": "enum",
-+      "values": [
-+        "md5",
-+        "sha1"
-+      ]
-+    },
-+    {
-+      "name": "476",
-+      "meta-type": "enum",
-+      "values": [
-+        "qcow",
-+        "luks"
-+      ]
-+    },
-+    {
-+      "name": "477",
-+      "members": [
-+        {
-+          "name": "key-secret",
-+          "default": null,
-+          "type": "str"
-+        },
-+        {
-+          "name": "cipher-alg",
-+          "default": null,
-+          "type": "444"
-+        },
-+        {
-+          "name": "cipher-mode",
-+          "default": null,
-+          "type": "445"
-+        },
-+        {
-+          "name": "ivgen-alg",
-+          "default": null,
-+          "type": "446"
-+        },
-+        {
-+          "name": "ivgen-hash-alg",
-+          "default": null,
-+          "type": "447"
-+        },
-+        {
-+          "name": "hash-alg",
-+          "default": null,
-+          "type": "447"
-+        },
-+        {
-+          "name": "iter-time",
-+          "default": null,
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "478",
-+      "meta-type": "enum",
-+      "values": [
-+        "full",
-+        "erasure-coded"
-+      ]
-+    },
-+    {
-+      "name": "479",
-+      "members": [
-+        {
-+          "name": "copies",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "480",
-+      "members": [
-+        {
-+          "name": "data-strips",
-+          "type": "int"
-+        },
-+        {
-+          "name": "parity-strips",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "481",
-+      "meta-type": "enum",
-+      "values": [
-+        "left",
-+        "middle",
-+        "right",
-+        "wheel-up",
-+        "wheel-down",
-+        "side",
-+        "extra"
-+      ]
-+    },
-+    {
-+      "name": "482",
-+      "meta-type": "enum",
-+      "values": [
-+        "x",
-+        "y"
-+      ]
-+    },
-+    {
-+      "name": "483",
-+      "members": [
-+        {
-+          "name": "base",
-+          "type": "int"
-+        },
-+        {
-+          "name": "limit",
-+          "type": "int"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "484",
-+      "tag": "format",
-+      "variants": [
-+        {
-+          "case": "luks",
-+          "type": "474"
-+        },
-+        {
-+          "case": "aes",
-+          "type": "0"
-+        }
-+      ],
-+      "members": [
-+        {
-+          "name": "format",
-+          "type": "437"
-+        }
-+      ],
-+      "meta-type": "object"
-+    },
-+    {
-+      "name": "[227]",
-+      "element-type": "227",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "[485]",
-+      "element-type": "485",
-+      "meta-type": "array"
-+    },
-+    {
-+      "name": "485",
-+      "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"
-+    }
-+  ],
-+  "id": "libvirt-49"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "host"
-+    }
-+  },
-+  "id": "libvirt-50"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": true,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "kvm-hint-dedicated": false,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-50"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": true,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "kvm-hint-dedicated": false,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": true,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-51"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "host",
-+      "props": {
-+        "migratable": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-52"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": true,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "kvm-hint-dedicated": false,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-52"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "kvm-asyncpf": true,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": true,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "npt": false,
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "pcommit": false,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": false,
-+        "invtsc": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 94,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": true,
-+        "kvm-steal-time": true,
-+        "kvmclock": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": true,
-+        "acpi": false,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": true,
-+        "tsc-scale": false,
-+        "topoext": true,
-+        "clflushopt": true,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": true,
-+        "kvm-hint-dedicated": false,
-+        "lmce": true,
-+        "perfctr-nb": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vme": true,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-53"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "amd-no-ssb": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": true,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": true,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": true,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-53"
-+}
-+
-+{
-+  "execute": "query-sev-capabilities",
-+  "id": "libvirt-54"
-+}
-+
-+{
-+  "id": "libvirt-54",
-+  "error": {
-+    "class": "GenericError",
-+    "desc": "SEV feature is not available"
-+  }
-+}
-+
-+{
-+  "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
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [
-+        "kvm"
-+      ],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "fxsr-opt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "spec-ctrl",
-+        "3dnowprefetch",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "avx512f",
-+        "avx512dq",
-+        "rdseed",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "3dnowprefetch",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "spec-ctrl",
-+        "3dnowprefetch",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "3dnowprefetch",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "avx",
-+        "f16c",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "KnightsMill",
-+      "typename": "KnightsMill-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "avx512f",
-+        "rdseed",
-+        "avx512pf",
-+        "avx512er",
-+        "avx512cd",
-+        "avx512-vpopcntdq",
-+        "avx512-4vnniw",
-+        "avx512-4fmaps",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "invpcid",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "invpcid"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "spec-ctrl"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "rdseed",
-+        "sha-ni",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "topoext",
-+        "ibpb",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "rdseed",
-+        "sha-ni",
-+        "fxsr-opt",
-+        "misalignsse",
-+        "3dnowprefetch",
-+        "osvw",
-+        "topoext",
-+        "xsavec"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "invpcid",
-+        "rdseed",
-+        "spec-ctrl",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "avx2",
-+        "invpcid",
-+        "rdseed",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "spec-ctrl",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [
-+        "fma",
-+        "pcid",
-+        "x2apic",
-+        "tsc-deadline",
-+        "avx",
-+        "f16c",
-+        "rdrand",
-+        "hle",
-+        "avx2",
-+        "invpcid",
-+        "rtm",
-+        "rdseed",
-+        "3dnowprefetch"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "libvirt-2"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max"
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-3"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483658,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": false,
-+        "kvm_asyncpf": false,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": false,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "hle": false,
-+        "npt": true,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": true,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 6,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": false,
-+        "tsc_adjust": false,
-+        "kvm-steal-time": false,
-+        "kvm_steal_time": false,
-+        "kvmclock": false,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": true,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "kvm-pv-unhalt": false,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-4"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "static",
-+    "model": {
-+      "name": "max",
-+      "props": {
-+        "migratable": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-5"
-+}
-+
-+{
-+  "execute": "query-cpu-model-expansion",
-+  "arguments": {
-+    "type": "full",
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "kvm-asyncpf": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "avx512cd": false,
-+        "decodeassists": false,
-+        "sse4.1": true,
-+        "family": 6,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "xcrypt": false,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "xcrypt-en": false,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp-legacy": false,
-+        "avx512-4fmaps": false,
-+        "vmcb-clean": false,
-+        "hle": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "npt": true,
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm-lock": false,
-+        "smep": true,
-+        "smap": true,
-+        "pfthreshold": false,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pae": true,
-+        "pat": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "pcommit": true,
-+        "syscall": true,
-+        "avx512dq": false,
-+        "svm": true,
-+        "invtsc": false,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "kvm-mmu": false,
-+        "sse4.2": true,
-+        "pge": true,
-+        "avx512bitalg": false,
-+        "pdcm": false,
-+        "model": 6,
-+        "movbe": true,
-+        "nrip-save": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ds-cpl": false,
-+        "ibs": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "apic": true,
-+        "pmm": false,
-+        "spec-ctrl": false,
-+        "tsc-adjust": false,
-+        "kvm-steal-time": false,
-+        "kvmclock": false,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "xop": false,
-+        "ibpb": false,
-+        "avx": false,
-+        "acpi": true,
-+        "avx512bw": false,
-+        "ace2": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "popcnt": true,
-+        "vaes": false,
-+        "xsaves": false,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "virt-ssbd": false,
-+        "nodeid-msr": false,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "bmi1": true,
-+        "bmi2": true,
-+        "kvm-pv-unhalt": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "clflushopt": true,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "xstore": false,
-+        "rtm": false,
-+        "kvm-hint-dedicated": false,
-+        "lmce": false,
-+        "perfctr-nb": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vme": false,
-+        "vmx": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "sha-ni": false,
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-6"
-+}
-+
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483658,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": false,
-+        "intel-pt": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": false,
-+        "kvm_asyncpf": false,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": false,
-+        "avx512vbmi2": false,
-+        "cr8legacy": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": false,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "AuthenticAMD",
-+        "pku": true,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": true,
-+        "amd-no-ssb": false,
-+        "hle": false,
-+        "npt": true,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": true,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": false,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": false,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": false,
-+        "kvm-nopiodelay": false,
-+        "tm": false,
-+        "kvmclock-stable-bit": false,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": true,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": true,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": false,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": false,
-+        "cx8": true,
-+        "cldemote": false,
-+        "hv-reenlightenment": false,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 6,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": false,
-+        "ssse3": true,
-+        "sse4a": true,
-+        "invpcid": false,
-+        "pdpe1gb": true,
-+        "tsc-deadline": false,
-+        "fma": false,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": false,
-+        "fma4": false,
-+        "la57": true,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": false,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": false,
-+        "tsc_adjust": false,
-+        "kvm-steal-time": false,
-+        "kvm_steal_time": false,
-+        "kvmclock": false,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "amd-ssbd": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": true,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": true,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": false,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483658,
-+        "kvm-pv-unhalt": false,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": true,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": false,
-+        "3dnow": true,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": false,
-+        "lmce": false,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "hv-tlbflush": false,
-+        "rdrand": false,
-+        "rdseed": false,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": false,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "QEMU TCG CPU version 2.5+",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "libvirt-6"
-+}
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-new file mode 100644
-index 0000000000..07e3de8677
---- /dev/null
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -0,0 +1,1213 @@
-+<qemuCaps>
-+  <qemuctime>0</qemuctime>
-+  <selfctime>0</selfctime>
-+  <selfvers>0</selfvers>
-+  <usedQMP/>
-+  <flag name='kvm'/>
-+  <flag name='no-hpet'/>
-+  <flag name='spice'/>
-+  <flag name='boot-index'/>
-+  <flag name='hda-duplex'/>
-+  <flag name='virtio-tx-alg'/>
-+  <flag name='virtio-blk-pci.ioeventfd'/>
-+  <flag name='sga'/>
-+  <flag name='virtio-blk-pci.event_idx'/>
-+  <flag name='virtio-net-pci.event_idx'/>
-+  <flag name='piix3-usb-uhci'/>
-+  <flag name='piix4-usb-uhci'/>
-+  <flag name='usb-ehci'/>
-+  <flag name='ich9-usb-ehci1'/>
-+  <flag name='vt82c686b-usb-uhci'/>
-+  <flag name='pci-ohci'/>
-+  <flag name='usb-redir'/>
-+  <flag name='usb-hub'/>
-+  <flag name='ich9-ahci'/>
-+  <flag name='no-acpi'/>
-+  <flag name='virtio-blk-pci.scsi'/>
-+  <flag name='scsi-disk.channel'/>
-+  <flag name='scsi-block'/>
-+  <flag name='transaction'/>
-+  <flag name='block-job-async'/>
-+  <flag name='scsi-cd'/>
-+  <flag name='ide-cd'/>
-+  <flag name='hda-micro'/>
-+  <flag name='dump-guest-memory'/>
-+  <flag name='nec-usb-xhci'/>
-+  <flag name='balloon-event'/>
-+  <flag name='lsi'/>
-+  <flag name='virtio-scsi-pci'/>
-+  <flag name='blockio'/>
-+  <flag name='disable-s3'/>
-+  <flag name='disable-s4'/>
-+  <flag name='usb-redir.filter'/>
-+  <flag name='ide-drive.wwn'/>
-+  <flag name='scsi-disk.wwn'/>
-+  <flag name='seccomp-sandbox'/>
-+  <flag name='reboot-timeout'/>
-+  <flag name='seamless-migration'/>
-+  <flag name='block-commit'/>
-+  <flag name='vnc'/>
-+  <flag name='drive-mirror'/>
-+  <flag name='usb-redir.bootindex'/>
-+  <flag name='usb-host.bootindex'/>
-+  <flag name='blockdev-snapshot-sync'/>
-+  <flag name='qxl'/>
-+  <flag name='VGA'/>
-+  <flag name='cirrus-vga'/>
-+  <flag name='vmware-svga'/>
-+  <flag name='device-video-primary'/>
-+  <flag name='usb-serial'/>
-+  <flag name='usb-net'/>
-+  <flag name='add-fd'/>
-+  <flag name='nbd-server'/>
-+  <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='vfio-pci.bootindex'/>
-+  <flag name='scsi-generic'/>
-+  <flag name='scsi-generic.bootindex'/>
-+  <flag name='mem-merge'/>
-+  <flag name='vnc-websocket'/>
-+  <flag name='drive-discard'/>
-+  <flag name='mlock'/>
-+  <flag name='device-del-event'/>
-+  <flag name='dmi-to-pci-bridge'/>
-+  <flag name='i440fx-pci-hole64-size'/>
-+  <flag name='q35-pci-hole64-size'/>
-+  <flag name='usb-storage'/>
-+  <flag name='usb-storage.removable'/>
-+  <flag name='ich9-intel-hda'/>
-+  <flag name='kvm-pit-lost-tick-policy'/>
-+  <flag name='boot-strict'/>
-+  <flag name='pvpanic'/>
-+  <flag name='spice-file-xfer-disable'/>
-+  <flag name='spiceport'/>
-+  <flag name='usb-kbd'/>
-+  <flag name='msg-timestamp'/>
-+  <flag name='active-commit'/>
-+  <flag name='change-backing-file'/>
-+  <flag name='memory-backend-ram'/>
-+  <flag name='numa'/>
-+  <flag name='memory-backend-file'/>
-+  <flag name='usb-audio'/>
-+  <flag name='rtc-reset-reinjection'/>
-+  <flag name='splash-timeout'/>
-+  <flag name='iothread'/>
-+  <flag name='migrate-rdma'/>
-+  <flag name='ivshmem'/>
-+  <flag name='drive-iotune-max'/>
-+  <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='aes-key-wrap'/>
-+  <flag name='dea-key-wrap'/>
-+  <flag name='pci-serial'/>
-+  <flag name='vhost-user-multiqueue'/>
-+  <flag name='migration-event'/>
-+  <flag name='ioh3420'/>
-+  <flag name='x3130-upstream'/>
-+  <flag name='xio3130-downstream'/>
-+  <flag name='rtl8139'/>
-+  <flag name='e1000'/>
-+  <flag name='virtio-net'/>
-+  <flag name='gic-version'/>
-+  <flag name='incoming-defer'/>
-+  <flag name='virtio-gpu'/>
-+  <flag name='virtio-gpu.virgl'/>
-+  <flag name='virtio-keyboard'/>
-+  <flag name='virtio-mouse'/>
-+  <flag name='virtio-tablet'/>
-+  <flag name='virtio-input-host'/>
-+  <flag name='chardev-file-append'/>
-+  <flag name='ich9-disable-s3'/>
-+  <flag name='ich9-disable-s4'/>
-+  <flag name='vserport-change-event'/>
-+  <flag name='virtio-balloon-pci.deflate-on-oom'/>
-+  <flag name='mptsas1068'/>
-+  <flag name='qxl.vram64_size_mb'/>
-+  <flag name='chardev-logfile'/>
-+  <flag name='debug-threads'/>
-+  <flag name='secret'/>
-+  <flag name='pxb'/>
-+  <flag name='pxb-pcie'/>
-+  <flag name='device-tray-moved-event'/>
-+  <flag name='nec-usb-xhci-ports'/>
-+  <flag name='virtio-scsi-pci.iothread'/>
-+  <flag name='name-guest'/>
-+  <flag name='qxl.max_outputs'/>
-+  <flag name='spice-unix'/>
-+  <flag name='drive-detect-zeroes'/>
-+  <flag name='tls-creds-x509'/>
-+  <flag name='intel-iommu'/>
-+  <flag name='smm'/>
-+  <flag name='virtio-pci-disable-legacy'/>
-+  <flag name='query-hotpluggable-cpus'/>
-+  <flag name='virtio-net.rx_queue_size'/>
-+  <flag name='virtio-vga'/>
-+  <flag name='drive-iotune-max-length'/>
-+  <flag name='ivshmem-plain'/>
-+  <flag name='ivshmem-doorbell'/>
-+  <flag name='query-qmp-schema'/>
-+  <flag name='gluster.debug_level'/>
-+  <flag name='vhost-scsi'/>
-+  <flag name='drive-iotune-group'/>
-+  <flag name='query-cpu-model-expansion'/>
-+  <flag name='virtio-net.host_mtu'/>
-+  <flag name='nvdimm'/>
-+  <flag name='pcie-root-port'/>
-+  <flag name='query-cpu-definitions'/>
-+  <flag name='block-write-threshold'/>
-+  <flag name='query-named-block-nodes'/>
-+  <flag name='cpu-cache'/>
-+  <flag name='qemu-xhci'/>
-+  <flag name='kernel-irqchip'/>
-+  <flag name='kernel-irqchip.split'/>
-+  <flag name='intel-iommu.intremap'/>
-+  <flag name='intel-iommu.caching-mode'/>
-+  <flag name='intel-iommu.eim'/>
-+  <flag name='intel-iommu.device-iotlb'/>
-+  <flag name='virtio.iommu_platform'/>
-+  <flag name='virtio.ats'/>
-+  <flag name='loadparm'/>
-+  <flag name='vnc-multi-servers'/>
-+  <flag name='virtio-net.tx_queue_size'/>
-+  <flag name='chardev-reconnect'/>
-+  <flag name='virtio-gpu.max_outputs'/>
-+  <flag name='vxhs'/>
-+  <flag name='virtio-blk.num-queues'/>
-+  <flag name='vmcoreinfo'/>
-+  <flag name='numa.dist'/>
-+  <flag name='disk-share-rw'/>
-+  <flag name='iscsi.password-secret'/>
-+  <flag name='isa-serial'/>
-+  <flag name='dump-completed'/>
-+  <flag name='qcow2-luks'/>
-+  <flag name='pcie-pci-bridge'/>
-+  <flag name='seccomp-blacklist'/>
-+  <flag name='query-cpus-fast'/>
-+  <flag name='disk-write-cache'/>
-+  <flag name='nbd-tls'/>
-+  <flag name='tpm-crb'/>
-+  <flag name='pr-manager-helper'/>
-+  <flag name='qom-list-properties'/>
-+  <flag name='memory-backend-file.discard-data'/>
-+  <flag name='sdl-gl'/>
-+  <flag name='screendump_device'/>
-+  <flag name='hda-output'/>
-+  <flag name='blockdev-del'/>
-+  <flag name='vmgenid'/>
-+  <flag name='vhost-vsock'/>
-+  <flag name='chardev-fd-pass'/>
-+  <flag name='tpm-emulator'/>
-+  <flag name='mch'/>
-+  <flag name='mch.extended-tseg-mbytes'/>
-+  <flag name='sev-guest'/>
-+  <version>2012050</version>
-+  <kvmVersion>0</kvmVersion>
-+  <microcodeVersion>437827</microcodeVersion>
-+  <package>v2.12.0-2284-gab3257c281</package>
-+  <arch>x86_64</arch>
-+  <hostCPU type='kvm' model='base' migratability='yes'>
-+    <property name='phys-bits' type='number' value='0'/>
-+    <property name='core-id' type='number' value='-1'/>
-+    <property name='xlevel' type='number' value='2147483656'/>
-+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-+    <property name='ia64' type='boolean' value='false'/>
-+    <property name='aes' type='boolean' value='true' migratable='yes'/>
-+    <property name='mmx' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdpid' type='boolean' value='false'/>
-+    <property name='arat' type='boolean' value='true' migratable='yes'/>
-+    <property name='gfni' type='boolean' value='false'/>
-+    <property name='pause-filter' type='boolean' value='false'/>
-+    <property name='xsavec' type='boolean' value='true' migratable='yes'/>
-+    <property name='intel-pt' type='boolean' value='false'/>
-+    <property name='hv-frequencies' type='boolean' value='false'/>
-+    <property name='tsc-frequency' type='number' value='0'/>
-+    <property name='xd' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vendor-id' type='string' value=''/>
-+    <property name='kvm-asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_asyncpf' type='boolean' value='true' migratable='yes'/>
-+    <property name='perfctr_core' type='boolean' value='false'/>
-+    <property name='perfctr-core' type='boolean' value='false'/>
-+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='6'/>
-+    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-runtime' type='boolean' value='false'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='thread-id' type='number' value='-1'/>
-+    <property name='min-level' type='number' value='13'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='hv-relaxed' type='boolean' value='false'/>
-+    <property name='hv-crash' type='boolean' value='false'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xtpr' 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='avx512vbmi2' type='boolean' value='false'/>
-+    <property name='cr8legacy' type='boolean' value='false'/>
-+    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='kvm_pv_eoi' type='boolean' value='true' migratable='yes'/>
-+    <property name='apic-id' type='number' value='4294967295'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='GenuineIntel'/>
-+    <property name='pku' type='boolean' value='false'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='cmp_legacy' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='node-id' type='number' value='-1'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb_clean' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='false'/>
-+    <property name='amd-no-ssb' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='true' migratable='yes'/>
-+    <property name='npt' type='boolean' value='false'/>
-+    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-+    <property name='clwb' 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='svm_lock' type='boolean' value='false'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='pfthreshold' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <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='hv-stimer' type='boolean' value='false'/>
-+    <property name='i64' type='boolean' value='true' migratable='yes'/>
-+    <property name='flushbyasid' type='boolean' value='false'/>
-+    <property name='f16c' type='boolean' value='true' migratable='yes'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pae' 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='kvm_nopiodelay' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-nopiodelay' type='boolean' value='true' migratable='yes'/>
-+    <property name='tm' type='boolean' value='false'/>
-+    <property name='kvmclock-stable-bit' type='boolean' value='true' migratable='yes'/>
-+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-+    <property name='socket-id' type='number' value='-1'/>
-+    <property name='pcommit' type='boolean' value='false'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='level' type='number' value='13'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='svm' type='boolean' value='false'/>
-+    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-reset' type='boolean' value='false'/>
-+    <property name='invtsc' type='boolean' value='true' migratable='no'/>
-+    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssbd' type='boolean' value='false'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='cldemote' type='boolean' value='false'/>
-+    <property name='hv-reenlightenment' type='boolean' value='false'/>
-+    <property name='kvm_mmu' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512bitalg' type='boolean' value='false'/>
-+    <property name='nodeid_msr' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='model' type='number' value='94'/>
-+    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='false'/>
-+    <property name='invpcid' type='boolean' value='true' migratable='yes'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc-deadline' type='boolean' value='true' migratable='yes'/>
-+    <property name='fma' type='boolean' value='true' migratable='yes'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='enforce' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='3'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='ds_cpl' type='boolean' value='false'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='false'/>
-+    <property name='osvw' type='boolean' value='false'/>
-+    <property name='check' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-spinlocks' type='number' value='-1'/>
-+    <property name='pmu' type='boolean' value='false'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='min-xlevel2' type='number' value='0'/>
-+    <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm_steal_time' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
-+    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='amd-ssbd' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='true' migratable='yes'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='false'/>
-+    <property name='hv-vapic' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='ht' 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='false'/>
-+    <property name='vaes' type='boolean' value='false'/>
-+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='true' migratable='yes'/>
-+    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='umip' type='boolean' value='false'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-+    <property name='virt-ssbd' type='boolean' value='false'/>
-+    <property name='x-hv-max-vps' type='number' value='-1'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-+    <property name='misalignsse' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483656'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='realized' type='boolean' value='false'/>
-+    <property name='tsc_scale' type='boolean' value='false'/>
-+    <property name='tsc-scale' type='boolean' value='false'/>
-+    <property name='topoext' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vpindex' type='boolean' value='false'/>
-+    <property name='xlevel2' type='number' value='0'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='false'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='true' migratable='yes'/>
-+    <property name='3dnow' type='boolean' value='false'/>
-+    <property name='erms' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='vpclmulqdq' type='boolean' value='false'/>
-+    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='hv-synic' type='boolean' value='false'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='fxsr_opt' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lmce' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-time' type='boolean' value='false'/>
-+    <property name='perfctr-nb' type='boolean' value='false'/>
-+    <property name='perfctr_nb' type='boolean' value='false'/>
-+    <property name='ffxsr' type='boolean' value='false'/>
-+    <property name='hv-tlbflush' type='boolean' value='false'/>
-+    <property name='rdrand' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdseed' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='false'/>
-+    <property name='vme' type='boolean' value='true' migratable='yes'/>
-+    <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='pse36' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='pause_filter' type='boolean' value='false'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <hostCPU type='tcg' model='base' migratability='yes'>
-+    <property name='phys-bits' type='number' value='0'/>
-+    <property name='core-id' type='number' value='-1'/>
-+    <property name='xlevel' type='number' value='2147483658'/>
-+    <property name='cmov' type='boolean' value='true' migratable='yes'/>
-+    <property name='ia64' type='boolean' value='false'/>
-+    <property name='aes' type='boolean' value='true' migratable='yes'/>
-+    <property name='mmx' type='boolean' value='true' migratable='yes'/>
-+    <property name='rdpid' type='boolean' value='false'/>
-+    <property name='arat' type='boolean' value='true' migratable='yes'/>
-+    <property name='gfni' type='boolean' value='false'/>
-+    <property name='pause-filter' type='boolean' value='false'/>
-+    <property name='xsavec' type='boolean' value='false'/>
-+    <property name='intel-pt' type='boolean' value='false'/>
-+    <property name='hv-frequencies' type='boolean' value='false'/>
-+    <property name='tsc-frequency' type='number' value='0'/>
-+    <property name='xd' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vendor-id' type='string' value=''/>
-+    <property name='kvm-asyncpf' type='boolean' value='false'/>
-+    <property name='kvm_asyncpf' type='boolean' value='false'/>
-+    <property name='perfctr_core' type='boolean' value='false'/>
-+    <property name='perfctr-core' type='boolean' value='false'/>
-+    <property name='mpx' type='boolean' value='true' migratable='yes'/>
-+    <property name='pbe' type='boolean' value='false'/>
-+    <property name='decodeassists' type='boolean' value='false'/>
-+    <property name='avx512cd' type='boolean' value='false'/>
-+    <property name='sse4_1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.1' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-1' type='boolean' value='true' migratable='yes'/>
-+    <property name='family' type='number' value='6'/>
-+    <property name='legacy-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='vmware-cpuid-freq' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512f' type='boolean' value='false'/>
-+    <property name='msr' type='boolean' value='true' migratable='yes'/>
-+    <property name='mce' type='boolean' value='true' migratable='yes'/>
-+    <property name='mca' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-runtime' type='boolean' value='false'/>
-+    <property name='xcrypt' type='boolean' value='false'/>
-+    <property name='thread-id' type='number' value='-1'/>
-+    <property name='min-level' type='number' value='13'/>
-+    <property name='xgetbv1' type='boolean' value='true' migratable='yes'/>
-+    <property name='cid' type='boolean' value='false'/>
-+    <property name='hv-relaxed' type='boolean' value='false'/>
-+    <property name='hv-crash' type='boolean' value='false'/>
-+    <property name='ds' type='boolean' value='false'/>
-+    <property name='fxsr' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaveopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xtpr' 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='false'/>
-+    <property name='avx512vbmi2' type='boolean' value='false'/>
-+    <property name='cr8legacy' type='boolean' value='true' migratable='yes'/>
-+    <property name='cpuid-0xb' type='boolean' value='true' migratable='yes'/>
-+    <property name='xcrypt-en' type='boolean' value='false'/>
-+    <property name='kvm_pv_eoi' type='boolean' value='false'/>
-+    <property name='apic-id' type='number' value='4294967295'/>
-+    <property name='pn' type='boolean' value='false'/>
-+    <property name='dca' type='boolean' value='false'/>
-+    <property name='vendor' type='string' value='AuthenticAMD'/>
-+    <property name='pku' type='boolean' value='true' migratable='yes'/>
-+    <property name='smx' type='boolean' value='false'/>
-+    <property name='cmp_legacy' type='boolean' value='false'/>
-+    <property name='cmp-legacy' type='boolean' value='false'/>
-+    <property name='node-id' type='number' value='-1'/>
-+    <property name='avx512-4fmaps' type='boolean' value='false'/>
-+    <property name='vmcb_clean' type='boolean' value='false'/>
-+    <property name='vmcb-clean' type='boolean' value='false'/>
-+    <property name='3dnowext' type='boolean' value='true' migratable='yes'/>
-+    <property name='amd-no-ssb' type='boolean' value='false'/>
-+    <property name='hle' type='boolean' value='false'/>
-+    <property name='npt' type='boolean' value='true' migratable='yes'/>
-+    <property name='memory' type='string' value='/machine/unattached/system[0]'/>
-+    <property name='clwb' type='boolean' value='true' migratable='yes'/>
-+    <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='svm_lock' type='boolean' value='false'/>
-+    <property name='svm-lock' type='boolean' value='false'/>
-+    <property name='pfthreshold' type='boolean' value='false'/>
-+    <property name='smep' type='boolean' value='true' migratable='yes'/>
-+    <property name='smap' type='boolean' value='true' migratable='yes'/>
-+    <property name='x2apic' type='boolean' value='false'/>
-+    <property name='avx512vbmi' type='boolean' value='false'/>
-+    <property name='avx512vnni' type='boolean' value='false'/>
-+    <property name='hv-stimer' type='boolean' value='false'/>
-+    <property name='i64' type='boolean' value='true' migratable='yes'/>
-+    <property name='flushbyasid' type='boolean' value='false'/>
-+    <property name='f16c' type='boolean' value='false'/>
-+    <property name='ace2-en' type='boolean' value='false'/>
-+    <property name='pat' type='boolean' value='true' migratable='yes'/>
-+    <property name='pae' 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='kvm_nopiodelay' type='boolean' value='false'/>
-+    <property name='kvm-nopiodelay' type='boolean' value='false'/>
-+    <property name='tm' type='boolean' value='false'/>
-+    <property name='kvmclock-stable-bit' type='boolean' value='false'/>
-+    <property name='hypervisor' type='boolean' value='true' migratable='yes'/>
-+    <property name='socket-id' type='number' value='-1'/>
-+    <property name='pcommit' type='boolean' value='true' migratable='yes'/>
-+    <property name='syscall' type='boolean' value='true' migratable='yes'/>
-+    <property name='level' type='number' value='13'/>
-+    <property name='avx512dq' type='boolean' value='false'/>
-+    <property name='svm' type='boolean' value='true' migratable='yes'/>
-+    <property name='full-cpuid-auto-level' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-reset' type='boolean' value='false'/>
-+    <property name='invtsc' type='boolean' value='false'/>
-+    <property name='sse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse2' type='boolean' value='true' migratable='yes'/>
-+    <property name='ssbd' type='boolean' value='false'/>
-+    <property name='est' type='boolean' value='false'/>
-+    <property name='avx512ifma' type='boolean' value='false'/>
-+    <property name='tm2' type='boolean' value='false'/>
-+    <property name='kvm-pv-eoi' type='boolean' value='false'/>
-+    <property name='cx8' type='boolean' value='true' migratable='yes'/>
-+    <property name='cldemote' type='boolean' value='false'/>
-+    <property name='hv-reenlightenment' type='boolean' value='false'/>
-+    <property name='kvm_mmu' type='boolean' value='false'/>
-+    <property name='kvm-mmu' type='boolean' value='false'/>
-+    <property name='sse4_2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4-2' type='boolean' value='true' migratable='yes'/>
-+    <property name='pge' type='boolean' value='true' migratable='yes'/>
-+    <property name='fill-mtrr-mask' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512bitalg' type='boolean' value='false'/>
-+    <property name='nodeid_msr' type='boolean' value='false'/>
-+    <property name='pdcm' type='boolean' value='false'/>
-+    <property name='movbe' type='boolean' value='true' migratable='yes'/>
-+    <property name='model' type='number' value='6'/>
-+    <property name='nrip_save' type='boolean' value='false'/>
-+    <property name='nrip-save' type='boolean' value='false'/>
-+    <property name='kvm_pv_unhalt' type='boolean' value='false'/>
-+    <property name='ssse3' type='boolean' value='true' migratable='yes'/>
-+    <property name='sse4a' type='boolean' value='true' migratable='yes'/>
-+    <property name='invpcid' type='boolean' value='false'/>
-+    <property name='pdpe1gb' type='boolean' value='true' migratable='yes'/>
-+    <property name='tsc-deadline' type='boolean' value='false'/>
-+    <property name='fma' type='boolean' value='false'/>
-+    <property name='cx16' type='boolean' value='true' migratable='yes'/>
-+    <property name='de' type='boolean' value='true' migratable='yes'/>
-+    <property name='enforce' type='boolean' value='false'/>
-+    <property name='stepping' type='number' value='3'/>
-+    <property name='xsave' type='boolean' value='true' migratable='yes'/>
-+    <property name='clflush' type='boolean' value='true' migratable='yes'/>
-+    <property name='skinit' type='boolean' value='false'/>
-+    <property name='tsc' type='boolean' value='true' migratable='yes'/>
-+    <property name='tce' type='boolean' value='false'/>
-+    <property name='fpu' type='boolean' value='true' migratable='yes'/>
-+    <property name='ibs' type='boolean' value='false'/>
-+    <property name='ds_cpl' type='boolean' value='false'/>
-+    <property name='ds-cpl' type='boolean' value='false'/>
-+    <property name='host-phys-bits' type='boolean' value='false'/>
-+    <property name='fma4' type='boolean' value='false'/>
-+    <property name='la57' type='boolean' value='true' migratable='yes'/>
-+    <property name='osvw' type='boolean' value='false'/>
-+    <property name='check' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-spinlocks' type='number' value='-1'/>
-+    <property name='pmu' type='boolean' value='false'/>
-+    <property name='pmm' type='boolean' value='false'/>
-+    <property name='apic' type='boolean' value='true' migratable='yes'/>
-+    <property name='spec-ctrl' type='boolean' value='false'/>
-+    <property name='min-xlevel2' type='number' value='0'/>
-+    <property name='tsc-adjust' type='boolean' value='false'/>
-+    <property name='tsc_adjust' type='boolean' value='false'/>
-+    <property name='kvm-steal-time' type='boolean' value='false'/>
-+    <property name='kvm_steal_time' type='boolean' value='false'/>
-+    <property name='kvmclock' type='boolean' value='false'/>
-+    <property name='l3-cache' type='boolean' value='true' migratable='yes'/>
-+    <property name='lwp' type='boolean' value='false'/>
-+    <property name='amd-ssbd' type='boolean' value='false'/>
-+    <property name='ibpb' type='boolean' value='false'/>
-+    <property name='xop' type='boolean' value='false'/>
-+    <property name='avx' type='boolean' value='false'/>
-+    <property name='ace2' type='boolean' value='false'/>
-+    <property name='avx512bw' type='boolean' value='false'/>
-+    <property name='acpi' type='boolean' value='true' migratable='yes'/>
-+    <property name='hv-vapic' type='boolean' value='false'/>
-+    <property name='fsgsbase' type='boolean' value='true' migratable='yes'/>
-+    <property name='ht' 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='vaes' type='boolean' value='false'/>
-+    <property name='popcnt' type='boolean' value='true' migratable='yes'/>
-+    <property name='xsaves' type='boolean' value='false'/>
-+    <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/>
-+    <property name='lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='umip' type='boolean' value='false'/>
-+    <property name='pse' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx2' type='boolean' value='false'/>
-+    <property name='sep' type='boolean' value='true' migratable='yes'/>
-+    <property name='pclmuldq' type='boolean' value='true' migratable='yes'/>
-+    <property name='virt-ssbd' type='boolean' value='false'/>
-+    <property name='x-hv-max-vps' type='number' value='-1'/>
-+    <property name='nodeid-msr' type='boolean' value='false'/>
-+    <property name='kvm' type='boolean' value='true' migratable='yes'/>
-+    <property name='misalignsse' type='boolean' value='false'/>
-+    <property name='min-xlevel' type='number' value='2147483658'/>
-+    <property name='kvm-pv-unhalt' type='boolean' value='false'/>
-+    <property name='bmi2' type='boolean' value='true' migratable='yes'/>
-+    <property name='bmi1' type='boolean' value='true' migratable='yes'/>
-+    <property name='realized' type='boolean' value='false'/>
-+    <property name='tsc_scale' type='boolean' value='false'/>
-+    <property name='tsc-scale' type='boolean' value='false'/>
-+    <property name='topoext' type='boolean' value='false'/>
-+    <property name='hv-vpindex' type='boolean' value='false'/>
-+    <property name='xlevel2' type='number' value='0'/>
-+    <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-no-smi-migration' type='boolean' value='false'/>
-+    <property name='monitor' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512er' type='boolean' value='false'/>
-+    <property name='pmm-en' type='boolean' value='false'/>
-+    <property name='pcid' type='boolean' value='false'/>
-+    <property name='3dnow' type='boolean' value='true' migratable='yes'/>
-+    <property name='erms' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf-lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='lahf_lm' type='boolean' value='true' migratable='yes'/>
-+    <property name='vpclmulqdq' type='boolean' value='false'/>
-+    <property name='fxsr-opt' type='boolean' value='false'/>
-+    <property name='hv-synic' type='boolean' value='false'/>
-+    <property name='xstore' type='boolean' value='false'/>
-+    <property name='fxsr_opt' type='boolean' value='false'/>
-+    <property name='kvm-hint-dedicated' type='boolean' value='false'/>
-+    <property name='rtm' type='boolean' value='false'/>
-+    <property name='lmce' type='boolean' value='false'/>
-+    <property name='hv-time' type='boolean' value='false'/>
-+    <property name='perfctr-nb' type='boolean' value='false'/>
-+    <property name='perfctr_nb' type='boolean' value='false'/>
-+    <property name='ffxsr' type='boolean' value='false'/>
-+    <property name='hv-tlbflush' type='boolean' value='false'/>
-+    <property name='rdrand' type='boolean' value='false'/>
-+    <property name='rdseed' type='boolean' value='false'/>
-+    <property name='avx512-4vnniw' type='boolean' value='false'/>
-+    <property name='vmx' type='boolean' value='false'/>
-+    <property name='vme' 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='pse36' type='boolean' value='true' migratable='yes'/>
-+    <property name='kvm-pv-tlb-flush' type='boolean' value='false'/>
-+    <property name='tbm' type='boolean' value='false'/>
-+    <property name='wdt' type='boolean' value='false'/>
-+    <property name='pause_filter' type='boolean' value='false'/>
-+    <property name='sha-ni' type='boolean' value='false'/>
-+    <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
-+    <property name='abm' type='boolean' value='true' migratable='yes'/>
-+    <property name='avx512pf' type='boolean' value='false'/>
-+    <property name='xstore-en' type='boolean' value='false'/>
-+  </hostCPU>
-+  <cpu type='kvm' name='max' usable='yes'/>
-+  <cpu type='kvm' name='host' usable='yes'/>
-+  <cpu type='kvm' name='base' usable='yes'/>
-+  <cpu type='kvm' name='qemu64' usable='yes'/>
-+  <cpu type='kvm' name='qemu32' usable='yes'/>
-+  <cpu type='kvm' name='phenom' usable='no'>
-+    <blocker name='mmxext'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+    <blocker name='sse4a'/>
-+    <blocker name='npt'/>
-+  </cpu>
-+  <cpu type='kvm' name='pentium3' usable='yes'/>
-+  <cpu type='kvm' name='pentium2' usable='yes'/>
-+  <cpu type='kvm' name='pentium' usable='yes'/>
-+  <cpu type='kvm' name='n270' usable='yes'/>
-+  <cpu type='kvm' name='kvm64' usable='yes'/>
-+  <cpu type='kvm' name='kvm32' usable='yes'/>
-+  <cpu type='kvm' name='coreduo' usable='yes'/>
-+  <cpu type='kvm' name='core2duo' usable='yes'/>
-+  <cpu type='kvm' name='athlon' usable='no'>
-+    <blocker name='mmxext'/>
-+    <blocker name='3dnowext'/>
-+    <blocker name='3dnow'/>
-+  </cpu>
-+  <cpu type='kvm' name='Westmere-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Westmere' usable='yes'/>
-+  <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='clwb'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Server' usable='no'>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='clwb'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Skylake-Client' usable='yes'/>
-+  <cpu type='kvm' name='SandyBridge-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='SandyBridge' usable='yes'/>
-+  <cpu type='kvm' name='Penryn' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G5' usable='no'>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G4' usable='no'>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G3' usable='no'>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+  </cpu>
-+  <cpu type='kvm' name='Opteron_G2' usable='yes'/>
-+  <cpu type='kvm' name='Opteron_G1' usable='yes'/>
-+  <cpu type='kvm' name='Nehalem-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Nehalem' usable='yes'/>
-+  <cpu type='kvm' name='KnightsMill' usable='no'>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512pf'/>
-+    <blocker name='avx512er'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='avx512-4vnniw'/>
-+    <blocker name='avx512-4fmaps'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512f'/>
-+  </cpu>
-+  <cpu type='kvm' name='IvyBridge-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='IvyBridge' usable='yes'/>
-+  <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
-+  <cpu type='kvm' name='Haswell-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Haswell' usable='yes'/>
-+  <cpu type='kvm' name='EPYC-IBPB' usable='no'>
-+    <blocker name='sha-ni'/>
-+    <blocker name='mmxext'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='cr8legacy'/>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+    <blocker name='ibpb'/>
-+  </cpu>
-+  <cpu type='kvm' name='EPYC' usable='no'>
-+    <blocker name='sha-ni'/>
-+    <blocker name='mmxext'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='cr8legacy'/>
-+    <blocker name='sse4a'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='osvw'/>
-+  </cpu>
-+  <cpu type='kvm' name='Conroe' usable='yes'/>
-+  <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-+  <cpu type='kvm' name='Broadwell-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='kvm' name='Broadwell' usable='yes'/>
-+  <cpu type='kvm' name='486' usable='yes'/>
-+  <cpu type='tcg' name='max' usable='yes'/>
-+  <cpu type='tcg' name='host' usable='no'>
-+    <blocker name='kvm'/>
-+  </cpu>
-+  <cpu type='tcg' name='base' usable='yes'/>
-+  <cpu type='tcg' name='qemu64' usable='yes'/>
-+  <cpu type='tcg' name='qemu32' usable='yes'/>
-+  <cpu type='tcg' name='phenom' usable='no'>
-+    <blocker name='fxsr-opt'/>
-+  </cpu>
-+  <cpu type='tcg' name='pentium3' usable='yes'/>
-+  <cpu type='tcg' name='pentium2' usable='yes'/>
-+  <cpu type='tcg' name='pentium' usable='yes'/>
-+  <cpu type='tcg' name='n270' usable='yes'/>
-+  <cpu type='tcg' name='kvm64' usable='yes'/>
-+  <cpu type='tcg' name='kvm32' usable='yes'/>
-+  <cpu type='tcg' name='coreduo' usable='yes'/>
-+  <cpu type='tcg' name='core2duo' usable='yes'/>
-+  <cpu type='tcg' name='athlon' usable='yes'/>
-+  <cpu type='tcg' name='Westmere-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Westmere' usable='yes'/>
-+  <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Server' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='avx512dq'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512bw'/>
-+    <blocker name='avx512vl'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client-IBRS' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Skylake-Client' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='SandyBridge' usable='no'>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+  </cpu>
-+  <cpu type='tcg' name='Penryn' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G5' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+    <blocker name='tbm'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G4' usable='no'>
-+    <blocker name='avx'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='xop'/>
-+    <blocker name='fma4'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G3' usable='no'>
-+    <blocker name='misalignsse'/>
-+  </cpu>
-+  <cpu type='tcg' name='Opteron_G2' usable='yes'/>
-+  <cpu type='tcg' name='Opteron_G1' usable='yes'/>
-+  <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Nehalem' usable='yes'/>
-+  <cpu type='tcg' name='KnightsMill' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='avx512f'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='avx512pf'/>
-+    <blocker name='avx512er'/>
-+    <blocker name='avx512cd'/>
-+    <blocker name='avx512-vpopcntdq'/>
-+    <blocker name='avx512-4vnniw'/>
-+    <blocker name='avx512-4fmaps'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='IvyBridge' usable='no'>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-noTSX' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell-IBRS' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='spec-ctrl'/>
-+  </cpu>
-+  <cpu type='tcg' name='Haswell' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC-IBPB' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='sha-ni'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='ibpb'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='EPYC' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='sha-ni'/>
-+    <blocker name='fxsr-opt'/>
-+    <blocker name='misalignsse'/>
-+    <blocker name='3dnowprefetch'/>
-+    <blocker name='osvw'/>
-+    <blocker name='topoext'/>
-+    <blocker name='xsavec'/>
-+  </cpu>
-+  <cpu type='tcg' name='Conroe' usable='yes'/>
-+  <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-noTSX' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell-IBRS' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='spec-ctrl'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='Broadwell' usable='no'>
-+    <blocker name='fma'/>
-+    <blocker name='pcid'/>
-+    <blocker name='x2apic'/>
-+    <blocker name='tsc-deadline'/>
-+    <blocker name='avx'/>
-+    <blocker name='f16c'/>
-+    <blocker name='rdrand'/>
-+    <blocker name='hle'/>
-+    <blocker name='avx2'/>
-+    <blocker name='invpcid'/>
-+    <blocker name='rtm'/>
-+    <blocker name='rdseed'/>
-+    <blocker name='3dnowprefetch'/>
-+  </cpu>
-+  <cpu type='tcg' name='486' usable='yes'/>
-+  <machine name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='isapc' hotplugCpus='yes' maxCpus='1'/>
-+  <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/>
-+  <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='xenpv' maxCpus='1'/>
-+  <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
-+  <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
-+  <machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+</qemuCaps>
-diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
-index 43f2bcfbc8..0813672537 100644
---- a/tests/qemucapabilitiestest.c
-+++ b/tests/qemucapabilitiestest.c
-@@ -175,6 +175,7 @@ mymain(void)
-     DO_TEST("x86_64", "caps_2.9.0");
-     DO_TEST("x86_64", "caps_2.10.0");
-     DO_TEST("x86_64", "caps_2.12.0");
-+    DO_TEST("x86_64", "caps_3.0.0");
-     DO_TEST("aarch64", "caps_2.6.0");
-     DO_TEST("aarch64", "caps_2.10.0");
-     DO_TEST("aarch64", "caps_2.12.0");
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-qemuxml2argv-Add-test-case-for-empty-CDROM-with-cache-mode.patch b/SOURCES/libvirt-tests-qemuxml2argv-Add-test-case-for-empty-CDROM-with-cache-mode.patch
deleted file mode 100644
index e55d7eb..0000000
--- a/SOURCES/libvirt-tests-qemuxml2argv-Add-test-case-for-empty-CDROM-with-cache-mode.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 743fd6401299ceee855b50ee844b8f2fb39551d2 Mon Sep 17 00:00:00 2001
-Message-Id: <743fd6401299ceee855b50ee844b8f2fb39551d2@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 21 Jan 2019 18:43:12 +0100
-Subject: [PATCH] tests: qemuxml2argv: Add test case for empty CDROM with cache
- mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upcomming change will influence CDROM with cache mode so add a test
-case.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit a641e044c1294984979199fefbb9a9c928f7708a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1553255
-
- Conflicts:
-	tests/qemuxml2argvdata/disk-cdrom.args
-            - context: bootindex not yet assumed
-	tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
-	tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
-            - missing refactor to capability file based tests
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/qemuxml2argvdata/disk-cdrom.args  | 4 +++-
- tests/qemuxml2argvdata/disk-cdrom.xml   | 6 ++++++
- tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 ++++++
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
-index 55a76f6dac..547263cbd8 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom.args
-@@ -24,6 +24,8 @@ server,nowait \
- -usb \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
- -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\
-+-drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\
- readonly=on \
-+-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-+-drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on,cache=none \
- -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.xml b/tests/qemuxml2argvdata/disk-cdrom.xml
-index 341025c477..fa78f652bf 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.xml
-+++ b/tests/qemuxml2argvdata/disk-cdrom.xml
-@@ -23,6 +23,12 @@
-     <disk type='file' device='cdrom'>
-       <driver name='qemu' type='raw'/>
-       <source file='/root/boot.iso'/>
-+      <target dev='hdb' bus='ide'/>
-+      <readonly/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
-+    </disk>
-+    <disk type='file' device='cdrom'>
-+      <driver name='qemu' type='raw' cache='none'/>
-       <target dev='hdc' bus='ide'/>
-       <readonly/>
-       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml
-index 163ce88f19..ccc2716828 100644
---- a/tests/qemuxml2xmloutdata/disk-cdrom.xml
-+++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml
-@@ -23,6 +23,12 @@
-     <disk type='file' device='cdrom'>
-       <driver name='qemu' type='raw'/>
-       <source file='/root/boot.iso'/>
-+      <target dev='hdb' bus='ide'/>
-+      <readonly/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
-+    </disk>
-+    <disk type='file' device='cdrom'>
-+      <driver name='qemu' type='raw' cache='none'/>
-       <target dev='hdc' bus='ide'/>
-       <readonly/>
-       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-tests-qemuxml2argv-add-CAPS_ARCH_LATEST-macro.patch b/SOURCES/libvirt-tests-qemuxml2argv-add-CAPS_ARCH_LATEST-macro.patch
deleted file mode 100644
index 050e8f3..0000000
--- a/SOURCES/libvirt-tests-qemuxml2argv-add-CAPS_ARCH_LATEST-macro.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From d87b6566d14526883e9439ebd3f922fc7ed22abb Mon Sep 17 00:00:00 2001
-Message-Id: <d87b6566d14526883e9439ebd3f922fc7ed22abb@dist-git>
-From: Bjoern Walk <bwalk@linux.ibm.com>
-Date: Wed, 17 Apr 2019 14:46:00 +0200
-Subject: [PATCH] tests: qemuxml2argv: add CAPS_ARCH_LATEST macro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Testing with the latest capabilities is possible with the x86_64 centric
-implemented macro CAPS_LATEST. The new macro CAPS_ARCH_LATEST provides
-the user the ability to specify the desired architecture when testing with
-the latest capabilities.
-
-Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-(cherry picked from commit bc4c83838d51f42b86d189280c9011494ef435f0)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-RHEL 8.1: https://bugzilla.redhat.com/show_bug.cgi?id=1698855
-Message-Id: <c75aeb78417e458e1fc0c9a5994e4d462cf1c0a0.1555505143.git.jtomko@redhat.com>
-
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- tests/qemuxml2argvtest.c | 31 +++++++++++++++++++++++--------
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 690a39054e..abb256c913 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -623,10 +623,11 @@ testCompareXMLToArgv(const void *data)
- static int
- mymain(void)
- {
--    int ret = 0;
-+    int ret = 0, i;
-     char *fakerootdir;
-     bool skipLegacyCPUs = false;
--    char *capslatest_x86_64 = NULL;
-+    const char *archs[] = { "x86_64", "s390x" };
-+    virHashTablePtr capslatest = NULL;
- 
-     if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) {
-         fprintf(stderr, "Out of memory\n");
-@@ -695,12 +696,23 @@ mymain(void)
-     if (VIR_STRDUP_QUIET(driver.config->memoryBackingDir, "/var/lib/libvirt/qemu/ram") < 0)
-         return EXIT_FAILURE;
- 
--    if (!(capslatest_x86_64 = testQemuGetLatestCapsForArch(abs_srcdir "/qemucapabilitiesdata",
--                                                           "x86_64", "xml")))
-+    capslatest = virHashCreate(4, virHashValueFree);
-+    if (!capslatest)
-         return EXIT_FAILURE;
- 
--    VIR_TEST_VERBOSE("\nlatest caps x86_64: %s\n", capslatest_x86_64);
-+    VIR_TEST_VERBOSE("\n");
- 
-+    for (i = 0; i < ARRAY_CARDINALITY(archs); ++i) {
-+        char *cap = testQemuGetLatestCapsForArch(abs_srcdir "/qemucapabilitiesdata",
-+                                                 archs[i], "xml");
-+
-+        if (!cap || virHashAddEntry(capslatest, archs[i], cap) < 0)
-+            return EXIT_FAILURE;
-+
-+        VIR_TEST_VERBOSE("latest caps for %s: %s\n", archs[i], cap);
-+    }
-+
-+    VIR_TEST_VERBOSE("\n");
- 
- /**
-  * The following set of macros allows testing of XML -> argv conversion with a
-@@ -748,9 +760,12 @@ mymain(void)
- # define DO_TEST_CAPS_VER(name, ver) \
-     DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
- 
-+# define DO_TEST_CAPS_ARCH_LATEST(name, arch) \
-+    DO_TEST_CAPS_INTERNAL(name, arch "-latest", NULL, 0, 0, arch, \
-+                          virHashLookup(capslatest, arch), true)
-+
- # define DO_TEST_CAPS_LATEST(name) \
--    DO_TEST_CAPS_INTERNAL(name, "x86_64-latest", NULL, 0, 0, "x86_64", \
--                          capslatest_x86_64, true)
-+    DO_TEST_CAPS_ARCH_LATEST(name, "x86_64")
- 
- /**
-  * The following test macros should be used only in cases when the tests require
-@@ -2966,7 +2981,7 @@ mymain(void)
-     VIR_FREE(driver.config->nbdTLSx509certdir);
-     qemuTestDriverFree(&driver);
-     VIR_FREE(fakerootdir);
--    VIR_FREE(capslatest_x86_64);
-+    virHashFree(capslatest);
- 
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-tests-remove-unnecessary-XML-elements-from-hugepages-numa-default.patch b/SOURCES/libvirt-tests-remove-unnecessary-XML-elements-from-hugepages-numa-default.patch
deleted file mode 100644
index b5714d3..0000000
--- a/SOURCES/libvirt-tests-remove-unnecessary-XML-elements-from-hugepages-numa-default.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 64f5751f38c0a5d31b2e7eb05b8b2de0886e77b7 Mon Sep 17 00:00:00 2001
-Message-Id: <64f5751f38c0a5d31b2e7eb05b8b2de0886e77b7@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:39 +0200
-Subject: [PATCH] tests: remove unnecessary XML elements from
- hugepages-numa-default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 335c4a5e26b23d4dcb86ede5a43c5bb8a68b604e)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-numa-default.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../hugepages-numa-default.args               | 42 ++---------
- .../hugepages-numa-default.xml                | 74 +------------------
- tests/qemuxml2argvtest.c                      |  6 --
- 3 files changed, 7 insertions(+), 115 deletions(-)
-
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
-index 20c7802fd8..cc2223aee1 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-default.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
--QEMU_AUDIO_DRV=spice \
-+QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fedora \
- -S \
-@@ -14,46 +14,14 @@ QEMU_AUDIO_DRV=spice \
- -mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
- -numa node,nodeid=0,cpus=0-1,mem=1024 \
- -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
-+-display none \
- -no-user-config \
- -nodefaults \
- -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\
- server,nowait \
- -mon chardev=charmonitor,id=monitor,mode=control \
---rtc base=utc,driftfix=slew \
---no-hpet \
-+-rtc base=utc \
- -no-shutdown \
---global PIIX4_PM.disable_s3=1 \
---global PIIX4_PM.disable_s4=1 \
-+-no-acpi \
- -boot c \
---device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x6.0x7 \
---device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\
--addr=0x6 \
---device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x6.0x1 \
---device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x6.0x2 \
---device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 \
---drive file=/var/lib/libvirt/images/fedora.qcow2,format=qcow2,if=none,\
--id=drive-virtio-disk0 \
---device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\
--id=virtio-disk0 \
---drive if=none,id=drive-ide0-0-0,media=cdrom,readonly=on \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---chardev socket,id=charchannel0,\
--path=/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,server,\
--nowait \
---device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
--id=channel0,name=org.qemu.guest_agent.0 \
---chardev spicevmc,id=charchannel1,name=vdagent \
---device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\
--id=channel1,name=com.redhat.spice.0 \
---device usb-tablet,id=input0,bus=usb.0,port=1 \
---spice port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \
---vga qxl \
---global qxl-vga.ram_size=67108864 \
---global qxl-vga.vram_size=67108864 \
---device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
---device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
---chardev spicevmc,id=charredir0,name=usbredir \
---device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
---chardev spicevmc,id=charredir1,name=usbredir \
---device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=3 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.xml b/tests/qemuxml2argvdata/hugepages-numa-default.xml
-index d3c6308be0..6bbd80d515 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-default.xml
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default.xml
-@@ -11,90 +11,20 @@
-     <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
-     <boot dev='hd'/>
-   </os>
--  <features>
--    <acpi/>
--    <apic/>
--    <pae/>
--  </features>
-   <cpu>
-     <numa>
-       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
-     </numa>
-   </cpu>
--  <clock offset='utc'>
--    <timer name='rtc' tickpolicy='catchup'/>
--    <timer name='pit' tickpolicy='delay'/>
--    <timer name='hpet' present='no'/>
--  </clock>
-   <on_poweroff>destroy</on_poweroff>
-   <on_reboot>restart</on_reboot>
-   <on_crash>restart</on_crash>
--  <pm>
--    <suspend-to-mem enabled='no'/>
--    <suspend-to-disk enabled='no'/>
--  </pm>
-   <devices>
-     <emulator>/usr/bin/qemu-system-x86_64</emulator>
--    <disk type='file' device='disk'>
--      <driver name='qemu' type='qcow2'/>
--      <source file='/var/lib/libvirt/images/fedora.qcow2'/>
--      <target dev='vda' bus='virtio'/>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
--    </disk>
--    <disk type='block' device='cdrom'>
--      <driver name='qemu' type='raw'/>
--      <target dev='hda' bus='ide'/>
--      <readonly/>
--      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
--    </disk>
--    <controller type='usb' index='0' model='ich9-ehci1'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
--    </controller>
--    <controller type='usb' index='0' model='ich9-uhci1'>
--      <master startport='0'/>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
--    </controller>
--    <controller type='usb' index='0' model='ich9-uhci2'>
--      <master startport='2'/>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
--    </controller>
--    <controller type='usb' index='0' model='ich9-uhci3'>
--      <master startport='4'/>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
--    </controller>
-+    <controller type='usb' index='0'/>
-     <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>
--    <controller type='virtio-serial' index='0'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
--    </controller>
--    <channel type='unix'>
--      <source mode='bind' path='/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0'/>
--      <target type='virtio' name='org.qemu.guest_agent.0'/>
--      <address type='virtio-serial' controller='0' bus='0' port='1'/>
--    </channel>
--    <channel type='spicevmc'>
--      <target type='virtio' name='com.redhat.spice.0'/>
--      <address type='virtio-serial' controller='0' bus='0' port='2'/>
--    </channel>
--    <input type='tablet' bus='usb'/>
-     <input type='mouse' bus='ps2'/>
-     <input type='keyboard' bus='ps2'/>
--    <graphics type='spice' autoport='yes'/>
--    <sound model='ich6'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
--    </sound>
--    <video>
--      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
--    </video>
--    <redirdev bus='usb' type='spicevmc'>
--    </redirdev>
--    <redirdev bus='usb' type='spicevmc'>
--    </redirdev>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index bf3fb156a2..19fb7a0931 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -947,12 +947,6 @@ mymain(void)
- 
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default",
--            QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
--            QEMU_CAPS_VIRTIO_SCSI,
--            QEMU_CAPS_ICH9_USB_EHCI1,
--            QEMU_CAPS_SPICE,
--            QEMU_CAPS_DEVICE_QXL,
--            QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-default-dimm",
-             QEMU_CAPS_DEVICE_PC_DIMM,
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-numa-into-hugepages-numa-default.patch b/SOURCES/libvirt-tests-rename-hugepages-numa-into-hugepages-numa-default.patch
deleted file mode 100644
index ece5c23..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-numa-into-hugepages-numa-default.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 83ee499377184280b91ce968f98152cb3ab19232 Mon Sep 17 00:00:00 2001
-Message-Id: <83ee499377184280b91ce968f98152cb3ab19232@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:38 +0200
-Subject: [PATCH] tests: rename hugepages-numa into hugepages-numa-default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8d89a5c89a765d826ffe39ea657208c91f3e315e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../{hugepages-numa.args => hugepages-numa-default.args}        | 0
- .../{hugepages-numa.xml => hugepages-numa-default.xml}          | 0
- tests/qemuxml2argvtest.c                                        | 2 +-
- 3 files changed, 1 insertion(+), 1 deletion(-)
- rename tests/qemuxml2argvdata/{hugepages-numa.args => hugepages-numa-default.args} (100%)
- rename tests/qemuxml2argvdata/{hugepages-numa.xml => hugepages-numa-default.xml} (100%)
-
-diff --git a/tests/qemuxml2argvdata/hugepages-numa.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
-similarity index 100%
-rename from tests/qemuxml2argvdata/hugepages-numa.args
-rename to tests/qemuxml2argvdata/hugepages-numa-default.args
-diff --git a/tests/qemuxml2argvdata/hugepages-numa.xml b/tests/qemuxml2argvdata/hugepages-numa-default.xml
-similarity index 100%
-rename from tests/qemuxml2argvdata/hugepages-numa.xml
-rename to tests/qemuxml2argvdata/hugepages-numa-default.xml
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index a97b48525a..bf3fb156a2 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -946,7 +946,7 @@ mymain(void)
-     DO_TEST("pmu-feature-off", NONE);
- 
-     DO_TEST("hugepages-default", NONE);
--    DO_TEST("hugepages-numa",
-+    DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
-             QEMU_CAPS_VIRTIO_SCSI,
-             QEMU_CAPS_ICH9_USB_EHCI1,
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages-into-hugepages-numa-nodeset.patch b/SOURCES/libvirt-tests-rename-hugepages-pages-into-hugepages-numa-nodeset.patch
deleted file mode 100644
index f80af27..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages-into-hugepages-numa-nodeset.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 3e0f1ade36fd228d822b955aa417a2d81ec137b7 Mon Sep 17 00:00:00 2001
-Message-Id: <3e0f1ade36fd228d822b955aa417a2d81ec137b7@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:41 +0200
-Subject: [PATCH] tests: rename hugepages-pages into hugepages-numa-nodeset
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-<numatune> for numa guest is tested by numatune-memnode test.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit a83461b09af48dd22ebf7794e66268244387e3f1)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...s-pages.args => hugepages-numa-nodeset.args} | 17 +++++------------
- ...ges-pages.xml => hugepages-numa-nodeset.xml} | 12 +-----------
- tests/qemuxml2argvtest.c                        |  2 +-
- ...ges-pages.xml => hugepages-numa-nodeset.xml} | 17 +----------------
- tests/qemuxml2xmltest.c                         |  2 +-
- 5 files changed, 9 insertions(+), 41 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages.args => hugepages-numa-nodeset.args} (77%)
- rename tests/qemuxml2argvdata/{hugepages-pages.xml => hugepages-numa-nodeset.xml} (74%)
- rename tests/qemuxml2xmloutdata/{hugepages-pages.xml => hugepages-numa-nodeset.xml} (66%)
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-similarity index 77%
-rename from tests/qemuxml2argvdata/hugepages-pages.args
-rename to tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-index 7ece0272a0..22f0e605fe 100644
---- a/tests/qemuxml2argvdata/hugepages-pages.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-@@ -11,20 +11,16 @@ QEMU_AUDIO_DRV=none \
- -m 4096 \
- -smp 4,sockets=4,cores=1,threads=1 \
- -object memory-backend-file,id=ram-node0,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
--host-nodes=0-3,policy=bind \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \
- -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
- -object memory-backend-file,id=ram-node1,prealloc=yes,\
--mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
--host-nodes=0-3,policy=bind \
-+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \
- -numa node,nodeid=1,cpus=1,memdev=ram-node1 \
- -object memory-backend-file,id=ram-node2,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
--host-nodes=0-3,policy=bind \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \
- -numa node,nodeid=2,cpus=2,memdev=ram-node2 \
- -object memory-backend-file,id=ram-node3,prealloc=yes,\
--mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\
--host-nodes=3,policy=bind \
-+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824 \
- -numa node,nodeid=3,cpus=3,memdev=ram-node3 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
- -display none \
-@@ -37,7 +33,4 @@ server,nowait \
- -no-shutdown \
- -no-acpi \
- -boot c \
---usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-pages.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
-similarity index 74%
-rename from tests/qemuxml2argvdata/hugepages-pages.xml
-rename to tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
-index f9270782d4..e81fa44d58 100644
---- a/tests/qemuxml2argvdata/hugepages-pages.xml
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
-@@ -10,10 +10,6 @@
-     </hugepages>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
--  <numatune>
--    <memory mode='strict' nodeset='0-3'/>
--    <memnode cellid='3' mode='strict' nodeset='3'/>
--  </numatune>
-   <os>
-     <type arch='i686' machine='pc'>hvm</type>
-     <boot dev='hd'/>
-@@ -32,16 +28,10 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</emulator>
--    <disk type='block' device='disk'>
--      <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'/>
--    <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='virtio'/>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index ea26d17a63..3bb5efbd8d 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -954,7 +954,7 @@ mymain(void)
-     DO_TEST("hugepages-numa-default-dimm",
-             QEMU_CAPS_DEVICE_PC_DIMM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
--    DO_TEST("hugepages-pages",
-+    DO_TEST("hugepages-numa-nodeset",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
-similarity index 66%
-rename from tests/qemuxml2xmloutdata/hugepages-pages.xml
-rename to tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
-index 498610a217..affd124048 100644
---- a/tests/qemuxml2xmloutdata/hugepages-pages.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
-@@ -10,10 +10,6 @@
-     </hugepages>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
--  <numatune>
--    <memory mode='strict' nodeset='0-3'/>
--    <memnode cellid='3' mode='strict' nodeset='3'/>
--  </numatune>
-   <os>
-     <type arch='i686' machine='pc'>hvm</type>
-     <boot dev='hd'/>
-@@ -32,23 +28,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index b4bd9ebc4c..2c3d16495e 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -333,7 +333,7 @@ mymain(void)
-     DO_TEST("pages-discard", NONE);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
--    DO_TEST("hugepages-pages", NONE);
-+    DO_TEST("hugepages-numa-nodeset", NONE);
-     DO_TEST("hugepages-pages2", NONE);
-     DO_TEST("hugepages-pages3", NONE);
-     DO_TEST("hugepages-pages4", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages2-into-hugepages-numa-default-2M.patch b/SOURCES/libvirt-tests-rename-hugepages-pages2-into-hugepages-numa-default-2M.patch
deleted file mode 100644
index 99e2261..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages2-into-hugepages-numa-default-2M.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From b7c7f867e4c46c09acb7c65ff4c5e66564bfa090 Mon Sep 17 00:00:00 2001
-Message-Id: <b7c7f867e4c46c09acb7c65ff4c5e66564bfa090@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:42 +0200
-Subject: [PATCH] tests: rename hugepages-pages2 into hugepages-numa-default-2M
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 1abcfa5c17b4ea26f75b2b37281d4990eb6be20f)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...s-pages2.args => hugepages-numa-default-2M.args} |  5 +----
- ...ges-pages2.xml => hugepages-numa-default-2M.xml} |  8 +-------
- tests/qemuxml2argvtest.c                            |  5 +++--
- ...ges-pages2.xml => hugepages-numa-default-2M.xml} | 13 +------------
- tests/qemuxml2xmltest.c                             |  2 +-
- 5 files changed, 7 insertions(+), 26 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages2.args => hugepages-numa-default-2M.args} (77%)
- rename tests/qemuxml2argvdata/{hugepages-pages2.xml => hugepages-numa-default-2M.xml} (77%)
- rename tests/qemuxml2xmloutdata/{hugepages-pages2.xml => hugepages-numa-default-2M.xml} (67%)
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages2.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-similarity index 77%
-rename from tests/qemuxml2argvdata/hugepages-pages2.args
-rename to tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-index 21105ef844..2dfacefe4a 100644
---- a/tests/qemuxml2argvdata/hugepages-pages2.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-@@ -25,7 +25,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
- -no-shutdown \
- -no-acpi \
- -boot c \
---usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-pages2.xml b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
-similarity index 77%
-rename from tests/qemuxml2argvdata/hugepages-pages2.xml
-rename to tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
-index 3b2d72ef3c..357c77da2a 100644
---- a/tests/qemuxml2argvdata/hugepages-pages2.xml
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
-@@ -25,16 +25,10 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</emulator>
--    <disk type='block' device='disk'>
--      <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'/>
--    <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='virtio'/>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 3bb5efbd8d..6a79918f67 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -951,14 +951,15 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-+    DO_TEST("hugepages-numa-default-2M",
-+            QEMU_CAPS_OBJECT_MEMORY_RAM,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-default-dimm",
-             QEMU_CAPS_DEVICE_PC_DIMM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-nodeset",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
--    DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM,
--            QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE,
-             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages2.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
-similarity index 67%
-rename from tests/qemuxml2xmloutdata/hugepages-pages2.xml
-rename to tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
-index cd79960f1b..3777824e1a 100644
---- a/tests/qemuxml2xmloutdata/hugepages-pages2.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
-@@ -25,23 +25,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 2c3d16495e..a4448ff168 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -332,9 +332,9 @@ mymain(void)
- 
-     DO_TEST("pages-discard", NONE);
-     DO_TEST("hugepages-default", NONE);
-+    DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
--    DO_TEST("hugepages-pages2", NONE);
-     DO_TEST("hugepages-pages3", NONE);
-     DO_TEST("hugepages-pages4", NONE);
-     DO_TEST("hugepages-pages5", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages3-into-hugepages-numa-nodeset-part.patch b/SOURCES/libvirt-tests-rename-hugepages-pages3-into-hugepages-numa-nodeset-part.patch
deleted file mode 100644
index 508eead..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages3-into-hugepages-numa-nodeset-part.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From c8e971d3757759bcd14a6dc611e563f17e0cd4ed Mon Sep 17 00:00:00 2001
-Message-Id: <c8e971d3757759bcd14a6dc611e563f17e0cd4ed@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:44 +0200
-Subject: [PATCH] tests: rename hugepages-pages3 into
- hugepages-numa-nodeset-part
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 96937ccf265e1dc318bccbde042d0b95b2db30d3)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...pages3.args => hugepages-numa-nodeset-part.args} |  5 +----
- ...s-pages3.xml => hugepages-numa-nodeset-part.xml} |  8 +-------
- tests/qemuxml2argvtest.c                            |  3 ++-
- ...s-pages3.xml => hugepages-numa-nodeset-part.xml} | 13 +------------
- tests/qemuxml2xmltest.c                             |  2 +-
- 5 files changed, 6 insertions(+), 25 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages3.args => hugepages-numa-nodeset-part.args} (80%)
- rename tests/qemuxml2argvdata/{hugepages-pages3.xml => hugepages-numa-nodeset-part.xml} (77%)
- rename tests/qemuxml2xmloutdata/{hugepages-pages3.xml => hugepages-numa-nodeset-part.xml} (67%)
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages3.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-similarity index 80%
-rename from tests/qemuxml2argvdata/hugepages-pages3.args
-rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-index 2fc701ca22..9999071176 100644
---- a/tests/qemuxml2argvdata/hugepages-pages3.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-@@ -26,7 +26,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
- -no-shutdown \
- -no-acpi \
- -boot c \
---usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-pages3.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
-similarity index 77%
-rename from tests/qemuxml2argvdata/hugepages-pages3.xml
-rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
-index 3d3b3f3cc3..b19bdedb36 100644
---- a/tests/qemuxml2argvdata/hugepages-pages3.xml
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
-@@ -25,16 +25,10 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</emulator>
--    <disk type='block' device='disk'>
--      <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'/>
--    <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='virtio'/>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index a95d2c1915..5a41bbe6e0 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -964,7 +964,8 @@ mymain(void)
-     DO_TEST("hugepages-numa-nodeset",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
--    DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM,
-+    DO_TEST("hugepages-numa-nodeset-part",
-+            QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-shared",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages3.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
-similarity index 67%
-rename from tests/qemuxml2xmloutdata/hugepages-pages3.xml
-rename to tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
-index be21c3eddd..1230edfd02 100644
---- a/tests/qemuxml2xmloutdata/hugepages-pages3.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
-@@ -25,23 +25,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 83c0ffdfe2..bb7b0ce481 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -336,7 +336,7 @@ mymain(void)
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
--    DO_TEST("hugepages-pages3", NONE);
-+    DO_TEST("hugepages-numa-nodeset-part", NONE);
-     DO_TEST("hugepages-pages4", NONE);
-     DO_TEST("hugepages-pages5", NONE);
-     DO_TEST("hugepages-pages6", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages4-into-hugepages-numa-nodeset-nonexist.patch b/SOURCES/libvirt-tests-rename-hugepages-pages4-into-hugepages-numa-nodeset-nonexist.patch
deleted file mode 100644
index e3ace08..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages4-into-hugepages-numa-nodeset-nonexist.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 12dd0446ce6df2388e169e6f33438e538f016e60 Mon Sep 17 00:00:00 2001
-Message-Id: <12dd0446ce6df2388e169e6f33438e538f016e60@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:45 +0200
-Subject: [PATCH] tests: rename hugepages-pages4 into
- hugepages-numa-nodeset-nonexist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 5534edcb9e0cd462f2bae8acb92bd9b85aa874f0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ....xml => hugepages-numa-nodeset-nonexist.xml} | 17 +----------------
- tests/qemuxml2argvtest.c                        |  5 +++--
- .../hugepages-numa-nodeset-nonexist.xml         |  1 +
- tests/qemuxml2xmloutdata/hugepages-pages4.xml   |  1 -
- tests/qemuxml2xmltest.c                         |  2 +-
- 5 files changed, 6 insertions(+), 20 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages4.xml => hugepages-numa-nodeset-nonexist.xml} (66%)
- create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages4.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages4.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
-similarity index 66%
-rename from tests/qemuxml2argvdata/hugepages-pages4.xml
-rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
-index 9f79881a59..8211d72be9 100644
---- a/tests/qemuxml2argvdata/hugepages-pages4.xml
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
-@@ -10,10 +10,6 @@
-     </hugepages>
-   </memoryBacking>
-   <vcpu placement='static'>4</vcpu>
--  <numatune>
--    <memory mode='strict' nodeset='0-3'/>
--    <memnode cellid='3' mode='strict' nodeset='3'/>
--  </numatune>
-   <os>
-     <type arch='i686' machine='pc'>hvm</type>
-     <boot dev='hd'/>
-@@ -32,23 +28,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 5a41bbe6e0..1b6e8ded43 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -967,12 +967,13 @@ mymain(void)
-     DO_TEST("hugepages-numa-nodeset-part",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-+    DO_TEST_FAILURE("hugepages-numa-nodeset-nonexist",
-+                    QEMU_CAPS_OBJECT_MEMORY_RAM,
-+                    QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-shared",
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
--    DO_TEST_FAILURE("hugepages-pages4",
--            QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-pages5", NONE);
-     DO_TEST("hugepages-pages6", NONE);
-     DO_TEST("hugepages-pages7",
-diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
-new file mode 120000
-index 0000000000..d490edca69
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-nonexist.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages4.xml b/tests/qemuxml2xmloutdata/hugepages-pages4.xml
-deleted file mode 120000
-index 127e66e64f..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-pages4.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-pages4.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index bb7b0ce481..9b3152821f 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -337,7 +337,7 @@ mymain(void)
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
-     DO_TEST("hugepages-numa-nodeset-part", NONE);
--    DO_TEST("hugepages-pages4", NONE);
-+    DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
-     DO_TEST("hugepages-pages5", NONE);
-     DO_TEST("hugepages-pages6", NONE);
-     DO_TEST("hugepages-pages7", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages5-into-hugepages-default-2M.patch b/SOURCES/libvirt-tests-rename-hugepages-pages5-into-hugepages-default-2M.patch
deleted file mode 100644
index eb212d9..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages5-into-hugepages-default-2M.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From b78dc3ab1a744d408803f28658ce3680ae544460 Mon Sep 17 00:00:00 2001
-Message-Id: <b78dc3ab1a744d408803f28658ce3680ae544460@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:46 +0200
-Subject: [PATCH] tests: rename hugepages-pages5 into hugepages-default-2M
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 6110770324b42c8af8b4bc40a61d41ccd563f90d)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-default-2M.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...epages-pages5.args => hugepages-default-2M.args} |  5 +----
- ...ugepages-pages5.xml => hugepages-default-2M.xml} | 13 +------------
- tests/qemuxml2argvtest.c                            |  2 +-
- tests/qemuxml2xmloutdata/hugepages-default-2M.xml   |  1 +
- tests/qemuxml2xmloutdata/hugepages-pages5.xml       |  1 -
- tests/qemuxml2xmltest.c                             |  2 +-
- 6 files changed, 5 insertions(+), 19 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages5.args => hugepages-default-2M.args} (75%)
- rename tests/qemuxml2argvdata/{hugepages-pages5.xml => hugepages-default-2M.xml} (63%)
- create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-2M.xml
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages5.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages5.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
-similarity index 75%
-rename from tests/qemuxml2argvdata/hugepages-pages5.args
-rename to tests/qemuxml2argvdata/hugepages-default-2M.args
-index dc13abed10..d094be1252 100644
---- a/tests/qemuxml2argvdata/hugepages-pages5.args
-+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
-@@ -23,7 +23,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
- -no-shutdown \
- -no-acpi \
- -boot c \
---usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-pages5.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
-similarity index 63%
-rename from tests/qemuxml2argvdata/hugepages-pages5.xml
-rename to tests/qemuxml2argvdata/hugepages-default-2M.xml
-index f636c186de..ac219a7800 100644
---- a/tests/qemuxml2argvdata/hugepages-pages5.xml
-+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
-@@ -19,23 +19,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 1b6e8ded43..57cfce1b7b 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -953,6 +953,7 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_FILE,
-             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-default", NONE);
-+    DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-default-2M",
-@@ -974,7 +975,6 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
--    DO_TEST("hugepages-pages5", NONE);
-     DO_TEST("hugepages-pages6", NONE);
-     DO_TEST("hugepages-pages7",
-             QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
-diff --git a/tests/qemuxml2xmloutdata/hugepages-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
-new file mode 120000
-index 0000000000..8786948fdd
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-default-2M.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/hugepages-default-2M.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages5.xml b/tests/qemuxml2xmloutdata/hugepages-pages5.xml
-deleted file mode 120000
-index cfead1c317..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-pages5.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-pages5.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 9b3152821f..2f860e548c 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -333,12 +333,12 @@ mymain(void)
-     DO_TEST("pages-discard", NONE);
-     DO_TEST("pages-discard-hugepages", NONE);
-     DO_TEST("hugepages-default", NONE);
-+    DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
-     DO_TEST("hugepages-numa-nodeset-part", NONE);
-     DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
--    DO_TEST("hugepages-pages5", NONE);
-     DO_TEST("hugepages-pages6", NONE);
-     DO_TEST("hugepages-pages7", NONE);
-     DO_TEST("hugepages-shared", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages6-into-hugepages-default-system-size.patch b/SOURCES/libvirt-tests-rename-hugepages-pages6-into-hugepages-default-system-size.patch
deleted file mode 100644
index 603472d..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages6-into-hugepages-default-system-size.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From f3f6c5523c0052782dc93a0d4c908a724b14f92f Mon Sep 17 00:00:00 2001
-Message-Id: <f3f6c5523c0052782dc93a0d4c908a724b14f92f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:47 +0200
-Subject: [PATCH] tests: rename hugepages-pages6 into
- hugepages-default-system-size
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 3d553f4d4bfa94bc0ba4111454a85a0f16cf89c3)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-default-system-size.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...ges6.args => hugepages-default-system-size.args} |  5 +----
- ...pages6.xml => hugepages-default-system-size.xml} | 13 +------------
- tests/qemuxml2argvtest.c                            |  2 +-
- .../hugepages-default-system-size.xml               |  1 +
- tests/qemuxml2xmloutdata/hugepages-pages6.xml       |  1 -
- tests/qemuxml2xmltest.c                             |  2 +-
- 6 files changed, 5 insertions(+), 19 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages6.args => hugepages-default-system-size.args} (72%)
- rename tests/qemuxml2argvdata/{hugepages-pages6.xml => hugepages-default-system-size.xml} (63%)
- create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages6.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages6.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
-similarity index 72%
-rename from tests/qemuxml2argvdata/hugepages-pages6.args
-rename to tests/qemuxml2argvdata/hugepages-default-system-size.args
-index 51467c0ae1..eeb7d142ce 100644
---- a/tests/qemuxml2argvdata/hugepages-pages6.args
-+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
-@@ -21,7 +21,4 @@ path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
- -no-shutdown \
- -no-acpi \
- -boot c \
---usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-pages6.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
-similarity index 63%
-rename from tests/qemuxml2argvdata/hugepages-pages6.xml
-rename to tests/qemuxml2argvdata/hugepages-default-system-size.xml
-index fc4f57fbc0..8a809ead5e 100644
---- a/tests/qemuxml2argvdata/hugepages-pages6.xml
-+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
-@@ -19,23 +19,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 57cfce1b7b..1aab23408d 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -954,6 +954,7 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-+    DO_TEST("hugepages-default-system-size", NONE);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-default-2M",
-@@ -975,7 +976,6 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
--    DO_TEST("hugepages-pages6", NONE);
-     DO_TEST("hugepages-pages7",
-             QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
-             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-diff --git a/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml b/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
-new file mode 120000
-index 0000000000..e64e3fb282
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/hugepages-default-system-size.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages6.xml b/tests/qemuxml2xmloutdata/hugepages-pages6.xml
-deleted file mode 120000
-index 584b7c92c8..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-pages6.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-pages6.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 2f860e548c..a3555b348e 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -334,12 +334,12 @@ mymain(void)
-     DO_TEST("pages-discard-hugepages", NONE);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-+    DO_TEST("hugepages-default-system-size", NONE);
-     DO_TEST("hugepages-numa-default-2M", NONE);
-     DO_TEST("hugepages-numa-default-dimm", NONE);
-     DO_TEST("hugepages-numa-nodeset", NONE);
-     DO_TEST("hugepages-numa-nodeset-part", NONE);
-     DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
--    DO_TEST("hugepages-pages6", NONE);
-     DO_TEST("hugepages-pages7", NONE);
-     DO_TEST("hugepages-shared", NONE);
-     DO_TEST("hugepages-memaccess", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages7-into-pages-dimm-discard.patch b/SOURCES/libvirt-tests-rename-hugepages-pages7-into-pages-dimm-discard.patch
deleted file mode 100644
index 0916207..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages7-into-pages-dimm-discard.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From bafa9aa0fb88ceb6ed672d534195f268b8da5e51 Mon Sep 17 00:00:00 2001
-Message-Id: <bafa9aa0fb88ceb6ed672d534195f268b8da5e51@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:48 +0200
-Subject: [PATCH] tests: rename hugepages-pages7 into pages-dimm-discard
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7e0ac26867da8b3b1464b7649a53fdd6dde8d9ab)
-
-Conflicts:
-    tests/qemuxml2argvdata/pages-dimm-discard.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...ges-pages7.args => pages-dimm-discard.args} | 16 +++++-----------
- ...pages-pages7.xml => pages-dimm-discard.xml} | 18 +-----------------
- tests/qemuxml2argvtest.c                       |  7 ++++---
- tests/qemuxml2xmloutdata/hugepages-pages7.xml  |  1 -
- .../qemuxml2xmloutdata/pages-dimm-discard.xml  |  1 +
- tests/qemuxml2xmltest.c                        |  2 +-
- 6 files changed, 12 insertions(+), 33 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages7.args => pages-dimm-discard.args} (65%)
- rename tests/qemuxml2argvdata/{hugepages-pages7.xml => pages-dimm-discard.xml} (73%)
- delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages7.xml
- create mode 120000 tests/qemuxml2xmloutdata/pages-dimm-discard.xml
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages7.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
-similarity index 65%
-rename from tests/qemuxml2argvdata/hugepages-pages7.args
-rename to tests/qemuxml2argvdata/pages-dimm-discard.args
-index 02a98026eb..97184e074a 100644
---- a/tests/qemuxml2argvdata/hugepages-pages7.args
-+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
-@@ -10,16 +10,14 @@ QEMU_AUDIO_DRV=none \
- -machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -smp 2,sockets=2,cores=1,threads=1 \
---mem-prealloc \
---mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
- -numa node,nodeid=0,cpus=0-1,mem=1024 \
- -object memory-backend-file,id=memdimm0,prealloc=yes,\
- mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\
- host-nodes=1-3,policy=bind \
- -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
---object memory-backend-file,id=memdimm1,prealloc=yes,\
--mem-path=/dev/hugepages2M/libvirt/qemu/-1-fedora,discard-data=yes,share=no,\
--size=536870912 \
-+-object memory-backend-file,id=memdimm1,\
-+mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-fedora/dimm1,\
-+discard-data=yes,share=no,size=536870912 \
- -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
- -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
- -display none \
-@@ -30,10 +28,6 @@ server,nowait \
- -mon chardev=charmonitor,id=monitor,mode=control \
- -rtc base=utc \
- -no-shutdown \
-+-no-acpi \
- -boot c \
---usb \
---drive file=/var/lib/libvirt/images/fedora.qcow2,format=qcow2,if=none,\
--id=drive-virtio-disk0 \
---device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\
--id=virtio-disk0 \
---device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-+-usb
-diff --git a/tests/qemuxml2argvdata/hugepages-pages7.xml b/tests/qemuxml2argvdata/pages-dimm-discard.xml
-similarity index 73%
-rename from tests/qemuxml2argvdata/hugepages-pages7.xml
-rename to tests/qemuxml2argvdata/pages-dimm-discard.xml
-index 28c72f85a7..3d233687e1 100644
---- a/tests/qemuxml2argvdata/hugepages-pages7.xml
-+++ b/tests/qemuxml2argvdata/pages-dimm-discard.xml
-@@ -4,19 +4,11 @@
-   <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory>
-   <memory unit='KiB'>2621439</memory>
-   <currentMemory unit='KiB'>2621439</currentMemory>
--  <memoryBacking>
--    <hugepages/>
--  </memoryBacking>
-   <vcpu placement='static'>2</vcpu>
-   <os>
-     <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type>
-     <boot dev='hd'/>
-   </os>
--  <features>
--    <acpi/>
--    <apic/>
--    <pae/>
--  </features>
-   <cpu>
-     <numa>
-       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
-@@ -28,21 +20,13 @@
-   <on_crash>restart</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-x86_64</emulator>
--    <disk type='file' device='disk'>
--      <driver name='qemu' type='qcow2'/>
--      <source file='/var/lib/libvirt/images/fedora.qcow2'/>
--      <target dev='vda' bus='virtio'/>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
--    </disk>
-     <controller type='usb' index='0'>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-     </controller>
-     <controller type='pci' index='0' model='pci-root'/>
-     <input type='mouse' bus='ps2'/>
-     <input type='keyboard' bus='ps2'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-     <memory model='dimm' discard='no'>
-       <source>
-         <nodemask>1-3</nodemask>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 1aab23408d..f8fbca1806 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -952,6 +952,10 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE,
-             QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-+    DO_TEST("pages-dimm-discard",
-+            QEMU_CAPS_DEVICE_PC_DIMM,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE,
-+            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-@@ -976,9 +980,6 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
--    DO_TEST("hugepages-pages7",
--            QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
--            QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST_FAILURE("hugepages-pages8",
-                     QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
-                     QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-diff --git a/tests/qemuxml2xmloutdata/hugepages-pages7.xml b/tests/qemuxml2xmloutdata/hugepages-pages7.xml
-deleted file mode 120000
-index b4ce4defda..0000000000
---- a/tests/qemuxml2xmloutdata/hugepages-pages7.xml
-+++ /dev/null
-@@ -1 +0,0 @@
--../qemuxml2argvdata/hugepages-pages7.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmloutdata/pages-dimm-discard.xml b/tests/qemuxml2xmloutdata/pages-dimm-discard.xml
-new file mode 120000
-index 0000000000..05bbef8d65
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/pages-dimm-discard.xml
-@@ -0,0 +1 @@
-+../qemuxml2argvdata/pages-dimm-discard.xml
-\ No newline at end of file
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index a3555b348e..6afc48f98e 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -332,6 +332,7 @@ mymain(void)
- 
-     DO_TEST("pages-discard", NONE);
-     DO_TEST("pages-discard-hugepages", NONE);
-+    DO_TEST("pages-dimm-discard", NONE);
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-@@ -340,7 +341,6 @@ mymain(void)
-     DO_TEST("hugepages-numa-nodeset", NONE);
-     DO_TEST("hugepages-numa-nodeset-part", NONE);
-     DO_TEST("hugepages-numa-nodeset-nonexist", NONE);
--    DO_TEST("hugepages-pages7", NONE);
-     DO_TEST("hugepages-shared", NONE);
-     DO_TEST("hugepages-memaccess", NONE);
-     DO_TEST("hugepages-memaccess2", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-pages8-into-hugepages-nodeset-nonexist.patch b/SOURCES/libvirt-tests-rename-hugepages-pages8-into-hugepages-nodeset-nonexist.patch
deleted file mode 100644
index 144909c..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-pages8-into-hugepages-nodeset-nonexist.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From b62a8d7fc457babdc57a93264fb8f75f8ecf7369 Mon Sep 17 00:00:00 2001
-Message-Id: <b62a8d7fc457babdc57a93264fb8f75f8ecf7369@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:49 +0200
-Subject: [PATCH] tests: rename hugepages-pages8 into
- hugepages-nodeset-nonexist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 67cffcbbdb4a7dcdc10681695e00615ffae8e726)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...es-pages8.xml => hugepages-nodeset-nonexist.xml} | 13 +------------
- tests/qemuxml2argvtest.c                            |  7 ++++---
- 2 files changed, 5 insertions(+), 15 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages-pages8.xml => hugepages-nodeset-nonexist.xml} (64%)
-
-diff --git a/tests/qemuxml2argvdata/hugepages-pages8.xml b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
-similarity index 64%
-rename from tests/qemuxml2argvdata/hugepages-pages8.xml
-rename to tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
-index 4cf4c1a8ad..477d3f1f2b 100644
---- a/tests/qemuxml2argvdata/hugepages-pages8.xml
-+++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml
-@@ -19,23 +19,12 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <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'/>
--    <memballoon model='virtio'>
--      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
--    </memballoon>
-+    <memballoon model='none'/>
-   </devices>
- </domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index f8fbca1806..d4251eff3e 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -959,6 +959,10 @@ mymain(void)
-     DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-default-2M", NONE);
-     DO_TEST("hugepages-default-system-size", NONE);
-+    DO_TEST_FAILURE("hugepages-nodeset-nonexist",
-+                    QEMU_CAPS_DEVICE_PC_DIMM,
-+                    QEMU_CAPS_OBJECT_MEMORY_FILE,
-+                    QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-numa-default",
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST("hugepages-numa-default-2M",
-@@ -980,9 +984,6 @@ mymain(void)
-             QEMU_CAPS_OBJECT_MEMORY_RAM,
-             QEMU_CAPS_OBJECT_MEMORY_FILE);
-     DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
--    DO_TEST_FAILURE("hugepages-pages8",
--                    QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE,
--                    QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD);
-     DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE,
-             QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM,
-             QEMU_CAPS_NUMA);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-rename-hugepages-to-hugepages-default.patch b/SOURCES/libvirt-tests-rename-hugepages-to-hugepages-default.patch
deleted file mode 100644
index f9a0aa4..0000000
--- a/SOURCES/libvirt-tests-rename-hugepages-to-hugepages-default.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 29e9e0e5601599b9246a9365ca5ff123e2534fdd Mon Sep 17 00:00:00 2001
-Message-Id: <29e9e0e5601599b9246a9365ca5ff123e2534fdd@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 13 Aug 2018 19:21:36 +0200
-Subject: [PATCH] tests: rename hugepages to hugepages-default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove unnecessary XML elements as well.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 47b8c6a04af38d38cd5d425b65d052623d1e35ba)
-
-Conflicts:
-    tests/qemuxml2argvdata/hugepages-default.args
-        - missing upstream commit <caccbba64a>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1615461
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- .../{hugepages.args => hugepages-default.args}              | 2 --
- .../{hugepages.xml => hugepages-default.xml}                | 5 -----
- tests/qemuxml2argvtest.c                                    | 2 +-
- .../{hugepages.xml => hugepages-default.xml}                | 6 ------
- tests/qemuxml2xmltest.c                                     | 2 +-
- 5 files changed, 2 insertions(+), 15 deletions(-)
- rename tests/qemuxml2argvdata/{hugepages.args => hugepages-default.args} (82%)
- rename tests/qemuxml2argvdata/{hugepages.xml => hugepages-default.xml} (79%)
- rename tests/qemuxml2xmloutdata/{hugepages.xml => hugepages-default.xml} (82%)
-
-diff --git a/tests/qemuxml2argvdata/hugepages.args b/tests/qemuxml2argvdata/hugepages-default.args
-similarity index 82%
-rename from tests/qemuxml2argvdata/hugepages.args
-rename to tests/qemuxml2argvdata/hugepages-default.args
-index ea61ba930e..115da3ea35 100644
---- a/tests/qemuxml2argvdata/hugepages.args
-+++ b/tests/qemuxml2argvdata/hugepages-default.args
-@@ -24,6 +24,4 @@ server,nowait \
- -no-acpi \
- -boot c \
- -usb \
---drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
- -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
-diff --git a/tests/qemuxml2argvdata/hugepages.xml b/tests/qemuxml2argvdata/hugepages-default.xml
-similarity index 79%
-rename from tests/qemuxml2argvdata/hugepages.xml
-rename to tests/qemuxml2argvdata/hugepages-default.xml
-index 2e65902f1c..99f53828fe 100644
---- a/tests/qemuxml2argvdata/hugepages.xml
-+++ b/tests/qemuxml2argvdata/hugepages-default.xml
-@@ -17,11 +17,6 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</emulator>
--    <disk type='block' device='disk'>
--      <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'/>
-     <controller type='ide' index='0'/>
-     <controller type='pci' index='0' model='pci-root'/>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 3cff4ffb5e..01553ada38 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -945,7 +945,7 @@ mymain(void)
-     DO_TEST("pmu-feature", NONE);
-     DO_TEST("pmu-feature-off", NONE);
- 
--    DO_TEST("hugepages", NONE);
-+    DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-numa",
-             QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
-             QEMU_CAPS_VIRTIO_SCSI,
-diff --git a/tests/qemuxml2xmloutdata/hugepages.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
-similarity index 82%
-rename from tests/qemuxml2xmloutdata/hugepages.xml
-rename to tests/qemuxml2xmloutdata/hugepages-default.xml
-index f78ca95c1b..40043434ee 100644
---- a/tests/qemuxml2xmloutdata/hugepages.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
-@@ -17,12 +17,6 @@
-   <on_crash>destroy</on_crash>
-   <devices>
-     <emulator>/usr/bin/qemu-system-i686</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'>
-       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-     </controller>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index e35644d479..f0cabc422d 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -330,7 +330,7 @@ mymain(void)
-     DO_TEST("pmu-feature", NONE);
-     DO_TEST("pmu-feature-off", NONE);
- 
--    DO_TEST("hugepages", NONE);
-+    DO_TEST("hugepages-default", NONE);
-     DO_TEST("hugepages-pages", NONE);
-     DO_TEST("hugepages-pages2", NONE);
-     DO_TEST("hugepages-pages3", NONE);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-sev-Test-launch-security-with-specific-QEMU-version.patch b/SOURCES/libvirt-tests-sev-Test-launch-security-with-specific-QEMU-version.patch
deleted file mode 100644
index eceb6a6..0000000
--- a/SOURCES/libvirt-tests-sev-Test-launch-security-with-specific-QEMU-version.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 3984480fb9a20cd47de94db3f0246c90eb8c3c14 Mon Sep 17 00:00:00 2001
-Message-Id: <3984480fb9a20cd47de94db3f0246c90eb8c3c14@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Mon, 20 Aug 2018 17:18:51 +0200
-Subject: [PATCH] tests: sev: Test launch-security with specific QEMU version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to test SEV we need real QEMU capabilities. Ideally, this would
-be tested with -latest capabilities, however, our capabilities are
-currently tied to Intel HW, even the 2.12.0 containing SEV were edited by
-hand, so we can only use that one for now, as splitting the capabilities
-according to the vendor is a refactor for another day. The need for real
-capabilities comes from the extended SEV platform data (PDH, cbitpos,
-etc.) we'll need to cache/parse.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Acked-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 6c50cef8a3e4e3407fb42a713a353e42ae3f2bc6)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1612009
-https://bugzilla.redhat.com/show_bug.cgi?id=1619150
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-
- Conflicts:
-	tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-            - this wasn't a 100% clean file rename and git doesn't like
-            that
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- ...=> launch-security-sev.x86_64-2.12.0.args} | 19 ++++++++++++-------
- tests/qemuxml2argvtest.c                      |  4 +---
- 2 files changed, 13 insertions(+), 10 deletions(-)
- rename tests/qemuxml2argvdata/{launch-security-sev.args => launch-security-sev.x86_64-2.12.0.args} (54%)
-
-diff --git a/tests/qemuxml2argvdata/launch-security-sev.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-similarity index 54%
-rename from tests/qemuxml2argvdata/launch-security-sev.args
-rename to tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-index db0be1a27d..6da068e1a5 100644
---- a/tests/qemuxml2argvdata/launch-security-sev.args
-+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-@@ -5,25 +5,30 @@ USER=test \
- LOGNAME=test \
- QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
---name QEMUGuest1 \
-+-name guest=QEMUGuest1,debug-threads=on \
- -S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \
- -m 214 \
-+-realtime mlock=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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
--server,nowait \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
- -mon chardev=charmonitor,id=monitor,mode=control \
- -rtc base=utc \
- -no-shutdown \
- -no-acpi \
---boot c \
---usb \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
---device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
- -object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=1,policy=0x1,\
- dh-cert-file=/tmp/lib/domain--1-QEMUGuest1/dh_cert.base64,\
--session-file=/tmp/lib/domain--1-QEMUGuest1/session.base64
-+session-file=/tmp/lib/domain--1-QEMUGuest1/session.base64 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index e6c0120670..02bb9889ee 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -2950,9 +2950,7 @@ mymain(void)
-     DO_TEST_CAPS_LATEST("vhost-vsock");
-     DO_TEST_CAPS_LATEST("vhost-vsock-auto");
- 
--    DO_TEST("launch-security-sev",
--            QEMU_CAPS_KVM,
--            QEMU_CAPS_SEV_GUEST);
-+    DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
- 
-     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
-         virFileDeleteTree(fakerootdir);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tests-virstorage-Add-test-cases-for-json-pseudo-URI-without-file-wrapper.patch b/SOURCES/libvirt-tests-virstorage-Add-test-cases-for-json-pseudo-URI-without-file-wrapper.patch
new file mode 100644
index 0000000..520b1ae
--- /dev/null
+++ b/SOURCES/libvirt-tests-virstorage-Add-test-cases-for-json-pseudo-URI-without-file-wrapper.patch
@@ -0,0 +1,54 @@
+From 4c5c4e4b30016175c40a1f2dac7e145042ea06ed Mon Sep 17 00:00:00 2001
+Message-Id: <4c5c4e4b30016175c40a1f2dac7e145042ea06ed@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:11 +0100
+Subject: [PATCH] tests: virstorage: Add test cases for "json:" pseudo-URI
+ without 'file' wrapper
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add few cases that prove the second format of "json:" pseudo-URIs.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 0d0d60ddc5e58359cff5be8dfd6dd27e98da0282)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <7f9970e468fd99dfb72033f688e45ca086be56a0.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virstoragetest.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 4341c04b1e..6d62aab654 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1315,6 +1315,10 @@ mymain(void)
+                                         "}"
+                             "}",
+                        "<source file='/path/to/file'/>\n");
++    TEST_BACKING_PARSE("json:{\"driver\":\"file\","
++                             "\"filename\":\"/path/to/file\""
++                            "}",
++                       "<source file='/path/to/file'/>\n");
+     TEST_BACKING_PARSE("json:{\"file.driver\":\"host_device\", "
+                              "\"file.filename\":\"/path/to/dev\"}",
+                        "<source dev='/path/to/dev'/>\n");
+@@ -1389,6 +1393,12 @@ mymain(void)
+                        "<source protocol='nbd'>\n"
+                        "  <host transport='unix' socket='/path/to/socket'/>\n"
+                        "</source>\n");
++    TEST_BACKING_PARSE("json:{\"driver\":\"nbd\","
++                             "\"path\":\"/path/to/socket\""
++                            "}",
++                       "<source protocol='nbd'>\n"
++                       "  <host transport='unix' socket='/path/to/socket'/>\n"
++                       "</source>\n");
+     TEST_BACKING_PARSE("json:{\"file.driver\":\"nbd\","
+                              "\"file.path\":\"/path/to/socket\""
+                             "}",
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-virstorage-Add-test-data-for-json-specified-raw-image-with-offset-size.patch b/SOURCES/libvirt-tests-virstorage-Add-test-data-for-json-specified-raw-image-with-offset-size.patch
new file mode 100644
index 0000000..35963ac
--- /dev/null
+++ b/SOURCES/libvirt-tests-virstorage-Add-test-data-for-json-specified-raw-image-with-offset-size.patch
@@ -0,0 +1,49 @@
+From 5becceb93612985adc0e358c03003b9e85f1053f Mon Sep 17 00:00:00 2001
+Message-Id: <5becceb93612985adc0e358c03003b9e85f1053f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:14 +0100
+Subject: [PATCH] tests: virstorage: Add test data for json specified raw image
+ with offset/size
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+QEMU allows specifying the offset and size into a raw file to expose a
+sub-slice of the image to the guest with the raw driver. Libvirt
+currently doesn't support it but we can add test case for future
+reference.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 554ae62637fe4205b7f51a75e798be9223dfdc3d)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <36808e0f9518770d82af2562d6a54e36f0cb13f5.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virstoragetest.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 6d62aab654..25d41f0de4 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1593,6 +1593,15 @@ mymain(void)
+                        "<source protocol='vxhs' name='c6718f6b-0401-441d-a8c3-1f0064d75ee0'>\n"
+                        "  <host name='example.com' port='9999'/>\n"
+                        "</source>\n");
++    TEST_BACKING_PARSE_FULL("json:{ \"driver\": \"raw\","
++                                    "\"offset\": 10752,"
++                                    "\"size\": 4063232,"
++                                    "\"file\": { \"driver\": \"file\","
++                                                "\"filename\": \"/tmp/testfle\""
++                                              "}"
++                                  "}",
++                            "<source file='/tmp/testfle'/>\n", 0);
++
+ #endif /* WITH_YAJL */
+ 
+  cleanup:
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-virstorage-Add-tests-for-NBD-URI-style-syntax-over-UNIX.patch b/SOURCES/libvirt-tests-virstorage-Add-tests-for-NBD-URI-style-syntax-over-UNIX.patch
new file mode 100644
index 0000000..2a3c2cb
--- /dev/null
+++ b/SOURCES/libvirt-tests-virstorage-Add-tests-for-NBD-URI-style-syntax-over-UNIX.patch
@@ -0,0 +1,61 @@
+From f2367a6085be46fa0c3e948d0da1277f38bf2fa8 Mon Sep 17 00:00:00 2001
+Message-Id: <f2367a6085be46fa0c3e948d0da1277f38bf2fa8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 17 Jan 2020 13:16:58 +0100
+Subject: [PATCH] tests: virstorage: Add tests for NBD URI style syntax over
+ UNIX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add few test cases for nbd+unix style URIs with few corner cases.
+
+The NBD URI syntax is documented at
+https://github.com/NetworkBlockDevice/nbd/blob/master/doc/uri.md
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2775aada167fad5a508b16a8cadac1fca489c7be)
+https://bugzilla.redhat.com/show_bug.cgi?id=1791614
+Message-Id: <5c316356be1b5aca0cc2858925833e6316de10f8.1579263320.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+---
+ tests/virstoragetest.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 370e19252b..4341c04b1e 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1274,6 +1274,26 @@ mymain(void)
+                        "<source protocol='nbd' name='exportname'>\n"
+                        "  <host name='example.org' port='1234'/>\n"
+                        "</source>\n");
++    TEST_BACKING_PARSE("nbd+unix://?socket=/tmp/sock",
++                       "<source protocol='nbd'>\n"
++                       "  <host transport='unix' socket='/tmp/sock'/>\n"
++                       "</source>\n");
++    TEST_BACKING_PARSE("nbd+unix:///?socket=/tmp/sock",
++                       "<source protocol='nbd'>\n"
++                       "  <host transport='unix' socket='/tmp/sock'/>\n"
++                       "</source>\n");
++    TEST_BACKING_PARSE("nbd+unix:////?socket=/tmp/sock",
++                       "<source protocol='nbd' name='/'>\n"
++                       "  <host transport='unix' socket='/tmp/sock'/>\n"
++                       "</source>\n");
++    TEST_BACKING_PARSE("nbd+unix:///exp?socket=/tmp/sock",
++                       "<source protocol='nbd' name='exp'>\n"
++                       "  <host transport='unix' socket='/tmp/sock'/>\n"
++                       "</source>\n");
++    TEST_BACKING_PARSE("nbd+unix:////exp?socket=/tmp/sock",
++                       "<source protocol='nbd' name='/exp'>\n"
++                       "  <host transport='unix' socket='/tmp/sock'/>\n"
++                       "</source>\n");
+     TEST_BACKING_PARSE_FULL("iscsi://testuser:testpass@example.org:1234/exportname",
+                             "<source protocol='iscsi' name='exportname'>\n"
+                             "  <host name='example.org' port='1234'/>\n"
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-tests-virstorage-Fix-backing-file-format-of-created-image.patch b/SOURCES/libvirt-tests-virstorage-Fix-backing-file-format-of-created-image.patch
new file mode 100644
index 0000000..3436012
--- /dev/null
+++ b/SOURCES/libvirt-tests-virstorage-Fix-backing-file-format-of-created-image.patch
@@ -0,0 +1,39 @@
+From 81a506d1ac93ce3c5a21ae0dc6906d26074083f6 Mon Sep 17 00:00:00 2001
+Message-Id: <81a506d1ac93ce3c5a21ae0dc6906d26074083f6@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:35 +0100
+Subject: [PATCH] tests: virstorage: Fix backing file format of created image
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We create some images for testing our code. We've recorded wrong format
+of the backing file for one of the images though.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit e5c8f6e0800106c9331c975344086c7834fcae2a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <fbd88f094ef3e9e43b4395bb7686bb9f6f76fb38.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virstoragetest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 39040bf4cb..e7794d6168 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -964,7 +964,7 @@ mymain(void)
+     /* Rewrite wrap and qcow2 back to 3-deep chain, absolute backing */
+     virCommandFree(cmd);
+     cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
+-                               "-F", "qcow2", "-b", absraw, "qcow2", NULL);
++                               "-F", "raw", "-b", absraw, "qcow2", NULL);
+     if (virCommandRun(cmd, NULL) < 0)
+         ret = -1;
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-tools-Fix-typo-generating-adapter_wwpn-field.patch b/SOURCES/libvirt-tools-Fix-typo-generating-adapter_wwpn-field.patch
deleted file mode 100644
index 499251f..0000000
--- a/SOURCES/libvirt-tools-Fix-typo-generating-adapter_wwpn-field.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 840579c84fd2fb59a1f141892d18ae86f9772cdf Mon Sep 17 00:00:00 2001
-Message-Id: <840579c84fd2fb59a1f141892d18ae86f9772cdf@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Fri, 20 Jul 2018 07:52:12 -0400
-Subject: [PATCH] tools: Fix typo generating adapter_wwpn field
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1601377
-
-Fix typo from commit id d45bee449 for the parent_wwpn field
-resulting in parent_wwnn being printed twice.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 313eaae3b5a4f9b1e94b153759b878614caecf34)
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- tools/virsh-pool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
-index cc49a5b96d..6faff781b2 100644
---- a/tools/virsh-pool.c
-+++ b/tools/virsh-pool.c
-@@ -371,7 +371,7 @@ virshBuildPoolXML(vshControl *ctl,
-             if (adapterParent)
-                 virBufferAsprintf(&buf, " parent='%s'", adapterParent);
-             else if (adapterParentWwnn && adapterParentWwpn)
--                virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwnn='%s'",
-+                virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwpn='%s'",
-                                   adapterParentWwnn, adapterParentWwpn);
-             else if (adapterParentFabricWwn)
-                 virBufferAsprintf(&buf, " parent_fabric_wwn='%s'",
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-tools-Secure-guest-check-for-AMD-in-virt-host-validate.patch b/SOURCES/libvirt-tools-Secure-guest-check-for-AMD-in-virt-host-validate.patch
new file mode 100644
index 0000000..d962395
--- /dev/null
+++ b/SOURCES/libvirt-tools-Secure-guest-check-for-AMD-in-virt-host-validate.patch
@@ -0,0 +1,107 @@
+From 962f3c23ce6f477cfb24f5fa66a9f296ce953759 Mon Sep 17 00:00:00 2001
+Message-Id: <962f3c23ce6f477cfb24f5fa66a9f296ce953759@dist-git>
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:21 +0200
+Subject: [PATCH] tools: Secure guest check for AMD in virt-host-validate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add checking in virt-host-validate for secure guest support
+on x86 for AMD Secure Encrypted Virtualization.
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 4b561d49ad5d6cc45766714253adb798bb99b6e8)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <638121e5c2692557b1b2d716371d324d61273282.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tools/virt-host-validate-common.c | 30 +++++++++++++++++++++++++++++-
+ tools/virt-host-validate-common.h |  1 +
+ 2 files changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
+index e59469a49b..82e6092c01 100644
+--- a/tools/virt-host-validate-common.c
++++ b/tools/virt-host-validate-common.c
+@@ -40,7 +40,8 @@ VIR_ENUM_IMPL(virHostValidateCPUFlag,
+               "vmx",
+               "svm",
+               "sie",
+-              "158");
++              "158",
++              "sev");
+ 
+ static bool quiet;
+ 
+@@ -420,14 +421,18 @@ int virHostValidateSecureGuests(const char *hvname,
+ {
+     virBitmapPtr flags;
+     bool hasFac158 = false;
++    bool hasAMDSev = false;
+     virArch arch = virArchFromHost();
+     g_autofree char *cmdline = NULL;
+     static const char *kIBMValues[] = {"y", "Y", "on", "ON", "oN", "On", "1"};
++    g_autofree char *mod_value = NULL;
+ 
+     flags = virHostValidateGetCPUFlags();
+ 
+     if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_FACILITY_158))
+         hasFac158 = true;
++    else if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SEV))
++        hasAMDSev = true;
+ 
+     virBitmapFree(flags);
+ 
+@@ -463,6 +468,29 @@ int virHostValidateSecureGuests(const char *hvname,
+             virHostMsgFail(level, "Hardware or firmware does not provide "
+                                   "support for IBM Secure Execution");
+         }
++    } else if (hasAMDSev) {
++        if (virFileReadValueString(&mod_value, "/sys/module/kvm_amd/parameters/sev") < 0) {
++            virHostMsgFail(level, "AMD Secure Encrypted Virtualization not "
++                                  "supported by the currently used kernel");
++            return 0;
++        }
++
++        if (mod_value[0] != '1') {
++            virHostMsgFail(level,
++                           "AMD Secure Encrypted Virtualization appears to be "
++                           "disabled in kernel. Add kvm_amd.sev=1 "
++                           "to the kernel cmdline arguments");
++            return 0;
++        }
++
++        if (virFileExists("/dev/sev")) {
++            virHostMsgPass();
++            return 1;
++        } else {
++            virHostMsgFail(level,
++                           "AMD Secure Encrypted Virtualization appears to be "
++                           "disabled in firemare.");
++        }
+     } else {
+         virHostMsgFail(level,
+                        "Unknown if this platform has Secure Guest support");
+diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h
+index 1653c9c95b..014331c0e0 100644
+--- a/tools/virt-host-validate-common.h
++++ b/tools/virt-host-validate-common.h
+@@ -39,6 +39,7 @@ typedef enum {
+     VIR_HOST_VALIDATE_CPU_FLAG_SVM,
+     VIR_HOST_VALIDATE_CPU_FLAG_SIE,
+     VIR_HOST_VALIDATE_CPU_FLAG_FACILITY_158,
++    VIR_HOST_VALIDATE_CPU_FLAG_SEV,
+ 
+     VIR_HOST_VALIDATE_CPU_FLAG_LAST,
+ } virHostValidateCPUFlag;
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-tools-Secure-guest-check-on-s390-in-virt-host-validate.patch b/SOURCES/libvirt-tools-Secure-guest-check-on-s390-in-virt-host-validate.patch
new file mode 100644
index 0000000..2aa8ecc
--- /dev/null
+++ b/SOURCES/libvirt-tools-Secure-guest-check-on-s390-in-virt-host-validate.patch
@@ -0,0 +1,158 @@
+From 085b955a75c49585d94fd5a19d6ac37833bb05cb Mon Sep 17 00:00:00 2001
+Message-Id: <085b955a75c49585d94fd5a19d6ac37833bb05cb@dist-git>
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:20 +0200
+Subject: [PATCH] tools: Secure guest check on s390 in virt-host-validate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add checking in virt-host-validate for secure guest support
+on s390 for IBM Secure Execution.
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Tested-by: Viktor Mihajlovski <mihajlov@linux.ibm.com>
+Reviewed-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 0254ceab82f5e1f7b505730586d8c8337ecc5920)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Conflicts:
+	tools/virt-host-validate-common.c
+	tools/virt-host-validate-common.h
+            - unrelated commit 4653a5194c1 was not backported
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <744e4ceb0760fe10ab0d82de24a78c280482d90d.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tools/virt-host-validate-common.c | 64 ++++++++++++++++++++++++++++++-
+ tools/virt-host-validate-common.h |  4 ++
+ tools/virt-host-validate-qemu.c   |  4 ++
+ 3 files changed, 70 insertions(+), 2 deletions(-)
+
+diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
+index bce0f14917..e59469a49b 100644
+--- a/tools/virt-host-validate-common.c
++++ b/tools/virt-host-validate-common.c
+@@ -39,7 +39,8 @@ VIR_ENUM_IMPL(virHostValidateCPUFlag,
+               VIR_HOST_VALIDATE_CPU_FLAG_LAST,
+               "vmx",
+               "svm",
+-              "sie");
++              "sie",
++              "158");
+ 
+ static bool quiet;
+ 
+@@ -209,7 +210,8 @@ virBitmapPtr virHostValidateGetCPUFlags(void)
+          * on the architecture, so check possible prefixes */
+         if (!STRPREFIX(line, "flags") &&
+             !STRPREFIX(line, "Features") &&
+-            !STRPREFIX(line, "features"))
++            !STRPREFIX(line, "features") &&
++            !STRPREFIX(line, "facilities"))
+             continue;
+ 
+         /* fgets() includes the trailing newline in the output buffer,
+@@ -411,3 +413,61 @@ int virHostValidateIOMMU(const char *hvname,
+     virHostMsgPass();
+     return 0;
+ }
++
++
++int virHostValidateSecureGuests(const char *hvname,
++                                virHostValidateLevel level)
++{
++    virBitmapPtr flags;
++    bool hasFac158 = false;
++    virArch arch = virArchFromHost();
++    g_autofree char *cmdline = NULL;
++    static const char *kIBMValues[] = {"y", "Y", "on", "ON", "oN", "On", "1"};
++
++    flags = virHostValidateGetCPUFlags();
++
++    if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_FACILITY_158))
++        hasFac158 = true;
++
++    virBitmapFree(flags);
++
++    virHostMsgCheck(hvname, "%s", _("for secure guest support"));
++    if (ARCH_IS_S390(arch)) {
++        if (hasFac158) {
++            if (!virFileIsDir("/sys/firmware/uv")) {
++                virHostMsgFail(level, "IBM Secure Execution not supported by "
++                                      "the currently used kernel");
++                return 0;
++            }
++
++            if (virFileReadValueString(&cmdline, "/proc/cmdline") < 0)
++                return -1;
++
++            /* we're prefix matching rather than equality matching here, because
++             * kernel would treat even something like prot_virt='yFOO' as
++             * enabled
++             */
++            if (virKernelCmdlineMatchParam(cmdline, "prot_virt", kIBMValues,
++                                           G_N_ELEMENTS(kIBMValues),
++                                           VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST |
++                                           VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX)) {
++                virHostMsgPass();
++                return 1;
++            } else {
++                virHostMsgFail(level,
++                               "IBM Secure Execution appears to be disabled "
++                               "in kernel. Add prot_virt=1 to kernel cmdline "
++                               "arguments");
++            }
++        } else {
++            virHostMsgFail(level, "Hardware or firmware does not provide "
++                                  "support for IBM Secure Execution");
++        }
++    } else {
++        virHostMsgFail(level,
++                       "Unknown if this platform has Secure Guest support");
++        return -1;
++    }
++
++    return 0;
++}
+diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h
+index 1b7e93e520..1653c9c95b 100644
+--- a/tools/virt-host-validate-common.h
++++ b/tools/virt-host-validate-common.h
+@@ -38,6 +38,7 @@ typedef enum {
+     VIR_HOST_VALIDATE_CPU_FLAG_VMX = 0,
+     VIR_HOST_VALIDATE_CPU_FLAG_SVM,
+     VIR_HOST_VALIDATE_CPU_FLAG_SIE,
++    VIR_HOST_VALIDATE_CPU_FLAG_FACILITY_158,
+ 
+     VIR_HOST_VALIDATE_CPU_FLAG_LAST,
+ } virHostValidateCPUFlag;
+@@ -83,3 +84,6 @@ int virHostValidateCGroupControllers(const char *hvname,
+ 
+ int virHostValidateIOMMU(const char *hvname,
+                          virHostValidateLevel level);
++
++int virHostValidateSecureGuests(const char *hvname,
++                                virHostValidateLevel level);
+diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c
+index ff3c1f0231..b38b0fbd6a 100644
+--- a/tools/virt-host-validate-qemu.c
++++ b/tools/virt-host-validate-qemu.c
+@@ -112,5 +112,9 @@ int virHostValidateQEMU(void)
+                              VIR_HOST_VALIDATE_WARN) < 0)
+         ret = -1;
+ 
++    if (virHostValidateSecureGuests("QEMU",
++                                    VIR_HOST_VALIDATE_WARN) < 0)
++        ret = -1;
++
+     return ret;
+ }
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-util-Avoid-possible-error-in-virCommandMassClose.patch b/SOURCES/libvirt-util-Avoid-possible-error-in-virCommandMassClose.patch
deleted file mode 100644
index 9806fc9..0000000
--- a/SOURCES/libvirt-util-Avoid-possible-error-in-virCommandMassClose.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From abf1be5d4639ca4b58d56633129a7cf1389b97f3 Mon Sep 17 00:00:00 2001
-Message-Id: <abf1be5d4639ca4b58d56633129a7cf1389b97f3@dist-git>
-From: John Ferlan <jferlan@redhat.com>
-Date: Tue, 30 Jul 2019 16:04:52 +0200
-Subject: [PATCH] util: Avoid possible error in virCommandMassClose
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Avoid the chance that sysconf(_SC_OPEN_MAX) returns -1 and thus
-would cause virBitmapNew would attempt to allocate a very large
-bitmap.
-
-Found by Coverity
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-ACKed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 6ae4f4a4ceb123417b732e869d53099983ae8d3f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <e17edd9e1f50630c019ec7206a0f15cd8c3e474a.1564495366.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircommand.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index dfc7e5428b..c53e3f47db 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -560,6 +560,11 @@ virCommandMassClose(virCommandPtr cmd,
-      * Therefore we can safely allocate memory here (and transitively call
-      * opendir/readdir) without a deadlock. */
- 
-+    if (openmax < 0) {
-+        virReportSystemError(errno, "%s", _("sysconf(_SC_OPEN_MAX) failed"));
-+        return -1;
-+    }
-+
-     if (!(fds = virBitmapNew(openmax)))
-         return -1;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-Don-t-overflow-in-virRandomBits.patch b/SOURCES/libvirt-util-Don-t-overflow-in-virRandomBits.patch
deleted file mode 100644
index 6afe595..0000000
--- a/SOURCES/libvirt-util-Don-t-overflow-in-virRandomBits.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f341ec3a1077c2d876ece271e5f58aa8d3ef795a Mon Sep 17 00:00:00 2001
-Message-Id: <f341ec3a1077c2d876ece271e5f58aa8d3ef795a@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 3 Dec 2018 08:46:18 -0500
-Subject: [PATCH] util: Don't overflow in virRandomBits
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1655586 [RHEL8]
-https://bugzilla.redhat.com/show_bug.cgi?id=1652894 [RHEL7]
-
-The function is supposed to return up to 64bit long integer. In
-order to do that it calls virRandomBytes() to fill the integer
-with random bytes and then masks out everything but requested
-bits. However, when doing that it shifts 1U and not 1ULL. So
-effectively, requesting 32 random bis or more always return 0
-which is not random enough.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Pino Toscano <ptoscano@redhat.com>
-(cherry picked from commit 78c47a92ecb450c9f8bcabd35da7006dc2547882)
-Signed-off-by: John Ferlan <jferlan@redhat.com>
----
- src/util/virrandom.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virrandom.c b/src/util/virrandom.c
-index 01cc82a052..3c011a8615 100644
---- a/src/util/virrandom.c
-+++ b/src/util/virrandom.c
-@@ -68,7 +68,7 @@ uint64_t virRandomBits(int nbits)
-         return 0;
-     }
- 
--    ret &= (1U << nbits) - 1;
-+    ret &= (1ULL << nbits) - 1;
-     return ret;
- }
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-Fix-virCgroupGetMemoryStat.patch b/SOURCES/libvirt-util-Fix-virCgroupGetMemoryStat.patch
deleted file mode 100644
index 2e3e9f5..0000000
--- a/SOURCES/libvirt-util-Fix-virCgroupGetMemoryStat.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From bab2adc524f6a9a10a89a1055d8a15ed85e1df5a Mon Sep 17 00:00:00 2001
-Message-Id: <bab2adc524f6a9a10a89a1055d8a15ed85e1df5a@dist-git>
-From: Peter Chubb <Peter.Chubb@data61.csiro.au>
-Date: Mon, 1 Jul 2019 17:08:07 +0200
-Subject: [PATCH] util: Fix virCgroupGetMemoryStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 901d2b9c introduced virCgroupGetMemoryStat and replaced
-the LXC virLXCCgroupGetMemStat logic in commit e634c7cd0. However,
-in doing so the replacement wasn't exact as the LXC logic used
-getline() to process the cgroup controller data, while the new
-virCgroupGetMemoryStat used "memory.stat" manual buffer read/
-processing which neglected to forward through @line in order
-to read each line in the output.
-
-To fix that, we should be sure to carry forward the @line value
-for each line read updating it beyond that current @newLine value
-once we've calculated the values that we want.
-
-Signed-off-by: Peter Chubb <peter.chubb@data61.csiro.au>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b8176d6eaa943bc9825ecc99d86c0c301e688dd0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e5fcbe6cbcfc0cc54ebbf01167080845f590268b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv1.c | 7 ++++++-
- src/util/vircgroupv2.c | 7 ++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 97d108d3ac..3147084f21 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1477,7 +1477,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group,
- 
-     line = stat;
- 
--    while (line) {
-+    while (*line) {
-         char *newLine = strchr(line, '\n');
-         char *valueStr = strchr(line, ' ');
-         unsigned long long value;
-@@ -1507,6 +1507,11 @@ virCgroupV1GetMemoryStat(virCgroupPtr group,
-             inactiveFileVal = value >> 10;
-         else if (STREQ(line, "unevictable"))
-             unevictableVal = value >> 10;
-+
-+        if (newLine)
-+            line = newLine + 1;
-+        else
-+            break;
-     }
- 
-     *cache = cacheVal;
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index d6362e2b05..bff2f78d7e 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1069,7 +1069,7 @@ virCgroupV2GetMemoryStat(virCgroupPtr group,
- 
-     line = stat;
- 
--    while (line) {
-+    while (*line) {
-         char *newLine = strchr(line, '\n');
-         char *valueStr = strchr(line, ' ');
-         unsigned long long value;
-@@ -1103,6 +1103,11 @@ virCgroupV2GetMemoryStat(virCgroupPtr group,
-             inactiveFileVal = value >> 10;
-         else if (STREQ(line, "unevictable"))
-             unevictableVal = value >> 10;
-+
-+        if (newLine)
-+            line = newLine + 1;
-+        else
-+            break;
-     }
- 
-     *cache = cacheVal;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-Introduce-a-parser-for-kernel-cmdline-arguments.patch b/SOURCES/libvirt-util-Introduce-a-parser-for-kernel-cmdline-arguments.patch
new file mode 100644
index 0000000..3f1b1d3
--- /dev/null
+++ b/SOURCES/libvirt-util-Introduce-a-parser-for-kernel-cmdline-arguments.patch
@@ -0,0 +1,446 @@
+From 8b59b9dab54c094dfc9bafd9d9f2c18f25877f36 Mon Sep 17 00:00:00 2001
+Message-Id: <8b59b9dab54c094dfc9bafd9d9f2c18f25877f36@dist-git>
+From: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Date: Wed, 24 Jun 2020 13:16:17 +0200
+Subject: [PATCH] util: Introduce a parser for kernel cmdline arguments
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce two utility functions to parse a kernel command
+line string according to the kernel code parsing rules in
+order to enable the caller to perform operations such as
+verifying whether certain argument=value combinations are
+present or retrieving an argument's value.
+
+Signed-off-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit c5fffb959d93b83d87e70b21d19424e9722700b0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1848997
+https://bugzilla.redhat.com/show_bug.cgi?id=1850351
+
+Conflicts:
+	src/util/virutil.c
+            - unrelated commits db72866310d and ab36f729470 were not
+              backported
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Message-Id: <784fbc062d41f991b6321ac051b05e6c80a470cd.1592996194.git.jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/libvirt_private.syms |   2 +
+ src/util/virutil.c       | 185 +++++++++++++++++++++++++++++++++++++++
+ src/util/virutil.h       |  34 +++++++
+ tests/utiltest.c         | 136 ++++++++++++++++++++++++++++
+ 4 files changed, 357 insertions(+)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index a3fe49ae33..9e290c7bdf 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -3395,6 +3395,8 @@ virHexToBin;
+ virHostGetDRMRenderNode;
+ virHostHasIOMMU;
+ virIndexToDiskName;
++virKernelCmdlineMatchParam;
++virKernelCmdlineNextParam;
+ virMemoryLimitIsSet;
+ virMemoryLimitTruncate;
+ virMemoryMaxValue;
+diff --git a/src/util/virutil.c b/src/util/virutil.c
+index 261b2d2af6..17fd06dbb2 100644
+--- a/src/util/virutil.c
++++ b/src/util/virutil.c
+@@ -1673,3 +1673,188 @@ virHostGetDRMRenderNode(void)
+     VIR_DIR_CLOSE(driDir);
+     return ret;
+ }
++
++
++static const char *virKernelCmdlineSkipQuote(const char *cmdline,
++                                             bool *is_quoted)
++{
++    if (cmdline[0] == '"') {
++        *is_quoted = !(*is_quoted);
++        cmdline++;
++    }
++    return cmdline;
++}
++
++
++/**
++ * virKernelCmdlineFindEqual:
++ * @cmdline: target kernel command line string
++ * @is_quoted: indicates whether the string begins with quotes
++ * @res: pointer to the position immediately after the parsed parameter,
++ * can be used in subsequent calls to process further parameters until
++ * the end of the string.
++ *
++ * Iterate over the provided kernel command line string while honoring
++ * the kernel quoting rules and returns the index of the equal sign
++ * separating argument and value.
++ *
++ * Returns 0 for the cases where no equal sign is found or the argument
++ * itself begins with the equal sign (both cases indicating that the
++ * argument has no value). Otherwise, returns the index of the equal
++ * sign in the string.
++ */
++static size_t virKernelCmdlineFindEqual(const char *cmdline,
++                                        bool is_quoted,
++                                        const char **res)
++{
++    size_t i;
++    size_t equal_index = 0;
++
++    for (i = 0; cmdline[i]; i++) {
++        if (!(is_quoted) && g_ascii_isspace(cmdline[i]))
++            break;
++        if (equal_index == 0 && cmdline[i] == '=') {
++            equal_index = i;
++            continue;
++        }
++        virKernelCmdlineSkipQuote(cmdline + i, &is_quoted);
++    }
++    *res = cmdline + i;
++    return equal_index;
++}
++
++
++static char* virKernelArgNormalize(const char *arg)
++{
++    return virStringReplace(arg, "_", "-");
++}
++
++
++/**
++ * virKernelCmdlineNextParam:
++ * @cmdline: kernel command line string to be checked for next parameter
++ * @param: pointer to hold retrieved parameter, will be NULL if none found
++ * @val: pointer to hold retrieved value of @param
++ *
++ * Parse the kernel cmdline and store the next parameter in @param
++ * and the value of @param in @val which can be NULL if @param has
++ * no value. In addition returns the address right after @param=@value
++ * for possible further processing.
++ *
++ * Returns a pointer to address right after @param=@val in the
++ * kernel command line, will point to the string's end (NULL)
++ * in case no next parameter is found
++ */
++const char *virKernelCmdlineNextParam(const char *cmdline,
++                                      char **param,
++                                      char **val)
++{
++    const char *next;
++    int equal_index;
++    bool is_quoted = false;
++    *param = NULL;
++    *val = NULL;
++
++    virSkipSpaces(&cmdline);
++    cmdline = virKernelCmdlineSkipQuote(cmdline, &is_quoted);
++    equal_index = virKernelCmdlineFindEqual(cmdline, is_quoted, &next);
++
++    if (next == cmdline)
++        return next;
++
++    /* param has no value */
++    if (equal_index == 0) {
++        if (is_quoted && next[-1] == '"')
++            *param = g_strndup(cmdline, next - cmdline - 1);
++        else
++            *param = g_strndup(cmdline, next - cmdline);
++        return next;
++    }
++
++    *param = g_strndup(cmdline, equal_index);
++
++    if (cmdline[equal_index + 1] == '"') {
++        is_quoted = true;
++        equal_index++;
++    }
++
++    if (is_quoted && next[-1] == '"')
++        *val = g_strndup(cmdline + equal_index + 1,
++                         next - cmdline - equal_index - 2);
++    else
++        *val = g_strndup(cmdline + equal_index + 1,
++                         next - cmdline - equal_index - 1);
++    return next;
++}
++
++
++static bool virKernelCmdlineStrCmp(const char *kernel_val,
++                                   const char *caller_val,
++                                   virKernelCmdlineFlags flags)
++{
++    if (flags & VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX)
++        return STRPREFIX(kernel_val, caller_val);
++    return STREQ(kernel_val, caller_val);
++}
++
++
++/**
++ * virKernelCmdlineMatchParam:
++ * @cmdline: kernel command line string to be checked for @arg
++ * @arg: kernel command line argument
++ * @values: array of possible values to match @arg
++ * @len_values: size of array, it can be 0 meaning a match will be positive if
++ *              the argument has no value.
++ * @flags: bitwise-OR of virKernelCmdlineFlags
++ *
++ * Try to match the provided kernel cmdline string with the provided @arg
++ * and the list @values of possible values according to the matching strategy
++ * defined in @flags.
++ *
++ *
++ * Returns true if a match is found, false otherwise
++ */
++bool virKernelCmdlineMatchParam(const char *cmdline,
++                                const char *arg,
++                                const char **values,
++                                size_t len_values,
++                                virKernelCmdlineFlags flags)
++{
++    bool match = false;
++    size_t i;
++    const char *next = cmdline;
++    g_autofree char *arg_norm = virKernelArgNormalize(arg);
++
++    while (next[0] != '\0') {
++        g_autofree char *kparam = NULL;
++        g_autofree char *kparam_norm = NULL;
++        g_autofree char *kval = NULL;
++
++        next = virKernelCmdlineNextParam(next, &kparam, &kval);
++
++        if (!kparam)
++            break;
++
++        kparam_norm = virKernelArgNormalize(kparam);
++
++        if (STRNEQ(kparam_norm, arg_norm))
++            continue;
++
++        if (!kval) {
++            match = (len_values == 0) ? true : false;
++        } else {
++            match = false;
++            for (i = 0; i < len_values; i++) {
++                if (virKernelCmdlineStrCmp(kval, values[i], flags)) {
++                    match = true;
++                    break;
++                }
++            }
++        }
++
++        if (match && (flags & VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST))
++            break;
++    }
++
++    return match;
++}
+diff --git a/src/util/virutil.h b/src/util/virutil.h
+index 0dcaff79ac..f1d2ccdd1f 100644
+--- a/src/util/virutil.h
++++ b/src/util/virutil.h
+@@ -145,6 +145,40 @@ bool virHostHasIOMMU(void);
+ 
+ char *virHostGetDRMRenderNode(void) G_GNUC_NO_INLINE;
+ 
++/* Kernel cmdline match and comparison strategy for arg=value pairs */
++typedef enum {
++    /* substring comparison of argument values */
++    VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX = 1,
++
++    /* strict string comparison of argument values */
++    VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ = 2,
++
++    /* look for any occurrence of the argument with the expected value,
++     * this should be used when an argument set to the expected value overrides
++     * all the other occurrences of the argument, e.g. when looking for 'arg=1'
++     * in 'arg=0 arg=1 arg=0' the search would succeed with this flag
++     */
++    VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST = 4,
++
++    /* look for the last occurrence of argument with the expected value,
++     * this should be used when the last occurrence of the argument overrides
++     * all the other ones, e.g. when looking for 'arg=1' in 'arg=0 arg=1' the
++     * search would succeed with this flag, but in 'arg=1 arg=0' it would not,
++     * because 'arg=0' overrides all the previous occurrences of 'arg'
++     */
++    VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST = 8,
++} virKernelCmdlineFlags;
++
++const char *virKernelCmdlineNextParam(const char *cmdline,
++                                      char **param,
++                                      char **val);
++
++bool virKernelCmdlineMatchParam(const char *cmdline,
++                                const char *arg,
++                                const char **values,
++                                size_t len_values,
++                                virKernelCmdlineFlags flags);
++
+ /**
+  * VIR_ASSIGN_IS_OVERFLOW:
+  * @rvalue: value that is checked (evaluated twice)
+diff --git a/tests/utiltest.c b/tests/utiltest.c
+index 5ae04585cb..2bff7859dc 100644
+--- a/tests/utiltest.c
++++ b/tests/utiltest.c
+@@ -254,6 +254,140 @@ testOverflowCheckMacro(const void *data G_GNUC_UNUSED)
+ }
+ 
+ 
++struct testKernelCmdlineNextParamData
++{
++    const char *cmdline;
++    const char *param;
++    const char *val;
++    const char *next;
++};
++
++static struct testKernelCmdlineNextParamData kEntries[] = {
++    { "arg1 arg2 arg3=val1",                        "arg1",              NULL,                  " arg2 arg3=val1"      },
++    { "arg1=val1 arg2 arg3=val3 arg4",              "arg1",              "val1",                " arg2 arg3=val3 arg4" },
++    { "arg1=sub1=val1,sub2=val2 arg3=val3 arg4",    "arg1",              "sub1=val1,sub2=val2", " arg3=val3 arg4"      },
++    { "arg3=val3 ",                                 "arg3",              "val3",                " "                    },
++    { "arg3=val3",                                  "arg3",              "val3",                ""                     },
++    { "arg-3=val3 arg4",                            "arg-3",             "val3",                " arg4"                },
++    { " arg_3=val3 arg4",                           "arg_3",             "val3",                " arg4"                },
++    { "arg2=\"value with space\" arg3=val3",        "arg2",              "value with space",    " arg3=val3"           },
++    { " arg2=\"value with space\"   arg3=val3",     "arg2",              "value with space",    "   arg3=val3"         },
++    { "  \"arg2=value with space\" arg3=val3",      "arg2",              "value with space",    " arg3=val3"           },
++    { "arg2=\"val\"ue arg3",                        "arg2",              "val\"ue",             " arg3"                },
++    { "arg2=value\" long\" arg3",                   "arg2",              "value\" long\"",      " arg3"                },
++    { " \"arg2 with space=value with space\" arg3", "arg2 with space",   "value with space",    " arg3"                },
++    { " arg2\" with space=val2\" arg3",             "arg2\" with space", "val2\"",              " arg3"                },
++    { " arg2longer=someval\" long\" arg2=val2",     "arg2longer",        "someval\" long\"",    " arg2=val2"           },
++    { "=val1 arg2=val2",                            "=val1",             NULL,                  " arg2=val2"           },
++    { " ",                                          NULL,                NULL,                  ""                     },
++    { "",                                           NULL,                NULL,                  ""                     },
++};
++
++static int
++testKernelCmdlineNextParam(const void *data G_GNUC_UNUSED)
++{
++    const char *next;
++    size_t i;
++
++    for (i = 0; i < G_N_ELEMENTS(kEntries); ++i) {
++        g_autofree char * param = NULL;
++        g_autofree char * val = NULL;
++
++        next = virKernelCmdlineNextParam(kEntries[i].cmdline, &param, &val);
++
++        if (STRNEQ_NULLABLE(param, kEntries[i].param) ||
++            STRNEQ_NULLABLE(val, kEntries[i].val) ||
++            STRNEQ(next, kEntries[i].next)) {
++            VIR_TEST_DEBUG("\nKernel cmdline [%s]", kEntries[i].cmdline);
++            VIR_TEST_DEBUG("Expect param [%s]", kEntries[i].param);
++            VIR_TEST_DEBUG("Actual param [%s]", param);
++            VIR_TEST_DEBUG("Expect value [%s]", kEntries[i].val);
++            VIR_TEST_DEBUG("Actual value [%s]", val);
++            VIR_TEST_DEBUG("Expect next [%s]", kEntries[i].next);
++            VIR_TEST_DEBUG("Actual next [%s]", next);
++
++            return -1;
++        }
++    }
++
++    return 0;
++}
++
++
++struct testKernelCmdlineMatchData
++{
++    const char *cmdline;
++    const char *arg;
++    const char *values[2];
++    virKernelCmdlineFlags flags;
++    bool result;
++};
++
++static struct testKernelCmdlineMatchData kMatchEntries[] = {
++    {"arg1 myarg=no arg2=val2 myarg=yes arg4=val4 myarg=no arg5", "myarg",  {"1", "y"},          VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST | VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ,     false },
++    {"arg1 myarg=no arg2=val2 myarg=yes arg4=val4 myarg=no arg5", "myarg",  {"on", "yes"},       VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST | VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ,     true  },
++    {"arg1 myarg=no arg2=val2 myarg=yes arg4=val4 myarg=no arg5", "myarg",  {"1", "y"},          VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST | VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX, true  },
++    {"arg1 myarg=no arg2=val2 myarg=yes arg4=val4 myarg=no arg5", "myarg",  {"a", "b"},          VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST | VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX, false },
++    {"arg1 myarg=no arg2=val2 myarg=yes arg4=val4 myarg=no arg5", "myarg",  {"on", "yes"},       VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST | VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ,      false },
++    {"arg1 myarg=no arg2=val2 myarg=yes arg4=val4 myarg=no arg5", "myarg",  {"1", "y"},          VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST | VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX,  false },
++    {"arg1 myarg=no arg2=val2 arg4=val4 myarg=yes arg5",          "myarg",  {"on", "yes"},       VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST | VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ,      true  },
++    {"arg1 myarg=no arg2=val2 arg4=val4 myarg=yes arg5",          "myarg",  {"1", "y"},          VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST | VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX,  true  },
++    {"arg1 myarg=no arg2=val2 arg4=val4 myarg arg5",              "myarg",  {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        true  },
++    {"arg1 myarg arg2=val2 arg4=val4 myarg=yes arg5",             "myarg",  {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST,                                       true  },
++    {"arg1 myarg arg2=val2 arg4=val4 myarg=yes arg5",             "myarg",  {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        false },
++    {"arg1 my-arg=no arg2=val2 arg4=val4 my_arg=yes arg5",        "my-arg", {"on", "yes"},       VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        true  },
++    {"arg1 my-arg=no arg2=val2 arg4=val4 my_arg=yes arg5 ",       "my-arg", {"on", "yes"},       VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST | VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ,      true  },
++    {"arg1 my-arg arg2=val2 arg4=val4 my_arg=yes arg5",           "my_arg", {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST,                                       true  },
++    {"arg1 my-arg arg2=val2 arg4=val4 my-arg=yes arg5",           "my_arg", {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST,                                       true  },
++    {"=arg1 my-arg arg2=val2 arg4=val4 my-arg=yes arg5",          "my_arg", {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST,                                       true  },
++    {"my-arg =arg1 arg2=val2 arg4=val4 my-arg=yes arg5",          "=arg1",  {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        true  },
++    {"arg1 arg2=val2 myarg=sub1=val1 arg5",                       "myarg",  {"sub1=val1", NULL}, VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        true  },
++    {"arg1 arg2=",                                                "arg2",   {"", ""},            VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST | VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ,      true  },
++    {" ",                                                         "myarg",  {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        false },
++    {"",                                                          "",       {NULL, NULL},        VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST,                                        false },
++};
++
++
++static int
++testKernelCmdlineMatchParam(const void *data G_GNUC_UNUSED)
++{
++    bool result;
++    size_t i, lenValues;
++
++    for (i = 0; i < G_N_ELEMENTS(kMatchEntries); ++i) {
++        if (kMatchEntries[i].values[0] == NULL)
++            lenValues = 0;
++        else
++            lenValues = G_N_ELEMENTS(kMatchEntries[i].values);
++
++        result = virKernelCmdlineMatchParam(kMatchEntries[i].cmdline,
++                                            kMatchEntries[i].arg,
++                                            kMatchEntries[i].values,
++                                            lenValues,
++                                            kMatchEntries[i].flags);
++
++        if (result != kMatchEntries[i].result) {
++            VIR_TEST_DEBUG("\nKernel cmdline [%s]", kMatchEntries[i].cmdline);
++            VIR_TEST_DEBUG("Kernel argument [%s]", kMatchEntries[i].arg);
++            VIR_TEST_DEBUG("Kernel values [%s] [%s]", kMatchEntries[i].values[0],
++                           kMatchEntries[i].values[1]);
++            if (kMatchEntries[i].flags & VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX)
++                VIR_TEST_DEBUG("Flag [VIR_KERNEL_CMDLINE_FLAGS_CMP_PREFIX]");
++            if (kMatchEntries[i].flags & VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ)
++                VIR_TEST_DEBUG("Flag [VIR_KERNEL_CMDLINE_FLAGS_CMP_EQ]");
++            if (kMatchEntries[i].flags & VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST)
++                VIR_TEST_DEBUG("Flag [VIR_KERNEL_CMDLINE_FLAGS_SEARCH_FIRST]");
++            if (kMatchEntries[i].flags & VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST)
++                VIR_TEST_DEBUG("Flag [VIR_KERNEL_CMDLINE_FLAGS_SEARCH_LAST]");
++            VIR_TEST_DEBUG("Expect result [%d]", kMatchEntries[i].result);
++            VIR_TEST_DEBUG("Actual result [%d]", result);
++
++            return -1;
++        }
++    }
++
++    return 0;
++}
+ 
+ 
+ static int
+@@ -277,6 +411,8 @@ mymain(void)
+     DO_TEST(ParseVersionString);
+     DO_TEST(RoundValueToPowerOfTwo);
+     DO_TEST(OverflowCheckMacro);
++    DO_TEST(KernelCmdlineNextParam);
++    DO_TEST(KernelCmdlineMatchParam);
+ 
+     return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-util-Introduce-virBitmapUnion.patch b/SOURCES/libvirt-util-Introduce-virBitmapUnion.patch
deleted file mode 100644
index d2895be..0000000
--- a/SOURCES/libvirt-util-Introduce-virBitmapUnion.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 6ee2c599db989189e639c3de88d20045c62a1d2c Mon Sep 17 00:00:00 2001
-Message-Id: <6ee2c599db989189e639c3de88d20045c62a1d2c@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:55:01 +0200
-Subject: [PATCH] util: Introduce virBitmapUnion()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 1b2ac8010cc1fe871f538b3f48c5e48213c5c074)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716908
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611085506.12564-2-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virbitmap.c     | 27 +++++++++++++++++++++++++++
- src/util/virbitmap.h     |  4 ++++
- tests/virbitmaptest.c    | 38 ++++++++++++++++++++++++++++++++++++++
- 4 files changed, 70 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index ee7625b0f3..05c96c29e2 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1476,6 +1476,7 @@ virBitmapSubtract;
- virBitmapToData;
- virBitmapToDataBuf;
- virBitmapToString;
-+virBitmapUnion;
- 
- 
- # util/virbuffer.h
-diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
-index ef18dad255..49e542a4e6 100644
---- a/src/util/virbitmap.c
-+++ b/src/util/virbitmap.c
-@@ -1265,6 +1265,33 @@ virBitmapIntersect(virBitmapPtr a,
- }
- 
- 
-+/**
-+ * virBitmapUnion:
-+ * @a: bitmap, modified to contain result
-+ * @b: other bitmap
-+ *
-+ * Performs union of two bitmaps: a = union(a, b)
-+ *
-+ * Returns 0 on success, <0 on failure.
-+ */
-+int
-+virBitmapUnion(virBitmapPtr a,
-+               const virBitmap *b)
-+{
-+    size_t i;
-+
-+    if (a->nbits < b->nbits &&
-+        virBitmapExpand(a, b->nbits - 1) < 0) {
-+        return -1;
-+    }
-+
-+    for (i = 0; i < b->map_len; i++)
-+        a->map[i] |= b->map[i];
-+
-+    return 0;
-+}
-+
-+
- /**
-  * virBitmapSubtract:
-  * @a: minuend/result
-diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
-index 312e7e2933..5934508d11 100644
---- a/src/util/virbitmap.h
-+++ b/src/util/virbitmap.h
-@@ -151,6 +151,10 @@ bool virBitmapOverlaps(virBitmapPtr b1,
- void virBitmapIntersect(virBitmapPtr a, virBitmapPtr b)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
-+int virBitmapUnion(virBitmapPtr a,
-+                   const virBitmap *b)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-+
- void virBitmapSubtract(virBitmapPtr a, virBitmapPtr b)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
-diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
-index 2fbafc0a76..cafe865dde 100644
---- a/tests/virbitmaptest.c
-+++ b/tests/virbitmaptest.c
-@@ -740,6 +740,34 @@ test14(const void *opaque)
-     return ret;
- }
- 
-+/* virBitmapUnion() */
-+static int
-+test15(const void *opaque)
-+{
-+    const struct testBinaryOpData *data = opaque;
-+    VIR_AUTOPTR(virBitmap) amap = NULL;
-+    VIR_AUTOPTR(virBitmap) bmap = NULL;
-+    VIR_AUTOPTR(virBitmap) resmap = NULL;
-+
-+    if (!(amap = virBitmapParseUnlimited(data->a)) ||
-+        !(bmap = virBitmapParseUnlimited(data->b)) ||
-+        !(resmap = virBitmapParseUnlimited(data->res))) {
-+        return -1;
-+    }
-+
-+    if (virBitmapUnion(amap, bmap) < 0)
-+        return -1;
-+
-+    if (!virBitmapEqual(amap, resmap)) {
-+        fprintf(stderr,
-+                "\n bitmap union failed: union('%s', '%s') != '%s'\n",
-+                data->a, data->b, data->res);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
- 
- #define TESTBINARYOP(A, B, RES, FUNC) \
-     testBinaryOpData.a = A; \
-@@ -798,6 +826,16 @@ mymain(void)
-     TESTBINARYOP("0-3", "0,^0", "0-3", test14);
-     TESTBINARYOP("0,2", "1,3", "0,2", test14);
- 
-+    /* virBitmapUnion() */
-+    virTestCounterReset("test15-");
-+    TESTBINARYOP("0-1", "0-1", "0-1", test15);
-+    TESTBINARYOP("0", "1", "0-1", test15);
-+    TESTBINARYOP("0-1", "2-3", "0-3", test15);
-+    TESTBINARYOP("0-3", "1-2", "0-3", test15);
-+    TESTBINARYOP("0,^0", "12345", "12345", test15);
-+    TESTBINARYOP("12345", "0,^0", "12345", test15);
-+    TESTBINARYOP("0,^0", "0,^0", "0,^0", test15);
-+
-     return ret;
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-Introduce-virNumaNodesetToCPUset.patch b/SOURCES/libvirt-util-Introduce-virNumaNodesetToCPUset.patch
deleted file mode 100644
index f35c94e..0000000
--- a/SOURCES/libvirt-util-Introduce-virNumaNodesetToCPUset.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From e624d2040a5a8e16e670accc52e110393d9fb2b8 Mon Sep 17 00:00:00 2001
-Message-Id: <e624d2040a5a8e16e670accc52e110393d9fb2b8@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:55:02 +0200
-Subject: [PATCH] util: Introduce virNumaNodesetToCPUset()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This helper converts a set of NUMA node to the set of CPUs
-they contain.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 2d2b26f96fed1e95dd4495168cee73c5c4092634)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716908
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611085506.12564-3-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virnuma.c       | 55 ++++++++++++++++++++++++++++++++++++++++
- src/util/virnuma.h       |  2 ++
- 3 files changed, 58 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 05c96c29e2..7c48908a54 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2485,6 +2485,7 @@ virNumaGetPages;
- virNumaIsAvailable;
- virNumaNodeIsAvailable;
- virNumaNodesetIsAvailable;
-+virNumaNodesetToCPUset;
- virNumaSetPagePoolSize;
- virNumaSetupMemoryPolicy;
- 
-diff --git a/src/util/virnuma.c b/src/util/virnuma.c
-index fd15714553..75f80dcd30 100644
---- a/src/util/virnuma.c
-+++ b/src/util/virnuma.c
-@@ -311,6 +311,49 @@ virNumaGetNodeCPUs(int node,
- # undef MASK_CPU_ISSET
- # undef n_bits
- 
-+/**
-+ * virNumaNodesetToCPUset:
-+ * @nodeset: bitmap containing a set of NUMA nodes
-+ * @cpuset: return location for a bitmap containing a set of CPUs
-+ *
-+ * Convert a set of NUMA node to the set of CPUs they contain.
-+ *
-+ * Returns 0 on success, <0 on failure.
-+ */
-+int
-+virNumaNodesetToCPUset(virBitmapPtr nodeset,
-+                       virBitmapPtr *cpuset)
-+{
-+    VIR_AUTOPTR(virBitmap) allNodesCPUs = NULL;
-+    size_t nodesetSize;
-+    size_t i;
-+
-+    *cpuset = NULL;
-+
-+    if (!nodeset)
-+        return 0;
-+
-+    allNodesCPUs = virBitmapNewEmpty();
-+    nodesetSize = virBitmapSize(nodeset);
-+
-+    for (i = 0; i < nodesetSize; i++) {
-+        VIR_AUTOPTR(virBitmap) nodeCPUs = NULL;
-+
-+        if (!virBitmapIsBitSet(nodeset, i))
-+            continue;
-+
-+        if (virNumaGetNodeCPUs(i, &nodeCPUs) < 0)
-+            return -1;
-+
-+        if (virBitmapUnion(allNodesCPUs, nodeCPUs) < 0)
-+            return -1;
-+    }
-+
-+    VIR_STEAL_PTR(*cpuset, allNodesCPUs);
-+
-+    return 0;
-+}
-+
- #else /* !WITH_NUMACTL */
- 
- int
-@@ -365,6 +408,18 @@ virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED,
-                    _("NUMA isn't available on this host"));
-     return -1;
- }
-+
-+int
-+virNumaNodesetToCPUset(virBitmapPtr nodeset ATTRIBUTE_UNUSED,
-+                       virBitmapPtr *cpuset)
-+{
-+    *cpuset = NULL;
-+
-+    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                   _("NUMA isn't available on this host"));
-+    return -1;
-+}
-+
- #endif /* !WITH_NUMACTL */
- 
- /**
-diff --git a/src/util/virnuma.h b/src/util/virnuma.h
-index a3ffb6d6c7..df7911db4e 100644
---- a/src/util/virnuma.h
-+++ b/src/util/virnuma.h
-@@ -48,6 +48,8 @@ int virNumaGetNodeMemory(int node,
- unsigned int virNumaGetMaxCPUs(void);
- 
- int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus) ATTRIBUTE_NOINLINE;
-+int virNumaNodesetToCPUset(virBitmapPtr nodeset,
-+                           virBitmapPtr *cpuset);
- 
- int virNumaGetPageInfo(int node,
-                        unsigned int page_size,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch b/SOURCES/libvirt-util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
new file mode 100644
index 0000000..53a265b
--- /dev/null
+++ b/SOURCES/libvirt-util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
@@ -0,0 +1,186 @@
+From 16b26f917f445c837127c786c7b641e1e38f93fe Mon Sep 17 00:00:00 2001
+Message-Id: <16b26f917f445c837127c786c7b641e1e38f93fe@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 19 Jun 2020 17:44:08 +0200
+Subject: [PATCH] util: Move virIsDevMapperDevice() to virdevmapper.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When introducing virdevmapper.c (in v4.3.0-rc1~427) I didn't
+realize there is a function that calls in devmapper. The function
+is called virIsDevMapperDevice() and lives in virutil.c. Now that
+we have a special file for handling devmapper move it there.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit dfa0e118f745fe3f4fe95975c6100f0fc6d788be)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1849095
+
+Conflicts:
+- src/util/virutil.c - Context, becasue v6.0.0-206-gfc920f704c is
+  not backported.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <84be146c2e7fc097da7189a7bf270577ffba18b2.1592581422.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/libvirt_private.syms           |  2 +-
+ src/storage/parthelper.c           |  2 +-
+ src/storage/storage_backend_disk.c |  1 +
+ src/util/virdevmapper.c            | 24 ++++++++++++++++++++++++
+ src/util/virdevmapper.h            |  3 +++
+ src/util/virutil.c                 | 24 ------------------------
+ src/util/virutil.h                 |  2 --
+ 7 files changed, 30 insertions(+), 28 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index ac5527ef01..a3fe49ae33 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -1871,6 +1871,7 @@ virDBusSetSharedBus;
+ 
+ # util/virdevmapper.h
+ virDevMapperGetTargets;
++virIsDevMapperDevice;
+ 
+ 
+ # util/virdnsmasq.h
+@@ -3394,7 +3395,6 @@ virHexToBin;
+ virHostGetDRMRenderNode;
+ virHostHasIOMMU;
+ virIndexToDiskName;
+-virIsDevMapperDevice;
+ virMemoryLimitIsSet;
+ virMemoryLimitTruncate;
+ virMemoryMaxValue;
+diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
+index 761a7f93fc..812e90d3cb 100644
+--- a/src/storage/parthelper.c
++++ b/src/storage/parthelper.c
+@@ -36,10 +36,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+-#include "virutil.h"
+ #include "virfile.h"
+ #include "virstring.h"
+ #include "virgettext.h"
++#include "virdevmapper.h"
+ 
+ /* we don't need to include the full internal.h just for this */
+ #define STREQ(a, b) (strcmp(a, b) == 0)
+diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
+index 00e8b1aa13..90c57af59b 100644
+--- a/src/storage/storage_backend_disk.c
++++ b/src/storage/storage_backend_disk.c
+@@ -31,6 +31,7 @@
+ #include "virfile.h"
+ #include "configmake.h"
+ #include "virstring.h"
++#include "virdevmapper.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_STORAGE
+ 
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index f000979ce0..23b2a16057 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -214,3 +214,27 @@ virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
+     return -1;
+ }
+ #endif /* ! WITH_DEVMAPPER */
++
++
++#if WITH_DEVMAPPER
++bool
++virIsDevMapperDevice(const char *dev_name)
++{
++    struct stat buf;
++
++    if (!stat(dev_name, &buf) &&
++        S_ISBLK(buf.st_mode) &&
++        dm_is_dm_major(major(buf.st_rdev)))
++            return true;
++
++    return false;
++}
++
++#else /* ! WITH_DEVMAPPER */
++
++bool
++virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
++{
++    return false;
++}
++#endif /* ! WITH_DEVMAPPER */
+diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
+index 87bbc63cfd..834900692e 100644
+--- a/src/util/virdevmapper.h
++++ b/src/util/virdevmapper.h
+@@ -25,3 +25,6 @@
+ int
+ virDevMapperGetTargets(const char *path,
+                        char ***devPaths) G_GNUC_NO_INLINE;
++
++bool
++virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
+diff --git a/src/util/virutil.c b/src/util/virutil.c
+index 4198473fce..261b2d2af6 100644
+--- a/src/util/virutil.c
++++ b/src/util/virutil.c
+@@ -37,10 +37,6 @@
+ #include <sys/types.h>
+ #include <termios.h>
+ 
+-#if WITH_DEVMAPPER
+-# include <libdevmapper.h>
+-#endif
+-
+ #include <netdb.h>
+ #ifdef HAVE_GETPWUID_R
+ # include <pwd.h>
+@@ -1327,26 +1323,6 @@ void virWaitForDevices(void)
+     ignore_value(virCommandRun(cmd, &exitstatus));
+ }
+ 
+-#if WITH_DEVMAPPER
+-bool
+-virIsDevMapperDevice(const char *dev_name)
+-{
+-    struct stat buf;
+-
+-    if (!stat(dev_name, &buf) &&
+-        S_ISBLK(buf.st_mode) &&
+-        dm_is_dm_major(major(buf.st_rdev)))
+-            return true;
+-
+-    return false;
+-}
+-#else
+-bool virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
+-{
+-    return false;
+-}
+-#endif
+-
+ bool
+ virValidateWWN(const char *wwn)
+ {
+diff --git a/src/util/virutil.h b/src/util/virutil.h
+index 58c45a6447..0dcaff79ac 100644
+--- a/src/util/virutil.h
++++ b/src/util/virutil.h
+@@ -116,8 +116,6 @@ bool virDoesUserExist(const char *name);
+ bool virDoesGroupExist(const char *name);
+ 
+ 
+-bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
+-
+ bool virValidateWWN(const char *wwn);
+ 
+ int virGetDeviceID(const char *path,
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-util-Propagate-numad-failures-correctly.patch b/SOURCES/libvirt-util-Propagate-numad-failures-correctly.patch
deleted file mode 100644
index 6414f96..0000000
--- a/SOURCES/libvirt-util-Propagate-numad-failures-correctly.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 8722ee949b2099c4a4ac246fba868ae47cb828d2 Mon Sep 17 00:00:00 2001
-Message-Id: <8722ee949b2099c4a4ac246fba868ae47cb828d2@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 11 Jun 2019 10:13:50 +0200
-Subject: [PATCH] util: Propagate numad failures correctly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Right now, if numad fails, we raise an error but return an
-empty string to the caller instead of a NULL pointer, which
-means processing will continue and the user will see
-
-  # virsh start guest
-  error: Failed to start domain guest
-  error: invalid argument: Failed to parse bitmap ''
-
-instead of a more reasonable
-
-  # virsh start guest
-  error: Failed to start domain guest
-  error: operation failed: Failed to query numad for the advisory nodeset
-
-Make sure the user gets a better error message.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716387
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit b34fb1fb6f99628932ad68db1ce4985a06def17f)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716907
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Message-Id: <20190611081350.6476-2-abologna@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnuma.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virnuma.c b/src/util/virnuma.c
-index 784db0a7ce..fd15714553 100644
---- a/src/util/virnuma.c
-+++ b/src/util/virnuma.c
-@@ -66,10 +66,12 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
- 
-     virCommandSetOutputBuffer(cmd, &output);
- 
--    if (virCommandRun(cmd, NULL) < 0)
--        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+    if (virCommandRun(cmd, NULL) < 0) {
-+        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                        _("Failed to query numad for the "
-                          "advisory nodeset"));
-+        VIR_FREE(output);
-+    }
- 
-     virCommandFree(cmd);
-     return output;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-Rework-virStringListAdd.patch b/SOURCES/libvirt-util-Rework-virStringListAdd.patch
deleted file mode 100644
index 1fcd4d1..0000000
--- a/SOURCES/libvirt-util-Rework-virStringListAdd.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From e7d53ee08ec9929974fb4159be8359c4ba88f5b2 Mon Sep 17 00:00:00 2001
-Message-Id: <e7d53ee08ec9929974fb4159be8359c4ba88f5b2@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:05 +0200
-Subject: [PATCH] util: Rework virStringListAdd
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So every caller does the same: they use virStringListAdd() to add
-new item into the list and then free the old copy to replace it
-with new list. It's not very memory effective, nor environmental
-friendly.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 71a390e0fdb4e6cbeaef4c9045a501a6c8de5412)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <a9764c87b3f557a2fd9ac8c5fcd077a3d713e2ca.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virmacmap.c  |  8 ++------
- src/util/virstring.c  | 33 ++++++++++++---------------------
- src/util/virstring.h  |  4 ++--
- tests/virstringtest.c |  6 +-----
- 4 files changed, 17 insertions(+), 34 deletions(-)
-
-diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
-index 88ca9b3f36..c7b700fa05 100644
---- a/src/util/virmacmap.c
-+++ b/src/util/virmacmap.c
-@@ -90,7 +90,6 @@ virMacMapAddLocked(virMacMapPtr mgr,
- {
-     int ret = -1;
-     char **macsList = NULL;
--    char **newMacsList = NULL;
- 
-     if ((macsList = virHashLookup(mgr->macs, domain)) &&
-         virStringListHasString((const char**) macsList, mac)) {
-@@ -98,15 +97,12 @@ virMacMapAddLocked(virMacMapPtr mgr,
-         goto cleanup;
-     }
- 
--    if (!(newMacsList = virStringListAdd((const char **) macsList, mac)) ||
--        virHashUpdateEntry(mgr->macs, domain, newMacsList) < 0)
-+    if (virStringListAdd(&macsList, mac) < 0 ||
-+        virHashUpdateEntry(mgr->macs, domain, macsList) < 0)
-         goto cleanup;
--    newMacsList = NULL;
--    virStringListFree(macsList);
- 
-     ret = 0;
-  cleanup:
--    virStringListFree(newMacsList);
-     return ret;
- }
- 
-diff --git a/src/util/virstring.c b/src/util/virstring.c
-index 0f13b6c664..74fa2f6a94 100644
---- a/src/util/virstring.c
-+++ b/src/util/virstring.c
-@@ -175,32 +175,23 @@ char *virStringListJoin(const char **strings,
-  * @strings: a NULL-terminated array of strings
-  * @item: string to add
-  *
-- * Creates new strings list with all strings duplicated and @item
-- * at the end of the list. Callers is responsible for freeing
-- * both @strings and returned list.
-+ * Appends @item into string list @strings. If *@strings is not
-+ * allocated yet new string list is created.
-+ *
-+ * Returns: 0 on success,
-+ *         -1 otherwise
-  */
--char **
--virStringListAdd(const char **strings,
-+int
-+virStringListAdd(char ***strings,
-                  const char *item)
- {
--    char **ret = NULL;
--    size_t i = virStringListLength(strings);
-+    size_t i = virStringListLength((const char **) *strings);
- 
--    if (VIR_ALLOC_N(ret, i + 2) < 0)
--        goto error;
-+    if (VIR_EXPAND_N(*strings, i, 2) < 0 ||
-+        VIR_STRDUP((*strings)[i - 2], item) < 0)
-+        return -1;
- 
--    for (i = 0; strings && strings[i]; i++) {
--        if (VIR_STRDUP(ret[i], strings[i]) < 0)
--            goto error;
--    }
--
--    if (VIR_STRDUP(ret[i], item) < 0)
--        goto error;
--
--    return ret;
-- error:
--    virStringListFree(ret);
--    return NULL;
-+    return 0;
- }
- 
- 
-diff --git a/src/util/virstring.h b/src/util/virstring.h
-index e68b9eec79..a3db08ce58 100644
---- a/src/util/virstring.h
-+++ b/src/util/virstring.h
-@@ -41,8 +41,8 @@ char *virStringListJoin(const char **strings,
-                         const char *delim)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
- 
--char **virStringListAdd(const char **strings,
--                        const char *item);
-+int virStringListAdd(char ***strings,
-+                     const char *item);
- void virStringListRemove(char ***strings,
-                          const char *item);
- 
-diff --git a/tests/virstringtest.c b/tests/virstringtest.c
-index 1230aba5b7..1a1e6364d1 100644
---- a/tests/virstringtest.c
-+++ b/tests/virstringtest.c
-@@ -179,12 +179,8 @@ static int testAdd(const void *args)
-     size_t i;
- 
-     for (i = 0; data->tokens[i]; i++) {
--        char **tmp = virStringListAdd((const char **)list, data->tokens[i]);
--        if (!tmp)
-+        if (virStringListAdd(&list, data->tokens[i]) < 0)
-             goto cleanup;
--        virStringListFree(list);
--        list = tmp;
--        tmp = NULL;
-     }
- 
-     if (!list &&
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-Rewrite-virHostCPUCountThreadSiblings.patch b/SOURCES/libvirt-util-Rewrite-virHostCPUCountThreadSiblings.patch
deleted file mode 100644
index 62b0d8e..0000000
--- a/SOURCES/libvirt-util-Rewrite-virHostCPUCountThreadSiblings.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 60e8b0492c1412f03188453cae1b9b8729d69745 Mon Sep 17 00:00:00 2001
-Message-Id: <60e8b0492c1412f03188453cae1b9b8729d69745@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Wed, 15 Aug 2018 14:04:42 +0200
-Subject: [PATCH] util: Rewrite virHostCPUCountThreadSiblings()
-
-We already have a function which parses
-thread_siblings_list for a CPU and returns the
-corresponding bitmap, and a bunch of utility functions
-that perform operations on bitmaps such as counting
-the number of set bits: use those to implement the
-function instead of having an additional ad-hoc parser
-for thread_siblings.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 794513e89d0dbd9a1b30f3745007bcfdb740d890)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1608479
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virhostcpu.c | 45 +++++++++++++++----------------------------
- 1 file changed, 16 insertions(+), 29 deletions(-)
-
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index 013c95bb56..b644398e00 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -201,35 +201,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum,
- 
- # define LINUX_NB_CPU_STATS 4
- 
--
--static unsigned long
--virHostCPUCountThreadSiblings(unsigned int cpu)
--{
--    unsigned long ret = 0;
--    int rv = -1;
--    char *str = NULL;
--    size_t i;
--
--    rv = virFileReadValueString(&str,
--                                "%s/cpu/cpu%u/topology/thread_siblings",
--                                SYSFS_SYSTEM_PATH, cpu);
--    if (rv == -2) {
--        ret = 1;
--        goto cleanup;
--    }
--    if (rv < 0)
--        goto cleanup;
--
--    for (i = 0; str[i] != '\0'; i++) {
--        if (c_isxdigit(str[i]))
--            ret += count_one_bits(virHexToBin(str[i]));
--    }
--
-- cleanup:
--    VIR_FREE(str);
--    return ret;
--}
--
- int
- virHostCPUGetSocket(unsigned int cpu, unsigned int *socket)
- {
-@@ -290,6 +261,22 @@ virHostCPUGetSiblingsList(unsigned int cpu)
-     return ret;
- }
- 
-+static unsigned long
-+virHostCPUCountThreadSiblings(unsigned int cpu)
-+{
-+    virBitmapPtr siblings_map;
-+    unsigned long ret = 0;
-+
-+    if (!(siblings_map = virHostCPUGetSiblingsList(cpu)))
-+        goto cleanup;
-+
-+    ret = virBitmapCountBits(siblings_map);
-+
-+ cleanup:
-+    virBitmapFree(siblings_map);
-+    return ret;
-+}
-+
- /* parses a node entry, returning number of processors in the node and
-  * filling arguments */
- static int
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-util-add-a-function-to-insert-new-interfaces-to-IPv6CheckForwarding-list.patch b/SOURCES/libvirt-util-add-a-function-to-insert-new-interfaces-to-IPv6CheckForwarding-list.patch
deleted file mode 100644
index 7ca96ce..0000000
--- a/SOURCES/libvirt-util-add-a-function-to-insert-new-interfaces-to-IPv6CheckForwarding-list.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 665a535028d1512e2afabf3c2c1cc100debfa7d7 Mon Sep 17 00:00:00 2001
-Message-Id: <665a535028d1512e2afabf3c2c1cc100debfa7d7@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 14 Jan 2019 11:35:03 -0500
-Subject: [PATCH] util: add a function to insert new interfaces to
- IPv6CheckForwarding list
-
-This same operation needs to be done in multiple places, so move the
-inline code into a separate function.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 37bb6facfc467179d6cfe6186ad6d5a55285c2c7)
-
-https://bugzilla.redhat.com/1583131
-
-Conflicts: src/util/virnetdevip.c - introduction of VIR_AUTOPTR upstream led to
-     conflicts in surrounding context, and elimination of cleanup and
-     error labels.
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virnetdevip.c | 29 ++++++++++++++++++++---------
- 1 file changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
-index 1bfbd20034..937ebcdbdb 100644
---- a/src/util/virnetdevip.c
-+++ b/src/util/virnetdevip.c
-@@ -539,6 +539,25 @@ struct virNetDevIPCheckIPv6ForwardingData {
-     size_t ndevices;
- };
- 
-+
-+static int
-+virNetDevIPCheckIPv6ForwardingAddIF(struct virNetDevIPCheckIPv6ForwardingData *data,
-+                                    char **ifname)
-+{
-+    size_t i;
-+
-+    /* add ifname to the array if it's not already there
-+     * (ifname is char** so VIR_APPEND_ELEMENT() will move the
-+     * original pointer out of the way and avoid having it freed)
-+     */
-+    for (i = 0; i < data->ndevices; i++) {
-+        if (STREQ(data->devices[i], *ifname))
-+            return 0;
-+    }
-+    return VIR_APPEND_ELEMENT(data->devices, data->ndevices, *ifname);
-+}
-+
-+
- static int
- virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
-                                        void *opaque)
-@@ -551,8 +570,6 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
-     int ret = 0;
-     int len = RTM_PAYLOAD(resp);
-     int oif = -1;
--    size_t i;
--    bool hasDevice;
- 
-     /* Ignore messages other than route ones */
-     if (resp->nlmsg_type != RTM_NEWROUTE)
-@@ -589,13 +606,7 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
-     accept_ra = virNetDevIPGetAcceptRA(ifname);
-     VIR_DEBUG("Checking route for device %s, accept_ra: %d", ifname, accept_ra);
- 
--    hasDevice = false;
--    for (i = 0; i < data->ndevices && !hasDevice; i++) {
--        if (STREQ(data->devices[i], ifname))
--            hasDevice = true;
--    }
--    if (accept_ra != 2 && !hasDevice &&
--        VIR_APPEND_ELEMENT(data->devices, data->ndevices, ifname) < 0)
-+    if (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)
-         goto error;
- 
-  cleanup:
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-add-virBufferTrimChars.patch b/SOURCES/libvirt-util-add-virBufferTrimChars.patch
new file mode 100644
index 0000000..0114425
--- /dev/null
+++ b/SOURCES/libvirt-util-add-virBufferTrimChars.patch
@@ -0,0 +1,151 @@
+From 494b2a24ad03653b4a2658a741669943555744bf Mon Sep 17 00:00:00 2001
+Message-Id: <494b2a24ad03653b4a2658a741669943555744bf@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:07 +0100
+Subject: [PATCH] util: add virBufferTrimChars
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A new helper for trimming combinations of specified characters from
+the tail of the buffer.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit fdd48f5b737c09a0581bf666d1578f5bd5d0de12)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <6c9d9490de405d56f3fd787dd5d02d3fb4943bb4.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/libvirt_private.syms |  1 +
+ src/util/virbuffer.c     | 26 ++++++++++++++++++++++++++
+ src/util/virbuffer.h     |  1 +
+ tests/virbuftest.c       | 36 ++++++++++++++++++++++++++++++++++++
+ 4 files changed, 64 insertions(+)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 1f97879faa..dbbec0d567 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -1642,6 +1642,7 @@ virBufferSetIndent;
+ virBufferStrcat;
+ virBufferStrcatVArgs;
+ virBufferTrim;
++virBufferTrimChars;
+ virBufferURIEncodeString;
+ virBufferUse;
+ virBufferVasprintf;
+diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
+index 1b93110919..914c386b18 100644
+--- a/src/util/virbuffer.c
++++ b/src/util/virbuffer.c
+@@ -673,6 +673,32 @@ virBufferTrim(virBufferPtr buf, const char *str, int len)
+     g_string_truncate(buf->str, buf->str->len - len);
+ }
+ 
++/**
++ * virBufferTrimChars:
++ * @buf: the buffer to trim
++ * @trim: the characters to be trimmed
++ *
++ * Trim the tail of the buffer. The longest string that can be formed with
++ * the characters from @trim is trimmed.
++ */
++void
++virBufferTrimChars(virBufferPtr buf, const char *trim)
++{
++    ssize_t i;
++
++    if (!buf || !buf->str)
++        return;
++
++    if (!trim)
++        return;
++
++    for (i = buf->str->len - 1; i > 0; i--) {
++        if (!strchr(trim, buf->str->str[i]))
++            break;
++    }
++
++    g_string_truncate(buf->str, i + 1);
++}
+ 
+ /**
+  * virBufferAddStr:
+diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
+index 38758a9125..183f78f279 100644
+--- a/src/util/virbuffer.h
++++ b/src/util/virbuffer.h
+@@ -92,4 +92,5 @@ size_t virBufferGetIndent(const virBuffer *buf);
+ size_t virBufferGetEffectiveIndent(const virBuffer *buf);
+ 
+ void virBufferTrim(virBufferPtr buf, const char *trim, int len);
++void virBufferTrimChars(virBufferPtr buf, const char *trim);
+ void virBufferAddStr(virBufferPtr buf, const char *str);
+diff --git a/tests/virbuftest.c b/tests/virbuftest.c
+index 1780b62bf4..7919075000 100644
+--- a/tests/virbuftest.c
++++ b/tests/virbuftest.c
+@@ -12,6 +12,7 @@
+ struct testBufAddStrData {
+     const char *data;
+     const char *expect;
++    const char *arg;
+ };
+ 
+ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
+@@ -130,6 +131,30 @@ static int testBufTrim(const void *data G_GNUC_UNUSED)
+     return ret;
+ }
+ 
++static int
++testBufTrimChars(const void *opaque)
++{
++    const struct testBufAddStrData *data = opaque;
++    virBuffer buf = VIR_BUFFER_INITIALIZER;
++    g_autofree char *actual = NULL;
++
++    virBufferAddStr(&buf, data->data);
++    virBufferTrimChars(&buf, data->arg);
++
++    if (!(actual = virBufferContentAndReset(&buf))) {
++        VIR_TEST_DEBUG("buf is empty");
++        return -1;
++    }
++
++    if (STRNEQ_NULLABLE(actual, data->expect)) {
++        VIR_TEST_DEBUG("testBufEscapeStr(): Strings don't match:");
++        virTestDifference(stderr, data->expect, actual);
++        return -1;
++    }
++
++    return 0;
++}
++
+ static int testBufAddBuffer(const void *data G_GNUC_UNUSED)
+ {
+     virBuffer buf1 = VIR_BUFFER_INITIALIZER;
+@@ -411,6 +436,17 @@ mymain(void)
+     DO_TEST_ESCAPE_REGEX("^$.|?*+()[]{}\\",
+                          "\\^\\$\\.\\|\\?\\*\\+\\(\\)\\[\\]\\{\\}\\\\");
+ 
++#define DO_TEST_TRIM_CHARS(_data, _arg, _expect) \
++    do { \
++        struct testBufAddStrData info = { .data = _data, .expect = _expect, .arg = _arg }; \
++        if (virTestRun("Buf: Trim: " #_data, testBufTrimChars, &info) < 0) \
++            ret = -1; \
++    } while (0)
++
++    DO_TEST_TRIM_CHARS("Trimmm", "m", "Tri");
++    DO_TEST_TRIM_CHARS("-abcd-efgh--", "-", "-abcd-efgh");
++    DO_TEST_TRIM_CHARS("-hABC-efgh--", "-h", "-hABC-efg");
++
+     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-util-alloc-add-macros-for-implementing-automatic-cleanup-functionality.patch b/SOURCES/libvirt-util-alloc-add-macros-for-implementing-automatic-cleanup-functionality.patch
deleted file mode 100644
index 8d9fb2c..0000000
--- a/SOURCES/libvirt-util-alloc-add-macros-for-implementing-automatic-cleanup-functionality.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 78f99c03b31dd7850a2eeebbf88e47e391376293 Mon Sep 17 00:00:00 2001
-Message-Id: <78f99c03b31dd7850a2eeebbf88e47e391376293@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Fri, 3 May 2019 13:54:30 +0200
-Subject: [PATCH] util: alloc: add macros for implementing automatic cleanup
- functionality
-
-New macros are introduced which help in adding GNU C's cleanup
-attribute to variable declarations. Variables declared with these
-macros will have their allocated memory freed automatically when
-they go out of scope.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit dcec13f5a2ba17223d403ff9e9fed916a4dd9c04)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1505998
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Message-Id: <7ca85d7157eda723aac994f7c9f0f04ed9a35ab5.1556884442.git.eskultet@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/util/viralloc.h | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/src/util/viralloc.h b/src/util/viralloc.h
-index 69d0f904f1..a23aa188bb 100644
---- a/src/util/viralloc.h
-+++ b/src/util/viralloc.h
-@@ -596,4 +596,46 @@ void virAllocTestInit(void);
- int virAllocTestCount(void);
- void virAllocTestOOM(int n, int m);
- void virAllocTestHook(void (*func)(int, void*), void *data);
-+
-+# define VIR_AUTOPTR_FUNC_NAME(type) type##AutoPtrFree
-+
-+/**
-+ * VIR_DEFINE_AUTOPTR_FUNC:
-+ * @type: type of the variable to be freed automatically
-+ * @func: cleanup function to be automatically called
-+ *
-+ * This macro defines a function for automatic freeing of
-+ * resources allocated to a variable of type @type. This newly
-+ * defined function works as a necessary wrapper around @func.
-+ */
-+# define VIR_DEFINE_AUTOPTR_FUNC(type, func) \
-+    static inline void VIR_AUTOPTR_FUNC_NAME(type)(type **_ptr) \
-+    { \
-+        if (*_ptr) \
-+            (func)(*_ptr); \
-+        *_ptr = NULL; \
-+    } \
-+
-+/**
-+ * VIR_AUTOFREE:
-+ * @type: type of the variable to be freed automatically
-+ *
-+ * Macro to automatically free the memory allocated to
-+ * the variable declared with it by calling virFree
-+ * when the variable goes out of scope.
-+ */
-+# define VIR_AUTOFREE(type) __attribute__((cleanup(virFree))) type
-+
-+/**
-+ * VIR_AUTOPTR:
-+ * @type: type of the variable to be freed automatically
-+ *
-+ * Macro to automatically free the memory allocated to
-+ * the variable declared with it by calling the function
-+ * defined by VIR_DEFINE_AUTOPTR_FUNC when the variable
-+ * goes out of scope.
-+ */
-+# define VIR_AUTOPTR(type) \
-+    __attribute__((cleanup(VIR_AUTOPTR_FUNC_NAME(type)))) type *
-+
- #endif /* __VIR_MEMORY_H_ */
--- 
-2.21.0
-
diff --git a/SOURCES/libvirt-util-bitmap-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch b/SOURCES/libvirt-util-bitmap-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
deleted file mode 100644
index 278fe5f..0000000
--- a/SOURCES/libvirt-util-bitmap-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 2fe1b73a5dbbfd79c3a1a8c48747a68846785e3b Mon Sep 17 00:00:00 2001
-Message-Id: <2fe1b73a5dbbfd79c3a1a8c48747a68846785e3b@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Wed, 5 Jun 2019 11:33:27 +0200
-Subject: [PATCH] util: bitmap: define cleanup function using
- VIR_DEFINE_AUTOPTR_FUNC
-
-Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in
-src/util/viralloc.h, define a new wrapper around an existing
-cleanup function which will be called when a variable declared
-with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant
-viralloc.h include, since that has moved from the source module into the
-header.
-
-When a variable of type virBitmapPtr is declared using
-VIR_AUTOPTR, the function virBitmapFree will be run
-automatically on it when it goes out of scope.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit a3c915e662f8c25cac683e20bbc419b497555e13)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1716943
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <fcbb5d4453100962a2fc83e486da799012eec675.1559727075.git.mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/util/virbitmap.c | 1 -
- src/util/virbitmap.h | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
-index 0cc5292d8c..ef18dad255 100644
---- a/src/util/virbitmap.c
-+++ b/src/util/virbitmap.c
-@@ -31,7 +31,6 @@
- #include <sys/types.h>
- 
- #include "virbitmap.h"
--#include "viralloc.h"
- #include "virbuffer.h"
- #include "c-ctype.h"
- #include "count-one-bits.h"
-diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
-index 2464814055..312e7e2933 100644
---- a/src/util/virbitmap.h
-+++ b/src/util/virbitmap.h
-@@ -25,6 +25,7 @@
- # define __BITMAP_H__
- 
- # include "internal.h"
-+# include "viralloc.h"
- 
- # include <sys/types.h>
- 
-@@ -155,4 +156,6 @@ void virBitmapSubtract(virBitmapPtr a, virBitmapPtr b)
- 
- void virBitmapShrink(virBitmapPtr map, size_t b);
- 
-+VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree)
-+
- #endif
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-cgroup-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch b/SOURCES/libvirt-util-cgroup-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
deleted file mode 100644
index bfe6577..0000000
--- a/SOURCES/libvirt-util-cgroup-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
+++ /dev/null
@@ -1,1528 +0,0 @@
-From 02e35feddf3a72cfd52db8485f3de637b7f518ea Mon Sep 17 00:00:00 2001
-Message-Id: <02e35feddf3a72cfd52db8485f3de637b7f518ea@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:47 +0200
-Subject: [PATCH] util: cgroup: use VIR_AUTOFREE instead of VIR_FREE for scalar
- types
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By making use of GNU C's cleanup attribute handled by the
-VIR_AUTOFREE macro for declaring scalar variables, majority
-of the VIR_FREE calls can be dropped, which in turn leads to
-getting rid of most of our cleanup sections.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 94f1855f099445d4a18d5e5f114b60b7c58798ad)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <97a6e61acf698facf2554b05d03cd490ecc25f7e.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 528 +++++++++++++++----------------------------
- 1 file changed, 181 insertions(+), 347 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index e810a3d81d..6bf4e88da1 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -163,7 +163,7 @@ virCgroupPartitionNeedsEscaping(const char *path)
- {
-     FILE *fp = NULL;
-     int ret = 0;
--    char *line = NULL;
-+    VIR_AUTOFREE(char *) line = NULL;
-     size_t buflen;
- 
-     /* If it starts with 'cgroup.' or a '_' of any
-@@ -223,7 +223,6 @@ virCgroupPartitionNeedsEscaping(const char *path)
-     }
- 
-  cleanup:
--    VIR_FREE(line);
-     VIR_FORCE_FCLOSE(fp);
-     return ret;
- }
-@@ -256,41 +255,40 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
-                               const char *machinename)
- {
-     size_t i;
--    bool valid = false;
--    char *partname = NULL;
--    char *scopename_old = NULL;
--    char *scopename_new = NULL;
--    char *partmachinename = NULL;
-+    VIR_AUTOFREE(char *) partname = NULL;
-+    VIR_AUTOFREE(char *) scopename_old = NULL;
-+    VIR_AUTOFREE(char *) scopename_new = NULL;
-+    VIR_AUTOFREE(char *) partmachinename = NULL;
- 
-     if (virAsprintf(&partname, "%s.libvirt-%s",
-                     name, drivername) < 0)
--        goto cleanup;
-+        return false;
- 
-     if (virCgroupPartitionEscape(&partname) < 0)
--        goto cleanup;
-+        return false;
- 
-     if (machinename &&
-         (virAsprintf(&partmachinename, "%s.libvirt-%s",
-                      machinename, drivername) < 0 ||
-          virCgroupPartitionEscape(&partmachinename) < 0))
--        goto cleanup;
-+        return false;
- 
-     if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true)))
--        goto cleanup;
-+        return false;
- 
-     /* We should keep trying even if this failed */
-     if (!machinename)
-         virResetLastError();
-     else if (!(scopename_new = virSystemdMakeScopeName(machinename,
-                                                        drivername, false)))
--        goto cleanup;
-+        return false;
- 
-     if (virCgroupPartitionEscape(&scopename_old) < 0)
--        goto cleanup;
-+        return false;
- 
-     if (scopename_new &&
-         virCgroupPartitionEscape(&scopename_new) < 0)
--        goto cleanup;
-+        return false;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-         char *tmp;
-@@ -303,7 +301,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
- 
-         tmp = strrchr(group->controllers[i].placement, '/');
-         if (!tmp)
--            goto cleanup;
-+            return false;
- 
-         if (stripEmulatorSuffix &&
-             (i == VIR_CGROUP_CONTROLLER_CPU ||
-@@ -313,7 +311,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
-                 *tmp = '\0';
-             tmp = strrchr(group->controllers[i].placement, '/');
-             if (!tmp)
--                goto cleanup;
-+                return false;
-         }
- 
-         tmp++;
-@@ -329,18 +327,11 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
-                       tmp, virCgroupControllerTypeToString(i),
-                       name, NULLSTR(machinename), partname,
-                       scopename_old, NULLSTR(scopename_new));
--            goto cleanup;
-+            return false;
-         }
-     }
- 
--    valid = true;
--
-- cleanup:
--    VIR_FREE(partmachinename);
--    VIR_FREE(partname);
--    VIR_FREE(scopename_old);
--    VIR_FREE(scopename_new);
--    return valid;
-+    return true;
- }
- 
- 
-@@ -378,7 +369,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-     FILE *mounts = NULL;
-     struct mntent entry;
-     char buf[CGROUP_MAX_VAL];
--    char *linksrc = NULL;
-     int ret = -1;
- 
-     mounts = fopen(path, "r");
-@@ -433,8 +423,9 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                     /* If it is a co-mount it has a filename like "cpu,cpuacct"
-                      * and we must identify the symlink path */
-                     if (checkLinks && strchr(tmp2 + 1, ',')) {
-+                        VIR_AUTOFREE(char *) linksrc = NULL;
-+
-                         *tmp2 = '\0';
--                        VIR_FREE(linksrc);
-                         if (virAsprintf(&linksrc, "%s/%s",
-                                         entry.mnt_dir, typestr) < 0)
-                             goto cleanup;
-@@ -468,7 +459,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
- 
-     ret = 0;
-  cleanup:
--    VIR_FREE(linksrc);
-     VIR_FORCE_FCLOSE(mounts);
-     return ret;
- }
-@@ -547,7 +537,7 @@ virCgroupDetectPlacement(virCgroupPtr group,
-     FILE *mapping  = NULL;
-     char line[1024];
-     int ret = -1;
--    char *procfile;
-+    VIR_AUTOFREE(char *) procfile = NULL;
- 
-     VIR_DEBUG("Detecting placement for pid %lld path %s",
-               (long long) pid, path);
-@@ -628,9 +618,7 @@ virCgroupDetectPlacement(virCgroupPtr group,
-     ret = 0;
- 
-  cleanup:
--    VIR_FREE(procfile);
-     VIR_FORCE_FCLOSE(mapping);
--
-     return ret;
- }
- 
-@@ -786,8 +774,7 @@ virCgroupSetValueStr(virCgroupPtr group,
-                      const char *key,
-                      const char *value)
- {
--    int ret = -1;
--    char *keypath = NULL;
-+    VIR_AUTOFREE(char *) keypath = NULL;
-     char *tmp = NULL;
- 
-     if (virCgroupPathOfController(group, controller, key, &keypath) < 0)
-@@ -800,18 +787,14 @@ virCgroupSetValueStr(virCgroupPtr group,
-             virReportSystemError(errno,
-                                  _("Invalid value '%s' for '%s'"),
-                                  value, tmp + 1);
--            goto cleanup;
-+            return -1;
-         }
-         virReportSystemError(errno,
-                              _("Unable to write to '%s'"), keypath);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(keypath);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -821,8 +804,8 @@ virCgroupGetValueStr(virCgroupPtr group,
-                      const char *key,
-                      char **value)
- {
--    char *keypath = NULL;
--    int ret = -1, rc;
-+    VIR_AUTOFREE(char *) keypath = NULL;
-+    int rc;
- 
-     *value = NULL;
- 
-@@ -834,18 +817,14 @@ virCgroupGetValueStr(virCgroupPtr group,
-     if ((rc = virFileReadAll(keypath, 1024*1024, value)) < 0) {
-         virReportSystemError(errno,
-                              _("Unable to read from '%s'"), keypath);
--        goto cleanup;
-+        return -1;
-     }
- 
-     /* Terminated with '\n' has sometimes harmful effects to the caller */
-     if (rc > 0 && (*value)[rc - 1] == '\n')
-         (*value)[rc - 1] = '\0';
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(keypath);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -856,8 +835,8 @@ virCgroupGetValueForBlkDev(virCgroupPtr group,
-                            const char *path,
-                            char **value)
- {
--    char *prefix = NULL;
--    char *str = NULL;
-+    VIR_AUTOFREE(char *) prefix = NULL;
-+    VIR_AUTOFREE(char *) str = NULL;
-     char **lines = NULL;
-     int ret = -1;
- 
-@@ -875,8 +854,6 @@ virCgroupGetValueForBlkDev(virCgroupPtr group,
- 
-     ret = 0;
-  error:
--    VIR_FREE(str);
--    VIR_FREE(prefix);
-     virStringListFree(lines);
-     return ret;
- }
-@@ -888,17 +865,12 @@ virCgroupSetValueU64(virCgroupPtr group,
-                      const char *key,
-                      unsigned long long int value)
- {
--    char *strval = NULL;
--    int ret;
-+    VIR_AUTOFREE(char *) strval = NULL;
- 
-     if (virAsprintf(&strval, "%llu", value) < 0)
-         return -1;
- 
--    ret = virCgroupSetValueStr(group, controller, key, strval);
--
--    VIR_FREE(strval);
--
--    return ret;
-+    return virCgroupSetValueStr(group, controller, key, strval);
- }
- 
- 
-@@ -908,17 +880,12 @@ virCgroupSetValueI64(virCgroupPtr group,
-                      const char *key,
-                      long long int value)
- {
--    char *strval = NULL;
--    int ret;
-+    VIR_AUTOFREE(char *) strval = NULL;
- 
-     if (virAsprintf(&strval, "%lld", value) < 0)
-         return -1;
- 
--    ret = virCgroupSetValueStr(group, controller, key, strval);
--
--    VIR_FREE(strval);
--
--    return ret;
-+    return virCgroupSetValueStr(group, controller, key, strval);
- }
- 
- 
-@@ -928,24 +895,19 @@ virCgroupGetValueI64(virCgroupPtr group,
-                      const char *key,
-                      long long int *value)
- {
--    char *strval = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) strval = NULL;
- 
-     if (virCgroupGetValueStr(group, controller, key, &strval) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virStrToLong_ll(strval, NULL, 10, value) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        strval);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(strval);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -955,24 +917,19 @@ virCgroupGetValueU64(virCgroupPtr group,
-                      const char *key,
-                      unsigned long long int *value)
- {
--    char *strval = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) strval = NULL;
- 
-     if (virCgroupGetValueStr(group, controller, key, &strval) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virStrToLong_ull(strval, NULL, 10, value) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        strval);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(strval);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -988,7 +945,7 @@ virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group)
- 
-     VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path);
-     for (i = 0; i < ARRAY_CARDINALITY(inherit_values); i++) {
--        char *value;
-+        VIR_AUTOFREE(char *) value = NULL;
- 
-         if (virCgroupGetValueStr(parent,
-                                  VIR_CGROUP_CONTROLLER_CPUSET,
-@@ -1001,11 +958,8 @@ virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group)
-         if (virCgroupSetValueStr(group,
-                                  VIR_CGROUP_CONTROLLER_CPUSET,
-                                  inherit_values[i],
--                                 value) < 0) {
--            VIR_FREE(value);
-+                                 value) < 0)
-             return -1;
--        }
--        VIR_FREE(value);
-     }
- 
-     return 0;
-@@ -1044,11 +998,10 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                    unsigned int flags)
- {
-     size_t i;
--    int ret = -1;
- 
-     VIR_DEBUG("Make group %s", group->path);
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        char *path = NULL;
-+        VIR_AUTOFREE(char *) path = NULL;
- 
-         /* We must never mkdir() in systemd's hierarchy */
-         if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
-@@ -1074,10 +1027,8 @@ virCgroupMakeGroup(virCgroupPtr parent,
-         if (!virFileExists(path)) {
-             if (!create ||
-                 mkdir(path, 0755) < 0) {
--                if (errno == EEXIST) {
--                    VIR_FREE(path);
-+                if (errno == EEXIST)
-                     continue;
--                }
-                 /* With a kernel that doesn't support multi-level directory
-                  * for blkio controller, libvirt will fail and disable all
-                  * other controllers even though they are available. So
-@@ -1085,24 +1036,20 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                 if (i == VIR_CGROUP_CONTROLLER_BLKIO) {
-                     VIR_DEBUG("Ignoring mkdir failure with blkio controller. Kernel probably too old");
-                     VIR_FREE(group->controllers[i].mountPoint);
--                    VIR_FREE(path);
-                     continue;
-                 } else {
-                     virReportSystemError(errno,
-                                          _("Failed to create controller %s for group"),
-                                          virCgroupControllerTypeToString(i));
--                    VIR_FREE(path);
--                    goto cleanup;
-+                    return -1;
-                 }
-             }
-             if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL &&
-                 (i == VIR_CGROUP_CONTROLLER_CPUSET ||
-                  STREQ(group->controllers[i].mountPoint,
-                        group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) {
--                if (virCgroupCpuSetInherit(parent, group) < 0) {
--                    VIR_FREE(path);
--                    goto cleanup;
--                }
-+                if (virCgroupCpuSetInherit(parent, group) < 0)
-+                    return -1;
-             }
-             /*
-              * Note that virCgroupSetMemoryUseHierarchy should always be
-@@ -1113,21 +1060,14 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                 (i == VIR_CGROUP_CONTROLLER_MEMORY ||
-                  STREQ(group->controllers[i].mountPoint,
-                        group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) {
--                if (virCgroupSetMemoryUseHierarchy(group) < 0) {
--                    VIR_FREE(path);
--                    goto cleanup;
--                }
-+                if (virCgroupSetMemoryUseHierarchy(group) < 0)
-+                    return -1;
-             }
-         }
--
--        VIR_FREE(path);
-     }
- 
-     VIR_DEBUG("Done making controllers for group");
--    ret = 0;
--
-- cleanup:
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -1339,9 +1279,9 @@ virCgroupNewPartition(const char *path,
-                       virCgroupPtr *group)
- {
-     int ret = -1;
--    char *parentPath = NULL;
-+    VIR_AUTOFREE(char *) parentPath = NULL;
-+    VIR_AUTOFREE(char *) newPath = NULL;
-     virCgroupPtr parent = NULL;
--    char *newPath = NULL;
-     VIR_DEBUG("path=%s create=%d controllers=%x",
-               path, create, controllers);
- 
-@@ -1381,8 +1321,6 @@ virCgroupNewPartition(const char *path,
-     if (ret != 0)
-         virCgroupFree(group);
-     virCgroupFree(&parent);
--    VIR_FREE(parentPath);
--    VIR_FREE(newPath);
-     return ret;
- }
- 
-@@ -1421,18 +1359,17 @@ virCgroupNewDomainPartition(virCgroupPtr partition,
-                             bool create,
-                             virCgroupPtr *group)
- {
--    int ret = -1;
--    char *grpname = NULL;
-+    VIR_AUTOFREE(char *)grpname = NULL;
- 
-     if (virAsprintf(&grpname, "%s.libvirt-%s",
-                     name, driver) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupPartitionEscape(&grpname) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupNew(-1, grpname, partition, -1, group) < 0)
--        goto cleanup;
-+        return -1;
- 
-     /*
-      * Create a cgroup with memory.use_hierarchy enabled to
-@@ -1448,14 +1385,10 @@ virCgroupNewDomainPartition(virCgroupPtr partition,
-                            VIR_CGROUP_MEM_HIERACHY) < 0) {
-         virCgroupRemove(*group);
-         virCgroupFree(group);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(grpname);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -1477,27 +1410,26 @@ virCgroupNewThread(virCgroupPtr domain,
-                    bool create,
-                    virCgroupPtr *group)
- {
--    int ret = -1;
--    char *name = NULL;
-+    VIR_AUTOFREE(char *) name = NULL;
-     int controllers;
- 
-     switch (nameval) {
-     case VIR_CGROUP_THREAD_VCPU:
-         if (virAsprintf(&name, "vcpu%d", id) < 0)
--            goto cleanup;
-+            return -1;
-         break;
-     case VIR_CGROUP_THREAD_EMULATOR:
-         if (VIR_STRDUP(name, "emulator") < 0)
--            goto cleanup;
-+            return -1;
-         break;
-     case VIR_CGROUP_THREAD_IOTHREAD:
-         if (virAsprintf(&name, "iothread%d", id) < 0)
--            goto cleanup;
-+            return -1;
-         break;
-     case VIR_CGROUP_THREAD_LAST:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unexpected name value %d"), nameval);
--        goto cleanup;
-+        return -1;
-     }
- 
-     controllers = ((1 << VIR_CGROUP_CONTROLLER_CPU) |
-@@ -1505,18 +1437,15 @@ virCgroupNewThread(virCgroupPtr domain,
-                    (1 << VIR_CGROUP_CONTROLLER_CPUSET));
- 
-     if (virCgroupNew(-1, name, domain, controllers, group) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) {
-         virCgroupRemove(*group);
-         virCgroupFree(group);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
-- cleanup:
--    VIR_FREE(name);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -1577,7 +1506,7 @@ virCgroupNewMachineSystemd(const char *name,
-     int ret = -1;
-     int rv;
-     virCgroupPtr init, parent = NULL;
--    char *path = NULL;
-+    VIR_AUTOFREE(char *) path = NULL;
-     char *offset;
- 
-     VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
-@@ -1662,7 +1591,6 @@ virCgroupNewMachineSystemd(const char *name,
-     ret = 0;
-  cleanup:
-     virCgroupFree(&parent);
--    VIR_FREE(path);
-     return ret;
- }
- 
-@@ -1894,9 +1822,11 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                             long long *requests_write)
- {
-     long long stats_val;
--    char *str1 = NULL, *str2 = NULL, *p1, *p2;
-+    VIR_AUTOFREE(char *) str1 = NULL;
-+    VIR_AUTOFREE(char *) str2 = NULL;
-+    char *p1 = NULL;
-+    char *p2 = NULL;
-     size_t i;
--    int ret = -1;
- 
-     const char *value_names[] = {
-         "Read ",
-@@ -1919,12 +1849,12 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-     if (virCgroupGetValueStr(group,
-                              VIR_CGROUP_CONTROLLER_BLKIO,
-                              "blkio.throttle.io_service_bytes", &str1) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupGetValueStr(group,
-                              VIR_CGROUP_CONTROLLER_BLKIO,
-                              "blkio.throttle.io_serviced", &str2) < 0)
--        goto cleanup;
-+        return -1;
- 
-     /* sum up all entries of the same kind, from all devices */
-     for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
-@@ -1938,7 +1868,7 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                                _("Cannot parse byte %sstat '%s'"),
-                                value_names[i],
-                                p1);
--                goto cleanup;
-+                return -1;
-             }
- 
-             if (stats_val < 0 ||
-@@ -1947,7 +1877,7 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                 virReportError(VIR_ERR_OVERFLOW,
-                                _("Sum of byte %sstat overflows"),
-                                value_names[i]);
--                goto cleanup;
-+                return -1;
-             }
-             *bytes_ptrs[i] += stats_val;
-         }
-@@ -1959,7 +1889,7 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                                _("Cannot parse %srequest stat '%s'"),
-                                value_names[i],
-                                p2);
--                goto cleanup;
-+                return -1;
-             }
- 
-             if (stats_val < 0 ||
-@@ -1968,18 +1898,13 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                 virReportError(VIR_ERR_OVERFLOW,
-                                _("Sum of %srequest stat overflows"),
-                                value_names[i]);
--                goto cleanup;
-+                return -1;
-             }
-             *requests_ptrs[i] += stats_val;
-         }
-     }
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(str2);
--    VIR_FREE(str1);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -2003,9 +1928,12 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
-                                   long long *requests_read,
-                                   long long *requests_write)
- {
--    char *str1 = NULL, *str2 = NULL, *str3 = NULL, *p1, *p2;
-+    VIR_AUTOFREE(char *) str1 = NULL;
-+    VIR_AUTOFREE(char *) str2 = NULL;
-+    VIR_AUTOFREE(char *) str3 = NULL;
-+    char *p1 = NULL;
-+    char *p2 = NULL;
-     size_t i;
--    int ret = -1;
- 
-     const char *value_names[] = {
-         "Read ",
-@@ -2023,28 +1951,28 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
-     if (virCgroupGetValueStr(group,
-                              VIR_CGROUP_CONTROLLER_BLKIO,
-                              "blkio.throttle.io_service_bytes", &str1) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupGetValueStr(group,
-                              VIR_CGROUP_CONTROLLER_BLKIO,
-                              "blkio.throttle.io_serviced", &str2) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (!(str3 = virCgroupGetBlockDevString(path)))
--        goto cleanup;
-+        return -1;
- 
-     if (!(p1 = strstr(str1, str3))) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Cannot find byte stats for block device '%s'"),
-                        str3);
--        goto cleanup;
-+        return -1;
-     }
- 
-     if (!(p2 = strstr(str2, str3))) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Cannot find request stats for block device '%s'"),
-                        str3);
--        goto cleanup;
-+        return -1;
-     }
- 
-     for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
-@@ -2052,38 +1980,32 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Cannot find byte %sstats for block device '%s'"),
-                            value_names[i], str3);
--            goto cleanup;
-+            return -1;
-         }
- 
-         if (virStrToLong_ll(p1 + strlen(value_names[i]), &p1, 10, bytes_ptrs[i]) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Cannot parse %sstat '%s'"),
-                            value_names[i], p1 + strlen(value_names[i]));
--            goto cleanup;
-+            return -1;
-         }
- 
-         if (!(p2 = strstr(p2, value_names[i]))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Cannot find request %sstats for block device '%s'"),
-                            value_names[i], str3);
--            goto cleanup;
-+            return -1;
-         }
- 
-         if (virStrToLong_ll(p2 + strlen(value_names[i]), &p2, 10, requests_ptrs[i]) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Cannot parse %sstat '%s'"),
-                            value_names[i], p2 + strlen(value_names[i]));
--            goto cleanup;
-+            return -1;
-         }
-     }
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(str3);
--    VIR_FREE(str2);
--    VIR_FREE(str1);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -2139,24 +2061,19 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned int riops)
- {
--    char *str = NULL;
--    char *blkstr = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
- 
-     if (!(blkstr = virCgroupGetBlockDevString(path)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%u", blkstr, riops) < 0)
--        goto error;
-+        return -1;
- 
--    ret = virCgroupSetValueStr(group,
-+    return virCgroupSetValueStr(group,
-                                VIR_CGROUP_CONTROLLER_BLKIO,
-                                "blkio.throttle.read_iops_device",
-                                str);
-- error:
--    VIR_FREE(blkstr);
--    VIR_FREE(str);
--    return ret;
- }
- 
- 
-@@ -2173,24 +2090,19 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
-                                  const char *path,
-                                  unsigned int wiops)
- {
--    char *str = NULL;
--    char *blkstr = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
- 
-     if (!(blkstr = virCgroupGetBlockDevString(path)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)
--        goto error;
-+        return -1;
- 
--    ret = virCgroupSetValueStr(group,
-+    return virCgroupSetValueStr(group,
-                                VIR_CGROUP_CONTROLLER_BLKIO,
-                                "blkio.throttle.write_iops_device",
-                                str);
-- error:
--    VIR_FREE(blkstr);
--    VIR_FREE(str);
--    return ret;
- }
- 
- 
-@@ -2207,24 +2119,19 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
-                                const char *path,
-                                unsigned long long rbps)
- {
--    char *str = NULL;
--    char *blkstr = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
- 
-     if (!(blkstr = virCgroupGetBlockDevString(path)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0)
--        goto error;
-+        return -1;
- 
--    ret = virCgroupSetValueStr(group,
-+    return virCgroupSetValueStr(group,
-                                VIR_CGROUP_CONTROLLER_BLKIO,
-                                "blkio.throttle.read_bps_device",
-                                str);
-- error:
--    VIR_FREE(blkstr);
--    VIR_FREE(str);
--    return ret;
- }
- 
- /**
-@@ -2240,24 +2147,19 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned long long wbps)
- {
--    char *str = NULL;
--    char *blkstr = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
- 
-     if (!(blkstr = virCgroupGetBlockDevString(path)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
--        goto error;
-+        return -1;
- 
--    ret = virCgroupSetValueStr(group,
-+    return virCgroupSetValueStr(group,
-                                VIR_CGROUP_CONTROLLER_BLKIO,
-                                "blkio.throttle.write_bps_device",
-                                str);
-- error:
--    VIR_FREE(blkstr);
--    VIR_FREE(str);
--    return ret;
- }
- 
- 
-@@ -2275,24 +2177,19 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
-                               const char *path,
-                               unsigned int weight)
- {
--    char *str = NULL;
--    char *blkstr = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
- 
-     if (!(blkstr = virCgroupGetBlockDevString(path)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
--        goto error;
-+        return -1;
- 
--    ret = virCgroupSetValueStr(group,
-+    return virCgroupSetValueStr(group,
-                                VIR_CGROUP_CONTROLLER_BLKIO,
-                                "blkio.weight_device",
-                                str);
-- error:
--    VIR_FREE(blkstr);
--    VIR_FREE(str);
--    return ret;
- }
- 
- /**
-@@ -2308,15 +2205,14 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned int *riops)
- {
--    char *str = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
- 
-     if (virCgroupGetValueForBlkDev(group,
-                                    VIR_CGROUP_CONTROLLER_BLKIO,
-                                    "blkio.throttle.read_iops_device",
-                                    path,
-                                    &str) < 0)
--        goto error;
-+        return -1;
- 
-     if (!str) {
-         *riops = 0;
-@@ -2324,13 +2220,10 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
--        goto error;
-+        return -1;
-     }
- 
--    ret = 0;
-- error:
--    VIR_FREE(str);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -2346,15 +2239,14 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
-                                  const char *path,
-                                  unsigned int *wiops)
- {
--    char *str = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
- 
-     if (virCgroupGetValueForBlkDev(group,
-                                    VIR_CGROUP_CONTROLLER_BLKIO,
-                                    "blkio.throttle.write_iops_device",
-                                    path,
-                                    &str) < 0)
--        goto error;
-+        return -1;
- 
-     if (!str) {
-         *wiops = 0;
-@@ -2362,13 +2254,10 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
--        goto error;
-+        return -1;
-     }
- 
--    ret = 0;
-- error:
--    VIR_FREE(str);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -2384,15 +2273,14 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
-                                const char *path,
-                                unsigned long long *rbps)
- {
--    char *str = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
- 
-     if (virCgroupGetValueForBlkDev(group,
-                                    VIR_CGROUP_CONTROLLER_BLKIO,
-                                    "blkio.throttle.read_bps_device",
-                                    path,
-                                    &str) < 0)
--        goto error;
-+        return -1;
- 
-     if (!str) {
-         *rbps = 0;
-@@ -2400,13 +2288,10 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
--        goto error;
-+        return -1;
-     }
- 
--    ret = 0;
-- error:
--    VIR_FREE(str);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -2422,15 +2307,14 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned long long *wbps)
- {
--    char *str = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
- 
-     if (virCgroupGetValueForBlkDev(group,
-                                    VIR_CGROUP_CONTROLLER_BLKIO,
-                                    "blkio.throttle.write_bps_device",
-                                    path,
-                                    &str) < 0)
--        goto error;
-+        return -1;
- 
-     if (!str) {
-         *wbps = 0;
-@@ -2438,13 +2322,10 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
--        goto error;
-+        return -1;
-     }
- 
--    ret = 0;
-- error:
--    VIR_FREE(str);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -2460,15 +2341,14 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
-                               const char *path,
-                               unsigned int *weight)
- {
--    char *str = NULL;
--    int ret = -1;
-+    VIR_AUTOFREE(char *) str = NULL;
- 
-     if (virCgroupGetValueForBlkDev(group,
-                                    VIR_CGROUP_CONTROLLER_BLKIO,
-                                    "blkio.weight_device",
-                                    path,
-                                    &str) < 0)
--        goto error;
-+        return -1;
- 
-     if (!str) {
-         *weight = 0;
-@@ -2476,13 +2356,10 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
--        goto error;
-+        return -1;
-     }
- 
--    ret = 0;
-- error:
--    VIR_FREE(str);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -2941,36 +2818,29 @@ int
- virCgroupAllowDevice(virCgroupPtr group, char type, int major, int minor,
-                      int perms)
- {
--    int ret = -1;
--    char *devstr = NULL;
--    char *majorstr = NULL;
--    char *minorstr = NULL;
-+    VIR_AUTOFREE(char *) devstr = NULL;
-+    VIR_AUTOFREE(char *) majorstr = NULL;
-+    VIR_AUTOFREE(char *) minorstr = NULL;
- 
-     if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
-         (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
--        goto cleanup;
-+        return -1;
- 
-     if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
-         (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
--        goto cleanup;
-+        return -1;
- 
-     if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
-                     virCgroupGetDevicePermsString(perms)) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupSetValueStr(group,
-                              VIR_CGROUP_CONTROLLER_DEVICES,
-                              "devices.allow",
-                              devstr) < 0)
--        goto cleanup;
-+        return -1;
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(devstr);
--    VIR_FREE(majorstr);
--    VIR_FREE(minorstr);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -3032,36 +2902,29 @@ int
- virCgroupDenyDevice(virCgroupPtr group, char type, int major, int minor,
-                     int perms)
- {
--    int ret = -1;
--    char *devstr = NULL;
--    char *majorstr = NULL;
--    char *minorstr = NULL;
-+    VIR_AUTOFREE(char *) devstr = NULL;
-+    VIR_AUTOFREE(char *) majorstr = NULL;
-+    VIR_AUTOFREE(char *) minorstr = NULL;
- 
-     if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
-         (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
--        goto cleanup;
-+        return -1;
- 
-     if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
-         (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
--        goto cleanup;
-+        return -1;
- 
-     if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
-                     virCgroupGetDevicePermsString(perms)) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCgroupSetValueStr(group,
-                              VIR_CGROUP_CONTROLLER_DEVICES,
-                              "devices.deny",
-                              devstr) < 0)
--        goto cleanup;
-+        return -1;
- 
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(devstr);
--    VIR_FREE(majorstr);
--    VIR_FREE(minorstr);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -3131,10 +2994,10 @@ virCgroupGetPercpuVcpuSum(virCgroupPtr group,
- {
-     int ret = -1;
-     ssize_t i = -1;
--    char *buf = NULL;
-     virCgroupPtr group_vcpu = NULL;
- 
-     while ((i = virBitmapNextSetBit(guestvcpus, i)) >= 0) {
-+        VIR_AUTOFREE(char *) buf = NULL;
-         char *pos;
-         unsigned long long tmp;
-         ssize_t j;
-@@ -3159,13 +3022,11 @@ virCgroupGetPercpuVcpuSum(virCgroupPtr group,
-         }
- 
-         virCgroupFree(&group_vcpu);
--        VIR_FREE(buf);
-     }
- 
-     ret = 0;
-  cleanup:
-     virCgroupFree(&group_vcpu);
--    VIR_FREE(buf);
-     return ret;
- }
- 
-@@ -3202,8 +3063,8 @@ virCgroupGetPercpuStats(virCgroupPtr group,
-     size_t i;
-     int need_cpus, total_cpus;
-     char *pos;
--    char *buf = NULL;
--    unsigned long long *sum_cpu_time = NULL;
-+    VIR_AUTOFREE(char *) buf = NULL;
-+    VIR_AUTOFREE(unsigned long long *) sum_cpu_time = NULL;
-     virTypedParameterPtr ent;
-     int param_idx;
-     unsigned long long cpu_time;
-@@ -3289,8 +3150,6 @@ virCgroupGetPercpuStats(virCgroupPtr group,
- 
-  cleanup:
-     virBitmapFree(cpumap);
--    VIR_FREE(sum_cpu_time);
--    VIR_FREE(buf);
-     return ret;
- }
- 
-@@ -3461,7 +3320,7 @@ virCgroupRemoveRecursively(char *grppath)
-     /* This is best-effort cleanup: we want to log failures with just
-      * VIR_ERROR instead of normal virReportError */
-     while ((direrr = virDirRead(grpdir, &ent, NULL)) > 0) {
--        char *path;
-+        VIR_AUTOFREE(char *) path = NULL;
- 
-         if (ent->d_type != DT_DIR) continue;
- 
-@@ -3470,7 +3329,6 @@ virCgroupRemoveRecursively(char *grppath)
-             break;
-         }
-         rc = virCgroupRemoveRecursively(path);
--        VIR_FREE(path);
-         if (rc != 0)
-             break;
-     }
-@@ -3508,10 +3366,11 @@ virCgroupRemove(virCgroupPtr group)
- {
-     int rc = 0;
-     size_t i;
--    char *grppath = NULL;
- 
-     VIR_DEBUG("Removing cgroup %s", group->path);
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        VIR_AUTOFREE(char *) grppath = NULL;
-+
-         /* Skip over controllers not mounted */
-         if (!group->controllers[i].mountPoint)
-             continue;
-@@ -3533,7 +3392,6 @@ virCgroupRemove(virCgroupPtr group)
- 
-         VIR_DEBUG("Removing cgroup %s and all child cgroups", grppath);
-         rc = virCgroupRemoveRecursively(grppath);
--        VIR_FREE(grppath);
-     }
-     VIR_DEBUG("Done removing cgroup %s", group->path);
- 
-@@ -3549,7 +3407,7 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
- {
-     int ret = -1;
-     bool killedAny = false;
--    char *keypath = NULL;
-+    VIR_AUTOFREE(char *) keypath = NULL;
-     bool done = false;
-     FILE *fp = NULL;
-     VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
-@@ -3613,7 +3471,6 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
-     ret = killedAny ? 1 : 0;
- 
-  cleanup:
--    VIR_FREE(keypath);
-     VIR_FORCE_FCLOSE(fp);
- 
-     return ret;
-@@ -3678,7 +3535,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
-     int ret = -1;
-     int rc;
-     bool killedAny = false;
--    char *keypath = NULL;
-+    VIR_AUTOFREE(char *) keypath = NULL;
-     DIR *dp = NULL;
-     virCgroupPtr subgroup = NULL;
-     struct dirent *ent;
-@@ -3732,7 +3589,6 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
- 
-  cleanup:
-     virCgroupFree(&subgroup);
--    VIR_FREE(keypath);
-     VIR_DIR_CLOSE(dp);
-     return ret;
- }
-@@ -3846,9 +3702,8 @@ int
- virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
-                         unsigned long long *sys)
- {
--    char *str;
-+    VIR_AUTOFREE(char *) str = NULL;
-     char *p;
--    int ret = -1;
-     static double scale = -1.0;
- 
-     if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-@@ -3860,14 +3715,14 @@ virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Cannot parse user stat '%s'"),
-                        p);
--        goto cleanup;
-+        return -1;
-     }
-     if (!(p = STRSKIP(p, "\nsystem ")) ||
-         virStrToLong_ull(p, NULL, 10, sys) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Cannot parse sys stat '%s'"),
-                        p);
--        goto cleanup;
-+        return -1;
-     }
-     /* times reported are in system ticks (generally 100 Hz), but that
-      * rate can theoretically vary between machines.  Scale things
-@@ -3877,17 +3732,14 @@ virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
-         if (ticks_per_sec == -1) {
-             virReportSystemError(errno, "%s",
-                                  _("Cannot determine system clock HZ"));
--            goto cleanup;
-+            return -1;
-         }
-         scale = 1000000000.0 / ticks_per_sec;
-     }
-     *user *= scale;
-     *sys *= scale;
- 
--    ret = 0;
-- cleanup:
--    VIR_FREE(str);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -3913,10 +3765,9 @@ int
- virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                    const char *mountopts)
- {
--    int ret = -1;
-     size_t i;
--    char *opts = NULL;
--    char *root = NULL;
-+    VIR_AUTOFREE(char *) opts = NULL;
-+    VIR_AUTOFREE(char *) root = NULL;
- 
-     if (!(root = virCgroupIdentifyRoot(group)))
-         return -1;
-@@ -3927,18 +3778,18 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-         virReportSystemError(errno,
-                              _("Unable to create directory %s"),
-                              root);
--        goto cleanup;
-+        return -1;
-     }
- 
-     if (virAsprintf(&opts,
-                     "mode=755,size=65536%s", mountopts) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) {
-         virReportSystemError(errno,
-                              _("Failed to mount %s on %s type %s"),
-                              "tmpfs", root, "tmpfs");
--        goto cleanup;
-+        return -1;
-     }
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-@@ -3946,11 +3797,11 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-             continue;
- 
-         if (!virFileExists(group->controllers[i].mountPoint)) {
--            char *src;
-+            VIR_AUTOFREE(char *) src = NULL;
-             if (virAsprintf(&src, "%s%s",
-                             oldroot,
-                             group->controllers[i].mountPoint) < 0)
--                goto cleanup;
-+                return -1;
- 
-             VIR_DEBUG("Create mount point '%s'",
-                       group->controllers[i].mountPoint);
-@@ -3958,8 +3809,7 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                 virReportSystemError(errno,
-                                      _("Unable to create directory %s"),
-                                      group->controllers[i].mountPoint);
--                VIR_FREE(src);
--                goto cleanup;
-+                return -1;
-             }
- 
-             if (mount(src, group->controllers[i].mountPoint, "none", MS_BIND,
-@@ -3967,11 +3817,8 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                 virReportSystemError(errno,
-                                      _("Failed to bind cgroup '%s' on '%s'"),
-                                      src, group->controllers[i].mountPoint);
--                VIR_FREE(src);
--                goto cleanup;
-+                return -1;
-             }
--
--            VIR_FREE(src);
-         }
- 
-         if (group->controllers[i].linkPoint) {
-@@ -3984,16 +3831,12 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                                      _("Unable to symlink directory %s to %s"),
-                                      group->controllers[i].mountPoint,
-                                      group->controllers[i].linkPoint);
--                goto cleanup;
-+                return -1;
-             }
-         }
-     }
--    ret = 0;
- 
-- cleanup:
--    VIR_FREE(root);
--    VIR_FREE(opts);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -4004,11 +3847,11 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
- {
-     int ret = -1;
-     size_t i;
--    char *base = NULL, *entry = NULL;
-     DIR *dh = NULL;
-     int direrr;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        VIR_AUTOFREE(char *) base = NULL;
-         struct dirent *de;
- 
-         if (!((1 << i) & controllers))
-@@ -4025,6 +3868,8 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
-             goto cleanup;
- 
-         while ((direrr = virDirRead(dh, &de, base)) > 0) {
-+            VIR_AUTOFREE(char *) entry = NULL;
-+
-             if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0)
-                 goto cleanup;
- 
-@@ -4034,8 +3879,6 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
-                                      entry, uid, gid);
-                 goto cleanup;
-             }
--
--            VIR_FREE(entry);
-         }
-         if (direrr < 0)
-             goto cleanup;
-@@ -4047,7 +3890,6 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
-             goto cleanup;
-         }
- 
--        VIR_FREE(base);
-         VIR_DIR_CLOSE(dh);
-     }
- 
-@@ -4055,8 +3897,6 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
- 
-  cleanup:
-     VIR_DIR_CLOSE(dh);
--    VIR_FREE(entry);
--    VIR_FREE(base);
-     return ret;
- }
- 
-@@ -4071,8 +3911,7 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
- bool
- virCgroupSupportsCpuBW(virCgroupPtr cgroup)
- {
--    char *path = NULL;
--    bool ret = false;
-+    VIR_AUTOFREE(char *) path = NULL;
- 
-     if (!cgroup)
-         return false;
-@@ -4080,21 +3919,17 @@ virCgroupSupportsCpuBW(virCgroupPtr cgroup)
-     if (virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU,
-                                   "cpu.cfs_period_us", &path) < 0) {
-         virResetLastError();
--        goto cleanup;
-+        return false;
-     }
- 
--    ret = virFileExists(path);
--
-- cleanup:
--    VIR_FREE(path);
--    return ret;
-+    return virFileExists(path);
- }
- 
- int
- virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller)
- {
-     int ret = -1;
--    char *content = NULL;
-+    VIR_AUTOFREE(char *) content = NULL;
- 
-     if (!cgroup)
-         return -1;
-@@ -4104,7 +3939,6 @@ virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller)
-     if (ret == 0 && content[0] == '\0')
-         ret = 1;
- 
--    VIR_FREE(content);
-     return ret;
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-check-accept_ra-for-all-nexthop-interfaces-of-multipath-routes.patch b/SOURCES/libvirt-util-check-accept_ra-for-all-nexthop-interfaces-of-multipath-routes.patch
deleted file mode 100644
index b9a568a..0000000
--- a/SOURCES/libvirt-util-check-accept_ra-for-all-nexthop-interfaces-of-multipath-routes.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1e443270387834e84a335ec500cf069172ab261c Mon Sep 17 00:00:00 2001
-Message-Id: <1e443270387834e84a335ec500cf069172ab261c@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 14 Jan 2019 11:35:05 -0500
-Subject: [PATCH] util: check accept_ra for all nexthop interfaces of multipath
- routes
-
-When checking the setting of accept_ra, we have assumed that all
-routes have a single nexthop, so the interface of the route would be
-in the RTA_OIF attribute of the netlink RTM_NEWROUTE message. But
-multipath routes don't have an RTA_OIF; instead, they have an
-RTA_MULTIPATH attribute, which is an array of rtnexthop, with each
-rtnexthop having an interface. This patch adds a loop to look at the
-setting of accept_ra of the interface for every rtnexthop in the
-array.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d40b820c5d3b0c9d5222844110881af66cdbb746)
-
-https://bugzilla.redhat.com/1583131
-
-Conflicts: src/util/virnetdevip.c - more context conflicts due to addition of
-        VIR_AUTOPTR and resulting removal of cleanup/error labels upstream.
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virnetdevip.c | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
-index d56f4f05f3..fff41ec498 100644
---- a/src/util/virnetdevip.c
-+++ b/src/util/virnetdevip.c
-@@ -601,6 +601,43 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
-         goto cleanup;
-     }
- 
-+    /* if no RTA_OIF was found, see if this is a multipath route (one
-+     * which has an array of nexthops, each with its own interface)
-+     */
-+
-+    rta_attr = (struct rtattr *)nlmsg_find_attr(resp, sizeof(struct rtmsg), RTA_MULTIPATH);
-+    if (rta_attr) {
-+        /* The data of the attribute is an array of rtnexthop */
-+        struct rtnexthop *nh = RTA_DATA(rta_attr);
-+        size_t len = RTA_PAYLOAD(rta_attr);
-+
-+        /* validate the attribute array length */
-+        len = MIN(len, ((char *)resp + NLMSG_PAYLOAD(resp, 0) - (char *)rta_attr));
-+
-+        while (len >= sizeof(*nh) && len >= nh->rtnh_len) {
-+            /* check accept_ra for the interface of each nexthop */
-+
-+            ifname = virNetDevGetName(nh->rtnh_ifindex);
-+
-+            if (ifname)
-+                accept_ra = virNetDevIPGetAcceptRA(ifname);
-+
-+            VIR_DEBUG("Checking multipath route nexthop device %s (%d), accept_ra: %d",
-+                      ifname, nh->rtnh_ifindex, accept_ra);
-+
-+            if (!ifname ||
-+                (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)) {
-+                goto error;
-+            }
-+
-+            VIR_FREE(ifname); /* in case it wasn't added to the array */
-+            data->hasRARoutes = true;
-+
-+            len -= NLMSG_ALIGN(nh->rtnh_len);
-+            nh = RTNH_NEXT(nh);
-+        }
-+    }
-+
-  cleanup:
-     VIR_FREE(ifname);
-     return ret;
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-command-Ignore-bitmap-errors-when-enumerating-file-descriptors-to-close.patch b/SOURCES/libvirt-util-command-Ignore-bitmap-errors-when-enumerating-file-descriptors-to-close.patch
deleted file mode 100644
index 05e45db..0000000
--- a/SOURCES/libvirt-util-command-Ignore-bitmap-errors-when-enumerating-file-descriptors-to-close.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2544ab6ac5b788d2df319afaef8d495409aa7b32 Mon Sep 17 00:00:00 2001
-Message-Id: <2544ab6ac5b788d2df319afaef8d495409aa7b32@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 30 Jul 2019 16:04:51 +0200
-Subject: [PATCH] util: command: Ignore bitmap errors when enumerating file
- descriptors to close
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-virCommandMassCloseGetFDsLinux fails when running libvird on valgrind
-with the following message:
-
-libvirt:  error : internal error: unable to set FD as open: 1024
-
-This is because valgrind opens few file descriptors beyond the limit:
-
-65701125 lr-x------. 1 root root 64 Jul 18 14:48 1024 -> /home/pipo/build/libvirt/gcc/src/.libs/libvirtd
-65701126 lrwx------. 1 root root 64 Jul 18 14:48 1025 -> '/tmp/valgrind_proc_3849_cmdline_186612e3 (deleted)'
-65701127 lrwx------. 1 root root 64 Jul 18 14:48 1026 -> '/tmp/valgrind_proc_3849_auxv_186612e3 (deleted)'
-65701128 lrwx------. 1 root root 64 Jul 18 14:48 1027 -> /dev/pts/11
-65701129 lr-x------. 1 root root 64 Jul 18 14:48 1028 -> 'pipe:[65689522]'
-65701130 l-wx------. 1 root root 64 Jul 18 14:48 1029 -> 'pipe:[65689522]'
-65701131 lr-x------. 1 root root 64 Jul 18 14:48 1030 -> /tmp/vgdb-pipe-from-vgdb-to-3849-by-root-on-angien
-
-Ignore bitmap errors in this case since we'd leak those FD's anyways in
-the previous scenario.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 728343983787cbd4d7ae8fa2007a157bb140f02a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <b10f29e40efb516e15a053c2e3aa8963c3ea9715.1564495366.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircommand.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 2353a4a554..dfc7e5428b 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -519,12 +519,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED,
-             goto cleanup;
-         }
- 
--        if (virBitmapSetBit(fds, fd) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("unable to set FD as open: %d"),
--                           fd);
--            goto cleanup;
--        }
-+        ignore_value(virBitmapSetBit(fds, fd));
-     }
- 
-     if (rc < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-command-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch b/SOURCES/libvirt-util-command-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
deleted file mode 100644
index ff97244..0000000
--- a/SOURCES/libvirt-util-command-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 47babc4b1ad1c615df10385bbaafdd30d9359b7a Mon Sep 17 00:00:00 2001
-Message-Id: <47babc4b1ad1c615df10385bbaafdd30d9359b7a@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Tue, 30 Jul 2019 15:30:46 +0200
-Subject: [PATCH] util: command: define cleanup function using
- VIR_DEFINE_AUTOPTR_FUNC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in
-src/util/viralloc.h, define a new wrapper around an existing
-cleanup function which will be called when a variable declared
-with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant
-viralloc.h include, since that has moved from the source module into the
-header.
-
-When a variable of type virCommandPtr is declared using VIR_AUTOPTR,
-the function virCommandFree will be run automatically on it when it
-goes out of scope.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 7e343758920cc954d448b6b14df5707bcd0dbd20)
-
-Prerequisite of: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <40a1fc21abc06c057574a4616eef9981dbfb25dd.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircommand.c | 1 -
- src/util/vircommand.h | 2 ++
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index c2b8a1a3c3..d328431373 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -44,7 +44,6 @@
- 
- #define __VIR_COMMAND_PRIV_H_ALLOW__
- #include "vircommandpriv.h"
--#include "viralloc.h"
- #include "virerror.h"
- #include "virutil.h"
- #include "virlog.h"
-diff --git a/src/util/vircommand.h b/src/util/vircommand.h
-index 883e212959..90bcc6c89d 100644
---- a/src/util/vircommand.h
-+++ b/src/util/vircommand.h
-@@ -24,6 +24,7 @@
- 
- # include "internal.h"
- # include "virbuffer.h"
-+# include "viralloc.h"
- 
- typedef struct _virCommand virCommand;
- typedef virCommand *virCommandPtr;
-@@ -218,5 +219,6 @@ int virCommandRunNul(virCommandPtr cmd,
-                      virCommandRunNulFunc func,
-                      void *data);
- 
-+VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree)
- 
- #endif /* __VIR_COMMAND_H__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-command-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch b/SOURCES/libvirt-util-command-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
deleted file mode 100644
index 4e000f4..0000000
--- a/SOURCES/libvirt-util-command-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 63fe889c0e3d5c9cf44ab030fb63baee3646cb9f Mon Sep 17 00:00:00 2001
-Message-Id: <63fe889c0e3d5c9cf44ab030fb63baee3646cb9f@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Tue, 30 Jul 2019 15:30:45 +0200
-Subject: [PATCH] util: command: use VIR_AUTOFREE instead of VIR_FREE for
- scalar types
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By making use of GNU C's cleanup attribute handled by the
-VIR_AUTOFREE macro for declaring scalar variables, majority
-of the VIR_FREE calls can be dropped, which in turn leads to
-getting rid of most of our cleanup sections.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 46a1f0bb648dec58d6ce4b0eccbb59be435d9073)
-
-Prerequisite of: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <f79e228ffb4335b228575e3b35adeb30848497bb.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircommand.c | 40 ++++++++++++----------------------------
- 1 file changed, 12 insertions(+), 28 deletions(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 6dab105f56..c2b8a1a3c3 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -508,11 +508,11 @@ virExec(virCommandPtr cmd)
-     int childout = -1;
-     int childerr = -1;
-     int tmpfd;
--    char *binarystr = NULL;
-+    VIR_AUTOFREE(char *) binarystr = NULL;
-     const char *binary = NULL;
-     int ret;
-     struct sigaction waxon, waxoff;
--    gid_t *groups = NULL;
-+    VIR_AUTOFREE(gid_t *) groups = NULL;
-     int ngroups;
- 
-     if (cmd->args[0][0] != '/') {
-@@ -605,9 +605,6 @@ virExec(virCommandPtr cmd)
- 
-         cmd->pid = pid;
- 
--        VIR_FREE(groups);
--        VIR_FREE(binarystr);
--
-         return 0;
-     }
- 
-@@ -797,9 +794,6 @@ virExec(virCommandPtr cmd)
-     /* This is cleanup of parent process only - child
-        should never jump here on error */
- 
--    VIR_FREE(binarystr);
--    VIR_FREE(groups);
--
-     /* NB we don't virReportError() on any failures here
-        because the code which jumped here already raised
-        an error condition which we must not overwrite */
-@@ -2387,7 +2381,7 @@ int
- virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
- {
-     int ret = -1;
--    char *str = NULL;
-+    VIR_AUTOFREE(char *) str = NULL;
-     size_t i;
-     bool synchronous = false;
-     int infd[2] = {-1, -1};
-@@ -2512,7 +2506,6 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid)
-         VIR_FORCE_CLOSE(cmd->infd);
-         VIR_FORCE_CLOSE(cmd->inpipe);
-     }
--    VIR_FREE(str);
-     return ret;
- }
- 
-@@ -2589,8 +2582,8 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
-         if (exitstatus && (cmd->rawStatus || WIFEXITED(status))) {
-             *exitstatus = cmd->rawStatus ? status : WEXITSTATUS(status);
-         } else if (status) {
--            char *str = virCommandToString(cmd);
--            char *st = virProcessTranslateStatus(status);
-+            VIR_AUTOFREE(char *) str = virCommandToString(cmd);
-+            VIR_AUTOFREE(char *) st = virProcessTranslateStatus(status);
-             bool haveErrMsg = cmd->errbuf && *cmd->errbuf && (*cmd->errbuf)[0];
- 
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -2598,8 +2591,6 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
-                            str ? str : cmd->args[0], NULLSTR(st),
-                            haveErrMsg ? ": " : "",
-                            haveErrMsg ? *cmd->errbuf : "");
--            VIR_FREE(str);
--            VIR_FREE(st);
-             return -1;
-         }
-     }
-@@ -2719,7 +2710,7 @@ int virCommandHandshakeWait(virCommandPtr cmd)
-         return -1;
-     }
-     if (c != '1') {
--        char *msg;
-+        VIR_AUTOFREE(char *) msg = NULL;
-         ssize_t len;
-         if (VIR_ALLOC_N(msg, 1024) < 0) {
-             VIR_FORCE_CLOSE(cmd->handshakeWait[0]);
-@@ -2732,7 +2723,6 @@ int virCommandHandshakeWait(virCommandPtr cmd)
- 
-         if ((len = saferead(cmd->handshakeWait[0], msg, 1024)) < 0) {
-             VIR_FORCE_CLOSE(cmd->handshakeWait[0]);
--            VIR_FREE(msg);
-             virReportSystemError(errno, "%s",
-                                  _("No error message from child failure"));
-             return -1;
-@@ -2740,7 +2730,6 @@ int virCommandHandshakeWait(virCommandPtr cmd)
-         VIR_FORCE_CLOSE(cmd->handshakeWait[0]);
-         msg[len-1] = '\0';
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", msg);
--        VIR_FREE(msg);
-         return -1;
-     }
-     VIR_FORCE_CLOSE(cmd->handshakeWait[0]);
-@@ -2854,8 +2843,8 @@ virCommandFree(virCommandPtr cmd)
-  * This requests asynchronous string IO on @cmd. It is useful in
-  * combination with virCommandRunAsync():
-  *
-- *      virCommandPtr cmd = virCommandNew*(...);
-- *      char *buf = NULL;
-+ *      VIR_AUTOPTR(virCommand) cmd = virCommandNew*(...);
-+ *      VIR_AUTOFREE(char *) buf = NULL;
-  *
-  *      ...
-  *
-@@ -2863,21 +2852,18 @@ virCommandFree(virCommandPtr cmd)
-  *      virCommandDoAsyncIO(cmd);
-  *
-  *      if (virCommandRunAsync(cmd, NULL) < 0)
-- *          goto cleanup;
-+ *          return;
-  *
-  *      ...
-  *
-  *      if (virCommandWait(cmd, NULL) < 0)
-- *          goto cleanup;
-+ *          return;
-  *
-  *      // @buf now contains @cmd's stdout
-  *      VIR_DEBUG("STDOUT: %s", NULLSTR(buf));
-  *
-  *      ...
-  *
-- *  cleanup:
-- *      VIR_FREE(buf);
-- *      virCommandFree(cmd);
-  *
-  * The libvirt's event loop is used for handling stdios of @cmd.
-  * Since current implementation uses strlen to determine length
-@@ -2970,11 +2956,11 @@ virCommandRunRegex(virCommandPtr cmd,
- {
-     int err;
-     regex_t *reg;
--    regmatch_t *vars = NULL;
-+    VIR_AUTOFREE(regmatch_t *) vars = NULL;
-     size_t i, j, k;
-     int totgroups = 0, ngroup = 0, maxvars = 0;
-     char **groups;
--    char *outbuf = NULL;
-+    VIR_AUTOFREE(char *) outbuf = NULL;
-     char **lines = NULL;
-     int ret = -1;
- 
-@@ -3055,13 +3041,11 @@ virCommandRunRegex(virCommandPtr cmd,
-     ret = 0;
-  cleanup:
-     virStringListFree(lines);
--    VIR_FREE(outbuf);
-     if (groups) {
-         for (j = 0; j < totgroups; j++)
-             VIR_FREE(groups[j]);
-         VIR_FREE(groups);
-     }
--    VIR_FREE(vars);
- 
-     for (i = 0; i < nregex; i++)
-         regfree(&reg[i]);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-enable-cgroups-v2-cpuset-controller-for-threads.patch b/SOURCES/libvirt-util-enable-cgroups-v2-cpuset-controller-for-threads.patch
deleted file mode 100644
index 4da907c..0000000
--- a/SOURCES/libvirt-util-enable-cgroups-v2-cpuset-controller-for-threads.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 77eb53c13d2d9a641143cc374f8262c2cb004120 Mon Sep 17 00:00:00 2001
-Message-Id: <77eb53c13d2d9a641143cc374f8262c2cb004120@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:14 +0200
-Subject: [PATCH] util: enable cgroups v2 cpuset controller for threads
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When we create cgroup for qemu threads we need to enable cpuset
-controller in order to use it.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit a6aedcf39bd3212a3cd624b765bb724fd36d6a8a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <1dfb136ea7a417fdcc03b84c59bb364a75e24d52.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index ef1f286726..04638c4e50 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -401,6 +401,12 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-                                             VIR_CGROUP_CONTROLLER_CPU) < 0) {
-                 return -1;
-             }
-+
-+            if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPUSET) &&
-+                virCgroupV2EnableController(parent,
-+                                            VIR_CGROUP_CONTROLLER_CPUSET) < 0) {
-+                return -1;
-+            }
-         } else {
-             size_t i;
-             for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-file-introduce-VIR_AUTOCLOSE-macro-to-close-fd-of-the-file-automatically.patch b/SOURCES/libvirt-util-file-introduce-VIR_AUTOCLOSE-macro-to-close-fd-of-the-file-automatically.patch
deleted file mode 100644
index 10b3612..0000000
--- a/SOURCES/libvirt-util-file-introduce-VIR_AUTOCLOSE-macro-to-close-fd-of-the-file-automatically.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 3d08d15b8fb214233e6b426bffe8f8b89969529a Mon Sep 17 00:00:00 2001
-Message-Id: <3d08d15b8fb214233e6b426bffe8f8b89969529a@dist-git>
-From: Shi Lei <shi_lei@massclouds.com>
-Date: Fri, 21 Jun 2019 09:25:42 +0200
-Subject: [PATCH] util: file: introduce VIR_AUTOCLOSE macro to close fd of the
- file automatically
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Shi Lei <shi_lei@massclouds.com>
-(cherry picked from commit 09d35afd2c3058688290d5d818343d0f6aa2dd6e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <93cb7516e852b96a82eac8dd71acdccc81ef13f9.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virfile.h | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virfile.h b/src/util/virfile.h
-index 51c221e069..fa03269289 100644
---- a/src/util/virfile.h
-+++ b/src/util/virfile.h
-@@ -53,6 +53,11 @@ int virFileClose(int *fdptr, virFileCloseFlags flags)
- int virFileFclose(FILE **file, bool preserve_errno) ATTRIBUTE_RETURN_CHECK;
- FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK;
- 
-+static inline void virForceCloseHelper(int *fd)
-+{
-+    ignore_value(virFileClose(fd, VIR_FILE_CLOSE_PRESERVE_ERRNO));
-+}
-+
- /* For use on normal paths; caller must check return value,
-    and failure sets errno per close. */
- # define VIR_CLOSE(FD) virFileClose(&(FD), 0)
-@@ -63,8 +68,7 @@ FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK;
- 
- /* For use on cleanup paths; errno is unaffected by close,
-    and no return value to worry about. */
--# define VIR_FORCE_CLOSE(FD) \
--    ignore_value(virFileClose(&(FD), VIR_FILE_CLOSE_PRESERVE_ERRNO))
-+# define VIR_FORCE_CLOSE(FD) virForceCloseHelper(&(FD))
- # define VIR_FORCE_FCLOSE(FILE) ignore_value(virFileFclose(&(FILE), true))
- 
- /* Similar VIR_FORCE_CLOSE() but ignores EBADF errors since they are expected
-@@ -79,6 +83,16 @@ FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK;
-                  VIR_FILE_CLOSE_PRESERVE_ERRNO | \
-                  VIR_FILE_CLOSE_DONT_LOG))
- 
-+/**
-+ * VIR_AUTOCLOSE:
-+ *
-+ * Macro to automatically force close the fd by calling virForceCloseHelper
-+ * when the fd goes out of scope. It's used to eliminate VIR_FORCE_CLOSE
-+ * in cleanup sections.
-+ */
-+# define VIR_AUTOCLOSE __attribute__((cleanup(virForceCloseHelper))) int
-+
-+
- /* Opaque type for managing a wrapper around a fd.  */
- struct _virFileWrapperFd;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-fix-memory-leak-in-virFirewallDInterfaceSetZone.patch b/SOURCES/libvirt-util-fix-memory-leak-in-virFirewallDInterfaceSetZone.patch
deleted file mode 100644
index 72157e1..0000000
--- a/SOURCES/libvirt-util-fix-memory-leak-in-virFirewallDInterfaceSetZone.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5d5b2a9e3641fe1f54913284154ffb15c5a89bbb Mon Sep 17 00:00:00 2001
-Message-Id: <5d5b2a9e3641fe1f54913284154ffb15c5a89bbb@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Wed, 13 Feb 2019 18:18:59 -0500
-Subject: [PATCH] util: fix memory leak in virFirewallDInterfaceSetZone()
-
-commit 3bba4825 added the new function virFirewallDInterfaceSetZone()
-which calledsends virDBUSCallMethod a DBusMessage** for the reply
-message, but doesn't use the reply, and also doesn't free it. Since
-this arg is allowed to be NULL, this patch simply sets it to NULL so
-we don't have to deal with it.
-
-This patch is a part of the resolution to
-https://bugzilla.redhat.com/1650320
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 2c48e84b7566eab1676400d73a7934f93a7ec831)
-Message-Id: <20190213231859.27018-1-laine@redhat.com>
----
- src/util/virfirewalld.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
-index 8aeb31db80..b49c895138 100644
---- a/src/util/virfirewalld.c
-+++ b/src/util/virfirewalld.c
-@@ -354,13 +354,12 @@ virFirewallDInterfaceSetZone(const char *iface,
-                              const char *zone)
- {
-     DBusConnection *sysbus = virDBusGetSystemBus();
--    DBusMessage *reply = NULL;
- 
-     if (!sysbus)
-         return -1;
- 
-     return virDBusCallMethod(sysbus,
--                             &reply,
-+                             NULL,
-                              NULL,
-                              VIR_FIREWALL_FIREWALLD_SERVICE,
-                              "/org/fedoraproject/FirewallD1",
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-hash-Improve-debugability-of-Duplicate-key-error-message.patch b/SOURCES/libvirt-util-hash-Improve-debugability-of-Duplicate-key-error-message.patch
new file mode 100644
index 0000000..9771afb
--- /dev/null
+++ b/SOURCES/libvirt-util-hash-Improve-debugability-of-Duplicate-key-error-message.patch
@@ -0,0 +1,209 @@
+From 14d881a9ddd3820be9518cc38e5504f26bf5fd56 Mon Sep 17 00:00:00 2001
+Message-Id: <14d881a9ddd3820be9518cc38e5504f26bf5fd56@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:43 +0100
+Subject: [PATCH] util: hash: Improve debugability of "Duplicate key" error
+ message
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If we get a user reporting this error message being shown it's pretty
+useless in terms of actually debugging it since we don't know which hash
+and which key are actually subject to the error.
+
+This patch adds a new hash table callback which formats the
+user-readable version of the hash key and reports it in the new message
+which will look like:
+
+"Duplicate hash table key 'blah'"
+
+That way we will at least have an anchor point where to start the
+search.
+
+There are two special implementations of keys which are numeric so we
+add specific printer functions for them.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit ae60e05817d6ea2d47533051c31e16b430453d62)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <214b5e7934db2f3d3b097c9e19f4e89de4912b6d.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_addr.c |  9 +++++++++
+ src/util/vircgroup.c   |  8 ++++++++
+ src/util/virhash.c     | 22 ++++++++++++++++++++--
+ src/util/virhash.h     | 13 +++++++++++++
+ 4 files changed, 50 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index ef7ee80e6a..607ba56efd 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -1007,6 +1007,13 @@ virZPCIAddrKeyCopy(const void *name)
+ }
+ 
+ 
++static char *
++virZPCIAddrKeyPrintHuman(const void *name)
++{
++    return g_strdup_printf("%u", *((unsigned int *)name));
++}
++
++
+ static void
+ virZPCIAddrKeyFree(void *name)
+ {
+@@ -1041,6 +1048,7 @@ virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSetPtr addrs,
+                                                        virZPCIAddrKeyCode,
+                                                        virZPCIAddrKeyEqual,
+                                                        virZPCIAddrKeyCopy,
++                                                       virZPCIAddrKeyPrintHuman,
+                                                        virZPCIAddrKeyFree)))
+             goto error;
+ 
+@@ -1048,6 +1056,7 @@ virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSetPtr addrs,
+                                                        virZPCIAddrKeyCode,
+                                                        virZPCIAddrKeyEqual,
+                                                        virZPCIAddrKeyCopy,
++                                                       virZPCIAddrKeyPrintHuman,
+                                                        virZPCIAddrKeyFree)))
+             goto error;
+     }
+diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
+index 87ed9f4565..dff2f6fd3a 100644
+--- a/src/util/vircgroup.c
++++ b/src/util/vircgroup.c
+@@ -2502,6 +2502,13 @@ virCgroupPidCopy(const void *name)
+ }
+ 
+ 
++static char *
++virCgroupPidPrintHuman(const void *name)
++{
++    return g_strdup_printf("%ld", (const long)name);
++}
++
++
+ int
+ virCgroupKillRecursiveInternal(virCgroupPtr group,
+                                int signum,
+@@ -2587,6 +2594,7 @@ virCgroupKillRecursive(virCgroupPtr group, int signum)
+                                              virCgroupPidCode,
+                                              virCgroupPidEqual,
+                                              virCgroupPidCopy,
++                                             virCgroupPidPrintHuman,
+                                              NULL);
+ 
+     VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum);
+diff --git a/src/util/virhash.c b/src/util/virhash.c
+index 313ca57a54..edf11e8b7a 100644
+--- a/src/util/virhash.c
++++ b/src/util/virhash.c
+@@ -59,6 +59,7 @@ struct _virHashTable {
+     virHashKeyCode keyCode;
+     virHashKeyEqual keyEqual;
+     virHashKeyCopy keyCopy;
++    virHashKeyPrintHuman keyPrint;
+     virHashKeyFree keyFree;
+ };
+ 
+@@ -98,6 +99,14 @@ static void *virHashStrCopy(const void *name)
+     return ret;
+ }
+ 
++
++static char *
++virHashStrPrintHuman(const void *name)
++{
++    return g_strdup(name);
++}
++
++
+ static void virHashStrFree(void *name)
+ {
+     VIR_FREE(name);
+@@ -136,6 +145,7 @@ virHashTablePtr virHashCreateFull(ssize_t size,
+                                   virHashKeyCode keyCode,
+                                   virHashKeyEqual keyEqual,
+                                   virHashKeyCopy keyCopy,
++                                  virHashKeyPrintHuman keyPrint,
+                                   virHashKeyFree keyFree)
+ {
+     virHashTablePtr table = NULL;
+@@ -153,6 +163,7 @@ virHashTablePtr virHashCreateFull(ssize_t size,
+     table->keyCode = keyCode;
+     table->keyEqual = keyEqual;
+     table->keyCopy = keyCopy;
++    table->keyPrint = keyPrint;
+     table->keyFree = keyFree;
+ 
+     if (VIR_ALLOC_N(table->table, size) < 0) {
+@@ -180,6 +191,7 @@ virHashNew(virHashDataFree dataFree)
+                              virHashStrCode,
+                              virHashStrEqual,
+                              virHashStrCopy,
++                             virHashStrPrintHuman,
+                              virHashStrFree);
+ }
+ 
+@@ -200,6 +212,7 @@ virHashTablePtr virHashCreate(ssize_t size, virHashDataFree dataFree)
+                              virHashStrCode,
+                              virHashStrEqual,
+                              virHashStrCopy,
++                             virHashStrPrintHuman,
+                              virHashStrFree);
+ }
+ 
+@@ -353,8 +366,13 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
+                 entry->payload = userdata;
+                 return 0;
+             } else {
+-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                               _("Duplicate key"));
++                g_autofree char *keystr = NULL;
++
++                if (table->keyPrint)
++                    keystr = table->keyPrint(name);
++
++                virReportError(VIR_ERR_INTERNAL_ERROR,
++                               _("Duplicate hash table key '%s'"), NULLSTR(keystr));
+                 return -1;
+             }
+         }
+diff --git a/src/util/virhash.h b/src/util/virhash.h
+index 6318c0b3cd..08f99d8a3d 100644
+--- a/src/util/virhash.h
++++ b/src/util/virhash.h
+@@ -86,6 +86,18 @@ typedef bool (*virHashKeyEqual)(const void *namea, const void *nameb);
+  * Returns a newly allocated copy of @name
+  */
+ typedef void *(*virHashKeyCopy)(const void *name);
++/**
++ * virHashKeyPrintHuman:
++ * @name: the hash key
++ *
++ * Get a human readable version of the key for error messages. Caller
++ * will free the returned string.
++ *
++ * Returns a string representation of the key for use in error messages. Caller
++ * promises to always free the returned string.
++ */
++typedef char *(*virHashKeyPrintHuman) (const void *name);
++
+ /**
+  * virHashKeyFree:
+  * @name: the hash key
+@@ -108,6 +120,7 @@ virHashTablePtr virHashCreateFull(ssize_t size,
+                                   virHashKeyCode keyCode,
+                                   virHashKeyEqual keyEqual,
+                                   virHashKeyCopy keyCopy,
++                                  virHashKeyPrintHuman keyPrint,
+                                   virHashKeyFree keyFree);
+ void virHashFree(virHashTablePtr table);
+ ssize_t virHashSize(const virHashTable *table);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-util-hash-Use-g_new0-for-allocating-hash-internals.patch b/SOURCES/libvirt-util-hash-Use-g_new0-for-allocating-hash-internals.patch
new file mode 100644
index 0000000..5a2bc01
--- /dev/null
+++ b/SOURCES/libvirt-util-hash-Use-g_new0-for-allocating-hash-internals.patch
@@ -0,0 +1,79 @@
+From 976fe48829d9dcee11ca33d9fcfdf013f3ad524e Mon Sep 17 00:00:00 2001
+Message-Id: <976fe48829d9dcee11ca33d9fcfdf013f3ad524e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:07:59 +0100
+Subject: [PATCH] util: hash: Use g_new0 for allocating hash internals
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the glib helpers and remove the mention of returning NULL on failure
+of virHashNew, virHashCreate and virHashCreateFull.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 50f7483a0d69906e90849f7f0a30f3f535021852)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1793263
+Message-Id: <c80f6e73321ef7a1d5db60fa56fcadaac63c199b.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virhash.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/src/util/virhash.c b/src/util/virhash.c
+index edf11e8b7a..d5c5e017a1 100644
+--- a/src/util/virhash.c
++++ b/src/util/virhash.c
+@@ -138,7 +138,7 @@ virHashComputeKey(const virHashTable *table, const void *name)
+  *
+  * Create a new virHashTablePtr.
+  *
+- * Returns the newly created object, or NULL if an error occurred.
++ * Returns the newly created object.
+  */
+ virHashTablePtr virHashCreateFull(ssize_t size,
+                                   virHashDataFree dataFree,
+@@ -153,8 +153,7 @@ virHashTablePtr virHashCreateFull(ssize_t size,
+     if (size <= 0)
+         size = 256;
+ 
+-    if (VIR_ALLOC(table) < 0)
+-        return NULL;
++    table = g_new0(virHashTable, 1);
+ 
+     table->seed = virRandomBits(32);
+     table->size = size;
+@@ -166,10 +165,7 @@ virHashTablePtr virHashCreateFull(ssize_t size,
+     table->keyPrint = keyPrint;
+     table->keyFree = keyFree;
+ 
+-    if (VIR_ALLOC_N(table->table, size) < 0) {
+-        VIR_FREE(table);
+-        return NULL;
+-    }
++    table->table = g_new0(virHashEntryPtr, table->size);
+ 
+     return table;
+ }
+@@ -181,7 +177,7 @@ virHashTablePtr virHashCreateFull(ssize_t size,
+  *
+  * Create a new virHashTablePtr.
+  *
+- * Returns the newly created object, or NULL if an error occurred.
++ * Returns the newly created object.
+  */
+ virHashTablePtr
+ virHashNew(virHashDataFree dataFree)
+@@ -203,7 +199,7 @@ virHashNew(virHashDataFree dataFree)
+  *
+  * Create a new virHashTablePtr.
+  *
+- * Returns the newly created object, or NULL if an error occurred.
++ * Returns the newly created object.
+  */
+ virHashTablePtr virHashCreate(ssize_t size, virHashDataFree dataFree)
+ {
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetCpus.patch b/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetCpus.patch
deleted file mode 100644
index 153d769..0000000
--- a/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetCpus.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 40020f9a96747e4e4b108c3cbef32222174bc2ab Mon Sep 17 00:00:00 2001
-Message-Id: <40020f9a96747e4e4b108c3cbef32222174bc2ab@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:13 +0200
-Subject: [PATCH] util: implement virCgroupV2(Set|Get)CpusetCpus
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 3b72c84ff1c1b8b393ba9c2ccb004f8eb1ebda95)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <6146318ef3b9ca769029e33c4617056cdb652844.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index bc6ced2367..ef1f286726 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1601,6 +1601,28 @@ virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
- }
- 
- 
-+static int
-+virCgroupV2SetCpusetCpus(virCgroupPtr group,
-+                         const char *cpus)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.cpus",
-+                                cpus);
-+}
-+
-+
-+static int
-+virCgroupV2GetCpusetCpus(virCgroupPtr group,
-+                         char **cpus)
-+{
-+    return virCgroupGetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.cpus",
-+                                cpus);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1665,6 +1687,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getCpusetMems = virCgroupV2GetCpusetMems,
-     .setCpusetMemoryMigrate = virCgroupV2SetCpusetMemoryMigrate,
-     .getCpusetMemoryMigrate = virCgroupV2GetCpusetMemoryMigrate,
-+    .setCpusetCpus = virCgroupV2SetCpusetCpus,
-+    .getCpusetCpus = virCgroupV2GetCpusetCpus,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMemoryMigrate.patch b/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMemoryMigrate.patch
deleted file mode 100644
index 39314e1..0000000
--- a/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMemoryMigrate.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0cde517cd560d47824e0e98fab32b62cbd0f89ea Mon Sep 17 00:00:00 2001
-Message-Id: <0cde517cd560d47824e0e98fab32b62cbd0f89ea@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:12 +0200
-Subject: [PATCH] util: implement virCgroupV2(Set|Get)CpusetMemoryMigrate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Cgroups v2 don't have memory_migrate interface and the migration is
-enabled by default.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 77c1cf4da2f761a91756c09fa4fd37ae1802e650)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b9de5444564a4e6f74c31c6b360e83879c451272.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 59b8c4ad2c..bc6ced2367 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1584,6 +1584,23 @@ virCgroupV2GetCpusetMems(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
-+                                  bool migrate ATTRIBUTE_UNUSED)
-+{
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
-+                                  bool *migrate)
-+{
-+    *migrate = true;
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1646,6 +1663,8 @@ virCgroupBackend virCgroupV2Backend = {
- 
-     .setCpusetMems = virCgroupV2SetCpusetMems,
-     .getCpusetMems = virCgroupV2GetCpusetMems,
-+    .setCpusetMemoryMigrate = virCgroupV2SetCpusetMemoryMigrate,
-+    .getCpusetMemoryMigrate = virCgroupV2GetCpusetMemoryMigrate,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMems.patch b/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMems.patch
deleted file mode 100644
index ec50860..0000000
--- a/SOURCES/libvirt-util-implement-virCgroupV2-Set-Get-CpusetMems.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From df01b3c361e5bdcd8505798336b15b862e9c6bea Mon Sep 17 00:00:00 2001
-Message-Id: <df01b3c361e5bdcd8505798336b15b862e9c6bea@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:11 +0200
-Subject: [PATCH] util: implement virCgroupV2(Set|Get)CpusetMems
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 74e7da060543a87610b42fc6ba26a45b0a6e3974)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2bb5ec423c37893ebbf2f882da13cc4e55b23941.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 8658454d8b..59b8c4ad2c 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1562,6 +1562,28 @@ virCgroupV2GetCpuacctStat(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetCpusetMems(virCgroupPtr group,
-+                         const char *mems)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.mems",
-+                                mems);
-+}
-+
-+
-+static int
-+virCgroupV2GetCpusetMems(virCgroupPtr group,
-+                         char **mems)
-+{
-+    return virCgroupGetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.mems",
-+                                mems);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1621,6 +1643,9 @@ virCgroupBackend virCgroupV2Backend = {
- 
-     .getCpuacctUsage = virCgroupV2GetCpuacctUsage,
-     .getCpuacctStat = virCgroupV2GetCpuacctStat,
-+
-+    .setCpusetMems = virCgroupV2SetCpusetMems,
-+    .getCpusetMems = virCgroupV2GetCpusetMems,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-introduce-cgroup-v2-files.patch b/SOURCES/libvirt-util-introduce-cgroup-v2-files.patch
deleted file mode 100644
index 4234cdc..0000000
--- a/SOURCES/libvirt-util-introduce-cgroup-v2-files.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 04bdbfa106768447822f3e8eeb2946e1f7bfb2b5 Mon Sep 17 00:00:00 2001
-Message-Id: <04bdbfa106768447822f3e8eeb2946e1f7bfb2b5@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:12 +0200
-Subject: [PATCH] util: introduce cgroup v2 files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Place cgroup v2 backend type before cgroup v1 to make it obvious
-that cgroup v2 is preferred implementation.
-
-Following patches will introduce support for hybrid configuration
-which will allow us to use both at the same time, but we should
-prefer cgroup v2 regardless.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b4ddf5ae62ee3a50c7ead1e00914a141e5798096)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <fcbffeda541380f2e11e42f192b80276153bc84f.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/Makefile.am             |  1 +
- src/libvirt_private.syms    |  3 ++
- src/util/Makefile.inc.am    |  2 ++
- src/util/vircgroup.c        |  3 ++
- src/util/vircgroupbackend.c |  2 ++
- src/util/vircgroupbackend.h |  3 +-
- src/util/vircgrouppriv.h    |  9 ++++++
- src/util/vircgroupv2.c      | 63 +++++++++++++++++++++++++++++++++++++
- src/util/vircgroupv2.h      | 27 ++++++++++++++++
- 9 files changed, 112 insertions(+), 1 deletion(-)
- create mode 100644 src/util/vircgroupv2.c
- create mode 100644 src/util/vircgroupv2.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0def0a3b19..cc8e29a45a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -680,6 +680,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \
- 		util/vircgroup.c \
- 		util/vircgroupbackend.c \
- 		util/vircgroupv1.c \
-+		util/vircgroupv2.c \
- 		util/vircommand.c \
- 		util/virconf.c \
- 		util/virdbus.c \
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index b144955154..8132f9664b 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1598,6 +1598,9 @@ virCgroupBackendRegister;
- # util/vircgroupv1.h
- virCgroupV1Register;
- 
-+# util/vircgroupv2.h
-+virCgroupV2Register;
-+
- # util/virclosecallbacks.h
- virCloseCallbacksGet;
- virCloseCallbacksGetConn;
-diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
-index 725ece98e9..24a98632a3 100644
---- a/src/util/Makefile.inc.am
-+++ b/src/util/Makefile.inc.am
-@@ -27,6 +27,8 @@ UTIL_SOURCES = \
- 	util/vircgroupbackend.h \
- 	util/vircgroupv1.c \
- 	util/vircgroupv1.h \
-+	util/vircgroupv2.c \
-+	util/vircgroupv2.h \
- 	util/virclosecallbacks.c \
- 	util/virclosecallbacks.h \
- 	util/vircommand.c \
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 7ec1399bc6..42930582db 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1240,6 +1240,9 @@ virCgroupFree(virCgroupPtr *group)
-         VIR_FREE((*group)->legacy[i].placement);
-     }
- 
-+    VIR_FREE((*group)->unified.mountPoint);
-+    VIR_FREE((*group)->unified.placement);
-+
-     VIR_FREE((*group)->path);
-     VIR_FREE(*group);
- }
-diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
-index d854c9711d..79fe6cb73d 100644
---- a/src/util/vircgroupbackend.c
-+++ b/src/util/vircgroupbackend.c
-@@ -21,6 +21,7 @@
- 
- #include "vircgroupbackend.h"
- #include "vircgroupv1.h"
-+#include "vircgroupv2.h"
- #include "virerror.h"
- #include "virthread.h"
- 
-@@ -28,6 +29,7 @@
- 
- VIR_ENUM_DECL(virCgroupBackend);
- VIR_ENUM_IMPL(virCgroupBackend, VIR_CGROUP_BACKEND_TYPE_LAST,
-+              "cgroup V2",
-               "cgroup V1");
- 
- static virOnceControl virCgroupBackendOnce = VIR_ONCE_CONTROL_INITIALIZER;
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 1c5744ef76..b1f19233e4 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -50,7 +50,8 @@ typedef enum {
- } virCgroupBackendTaskFlags;
- 
- typedef enum {
--    VIR_CGROUP_BACKEND_TYPE_V1 = 0,
-+    VIR_CGROUP_BACKEND_TYPE_V2 = 0,
-+    VIR_CGROUP_BACKEND_TYPE_V1,
-     VIR_CGROUP_BACKEND_TYPE_LAST,
- } virCgroupBackendType;
- 
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index c50a25f195..4a0d75ddbc 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -45,12 +45,21 @@ struct _virCgroupV1Controller {
- typedef struct _virCgroupV1Controller virCgroupV1Controller;
- typedef virCgroupV1Controller *virCgroupV1ControllerPtr;
- 
-+struct _virCgroupV2Controller {
-+    int controllers;
-+    char *mountPoint;
-+    char *placement;
-+};
-+typedef struct _virCgroupV2Controller virCgroupV2Controller;
-+typedef virCgroupV2Controller *virCgroupV2ControllerPtr;
-+
- struct _virCgroup {
-     char *path;
- 
-     virCgroupBackendPtr backend;
- 
-     virCgroupV1Controller legacy[VIR_CGROUP_CONTROLLER_LAST];
-+    virCgroupV2Controller unified;
- };
- 
- int virCgroupSetValueStr(virCgroupPtr group,
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-new file mode 100644
-index 0000000000..23bf81dae2
---- /dev/null
-+++ b/src/util/vircgroupv2.c
-@@ -0,0 +1,63 @@
-+/*
-+ * vircgroupv2.c: methods for cgroups v2 backend
-+ *
-+ * Copyright (C) 2018 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 "internal.h"
-+
-+#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
-+#include "vircgrouppriv.h"
-+#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
-+
-+#include "vircgroup.h"
-+#include "vircgroupbackend.h"
-+#include "vircgroupv2.h"
-+#include "virlog.h"
-+
-+VIR_LOG_INIT("util.cgroup");
-+
-+#define VIR_FROM_THIS VIR_FROM_CGROUP
-+
-+VIR_ENUM_DECL(virCgroupV2Controller);
-+VIR_ENUM_IMPL(virCgroupV2Controller, VIR_CGROUP_CONTROLLER_LAST,
-+              "cpu", "cpuacct", "cpuset", "memory", "devices",
-+              "freezer", "io", "net_cls", "perf_event", "name=systemd");
-+
-+#ifdef __linux__
-+
-+virCgroupBackend virCgroupV2Backend = {
-+    .type = VIR_CGROUP_BACKEND_TYPE_V2,
-+};
-+
-+
-+void
-+virCgroupV2Register(void)
-+{
-+    virCgroupBackendRegister(&virCgroupV2Backend);
-+}
-+
-+#else /* !__linux__ */
-+
-+void
-+virCgroupV2Register(void)
-+{
-+    VIR_INFO("Control groups not supported on this platform");
-+}
-+
-+#endif /* !__linux__ */
-diff --git a/src/util/vircgroupv2.h b/src/util/vircgroupv2.h
-new file mode 100644
-index 0000000000..a5d0bd0978
---- /dev/null
-+++ b/src/util/vircgroupv2.h
-@@ -0,0 +1,27 @@
-+/*
-+ * vircgroupv2.h: methods for cgroups v2 backend
-+ *
-+ * Copyright (C) 2018 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/>.
-+ */
-+
-+#ifndef __VIR_CGROUP_V2_H__
-+# define __VIR_CGROUP_V2_H__
-+
-+void
-+virCgroupV2Register(void);
-+
-+#endif /* __VIR_CGROUP_V2_H__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-introduce-vircgroupbackend-files.patch b/SOURCES/libvirt-util-introduce-vircgroupbackend-files.patch
deleted file mode 100644
index 78471e2..0000000
--- a/SOURCES/libvirt-util-introduce-vircgroupbackend-files.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 2396295b2654156d62165bc1d94e2a3f4d1e4733 Mon Sep 17 00:00:00 2001
-Message-Id: <2396295b2654156d62165bc1d94e2a3f4d1e4733@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:21 +0200
-Subject: [PATCH] util: introduce vircgroupbackend files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We will need to extract current cgroup v1 implementation into separate
-backend because there will be new cgroup v2 implementation and both will
-have to co-exist.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 1a2dbb5595871efa8de1ed258d94f0b60561a040)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <dbe1f56fc1ba95c077092303b1f17b67e8f9075a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/Makefile.am             |  1 +
- src/libvirt_private.syms    |  3 ++
- src/util/Makefile.inc.am    |  2 ++
- src/util/vircgroupbackend.c | 64 +++++++++++++++++++++++++++++++++++++
- src/util/vircgroupbackend.h | 46 ++++++++++++++++++++++++++
- 5 files changed, 116 insertions(+)
- create mode 100644 src/util/vircgroupbackend.c
- create mode 100644 src/util/vircgroupbackend.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index db8c8ebd1a..c4e797f5a2 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -678,6 +678,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \
- 		util/virbitmap.c \
- 		util/virbuffer.c \
- 		util/vircgroup.c \
-+		util/vircgroupbackend.c \
- 		util/vircommand.c \
- 		util/virconf.c \
- 		util/virdbus.c \
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 8c4be84fd5..627eb5e587 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1591,6 +1591,9 @@ virCgroupSetOwner;
- virCgroupSupportsCpuBW;
- virCgroupTerminateMachine;
- 
-+# util/vircgroupbackend.h
-+virCgroupBackendGetAll;
-+virCgroupBackendRegister;
- 
- # util/virclosecallbacks.h
- virCloseCallbacksGet;
-diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
-index 2cef465208..a9185bd7b7 100644
---- a/src/util/Makefile.inc.am
-+++ b/src/util/Makefile.inc.am
-@@ -23,6 +23,8 @@ UTIL_SOURCES = \
- 	util/virperf.h \
- 	util/vircgroup.c \
- 	util/vircgroup.h util/vircgrouppriv.h \
-+	util/vircgroupbackend.c \
-+	util/vircgroupbackend.h \
- 	util/virclosecallbacks.c \
- 	util/virclosecallbacks.h \
- 	util/vircommand.c \
-diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
-new file mode 100644
-index 0000000000..e014bfc0e6
---- /dev/null
-+++ b/src/util/vircgroupbackend.c
-@@ -0,0 +1,64 @@
-+/*
-+ * vircgroupbackend.c: methods for cgroups backend
-+ *
-+ * Copyright (C) 2018 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 "vircgroupbackend.h"
-+#include "virerror.h"
-+#include "virthread.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_CGROUP
-+
-+VIR_ENUM_DECL(virCgroupBackend);
-+VIR_ENUM_IMPL(virCgroupBackend, VIR_CGROUP_BACKEND_TYPE_LAST,
-+              "cgroup V1");
-+
-+static virOnceControl virCgroupBackendOnce = VIR_ONCE_CONTROL_INITIALIZER;
-+static virCgroupBackendPtr virCgroupBackends[VIR_CGROUP_BACKEND_TYPE_LAST] = { 0 };
-+
-+void
-+virCgroupBackendRegister(virCgroupBackendPtr backend)
-+{
-+    if (virCgroupBackends[backend->type]) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Cgroup backend '%s' already registered."),
-+                       virCgroupBackendTypeToString(backend->type));
-+        return;
-+    }
-+
-+    virCgroupBackends[backend->type] = backend;
-+}
-+
-+
-+static void
-+virCgroupBackendOnceInit(void)
-+{
-+}
-+
-+
-+virCgroupBackendPtr *
-+virCgroupBackendGetAll(void)
-+{
-+    if (virOnce(&virCgroupBackendOnce, virCgroupBackendOnceInit) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Failed to initialize cgroup backend."));
-+        return NULL;
-+    }
-+    return virCgroupBackends;
-+}
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-new file mode 100644
-index 0000000000..db052485a8
---- /dev/null
-+++ b/src/util/vircgroupbackend.h
-@@ -0,0 +1,46 @@
-+/*
-+ * vircgroupbackend.h: methods for cgroups backend
-+ *
-+ * Copyright (C) 2018 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/>.
-+ */
-+
-+#ifndef __VIR_CGROUP_BACKEND_H__
-+# define __VIR_CGROUP_BACKEND_H__
-+
-+# include "internal.h"
-+
-+# include "vircgroup.h"
-+
-+
-+typedef enum {
-+    VIR_CGROUP_BACKEND_TYPE_V1 = 0,
-+    VIR_CGROUP_BACKEND_TYPE_LAST,
-+} virCgroupBackendType;
-+
-+struct _virCgroupBackend {
-+    virCgroupBackendType type;
-+};
-+typedef struct _virCgroupBackend virCgroupBackend;
-+typedef virCgroupBackend *virCgroupBackendPtr;
-+
-+void
-+virCgroupBackendRegister(virCgroupBackendPtr backend);
-+
-+virCgroupBackendPtr *
-+virCgroupBackendGetAll(void);
-+
-+#endif /* __VIR_CGROUP_BACKEND_H__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-json-Introduce-virJSONValueArrayConcat.patch b/SOURCES/libvirt-util-json-Introduce-virJSONValueArrayConcat.patch
new file mode 100644
index 0000000..f228f9d
--- /dev/null
+++ b/SOURCES/libvirt-util-json-Introduce-virJSONValueArrayConcat.patch
@@ -0,0 +1,94 @@
+From 28699a44646cf4a754808fb2c815c741343264cd Mon Sep 17 00:00:00 2001
+Message-Id: <28699a44646cf4a754808fb2c815c741343264cd@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:17 +0100
+Subject: [PATCH] util: json: Introduce virJSONValueArrayConcat
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a helper that concatenates the second array into the first.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 3b60a0c0276ae7200b0bff7394e0d1e00706a1dd)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <d7f92bced2f95d7802dd3a823b7c6b966e454a7e.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/libvirt_private.syms |  1 +
+ src/util/virjson.c       | 31 +++++++++++++++++++++++++++++++
+ src/util/virjson.h       |  2 ++
+ 3 files changed, 34 insertions(+)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index afa7d4fcae..bc2858fc00 100644
+--- a/src/libvirt_private.syms
++++ b/src/libvirt_private.syms
+@@ -2279,6 +2279,7 @@ virISCSIScanTargets;
+ virJSONStringReformat;
+ virJSONValueArrayAppend;
+ virJSONValueArrayAppendString;
++virJSONValueArrayConcat;
+ virJSONValueArrayForeachSteal;
+ virJSONValueArrayGet;
+ virJSONValueArraySize;
+diff --git a/src/util/virjson.c b/src/util/virjson.c
+index 988a09e956..50993648eb 100644
+--- a/src/util/virjson.c
++++ b/src/util/virjson.c
+@@ -811,6 +811,37 @@ virJSONValueArrayAppendString(virJSONValuePtr object,
+ }
+ 
+ 
++/**
++ * virJSONValueArrayConcat:
++ * @a: JSON value array (destination)
++ * @c: JSON value array (source)
++ *
++ * Merges the members of @c array into @a. The values are stolen from @c.
++ */
++int
++virJSONValueArrayConcat(virJSONValuePtr a,
++                        virJSONValuePtr c)
++{
++    size_t i;
++
++    if (a->type != VIR_JSON_TYPE_ARRAY ||
++        c->type != VIR_JSON_TYPE_ARRAY) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("expecting JSON array"));
++        return -1;
++    }
++
++    a->data.array.values = g_renew(virJSONValuePtr, a->data.array.values,
++                                   a->data.array.nvalues + c->data.array.nvalues);
++
++    for (i = 0; i < c->data.array.nvalues; i++)
++        a->data.array.values[a->data.array.nvalues++] = g_steal_pointer(&c->data.array.values[i]);
++
++    c->data.array.nvalues = 0;
++
++    return 0;
++}
++
++
+ int
+ virJSONValueObjectHasKey(virJSONValuePtr object,
+                          const char *key)
+diff --git a/src/util/virjson.h b/src/util/virjson.h
+index 7a6b063b17..0894e91b59 100644
+--- a/src/util/virjson.h
++++ b/src/util/virjson.h
+@@ -71,6 +71,8 @@ virJSONValuePtr virJSONValueNewArrayFromBitmap(virBitmapPtr bitmap);
+ 
+ int virJSONValueObjectAppend(virJSONValuePtr object, const char *key, virJSONValuePtr value);
+ int virJSONValueArrayAppend(virJSONValuePtr object, virJSONValuePtr value);
++int virJSONValueArrayConcat(virJSONValuePtr a,
++                            virJSONValuePtr c);
+ 
+ int virJSONValueObjectHasKey(virJSONValuePtr object, const char *key);
+ virJSONValuePtr virJSONValueObjectGet(virJSONValuePtr object, const char *key);
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-util-json-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch b/SOURCES/libvirt-util-json-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
deleted file mode 100644
index 2b9884b..0000000
--- a/SOURCES/libvirt-util-json-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 25ceaef5ff5e392dace991db3e737dbdb50a6bba Mon Sep 17 00:00:00 2001
-Message-Id: <25ceaef5ff5e392dace991db3e737dbdb50a6bba@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Fri, 21 Jun 2019 09:26:02 +0200
-Subject: [PATCH] util: json: define cleanup function using
- VIR_DEFINE_AUTOPTR_FUNC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in
-src/util/viralloc.h, define a new wrapper around an existing
-cleanup function which will be called when a variable declared
-with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant
-viralloc.h include, since that has moved from the source module into the
-header.
-
-When a variable of type virJSONValuePtr is declared using
-VIR_AUTOPTR, the function virJSONValueFree will be run
-automatically on it when it goes out of scope.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit b5b5cdd69ca1c954635f9f6dda05d6b15b01cc8a)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <4dd72d7d93725d77a2bd89fbd890fe3d774f29d2.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virjson.c | 1 -
- src/util/virjson.h | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virjson.c b/src/util/virjson.c
-index 0559d40b64..92f3994e92 100644
---- a/src/util/virjson.c
-+++ b/src/util/virjson.c
-@@ -24,7 +24,6 @@
- #include <config.h>
- 
- #include "virjson.h"
--#include "viralloc.h"
- #include "virerror.h"
- #include "virlog.h"
- #include "virstring.h"
-diff --git a/src/util/virjson.h b/src/util/virjson.h
-index e4a82bdbc8..75f7f17b44 100644
---- a/src/util/virjson.h
-+++ b/src/util/virjson.h
-@@ -26,6 +26,7 @@
- 
- # include "internal.h"
- # include "virbitmap.h"
-+# include "viralloc.h"
- 
- # include <stdarg.h>
- 
-@@ -156,4 +157,6 @@ char *virJSONStringReformat(const char *jsonstr, bool pretty);
- 
- virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json);
- 
-+VIR_DEFINE_AUTOPTR_FUNC(virJSONValue, virJSONValueFree)
-+
- #endif /* __VIR_JSON_H_ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-make-forgotten-changes-suggested-during-review-of-commit-d40b820c.patch b/SOURCES/libvirt-util-make-forgotten-changes-suggested-during-review-of-commit-d40b820c.patch
deleted file mode 100644
index dc15478..0000000
--- a/SOURCES/libvirt-util-make-forgotten-changes-suggested-during-review-of-commit-d40b820c.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From dc8506596662fcf2a9aa7942cb1ee081984a23d1 Mon Sep 17 00:00:00 2001
-Message-Id: <dc8506596662fcf2a9aa7942cb1ee081984a23d1@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 14 Jan 2019 11:35:06 -0500
-Subject: [PATCH] util: make forgotten changes suggested during review of
- commit d40b820c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I had intended to make these changes to commit d40b820c before
-pushing, but forgot about it during the day between the initial review
-and ACK.
-
-Neither change is significant - just returning immediately when
-virNetDevGetName() fails (instead of logging a debug message first)
-and eliminating a comment that adds to confusion rather than
-eliminating it. Still, the changes should be made to be more
-consistent with nearly identical code just a few lines up (added in
-commit 7282f455)
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 85f223a8f2480ad446251639a078bb9420072506)
-
-https://bugzilla.redhat.com/1583131
-
-Conflicts: src/util/virnetdevip.c - more context conflicts
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virnetdevip.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
-index fff41ec498..6400887666 100644
---- a/src/util/virnetdevip.c
-+++ b/src/util/virnetdevip.c
-@@ -619,18 +619,18 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
- 
-             ifname = virNetDevGetName(nh->rtnh_ifindex);
- 
--            if (ifname)
--                accept_ra = virNetDevIPGetAcceptRA(ifname);
-+            if (!ifname)
-+               goto error;
-+
-+            accept_ra = virNetDevIPGetAcceptRA(ifname);
- 
-             VIR_DEBUG("Checking multipath route nexthop device %s (%d), accept_ra: %d",
-                       ifname, nh->rtnh_ifindex, accept_ra);
- 
--            if (!ifname ||
--                (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)) {
-+            if (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)
-                 goto error;
--            }
- 
--            VIR_FREE(ifname); /* in case it wasn't added to the array */
-+            VIR_FREE(ifname);
-             data->hasRARoutes = true;
- 
-             len -= NLMSG_ALIGN(nh->rtnh_len);
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-move-all-firewalld-specific-stuff-into-its-own-files.patch b/SOURCES/libvirt-util-move-all-firewalld-specific-stuff-into-its-own-files.patch
deleted file mode 100644
index 5e42aa3..0000000
--- a/SOURCES/libvirt-util-move-all-firewalld-specific-stuff-into-its-own-files.patch
+++ /dev/null
@@ -1,480 +0,0 @@
-From da064c59cfc1f35f4638a9e05447c21fea88cb14 Mon Sep 17 00:00:00 2001
-Message-Id: <da064c59cfc1f35f4638a9e05447c21fea88cb14@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Fri, 1 Feb 2019 20:29:28 -0500
-Subject: [PATCH] util: move all firewalld-specific stuff into its own files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In preparation for adding several other firewalld-specific functions,
-separate the code that's unique to firewalld from the more-generic
-"firewall" file.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit d8393b56e21708c219acc9bcd24a9c22ead4a3b4)
-
- Conflicts:
-   src/util/virerror.c - ; added to end of MACRO in context upstream.
-
-https://bugzilla.redhat.com/1650320
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- include/libvirt/virterror.h |   1 +
- src/libvirt_private.syms    |   5 ++
- src/util/Makefile.inc.am    |   3 +
- src/util/virerror.c         |   3 +-
- src/util/virfirewall.c      |  86 +-------------------
- src/util/virfirewalld.c     | 151 ++++++++++++++++++++++++++++++++++++
- src/util/virfirewalld.h     |  33 ++++++++
- src/util/virfirewalldpriv.h |  30 +++++++
- src/util/virfirewallpriv.h  |   2 -
- tests/virfirewalltest.c     |   2 +
- 10 files changed, 231 insertions(+), 85 deletions(-)
- create mode 100644 src/util/virfirewalld.c
- create mode 100644 src/util/virfirewalld.h
- create mode 100644 src/util/virfirewalldpriv.h
-
-diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
-index 57aadb8d16..30197adc3b 100644
---- a/include/libvirt/virterror.h
-+++ b/include/libvirt/virterror.h
-@@ -133,6 +133,7 @@ typedef enum {
-     VIR_FROM_PERF = 65,         /* Error from perf */
-     VIR_FROM_LIBSSH = 66,       /* Error from libssh connection transport */
-     VIR_FROM_RESCTRL = 67,      /* Error from resource control */
-+    VIR_FROM_FIREWALLD = 68,    /* Error from firewalld */
- 
- # ifdef VIR_ENUM_SENTINELS
-     VIR_ERR_DOMAIN_LAST
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 86846f3b08..57948d8049 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1903,6 +1903,11 @@ virFirewallStartRollback;
- virFirewallStartTransaction;
- 
- 
-+# util/virfirewalld.h
-+virFirewallDApplyRule;
-+virFirewallDIsRegistered;
-+
-+
- # util/virfirmware.h
- virFirmwareFreeList;
- virFirmwareParse;
-diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
-index a22265606c..2cef465208 100644
---- a/src/util/Makefile.inc.am
-+++ b/src/util/Makefile.inc.am
-@@ -57,6 +57,9 @@ UTIL_SOURCES = \
- 	util/virfirewall.c \
- 	util/virfirewall.h \
- 	util/virfirewallpriv.h \
-+	util/virfirewalld.c \
-+	util/virfirewalld.h \
-+	util/virfirewalldpriv.h \
- 	util/virfirmware.c \
- 	util/virfirmware.h \
- 	util/virgettext.c \
-diff --git a/src/util/virerror.c b/src/util/virerror.c
-index f198f27957..1d46fcdc82 100644
---- a/src/util/virerror.c
-+++ b/src/util/virerror.c
-@@ -140,7 +140,8 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST,
-               "Perf", /* 65 */
-               "Libssh transport layer",
-               "Resource control",
--    )
-+              "FirewallD",
-+              );
- 
- 
- /*
-diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
-index 10c370a2ae..4d084f6cbf 100644
---- a/src/util/virfirewall.c
-+++ b/src/util/virfirewall.c
-@@ -29,12 +29,12 @@
- 
- #include "viralloc.h"
- #include "virfirewallpriv.h"
-+#include "virfirewalld.h"
- #include "virerror.h"
- #include "virutil.h"
- #include "virstring.h"
- #include "vircommand.h"
- #include "virlog.h"
--#include "virdbus.h"
- #include "virfile.h"
- #include "virthread.h"
- 
-@@ -51,11 +51,6 @@ VIR_ENUM_IMPL(virFirewallLayerCommand, VIR_FIREWALL_LAYER_LAST,
-               IPTABLES_PATH,
-               IP6TABLES_PATH);
- 
--VIR_ENUM_DECL(virFirewallLayerFirewallD)
--VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST,
--              "eb", "ipv4", "ipv6")
--
--
- struct _virFirewallRule {
-     virFirewallLayer layer;
- 
-@@ -158,7 +153,7 @@ virFirewallValidateBackend(virFirewallBackend backend)
-     VIR_DEBUG("Validating backend %d", backend);
-     if (backend == VIR_FIREWALL_BACKEND_AUTOMATIC ||
-         backend == VIR_FIREWALL_BACKEND_FIREWALLD) {
--        int rv = virDBusIsServiceRegistered(VIR_FIREWALL_FIREWALLD_SERVICE);
-+        int rv = virFirewallDIsRegistered();
- 
-         VIR_DEBUG("Firewalld is registered ? %d", rv);
-         if (rv < 0) {
-@@ -726,81 +721,8 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule,
-                               bool ignoreErrors,
-                               char **output)
- {
--    const char *ipv = virFirewallLayerFirewallDTypeToString(rule->layer);
--    DBusConnection *sysbus = virDBusGetSystemBus();
--    DBusMessage *reply = NULL;
--    virError error;
--    int ret = -1;
--
--    if (!sysbus)
--        return -1;
--
--    memset(&error, 0, sizeof(error));
--
--    if (!ipv) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Unknown firewall layer %d"),
--                       rule->layer);
--        goto cleanup;
--    }
--
--    if (virDBusCallMethod(sysbus,
--                          &reply,
--                          &error,
--                          VIR_FIREWALL_FIREWALLD_SERVICE,
--                          "/org/fedoraproject/FirewallD1",
--                          "org.fedoraproject.FirewallD1.direct",
--                          "passthrough",
--                          "sa&s",
--                          ipv,
--                          (int)rule->argsLen,
--                          rule->args) < 0)
--        goto cleanup;
--
--    if (error.level == VIR_ERR_ERROR) {
--        /*
--         * As of firewalld-0.3.9.3-1.fc20.noarch the name and
--         * message fields in the error look like
--         *
--         *    name="org.freedesktop.DBus.Python.dbus.exceptions.DBusException"
--         * message="COMMAND_FAILED: '/sbin/iptables --table filter --delete
--         *          INPUT --in-interface virbr0 --protocol udp --destination-port 53
--         *          --jump ACCEPT' failed: iptables: Bad rule (does a matching rule
--         *          exist in that chain?)."
--         *
--         * We'd like to only ignore DBus errors precisely related to the failure
--         * of iptables/ebtables commands. A well designed DBus interface would
--         * return specific named exceptions not the top level generic python dbus
--         * exception name. With this current scheme our only option is todo a
--         * sub-string match for 'COMMAND_FAILED' on the message. eg like
--         *
--         * if (ignoreErrors &&
--         *     STREQ(error.name,
--         *           "org.freedesktop.DBus.Python.dbus.exceptions.DBusException") &&
--         *     STRPREFIX(error.message, "COMMAND_FAILED"))
--         *    ...
--         *
--         * But this risks our error detecting code being broken if firewalld changes
--         * ever alter the message string, so we're avoiding doing that.
--         */
--        if (ignoreErrors) {
--            VIR_DEBUG("Ignoring error '%s': '%s'",
--                      error.str1, error.message);
--        } else {
--            virReportErrorObject(&error);
--            goto cleanup;
--        }
--    } else {
--        if (virDBusMessageRead(reply, "s", output) < 0)
--            goto cleanup;
--    }
--
--    ret = 0;
--
-- cleanup:
--    virResetError(&error);
--    virDBusMessageUnref(reply);
--    return ret;
-+    /* wrapper necessary because virFirewallRule is a private struct */
-+    return virFirewallDApplyRule(rule->layer, rule->args, rule->argsLen, ignoreErrors, output);
- }
- 
- static int
-diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
-new file mode 100644
-index 0000000000..f27ec9c124
---- /dev/null
-+++ b/src/util/virfirewalld.c
-@@ -0,0 +1,151 @@
-+/*
-+ * virfirewalld.c: support for firewalld (https://firewalld.org)
-+ *
-+ * Copyright (C) 2019 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 <stdarg.h>
-+
-+#include "virfirewall.h"
-+#include "virfirewalld.h"
-+#define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
-+#include "virfirewalldpriv.h"
-+#include "virerror.h"
-+#include "virutil.h"
-+#include "virlog.h"
-+#include "virdbus.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_FIREWALLD
-+
-+VIR_LOG_INIT("util.firewalld");
-+
-+/* used to convert virFirewallLayer enum values to strings
-+ * understood by the firewalld.direct "passthrough" method
-+ */
-+VIR_ENUM_DECL(virFirewallLayerFirewallD);
-+VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST,
-+              "eb",
-+              "ipv4",
-+              "ipv6",
-+              );
-+
-+
-+/**
-+ * virFirewallDIsRegistered:
-+ *
-+ * Returns 0 if service is registered, -1 on fatal error, or -2 if service is not registered
-+ */
-+int
-+virFirewallDIsRegistered(void)
-+{
-+    return virDBusIsServiceRegistered(VIR_FIREWALL_FIREWALLD_SERVICE);
-+}
-+
-+
-+/**
-+ * virFirewallDApplyRule:
-+ * @layer:        which layer to apply the rule to
-+ * @args:         list of args to send to this layer's passthrough command.
-+ * @argsLen:      number of items in @args
-+ * @ignoreErrors: true to suppress logging of errors and return success
-+ *                false to log errors and return actual status
-+ * @output:       output of the direct passthrough command, if it was successful
-+ */
-+int
-+virFirewallDApplyRule(virFirewallLayer layer,
-+                      char **args, size_t argsLen,
-+                      bool ignoreErrors,
-+                      char **output)
-+{
-+    const char *ipv = virFirewallLayerFirewallDTypeToString(layer);
-+    DBusConnection *sysbus = virDBusGetSystemBus();
-+    DBusMessage *reply = NULL;
-+    virError error;
-+    int ret = -1;
-+
-+    if (!sysbus)
-+        return -1;
-+
-+    memset(&error, 0, sizeof(error));
-+
-+    if (!ipv) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unknown firewall layer %d"),
-+                       layer);
-+        goto cleanup;
-+    }
-+
-+    if (virDBusCallMethod(sysbus,
-+                          &reply,
-+                          &error,
-+                          VIR_FIREWALL_FIREWALLD_SERVICE,
-+                          "/org/fedoraproject/FirewallD1",
-+                          "org.fedoraproject.FirewallD1.direct",
-+                          "passthrough",
-+                          "sa&s",
-+                          ipv,
-+                          (int)argsLen,
-+                          args) < 0)
-+        goto cleanup;
-+
-+    if (error.level == VIR_ERR_ERROR) {
-+        /*
-+         * As of firewalld-0.3.9.3-1.fc20.noarch the name and
-+         * message fields in the error look like
-+         *
-+         *    name="org.freedesktop.DBus.Python.dbus.exceptions.DBusException"
-+         * message="COMMAND_FAILED: '/sbin/iptables --table filter --delete
-+         *          INPUT --in-interface virbr0 --protocol udp --destination-port 53
-+         *          --jump ACCEPT' failed: iptables: Bad rule (does a matching rule
-+         *          exist in that chain?)."
-+         *
-+         * We'd like to only ignore DBus errors precisely related to the failure
-+         * of iptables/ebtables commands. A well designed DBus interface would
-+         * return specific named exceptions not the top level generic python dbus
-+         * exception name. With this current scheme our only option is todo a
-+         * sub-string match for 'COMMAND_FAILED' on the message. eg like
-+         *
-+         * if (ignoreErrors &&
-+         *     STREQ(error.name,
-+         *           "org.freedesktop.DBus.Python.dbus.exceptions.DBusException") &&
-+         *     STRPREFIX(error.message, "COMMAND_FAILED"))
-+         *    ...
-+         *
-+         * But this risks our error detecting code being broken if firewalld changes
-+         * ever alter the message string, so we're avoiding doing that.
-+         */
-+        if (ignoreErrors) {
-+            VIR_DEBUG("Ignoring error '%s': '%s'",
-+                      error.str1, error.message);
-+        } else {
-+            virReportErrorObject(&error);
-+            goto cleanup;
-+        }
-+    } else {
-+        if (virDBusMessageRead(reply, "s", output) < 0)
-+            goto cleanup;
-+    }
-+
-+    ret = 0;
-+
-+ cleanup:
-+    virResetError(&error);
-+    virDBusMessageUnref(reply);
-+    return ret;
-+}
-diff --git a/src/util/virfirewalld.h b/src/util/virfirewalld.h
-new file mode 100644
-index 0000000000..83fe1149cc
---- /dev/null
-+++ b/src/util/virfirewalld.h
-@@ -0,0 +1,33 @@
-+/*
-+ * virfirewalld.h: support for firewalld (https://firewalld.org)
-+ *
-+ * Copyright (C) 2019 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/>.
-+ */
-+
-+#ifndef LIBVIRT_VIRFIREWALLD_H
-+# define LIBVIRT_VIRFIREWALLD_H
-+
-+# define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
-+
-+int virFirewallDIsRegistered(void);
-+
-+int virFirewallDApplyRule(virFirewallLayer layer,
-+                          char **args, size_t argsLen,
-+                          bool ignoreErrors,
-+                          char **output);
-+
-+#endif /* LIBVIRT_VIRFIREWALLD_H */
-diff --git a/src/util/virfirewalldpriv.h b/src/util/virfirewalldpriv.h
-new file mode 100644
-index 0000000000..6c03b467c9
---- /dev/null
-+++ b/src/util/virfirewalldpriv.h
-@@ -0,0 +1,30 @@
-+/*
-+ * virfirewalldpriv.h: private APIs for firewalld
-+ *
-+ * Copyright (C) 2019 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/>.
-+ */
-+
-+#ifndef LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
-+# error "virfirewalldpriv.h may only be included by virfirewalld.c or test suites"
-+#endif /* LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW */
-+
-+#ifndef LIBVIRT_VIRFIREWALLDPRIV_H
-+# define LIBVIRT_VIRFIREWALLDPRIV_H
-+
-+# define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
-+
-+#endif /* LIBVIRT_VIRFIREWALLDPRIV_H */
-diff --git a/src/util/virfirewallpriv.h b/src/util/virfirewallpriv.h
-index 130aaa1b73..bd6089bcc6 100644
---- a/src/util/virfirewallpriv.h
-+++ b/src/util/virfirewallpriv.h
-@@ -30,8 +30,6 @@
- 
- # include "virfirewall.h"
- 
--# define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
--
- typedef enum {
-     VIR_FIREWALL_BACKEND_AUTOMATIC,
-     VIR_FIREWALL_BACKEND_DIRECT,
-diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
-index e6d68745ae..397abfcc60 100644
---- a/tests/virfirewalltest.c
-+++ b/tests/virfirewalltest.c
-@@ -30,6 +30,8 @@
- # include "virbuffer.h"
- # include "vircommandpriv.h"
- # include "virfirewallpriv.h"
-+# define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
-+# include "virfirewalldpriv.h"
- # include "virmock.h"
- # include "virdbuspriv.h"
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-moving-type-argument-to-avoid-issues-with-mount-syscall.patch b/SOURCES/libvirt-util-moving-type-argument-to-avoid-issues-with-mount-syscall.patch
deleted file mode 100644
index a70a5d7..0000000
--- a/SOURCES/libvirt-util-moving-type-argument-to-avoid-issues-with-mount-syscall.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bb4d2abe30f8ad3de4f7f3201de897440cdd545c Mon Sep 17 00:00:00 2001
-Message-Id: <bb4d2abe30f8ad3de4f7f3201de897440cdd545c@dist-git>
-From: Julio Faracco <jcfaracco@gmail.com>
-Date: Mon, 1 Jul 2019 17:05:46 +0200
-Subject: [PATCH] util: moving 'type' argument to avoid issues with mount()
- syscall.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This commit fixes a mount call inside virgroup.c file. The NULL value
-into 'type' argument is causing a valgrind issue. See commit 794b576c
-for more details. The best approach to fix it is moving NULL to "none"
-filesytem.
-
-Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
-(cherry picked from commit 4539301bc84ee65558a48c1c3c22aa04f458dbe0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <006a95f4385f575718eee431fc905702cff3e848.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 0a31947b0d..e810a3d81d 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3962,7 +3962,7 @@ virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                 goto cleanup;
-             }
- 
--            if (mount(src, group->controllers[i].mountPoint, NULL, MS_BIND,
-+            if (mount(src, group->controllers[i].mountPoint, "none", MS_BIND,
-                       NULL) < 0) {
-                 virReportSystemError(errno,
-                                      _("Failed to bind cgroup '%s' on '%s'"),
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch b/SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
deleted file mode 100644
index 2d6c088..0000000
--- a/SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From ca441a9e1e6d757cd1aa7dfb84c0e37cb1924b87 Mon Sep 17 00:00:00 2001
-Message-Id: <ca441a9e1e6d757cd1aa7dfb84c0e37cb1924b87@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Tue, 30 Jul 2019 15:30:47 +0200
-Subject: [PATCH] util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE
- for scalar types
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By making use of GNU C's cleanup attribute handled by the
-VIR_AUTOFREE macro for declaring scalar variables, majority
-of the VIR_FREE calls can be dropped, which in turn leads to
-getting rid of most of our cleanup sections.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 2d9be4d8b4cfea2a85a8ebe21ffadf4b3101a09b)
-
-Prerequisite of: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <56656242ad6da70744bfda6d0757125eea669751.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index f86f698430..36c587efdb 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -149,10 +149,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
-     char macaddrstr[VIR_MAC_STRING_BUFLEN];
-     char ifuuidstr[VIR_UUID_STRING_BUFLEN];
-     char vmuuidstr[VIR_UUID_STRING_BUFLEN];
--    char *attachedmac_ex_id = NULL;
--    char *ifaceid_ex_id = NULL;
--    char *profile_ex_id = NULL;
--    char *vmid_ex_id = NULL;
-+    VIR_AUTOFREE(char *) attachedmac_ex_id = NULL;
-+    VIR_AUTOFREE(char *) ifaceid_ex_id = NULL;
-+    VIR_AUTOFREE(char *) profile_ex_id = NULL;
-+    VIR_AUTOFREE(char *) vmid_ex_id = NULL;
- 
-     virMacAddrFormat(macaddr, macaddrstr);
-     virUUIDFormat(ovsport->interfaceID, ifuuidstr);
-@@ -209,10 +209,6 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
- 
-     ret = 0;
-  cleanup:
--    VIR_FREE(attachedmac_ex_id);
--    VIR_FREE(ifaceid_ex_id);
--    VIR_FREE(vmid_ex_id);
--    VIR_FREE(profile_ex_id);
-     virCommandFree(cmd);
-     return ret;
- }
-@@ -339,10 +335,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-                                    virDomainInterfaceStatsPtr stats)
- {
-     virCommandPtr cmd = NULL;
--    char *output;
-     char *tmp;
-     bool gotStats = false;
-     int ret = -1;
-+    VIR_AUTOFREE(char *) output = NULL;
- 
-     /* Just ensure the interface exists in ovs */
-     cmd = virCommandNew(OVSVSCTL);
-@@ -399,7 +395,6 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-     ret = 0;
- 
-  cleanup:
--    VIR_FREE(output);
-     virCommandFree(cmd);
-     return ret;
- }
-@@ -425,7 +420,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
-     size_t ntokens = 0;
-     int status;
-     int ret = -1;
--    char *ovs_timeout = NULL;
-+    VIR_AUTOFREE(char *) ovs_timeout = NULL;
- 
-     /* Openvswitch vhostuser path are hardcoded to
-      * /<runstatedir>/openvswitch/<ifname>
-@@ -457,7 +452,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
-  cleanup:
-     virStringListFreeCount(tokens, ntokens);
-     virCommandFree(cmd);
--    VIR_FREE(ovs_timeout);
-     return ret;
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOPTR-for-aggregate-types.patch b/SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOPTR-for-aggregate-types.patch
deleted file mode 100644
index 2618401..0000000
--- a/SOURCES/libvirt-util-netdevopenvswitch-use-VIR_AUTOPTR-for-aggregate-types.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From d808105a19611b7561c7ab0e4b128fbabebc88e2 Mon Sep 17 00:00:00 2001
-Message-Id: <d808105a19611b7561c7ab0e4b128fbabebc88e2@dist-git>
-From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Date: Tue, 30 Jul 2019 15:30:49 +0200
-Subject: [PATCH] util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By making use of GNU C's cleanup attribute handled by the
-VIR_AUTOPTR macro for declaring aggregate pointer variables,
-majority of the calls to *Free functions can be dropped, which
-in turn leads to getting rid of most of our cleanup sections.
-
-Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 1077b46de6730eea76884b921bed1ece65be26ef)
-
-Prerequisite of: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <1b5f75ad2258bb10ea75fe646271e9625d49f998.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 80 +++++++++++----------------------
- 1 file changed, 27 insertions(+), 53 deletions(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index 0dcd49d40f..2f5c7ac789 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -144,11 +144,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
-                                    virNetDevVPortProfilePtr ovsport,
-                                    virNetDevVlanPtr virtVlan)
- {
--    int ret = -1;
--    virCommandPtr cmd = NULL;
-     char macaddrstr[VIR_MAC_STRING_BUFLEN];
-     char ifuuidstr[VIR_UUID_STRING_BUFLEN];
-     char vmuuidstr[VIR_UUID_STRING_BUFLEN];
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
-     VIR_AUTOFREE(char *) attachedmac_ex_id = NULL;
-     VIR_AUTOFREE(char *) ifaceid_ex_id = NULL;
-     VIR_AUTOFREE(char *) profile_ex_id = NULL;
-@@ -160,17 +159,17 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
- 
-     if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"",
-                     macaddrstr) < 0)
--        goto cleanup;
-+        return -1;
-     if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"",
-                     ifuuidstr) < 0)
--        goto cleanup;
-+        return -1;
-     if (virAsprintf(&vmid_ex_id, "external-ids:vm-id=\"%s\"",
-                     vmuuidstr) < 0)
--        goto cleanup;
-+        return -1;
-     if (ovsport->profileID[0] != '\0') {
-         if (virAsprintf(&profile_ex_id, "external-ids:port-profile=\"%s\"",
-                         ovsport->profileID) < 0)
--            goto cleanup;
-+            return -1;
-     }
- 
-     cmd = virCommandNew(OVSVSCTL);
-@@ -179,7 +178,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
-                          ifname, "--", "add-port", brname, ifname, NULL);
- 
-     if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (ovsport->profileID[0] == '\0') {
-         virCommandAddArgList(cmd,
-@@ -204,13 +203,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to add port %s to OVS bridge %s"),
-                        ifname, brname);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
-- cleanup:
--    virCommandFree(cmd);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -223,8 +219,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
-  */
- int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname)
- {
--    int ret = -1;
--    virCommandPtr cmd = NULL;
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
- 
-     cmd = virCommandNew(OVSVSCTL);
-     virNetDevOpenvswitchAddTimeout(cmd);
-@@ -233,13 +228,10 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch
-     if (virCommandRun(cmd, NULL) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to delete port %s from OVS"), ifname);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
-- cleanup:
--    virCommandFree(cmd);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -253,9 +245,8 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch
-  */
- int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
- {
--    virCommandPtr cmd = NULL;
-     size_t len;
--    int ret = -1;
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
- 
-     cmd = virCommandNew(OVSVSCTL);
-     virNetDevOpenvswitchAddTimeout(cmd);
-@@ -269,7 +260,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to run command to get OVS port data for "
-                          "interface %s"), ifname);
--        goto cleanup;
-+        return -1;
-     }
- 
-     /* Wipeout the newline, if it exists */
-@@ -277,10 +268,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
-     if (len > 0)
-         (*migrate)[len - 1] = '\0';
- 
--    ret = 0;
-- cleanup:
--    virCommandFree(cmd);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -294,8 +282,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
-  */
- int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
- {
--    virCommandPtr cmd = NULL;
--    int ret = -1;
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
- 
-     if (!migrate) {
-         VIR_DEBUG("No OVS port data for interface %s", ifname);
-@@ -312,13 +299,10 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to run command to set OVS port data for "
-                          "interface %s"), ifname);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
-- cleanup:
--    virCommandFree(cmd);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -334,10 +318,9 @@ int
- virNetDevOpenvswitchInterfaceStats(const char *ifname,
-                                    virDomainInterfaceStatsPtr stats)
- {
--    virCommandPtr cmd = NULL;
-     char *tmp;
-     bool gotStats = false;
--    int ret = -1;
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
-     VIR_AUTOFREE(char *) output = NULL;
- 
-     /* Just ensure the interface exists in ovs */
-@@ -350,7 +333,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-         /* no ovs-vsctl or interface 'ifname' doesn't exists in ovs */
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Interface not found"));
--        goto cleanup;
-+        return -1;
-     }
- 
- #define GET_STAT(name, member) \
-@@ -369,7 +352,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-                 *tmp != '\n') { \
-                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \
-                                _("Fail to parse ovs-vsctl output")); \
--                goto cleanup; \
-+                return -1; \
-             } \
-             gotStats = true; \
-         } \
-@@ -389,14 +372,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-     if (!gotStats) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Interface doesn't have any statistics"));
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
--
-- cleanup:
--    virCommandFree(cmd);
--    return ret;
-+    return 0;
- }
- 
- /**
-@@ -414,12 +393,12 @@ int
- virNetDevOpenvswitchGetVhostuserIfname(const char *path,
-                                        char **ifname)
- {
--    virCommandPtr cmd = NULL;
-     char *tmpIfname = NULL;
-     char **tokens = NULL;
-     size_t ntokens = 0;
-     int status;
-     int ret = -1;
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
- 
-     /* Openvswitch vhostuser path are hardcoded to
-      * /<runstatedir>/openvswitch/<ifname>
-@@ -450,7 +429,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
- 
-  cleanup:
-     virStringListFreeCount(tokens, ntokens);
--    virCommandFree(cmd);
-     return ret;
- }
- 
-@@ -466,8 +444,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
- int virNetDevOpenvswitchUpdateVlan(const char *ifname,
-                                    virNetDevVlanPtr virtVlan)
- {
--    int ret = -1;
--    virCommandPtr cmd = NULL;
-+    VIR_AUTOPTR(virCommand) cmd = NULL;
- 
-     cmd = virCommandNew(OVSVSCTL);
-     virNetDevOpenvswitchAddTimeout(cmd);
-@@ -478,16 +455,13 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
-                          "--", "--if-exists", "set", "Port", ifname, NULL);
- 
-     if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (virCommandRun(cmd, NULL) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to set vlan configuration on port %s"), ifname);
--        goto cleanup;
-+        return -1;
-     }
- 
--    ret = 0;
-- cleanup:
--    virCommandFree(cmd);
--    return ret;
-+    return 0;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-new-virFirewallD-APIs-docs.patch b/SOURCES/libvirt-util-new-virFirewallD-APIs-docs.patch
deleted file mode 100644
index ae0ea8a..0000000
--- a/SOURCES/libvirt-util-new-virFirewallD-APIs-docs.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 477f1de37ff7c911048d8d5e7f7de32f12d30b5d Mon Sep 17 00:00:00 2001
-Message-Id: <477f1de37ff7c911048d8d5e7f7de32f12d30b5d@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Fri, 1 Feb 2019 20:29:29 -0500
-Subject: [PATCH] util: new virFirewallD APIs + docs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-virFirewallDGetBackend() reports whether firewalld is currently using
-an iptables or an nftables backend.
-
-virFirewallDGetVersion() learns the version of the firewalld running
-on this system and returns it as 1000000*major + 1000*minor + micro.
-
-virFirewallDGetZones() gets a list of all currently active firewalld
-zones.
-
-virFirewallDInterfaceSetZone() sets the firewalld zone of the given
-interface.
-
-virFirewallDZoneExists() can be used to learn whether or not a
-particular zone is present and active in firewalld.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 3bba4825c291e51a8cd4d497d6e919ac2ee96ff0)
-
-Conflicts: src/util/virfirewalld.c - had to remove VIR_AUTO_PTR(), which doesn't
-   exist in libvirt 4.5.0, and replace with appropriately placed VIR_FREE()
-
-https://bugzilla.redhat.com/1650320
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |   5 +
- src/util/virfirewalld.c  | 223 +++++++++++++++++++++++++++++++++++++++
- src/util/virfirewalld.h  |  15 ++-
- 3 files changed, 242 insertions(+), 1 deletion(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 57948d8049..624151056a 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1905,7 +1905,12 @@ virFirewallStartTransaction;
- 
- # util/virfirewalld.h
- virFirewallDApplyRule;
-+virFirewallDGetBackend;
-+virFirewallDGetVersion;
-+virFirewallDGetZones;
-+virFirewallDInterfaceSetZone;
- virFirewallDIsRegistered;
-+virFirewallDZoneExists;
- 
- 
- # util/virfirmware.h
-diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
-index f27ec9c124..8dd6ac2b8a 100644
---- a/src/util/virfirewalld.c
-+++ b/src/util/virfirewalld.c
-@@ -22,6 +22,7 @@
- 
- #include <stdarg.h>
- 
-+#include "viralloc.h"
- #include "virfirewall.h"
- #include "virfirewalld.h"
- #define LIBVIRT_VIRFIREWALLDPRIV_H_ALLOW
-@@ -46,6 +47,14 @@ VIR_ENUM_IMPL(virFirewallLayerFirewallD, VIR_FIREWALL_LAYER_LAST,
-               );
- 
- 
-+VIR_ENUM_DECL(virFirewallDBackend);
-+VIR_ENUM_IMPL(virFirewallDBackend, VIR_FIREWALLD_BACKEND_LAST,
-+              "",
-+              "iptables",
-+              "nftables",
-+              );
-+
-+
- /**
-  * virFirewallDIsRegistered:
-  *
-@@ -57,6 +66,197 @@ virFirewallDIsRegistered(void)
-     return virDBusIsServiceRegistered(VIR_FIREWALL_FIREWALLD_SERVICE);
- }
- 
-+/**
-+ * virFirewallDGetVersion:
-+ * @version: pointer to location to save version in the form of:
-+ *           1000000 * major + 1000 * minor + micro
-+ *
-+ * queries the firewalld version property from dbus, and converts it
-+ * from a string into a number.
-+ *
-+ * Returns 0 if version was successfully retrieved, or -1 on error
-+ */
-+int
-+virFirewallDGetVersion(unsigned long *version)
-+{
-+    int ret = -1;
-+    DBusConnection *sysbus = virDBusGetSystemBus();
-+    DBusMessage *reply = NULL;
-+    char * versionStr = NULL;
-+
-+    if (!sysbus)
-+        return -1;
-+
-+    if (virDBusCallMethod(sysbus,
-+                          &reply,
-+                          NULL,
-+                          VIR_FIREWALL_FIREWALLD_SERVICE,
-+                          "/org/fedoraproject/FirewallD1",
-+                          "org.freedesktop.DBus.Properties",
-+                          "Get",
-+                          "ss",
-+                          "org.fedoraproject.FirewallD1",
-+                          "version") < 0)
-+        goto cleanup;
-+
-+    if (virDBusMessageRead(reply, "v", "s", &versionStr) < 0)
-+        goto cleanup;
-+
-+    if (virParseVersionString(versionStr, version, false) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse firewalld version '%s'"),
-+                       versionStr);
-+        goto cleanup;
-+    }
-+
-+    VIR_DEBUG("FirewallD version: %s - %lu", versionStr, *version);
-+
-+    ret = 0;
-+ cleanup:
-+    VIR_FREE(versionStr);
-+    virDBusMessageUnref(reply);
-+    return ret;
-+}
-+
-+/**
-+ * virFirewallDGetBackend:
-+ *
-+ * Returns virVirewallDBackendType value representing which packet
-+ * filtering backend is currently in use by firewalld, or -1 on error.
-+ */
-+int
-+virFirewallDGetBackend(void)
-+{
-+    DBusConnection *sysbus = virDBusGetSystemBus();
-+    DBusMessage *reply = NULL;
-+    virError error;
-+    char * backendStr = NULL;
-+    int backend = -1;
-+
-+    if (!sysbus)
-+        return -1;
-+
-+    memset(&error, 0, sizeof(error));
-+
-+    if (virDBusCallMethod(sysbus,
-+                          &reply,
-+                          &error,
-+                          VIR_FIREWALL_FIREWALLD_SERVICE,
-+                          "/org/fedoraproject/FirewallD1/config",
-+                          "org.freedesktop.DBus.Properties",
-+                          "Get",
-+                          "ss",
-+                          "org.fedoraproject.FirewallD1.config",
-+                          "FirewallBackend") < 0)
-+        goto cleanup;
-+
-+    if (error.level == VIR_ERR_ERROR) {
-+        /* we don't want to log any error in the case that
-+         * FirewallBackend isn't implemented in this firewalld, since
-+         * that just means that it is an old version, and only has an
-+         * iptables backend.
-+         */
-+        VIR_DEBUG("Failed to get FirewallBackend setting, assuming 'iptables'");
-+        backend = VIR_FIREWALLD_BACKEND_IPTABLES;
-+        goto cleanup;
-+    }
-+
-+    if (virDBusMessageRead(reply, "v", "s", &backendStr) < 0)
-+        goto cleanup;
-+
-+    VIR_DEBUG("FirewallD backend: %s", backendStr);
-+
-+    if ((backend = virFirewallDBackendTypeFromString(backendStr)) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unrecognized firewalld backend type: %s"),
-+                       backendStr);
-+        goto cleanup;
-+    }
-+
-+ cleanup:
-+    VIR_FREE(backendStr);
-+    virResetError(&error);
-+    virDBusMessageUnref(reply);
-+    return backend;
-+}
-+
-+
-+/**
-+ * virFirewallDGetZones:
-+ * @zones: array of char *, each entry is a null-terminated zone name
-+ * @nzones: number of entries in @zones
-+ *
-+ * Get the number of currently active firewalld zones, and their names
-+ * in an array of null-terminated strings. The memory pointed to by
-+ * @zones will belong to the caller, and must be freed.
-+ *
-+ * Returns 0 on success, -1 (and failure logged) on error
-+ */
-+int
-+virFirewallDGetZones(char ***zones, size_t *nzones)
-+{
-+    DBusConnection *sysbus = virDBusGetSystemBus();
-+    DBusMessage *reply = NULL;
-+    int ret = -1;
-+
-+    *nzones = 0;
-+    *zones = NULL;
-+
-+    if (!sysbus)
-+        return -1;
-+
-+    if (virDBusCallMethod(sysbus,
-+                          &reply,
-+                          NULL,
-+                          VIR_FIREWALL_FIREWALLD_SERVICE,
-+                          "/org/fedoraproject/FirewallD1",
-+                          "org.fedoraproject.FirewallD1.zone",
-+                          "getZones",
-+                          NULL) < 0)
-+        goto cleanup;
-+
-+    if (virDBusMessageRead(reply, "a&s", nzones, zones) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+ cleanup:
-+    virDBusMessageUnref(reply);
-+    return ret;
-+}
-+
-+
-+/**
-+ * virFirewallDZoneExists:
-+ * @match: name of zone to look for
-+ *
-+ * Returns true if the requested zone exists, or false if it doesn't exist
-+ */
-+bool
-+virFirewallDZoneExists(const char *match)
-+{
-+    size_t nzones = 0, i;
-+    char **zones = NULL;
-+    bool result = false;
-+
-+    return true;
-+
-+    if (virFirewallDGetZones(&zones, &nzones) < 0)
-+        goto cleanup;
-+
-+    for (i = 0; i < nzones; i++) {
-+        if (STREQ_NULLABLE(zones[i], match))
-+            result = true;
-+    }
-+
-+ cleanup:
-+    VIR_DEBUG("Requested zone '%s' %s exist",
-+              match, result ? "does" : "doesn't");
-+    for (i = 0; i < nzones; i++)
-+       VIR_FREE(zones[i]);
-+    VIR_FREE(zones);
-+    return result;
-+}
-+
- 
- /**
-  * virFirewallDApplyRule:
-@@ -149,3 +349,26 @@ virFirewallDApplyRule(virFirewallLayer layer,
-     virDBusMessageUnref(reply);
-     return ret;
- }
-+
-+
-+int
-+virFirewallDInterfaceSetZone(const char *iface,
-+                             const char *zone)
-+{
-+    DBusConnection *sysbus = virDBusGetSystemBus();
-+    DBusMessage *reply = NULL;
-+
-+    if (!sysbus)
-+        return -1;
-+
-+    return virDBusCallMethod(sysbus,
-+                             &reply,
-+                             NULL,
-+                             VIR_FIREWALL_FIREWALLD_SERVICE,
-+                             "/org/fedoraproject/FirewallD1",
-+                             "org.fedoraproject.FirewallD1.zone",
-+                             "changeZoneOfInterface",
-+                             "ss",
-+                             zone,
-+                             iface);
-+}
-diff --git a/src/util/virfirewalld.h b/src/util/virfirewalld.h
-index 83fe1149cc..f05f5f2f08 100644
---- a/src/util/virfirewalld.h
-+++ b/src/util/virfirewalld.h
-@@ -23,11 +23,24 @@
- 
- # define VIR_FIREWALL_FIREWALLD_SERVICE "org.fedoraproject.FirewallD1"
- 
--int virFirewallDIsRegistered(void);
-+typedef enum {
-+    VIR_FIREWALLD_BACKEND_NONE,
-+    VIR_FIREWALLD_BACKEND_IPTABLES,
-+    VIR_FIREWALLD_BACKEND_NFTABLES,
-+    VIR_FIREWALLD_BACKEND_LAST,
-+} virFirewallDBackendType;
- 
-+int virFirewallDGetVersion(unsigned long *version);
-+int virFirewallDGetBackend(void);
-+int virFirewallDIsRegistered(void);
-+int virFirewallDGetZones(char ***zones, size_t *nzones);
-+bool virFirewallDZoneExists(const char *match);
- int virFirewallDApplyRule(virFirewallLayer layer,
-                           char **args, size_t argsLen,
-                           bool ignoreErrors,
-                           char **output);
- 
-+int virFirewallDInterfaceSetZone(const char *iface,
-+                                 const char *zone);
-+
- #endif /* LIBVIRT_VIRFIREWALLD_H */
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-remove-const-specifier-from-nlmsghdr-arg-to-virNetlinkDumpCallback.patch b/SOURCES/libvirt-util-remove-const-specifier-from-nlmsghdr-arg-to-virNetlinkDumpCallback.patch
deleted file mode 100644
index 38cd3bf..0000000
--- a/SOURCES/libvirt-util-remove-const-specifier-from-nlmsghdr-arg-to-virNetlinkDumpCallback.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b990a79a9f4dc52452719bc99aa9f6caedafbf72 Mon Sep 17 00:00:00 2001
-Message-Id: <b990a79a9f4dc52452719bc99aa9f6caedafbf72@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 14 Jan 2019 11:35:02 -0500
-Subject: [PATCH] util: remove const specifier from nlmsghdr arg to
- virNetlinkDumpCallback()
-
-This is problematic if a callback function wants to send the nlmsghdr
-to a library function that has no "const" in its prototype
-(e.g. nlmsg_find_attr())
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 0ea259b6bf3c89bb3b144eba38bc0bd32e516107)
-
-https: //bugzilla.redhat.com/1583131
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virnetdevip.c | 2 +-
- src/util/virnetlink.h  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
-index bf98ed8a59..1bfbd20034 100644
---- a/src/util/virnetdevip.c
-+++ b/src/util/virnetdevip.c
-@@ -540,7 +540,7 @@ struct virNetDevIPCheckIPv6ForwardingData {
- };
- 
- static int
--virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp,
-+virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
-                                        void *opaque)
- {
-     struct rtmsg *rtmsg = NLMSG_DATA(resp);
-diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
-index 2a9de0a575..7ff88a5faf 100644
---- a/src/util/virnetlink.h
-+++ b/src/util/virnetlink.h
-@@ -52,7 +52,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg,
-                       uint32_t src_pid, uint32_t dst_pid,
-                       unsigned int protocol, unsigned int groups);
- 
--typedef int (*virNetlinkDumpCallback)(const struct nlmsghdr *resp,
-+typedef int (*virNetlinkDumpCallback)(struct nlmsghdr *resp,
-                                       void *data);
- 
- int virNetlinkDumpCommand(struct nl_msg *nl_msg,
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-remove-test-code-accidentally-committed-to-virFirewallDZoneExists.patch b/SOURCES/libvirt-util-remove-test-code-accidentally-committed-to-virFirewallDZoneExists.patch
deleted file mode 100644
index a66d259..0000000
--- a/SOURCES/libvirt-util-remove-test-code-accidentally-committed-to-virFirewallDZoneExists.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b2998798bddb9ffd98917cabd9d31578bf6724f3 Mon Sep 17 00:00:00 2001
-Message-Id: <b2998798bddb9ffd98917cabd9d31578bf6724f3@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Sat, 2 Feb 2019 23:32:54 -0500
-Subject: [PATCH] util: remove test code accidentally committed to
- virFirewallDZoneExists
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just before pushing the series containing commit 3bba4825 I had added
-a "return true" to the top of virFirewallDZoneExists() to measure the
-impact of calling that function once per network during startup. I
-found that the effect was minimal, but forgot to remove the "return
-true" before pushing. This unfortunately causes a failure to start
-networks on systems that have a firewalld version that doesn't support
-our libvirt zone file (i.e. pretty much everyone).
-
-This patch removes the unintended line.
-
-Signed-off-by: Laine Stump <laine@laine.org>
-(cherry picked from commit 7c9dcfed5ae6d5874ea0e67e47a6871707b8446a)
-
-https://bugzilla.redhat.com/1650320
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virfirewalld.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
-index 8dd6ac2b8a..8aeb31db80 100644
---- a/src/util/virfirewalld.c
-+++ b/src/util/virfirewalld.c
-@@ -238,8 +238,6 @@ virFirewallDZoneExists(const char *match)
-     char **zones = NULL;
-     bool result = false;
- 
--    return true;
--
-     if (virFirewallDGetZones(&zones, &nzones) < 0)
-         goto cleanup;
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-skip-RDMA-detection-for-non-PCI-network-devices.patch b/SOURCES/libvirt-util-skip-RDMA-detection-for-non-PCI-network-devices.patch
deleted file mode 100644
index 356bb43..0000000
--- a/SOURCES/libvirt-util-skip-RDMA-detection-for-non-PCI-network-devices.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From dce9613ddab9d780ce9aabeb9a084ffec307899c Mon Sep 17 00:00:00 2001
-Message-Id: <dce9613ddab9d780ce9aabeb9a084ffec307899c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 20 May 2019 10:12:55 +0200
-Subject: [PATCH] util: skip RDMA detection for non-PCI network devices
-
-Only PCI devices have '/sys/class/net/<ifname>/device/resource' so we
-need to skip this check for all other network devices.
-
-Without this patch and RDMA enabled libvirt will not detect any network
-device that doesn't have the path above which includes 'lo', 'virbr',
-'tun', etc.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1639258
-
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit f38ef0fac0582ac0cbb749af9d3f8ba515a6084a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1693299
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5d2c32fd3f2d7e3f9664d395c00cdfc942c738ce.1558339954.git.phrdina@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/util/virnetdev.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
-index b250af9e2c..9ca3ce69bc 100644
---- a/src/util/virnetdev.c
-+++ b/src/util/virnetdev.c
-@@ -3016,8 +3016,14 @@ virNetDevRDMAFeature(const char *ifname,
- 
-     if (virAsprintf(&eth_devpath, SYSFS_NET_DIR "%s/device/resource", ifname) < 0)
-         goto cleanup;
--    if (!virFileExists(eth_devpath))
-+
-+    /* If /sys/class/net/<ifname>/device/resource doesn't exist it is not a PCI
-+     * device and therefore it will not have RDMA. */
-+    if (!virFileExists(eth_devpath)) {
-+        ret = 0;
-         goto cleanup;
-+    }
-+
-     if (virFileReadAll(eth_devpath, RESOURCE_FILE_LEN, &eth_res_buf) < 0)
-         goto cleanup;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-storage-Store-backing-store-format-in-virStorageSource.patch b/SOURCES/libvirt-util-storage-Store-backing-store-format-in-virStorageSource.patch
new file mode 100644
index 0000000..70ee8a9
--- /dev/null
+++ b/SOURCES/libvirt-util-storage-Store-backing-store-format-in-virStorageSource.patch
@@ -0,0 +1,155 @@
+From 80cb87e61c8e48d2714c9369c14a880352114d20 Mon Sep 17 00:00:00 2001
+Message-Id: <80cb87e61c8e48d2714c9369c14a880352114d20@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:37 +0100
+Subject: [PATCH] util: storage: Store backing store format in virStorageSource
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We store the backing file string in the structure so we should also
+store the format so that callers can be simplified.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 62539c5f7d6a994b9cbd677564e7206cab1c5a45)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <6f884591ac16f32370925bdb7746c655c7c87302.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 35 +++++++++++++++++------------------
+ src/util/virstoragefile.h |  1 +
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 391e2ce86f..d594ee3695 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -935,15 +935,11 @@ virStorageFileGetEncryptionPayloadOffset(const struct FileEncryptionInfo *info,
+ static int
+ virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
+                                   char *buf,
+-                                  size_t len,
+-                                  int *backingFormat)
++                                  size_t len)
+ {
+-    int dummy;
++    int format;
+     size_t i;
+ 
+-    if (!backingFormat)
+-        backingFormat = &dummy;
+-
+     VIR_DEBUG("path=%s, buf=%p, len=%zu, meta->format=%d",
+               meta->path, buf, len, meta->format);
+ 
+@@ -1009,8 +1005,10 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
+     VIR_FREE(meta->backingStoreRaw);
+     if (fileTypeInfo[meta->format].getBackingStore != NULL) {
+         int store = fileTypeInfo[meta->format].getBackingStore(&meta->backingStoreRaw,
+-                                                               backingFormat,
++                                                               &format,
+                                                                buf, len);
++        meta->backingStoreRawFormat = format;
++
+         if (store == BACKING_STORE_INVALID)
+             return 0;
+ 
+@@ -1135,20 +1133,18 @@ virStorageFileGetMetadataFromBuf(const char *path,
+                                  int *backingFormat)
+ {
+     virStorageSourcePtr ret = NULL;
+-    int dummy;
+-
+-    if (!backingFormat)
+-        backingFormat = &dummy;
+ 
+     if (!(ret = virStorageFileMetadataNew(path, format)))
+         return NULL;
+ 
+-    if (virStorageFileGetMetadataInternal(ret, buf, len,
+-                                          backingFormat) < 0) {
++    if (virStorageFileGetMetadataInternal(ret, buf, len) < 0) {
+         virObjectUnref(ret);
+         return NULL;
+     }
+ 
++    if (backingFormat)
++        *backingFormat = ret->backingStoreRawFormat;
++
+     return ret;
+ }
+ 
+@@ -1211,9 +1207,12 @@ virStorageFileGetMetadataFromFD(const char *path,
+         return NULL;
+     }
+ 
+-    if (virStorageFileGetMetadataInternal(meta, buf, len, backingFormat) < 0)
++    if (virStorageFileGetMetadataInternal(meta, buf, len) < 0)
+         return NULL;
+ 
++    if (backingFormat)
++        *backingFormat = meta->backingStoreRawFormat;
++
+     if (S_ISREG(sb.st_mode))
+         meta->type = VIR_STORAGE_TYPE_FILE;
+     else if (S_ISBLK(sb.st_mode))
+@@ -2293,6 +2292,7 @@ virStorageSourceCopy(const virStorageSource *src,
+     def->volume = g_strdup(src->volume);
+     def->relPath = g_strdup(src->relPath);
+     def->backingStoreRaw = g_strdup(src->backingStoreRaw);
++    def->backingStoreRawFormat = src->backingStoreRawFormat;
+     def->externalDataStoreRaw = g_strdup(src->externalDataStoreRaw);
+     def->snapshot = g_strdup(src->snapshot);
+     def->configFile = g_strdup(src->configFile);
+@@ -5000,7 +5000,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+                                  unsigned int depth)
+ {
+     size_t headerLen;
+-    int backingFormat;
+     int rv;
+     g_autofree char *buf = NULL;
+     g_autoptr(virStorageSource) backingStore = NULL;
+@@ -5018,7 +5017,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+                                                    &buf, &headerLen, cycle) < 0)
+         return -1;
+ 
+-    if (virStorageFileGetMetadataInternal(src, buf, headerLen, &backingFormat) < 0)
++    if (virStorageFileGetMetadataInternal(src, buf, headerLen) < 0)
+         return -1;
+ 
+     if (src->backingStoreRaw) {
+@@ -5029,7 +5028,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+         if (rv == 1)
+             return 0;
+ 
+-        backingStore->format = backingFormat;
++        backingStore->format = src->backingStoreRawFormat;
+ 
+         if (backingStore->format == VIR_STORAGE_FILE_AUTO) {
+             /* Assuming the backing store to be raw can lead to failures. We do
+@@ -5180,7 +5179,7 @@ virStorageFileGetBackingStoreStr(virStorageSourcePtr src,
+     if (!(tmp = virStorageSourceCopy(src, false)))
+         return -1;
+ 
+-    if (virStorageFileGetMetadataInternal(tmp, buf, headerLen, NULL) < 0)
++    if (virStorageFileGetMetadataInternal(tmp, buf, headerLen) < 0)
+         return -1;
+ 
+     *backing = g_steal_pointer(&tmp->backingStoreRaw);
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 2a684fd746..ecba418bb3 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -330,6 +330,7 @@ struct _virStorageSource {
+     /* Name of the child backing store recorded in metadata of the
+      * current file.  */
+     char *backingStoreRaw;
++    virStorageFileFormat backingStoreRawFormat;
+     /* Name of the child data file recorded in metadata of the current file. */
+     char *externalDataStoreRaw;
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-util-storagefile-Drop-image-format-probing-by-file-suffix.patch b/SOURCES/libvirt-util-storagefile-Drop-image-format-probing-by-file-suffix.patch
new file mode 100644
index 0000000..ed14789
--- /dev/null
+++ b/SOURCES/libvirt-util-storagefile-Drop-image-format-probing-by-file-suffix.patch
@@ -0,0 +1,191 @@
+From d926f32560cb7996b6a5ec08545d946bf0594fe8 Mon Sep 17 00:00:00 2001
+Message-Id: <d926f32560cb7996b6a5ec08545d946bf0594fe8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:28 +0100
+Subject: [PATCH] util: storagefile: Drop image format probing by file suffix
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Probing by file suffix was meant to be a last resort if probing by
+contents fails or is not supported. For most formats we never specified
+any suffix. There's a few formats implementing both magic bytes and
+suffix and finally DMG which had only suffix probing. Since suffix
+probing is nowhere reliable and only one format depends on in which has a
+comment that qemu doesn't do the probing either drop the whole
+infrastructure.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 181fccc2ed67a79d462dfcf5b6fcfd2fbb1702b9)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <113e583f0c032b616ea5c691fe36540ebb8e7c8f.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 58 ++++++++++++---------------------------
+ 1 file changed, 17 insertions(+), 41 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index fcbc97d96a..6b83fc0e24 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -146,12 +146,10 @@ struct FileEncryptionInfo {
+     int payloadOffset; /* start offset of the volume data (in 512 byte sectors) */
+ };
+ 
+-/* Either 'magic' or 'extension' *must* be provided */
+ struct FileTypeInfo {
+     int magicOffset;    /* Byte offset of the magic */
+     const char *magic;  /* Optional string of file magic
+                          * to check at head of file */
+-    const char *extension; /* Optional file extension to check */
+     enum lv_endian endian; /* Endianness of file format */
+ 
+     int versionOffset;    /* Byte offset from start of file
+@@ -297,17 +295,17 @@ static struct FileEncryptionInfo const qcow2EncryptionInfo[] = {
+ };
+ 
+ static struct FileTypeInfo const fileTypeInfo[] = {
+-    [VIR_STORAGE_FILE_NONE] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
++    [VIR_STORAGE_FILE_NONE] = { 0, NULL, LV_LITTLE_ENDIAN,
+                                 -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL },
+-    [VIR_STORAGE_FILE_RAW] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
++    [VIR_STORAGE_FILE_RAW] = { 0, NULL, LV_LITTLE_ENDIAN,
+                                -1, 0, {0}, 0, 0, 0,
+                                luksEncryptionInfo,
+                                NULL, NULL },
+-    [VIR_STORAGE_FILE_DIR] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
++    [VIR_STORAGE_FILE_DIR] = { 0, NULL, LV_LITTLE_ENDIAN,
+                                -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL },
+     [VIR_STORAGE_FILE_BOCHS] = {
+         /*"Bochs Virtual HD Image", */ /* Untested */
+-        0, NULL, NULL,
++        0, NULL,
+         LV_LITTLE_ENDIAN, 64, 4, {0x20000},
+         32+16+16+4+4+4+4+4, 8, 1, NULL, NULL, NULL
+     },
+@@ -316,7 +314,7 @@ static struct FileTypeInfo const fileTypeInfo[] = {
+            #V2.0 Format
+            modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1
+         */ /* Untested */
+-        0, NULL, NULL,
++        0, NULL,
+         LV_LITTLE_ENDIAN, -1, 0, {0},
+         -1, 0, 0, NULL, NULL, NULL
+     },
+@@ -324,50 +322,50 @@ static struct FileTypeInfo const fileTypeInfo[] = {
+         /* XXX QEMU says there's no magic for dmg,
+          * /usr/share/misc/magic lists double magic (both offsets
+          * would have to match) but then disables that check. */
+-        0, NULL, ".dmg",
++        0, NULL,
+         0, -1, 0, {0},
+         -1, 0, 0, NULL, NULL, NULL
+     },
+     [VIR_STORAGE_FILE_ISO] = {
+-        32769, "CD001", ".iso",
++        32769, "CD001",
+         LV_LITTLE_ENDIAN, -2, 0, {0},
+         -1, 0, 0, NULL, NULL, NULL
+     },
+     [VIR_STORAGE_FILE_VPC] = {
+-        0, "conectix", NULL,
++        0, "conectix",
+         LV_BIG_ENDIAN, 12, 4, {0x10000},
+         8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, 8, 1, NULL, NULL, NULL
+     },
+     /* TODO: add getBackingStore function */
+     [VIR_STORAGE_FILE_VDI] = {
+-        64, "\x7f\x10\xda\xbe", ".vdi",
++        64, "\x7f\x10\xda\xbe",
+         LV_LITTLE_ENDIAN, 68, 4, {0x00010001},
+         64 + 5 * 4 + 256 + 7 * 4, 8, 1, NULL, NULL, NULL},
+ 
+     /* Not direct file formats, but used for various drivers */
+-    [VIR_STORAGE_FILE_FAT] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
++    [VIR_STORAGE_FILE_FAT] = { 0, NULL, LV_LITTLE_ENDIAN,
+                                -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL },
+-    [VIR_STORAGE_FILE_VHD] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
++    [VIR_STORAGE_FILE_VHD] = { 0, NULL, LV_LITTLE_ENDIAN,
+                                -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL },
+-    [VIR_STORAGE_FILE_PLOOP] = { 0, "WithouFreSpacExt", NULL, LV_LITTLE_ENDIAN,
++    [VIR_STORAGE_FILE_PLOOP] = { 0, "WithouFreSpacExt", LV_LITTLE_ENDIAN,
+                                  -2, 0, {0}, PLOOP_IMAGE_SIZE_OFFSET, 0,
+                                  PLOOP_SIZE_MULTIPLIER, NULL, NULL, NULL },
+ 
+     /* All formats with a backing store probe below here */
+     [VIR_STORAGE_FILE_COW] = {
+-        0, "OOOM", NULL,
++        0, "OOOM",
+         LV_BIG_ENDIAN, 4, 4, {2},
+         4+4+1024+4, 8, 1, NULL, cowGetBackingStore, NULL
+     },
+     [VIR_STORAGE_FILE_QCOW] = {
+-        0, "QFI", NULL,
++        0, "QFI",
+         LV_BIG_ENDIAN, 4, 4, {1},
+         QCOWX_HDR_IMAGE_SIZE, 8, 1,
+         qcow1EncryptionInfo,
+         qcowXGetBackingStore, NULL
+     },
+     [VIR_STORAGE_FILE_QCOW2] = {
+-        0, "QFI", NULL,
++        0, "QFI",
+         LV_BIG_ENDIAN, 4, 4, {2, 3},
+         QCOWX_HDR_IMAGE_SIZE, 8, 1,
+         qcow2EncryptionInfo,
+@@ -376,12 +374,12 @@ static struct FileTypeInfo const fileTypeInfo[] = {
+     },
+     [VIR_STORAGE_FILE_QED] = {
+         /* https://wiki.qemu.org/Features/QED */
+-        0, "QED", NULL,
++        0, "QED",
+         LV_LITTLE_ENDIAN, -2, 0, {0},
+         QED_HDR_IMAGE_SIZE, 8, 1, NULL, qedGetBackingStore, NULL
+     },
+     [VIR_STORAGE_FILE_VMDK] = {
+-        0, "KDMV", NULL,
++        0, "KDMV",
+         LV_LITTLE_ENDIAN, 4, 4, {1, 2, 3},
+         4+4+4, 8, 512, NULL, vmdk4GetBackingStore, NULL
+     },
+@@ -707,20 +705,6 @@ virStorageFileMatchesMagic(int magicOffset,
+ }
+ 
+ 
+-static bool
+-virStorageFileMatchesExtension(const char *extension,
+-                               const char *path)
+-{
+-    if (extension == NULL)
+-        return false;
+-
+-    if (virStringHasCaseSuffix(path, extension))
+-        return true;
+-
+-    return false;
+-}
+-
+-
+ static bool
+ virStorageFileMatchesVersion(int versionOffset,
+                              int versionSize,
+@@ -842,14 +826,6 @@ virStorageFileProbeFormatFromBuf(const char *path,
+                  "Please report new version to libvir-list@redhat.com",
+                  path, virStorageFileFormatTypeToString(possibleFormat));
+ 
+-    /* No magic, so check file extension */
+-    for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
+-        if (virStorageFileMatchesExtension(fileTypeInfo[i].extension, path)) {
+-            format = i;
+-            goto cleanup;
+-        }
+-    }
+-
+  cleanup:
+     VIR_DEBUG("format=%d", format);
+     return format;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-util-storagefile-Properly-set-transport-type-when-parsing-NBD-strings.patch b/SOURCES/libvirt-util-storagefile-Properly-set-transport-type-when-parsing-NBD-strings.patch
new file mode 100644
index 0000000..7b9b4bc
--- /dev/null
+++ b/SOURCES/libvirt-util-storagefile-Properly-set-transport-type-when-parsing-NBD-strings.patch
@@ -0,0 +1,69 @@
+From c8d5d7684ae855f75e3bba3f72b5b3f973ccdea2 Mon Sep 17 00:00:00 2001
+Message-Id: <c8d5d7684ae855f75e3bba3f72b5b3f973ccdea2@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 17 Jan 2020 13:16:57 +0100
+Subject: [PATCH] util: storagefile: Properly set transport type when parsing
+ NBD strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When parsing legacy NBD backing file strings such as
+'nbd:unix:/tmp/sock:exportname=/' we'd fail to set the transport to
+VIR_STORAGE_NET_HOST_TRANS_UNIX. This started to be a problem once we
+actually started to generate config of the backing store on the command
+line with -blockdev as the JSON code would try to format it as TCP and
+fail with:
+
+ internal error: argument key 'host' must not have null value
+
+Set the type properly and add a test.
+
+This bug was found by the libguestfs test suite in:
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791614
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reported-by: Ming Xie <mxie@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit 5f2fa393f721861132500f717ce509bb66afcdb7)
+Message-Id: <79e24a6416d5bfbba6cdb2764b29663c2f8ccd45.1579263320.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
+---
+ src/util/virstoragefile.c | 2 +-
+ tests/virstoragetest.c    | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 1397f532fd..7a2af0ad94 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2964,7 +2964,7 @@ virStorageSourceParseNBDColonString(const char *nbdstr,
+         }
+ 
+         src->hosts->socket = g_strdup(backing[2]);
+-
++        src->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_UNIX;
+    } else {
+         src->hosts->name = g_strdup(backing[1]);
+ 
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 2862758752..370e19252b 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1258,6 +1258,10 @@ mymain(void)
+                        "<source protocol='nbd' name=':test'>\n"
+                        "  <host name='example.org' port='6000'/>\n"
+                        "</source>\n");
++    TEST_BACKING_PARSE("nbd:unix:/tmp/sock:exportname=/",
++                       "<source protocol='nbd' name='/'>\n"
++                       "  <host transport='unix' socket='/tmp/sock'/>\n"
++                       "</source>\n");
+     TEST_BACKING_PARSE("nbd://example.org:1234",
+                        "<source protocol='nbd'>\n"
+                        "  <host name='example.org' port='1234'/>\n"
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-util-string-Introduce-macro-for-automatic-string-lists.patch b/SOURCES/libvirt-util-string-Introduce-macro-for-automatic-string-lists.patch
deleted file mode 100644
index 9c99563..0000000
--- a/SOURCES/libvirt-util-string-Introduce-macro-for-automatic-string-lists.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From b9490d128b1a65d4d1ca273ddd54c696fa62ad73 Mon Sep 17 00:00:00 2001
-Message-Id: <b9490d128b1a65d4d1ca273ddd54c696fa62ad73@dist-git>
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 21 Jun 2019 09:26:01 +0200
-Subject: [PATCH] util: string: Introduce macro for automatic string lists
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Similar to VIR_AUTOPTR, VIR_AUTOSTRINGLIST defines a list of strings
-which will be freed if the pointer is leaving scope.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit daefda165b28b399478137c75b5466f865c65be5)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/util/virstring.h
-            - different header file guard
-            - no AUTOPTR for string lists
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <7f1e7edf9c9a096fde1a2adf37090f8190e99be2.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virstring.c     | 10 ++++++++++
- src/util/virstring.h     | 10 ++++++++++
- 3 files changed, 21 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index a20e0593f0..06374deaae 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2923,6 +2923,7 @@ virStringHasControlChars;
- virStringIsEmpty;
- virStringIsPrintable;
- virStringListAdd;
-+virStringListAutoFree;
- virStringListFree;
- virStringListFreeCount;
- virStringListGetFirstWithPrefix;
-diff --git a/src/util/virstring.c b/src/util/virstring.c
-index 15f367af7c..0f13b6c664 100644
---- a/src/util/virstring.c
-+++ b/src/util/virstring.c
-@@ -332,6 +332,16 @@ void virStringListFree(char **strings)
- }
- 
- 
-+void virStringListAutoFree(char ***strings)
-+{
-+    if (!*strings)
-+        return;
-+
-+    virStringListFree(*strings);
-+    *strings = NULL;
-+}
-+
-+
- /**
-  * virStringListFreeCount:
-  * @strings: array of strings to free
-diff --git a/src/util/virstring.h b/src/util/virstring.h
-index 607ae66e99..e68b9eec79 100644
---- a/src/util/virstring.h
-+++ b/src/util/virstring.h
-@@ -53,6 +53,7 @@ int virStringListCopy(char ***dst,
-                       const char **src);
- 
- void virStringListFree(char **strings);
-+void virStringListAutoFree(char ***strings);
- void virStringListFreeCount(char **strings,
-                             size_t count);
- 
-@@ -309,4 +310,13 @@ int virStringParsePort(const char *str,
-                        unsigned int *port)
-     ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
- 
-+/**
-+ * VIR_AUTOSTRINGLIST:
-+ *
-+ * Declares a NULL-terminated list of strings which will be automatically freed
-+ * when the pointer goes out of scope.
-+ */
-+# define VIR_AUTOSTRINGLIST \
-+        __attribute__((cleanup(virStringListAutoFree))) char **
-+
- #endif /* __VIR_STRING_H__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-suppress-unimportant-ovs-vsctl-errors-when-getting-interface-stats.patch b/SOURCES/libvirt-util-suppress-unimportant-ovs-vsctl-errors-when-getting-interface-stats.patch
deleted file mode 100644
index 7f450bc..0000000
--- a/SOURCES/libvirt-util-suppress-unimportant-ovs-vsctl-errors-when-getting-interface-stats.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 53282d1e7f34724c6be7704ec56324c507894397 Mon Sep 17 00:00:00 2001
-Message-Id: <53282d1e7f34724c6be7704ec56324c507894397@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Tue, 30 Jul 2019 15:30:50 +0200
-Subject: [PATCH] util: suppress unimportant ovs-vsctl errors when getting
- interface stats
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit edaf13565 modified the stats retrieval for OVS interfaces to
-not fail when one of the fields was unrecognized by the ovs-vsctl
-command, but ovs-vsctl was still returning an error, and libvirt was
-cluttering the logs with these inconsequential error messages.
-
-This patch modifies the GET_STAT macro to add "--if-exists" to the
-ovs-vsctl command, which causes it to return an empty string (and exit
-with success) if the requested statistic isn't in its database, thus
-eliminating the ugly error messages from the log.
-
-Resolves: https://bugzilla.redhat.com/1683175
-
-Signed-off-by: Laine Stump <laine@laine.org>
-(cherry picked from commit 3f7cba3f5ea1731b9028b89b671cbd7e7d5e0421)
-
-Prerequisite of: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <e0309b32467a30a8a9be8371ef8cbba1713d662c.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index 2f5c7ac789..cb403aaf2e 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -342,10 +342,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
-         virCommandFree(cmd); \
-         cmd = virCommandNew(OVSVSCTL); \
-         virNetDevOpenvswitchAddTimeout(cmd); \
--        virCommandAddArgList(cmd, "get", "Interface", ifname, \
--                             "statistics:" name, NULL); \
-+        virCommandAddArgList(cmd, "--if-exists", "get", "Interface", \
-+                             ifname, "statistics:" name, NULL); \
-         virCommandSetOutputBuffer(cmd, &output); \
--        if (virCommandRun(cmd, NULL) < 0) { \
-+        if (virCommandRun(cmd, NULL) < 0 || !output || !*output || *output == '\n') { \
-             stats->member = -1; \
-         } else { \
-             if (virStrToLong_ll(output, &tmp, 10, &stats->member) < 0 || \
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-use-nlmsg_find_attr-instead-of-an-open-coded-loop.patch b/SOURCES/libvirt-util-use-nlmsg_find_attr-instead-of-an-open-coded-loop.patch
deleted file mode 100644
index 6b3e0cb..0000000
--- a/SOURCES/libvirt-util-use-nlmsg_find_attr-instead-of-an-open-coded-loop.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 46d50fe9ca30e8377995fea2b7d59239b46a0cfa Mon Sep 17 00:00:00 2001
-Message-Id: <46d50fe9ca30e8377995fea2b7d59239b46a0cfa@dist-git>
-From: Laine Stump <laine@laine.org>
-Date: Mon, 14 Jan 2019 11:35:04 -0500
-Subject: [PATCH] util: use nlmsg_find_attr() instead of an open-coded loop
-
-This is about the same number of code lines, but is simpler, and more
-consistent with what will be added to check another attribute in a
-coming patch.
-
-As a side effect, it
-
-Resolves: https://bugzilla.redhat.com/1583131
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 7282f455aaaa8bf2f73236aa9ec6b65b33c0fcdb)
-
-Conflicts: src/util/virnetdevip.c -  more blowback from the addition of VIR_AUTOPTR
-                             upstream.
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virnetdevip.c | 52 ++++++++++++++++++------------------------
- 1 file changed, 22 insertions(+), 30 deletions(-)
-
-diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
-index 937ebcdbdb..d56f4f05f3 100644
---- a/src/util/virnetdevip.c
-+++ b/src/util/virnetdevip.c
-@@ -564,50 +564,42 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
- {
-     struct rtmsg *rtmsg = NLMSG_DATA(resp);
-     int accept_ra = -1;
--    struct rtattr *rta;
-+    struct rtattr *rta_attr;
-     char *ifname = NULL;
-+    int ifindex = -1;
-     struct virNetDevIPCheckIPv6ForwardingData *data = opaque;
-     int ret = 0;
--    int len = RTM_PAYLOAD(resp);
--    int oif = -1;
- 
-     /* Ignore messages other than route ones */
-     if (resp->nlmsg_type != RTM_NEWROUTE)
-         return ret;
- 
--    /* Extract a device ID attribute */
--    VIR_WARNINGS_NO_CAST_ALIGN
--    for (rta = RTM_RTA(rtmsg); RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
--        VIR_WARNINGS_RESET
--        if (rta->rta_type == RTA_OIF) {
--            oif = *(int *)RTA_DATA(rta);
--
--            /* Should never happen: netlink message would be broken */
--            if (ifname) {
--                char *ifname2 = virNetDevGetName(oif);
--                VIR_WARN("Single route has unexpected 2nd interface "
--                         "- '%s' and '%s'", ifname, ifname2);
--                VIR_FREE(ifname2);
--                break;
--            }
--
--            if (!(ifname = virNetDevGetName(oif)))
--                goto error;
--        }
--    }
--
-     /* No need to do anything else for non RA routes */
-     if (rtmsg->rtm_protocol != RTPROT_RA)
-         goto cleanup;
- 
--    data->hasRARoutes = true;
-+    rta_attr = (struct rtattr *)nlmsg_find_attr(resp, sizeof(struct rtmsg), RTA_OIF);
-+    if (rta_attr) {
-+        /* This is a single path route, with interface used to reach
-+         * nexthop in the RTA_OIF attribute.
-+         */
-+        ifindex = *(int *)RTA_DATA(rta_attr);
-+        ifname = virNetDevGetName(ifindex);
- 
--    /* Check the accept_ra value for the interface */
--    accept_ra = virNetDevIPGetAcceptRA(ifname);
--    VIR_DEBUG("Checking route for device %s, accept_ra: %d", ifname, accept_ra);
-+        if (!ifname)
-+            goto error;
- 
--    if (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)
--        goto error;
-+        accept_ra = virNetDevIPGetAcceptRA(ifname);
-+
-+        VIR_DEBUG("Checking route for device %s (%d), accept_ra: %d",
-+                  ifname, ifindex, accept_ra);
-+
-+        if (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)
-+            goto error;
-+
-+        data->hasRARoutes = true;
-+        goto cleanup;
-+    }
- 
-  cleanup:
-     VIR_FREE(ifname);
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-util-vircgroup-improve-controller-detection.patch b/SOURCES/libvirt-util-vircgroup-improve-controller-detection.patch
deleted file mode 100644
index ad2ca4c..0000000
--- a/SOURCES/libvirt-util-vircgroup-improve-controller-detection.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 8c784cd15bbac88334271f95d14a9770c1b2d864 Mon Sep 17 00:00:00 2001
-Message-Id: <8c784cd15bbac88334271f95d14a9770c1b2d864@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:17 +0200
-Subject: [PATCH] util: vircgroup: improve controller detection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This affects only cgroups v2 where enabled controllers are not based on
-available mount points but on the list provided in cgroup.controllers
-file.  However, moving it will fill in placement as well, so it needs
-to be freed together with mount point if we don't need that controller.
-
-Before this patch we were assuming that all controllers available in
-root cgroup where available in all other sub-cgroups which was wrong.
-
-In order to fix it we need to move the cgroup controllers detection
-after cgroup placement was prepared in order to build correct path for
-cgroup.controllers file.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit d3007c844d8aa0caa0328ab18275be375f597704)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <cec99e4c53912c3ee6f45012fc4fd760f6e8445b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c   | 32 ++++++++++++++++----------------
- src/util/vircgroupv1.c |  1 +
- src/util/vircgroupv2.c |  5 +++--
- 3 files changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 4f71a1d197..ff2a0b75b5 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -386,22 +386,6 @@ virCgroupDetect(virCgroupPtr group,
-             return -1;
-     }
- 
--    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
--        if (group->backends[i]) {
--            int rc = group->backends[i]->detectControllers(group, controllers, parent);
--            if (rc < 0)
--                return -1;
--            controllersAvailable |= rc;
--        }
--    }
--
--    /* Check that at least 1 controller is available */
--    if (controllersAvailable == 0) {
--        virReportSystemError(ENXIO, "%s",
--                             _("At least one cgroup controller is required"));
--        return -1;
--    }
--
-     /* In some cases we can copy part of the placement info
-      * based on the parent cgroup...
-      */
-@@ -426,6 +410,22 @@ virCgroupDetect(virCgroupPtr group,
-         }
-     }
- 
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i]) {
-+            int rc = group->backends[i]->detectControllers(group, controllers, parent);
-+            if (rc < 0)
-+                return -1;
-+            controllersAvailable |= rc;
-+        }
-+    }
-+
-+    /* Check that at least 1 controller is available */
-+    if (controllersAvailable == 0) {
-+        virReportSystemError(ENXIO, "%s",
-+                             _("At least one cgroup controller is required"));
-+        return -1;
-+    }
-+
-     return 0;
- }
- 
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 784a963b79..5b218c7f78 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -463,6 +463,7 @@ virCgroupV1DetectControllers(virCgroupPtr group,
-                     }
-                 }
-                 VIR_FREE(group->legacy[i].mountPoint);
-+                VIR_FREE(group->legacy[i].placement);
-             }
-         }
-     } else {
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 60598712c8..10f8a9bbdf 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -249,8 +249,9 @@ virCgroupV2ParseControllersFile(virCgroupPtr group)
-     char **contList = NULL;
-     char **tmp;
- 
--    if (virAsprintf(&contFile, "%s/cgroup.controllers",
--                    group->unified.mountPoint) < 0)
-+    if (virAsprintf(&contFile, "%s%s/cgroup.controllers",
-+                    group->unified.mountPoint,
-+                    NULLSTR_EMPTY(group->unified.placement)) < 0)
-         return -1;
- 
-     rc = virFileReadAll(contFile, 1024 * 1024, &contStr);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroup-introduce-virCgroup-Get-Set-ValueRaw.patch b/SOURCES/libvirt-util-vircgroup-introduce-virCgroup-Get-Set-ValueRaw.patch
deleted file mode 100644
index de8b405..0000000
--- a/SOURCES/libvirt-util-vircgroup-introduce-virCgroup-Get-Set-ValueRaw.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 7ff748b22516848e8432d56ffa25a20452569648 Mon Sep 17 00:00:00 2001
-Message-Id: <7ff748b22516848e8432d56ffa25a20452569648@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Tue, 2 Jul 2019 15:13:24 +0200
-Subject: [PATCH] util: vircgroup: introduce virCgroup(Get|Set)ValueRaw
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If we need to get a path of specific file and we need to check its
-existence before we use it then we can reuse that path to get/set
-values instead of calling the existing get/set value functions which
-would be building the path again.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 3f741f9ace878e8aa9f537992b877a1e059d53a9)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1658890
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <176473826dad107b8880a33355b59dcefcb75e63.1562073117.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c     | 74 +++++++++++++++++++++++++---------------
- src/util/vircgrouppriv.h |  6 ++++
- 2 files changed, 52 insertions(+), 28 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 3c99934b25..769e23a523 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -460,28 +460,22 @@ virCgroupGetBlockDevString(const char *path)
- 
- 
- int
--virCgroupSetValueStr(virCgroupPtr group,
--                     int controller,
--                     const char *key,
-+virCgroupSetValueRaw(const char *path,
-                      const char *value)
- {
--    VIR_AUTOFREE(char *) keypath = NULL;
--    char *tmp = NULL;
-+    char *tmp;
- 
--    if (virCgroupPathOfController(group, controller, key, &keypath) < 0)
--        return -1;
--
--    VIR_DEBUG("Set value '%s' to '%s'", keypath, value);
--    if (virFileWriteStr(keypath, value, 0) < 0) {
-+    VIR_DEBUG("Set value '%s' to '%s'", path, value);
-+    if (virFileWriteStr(path, value, 0) < 0) {
-         if (errno == EINVAL &&
--            (tmp = strrchr(keypath, '/'))) {
-+            (tmp = strrchr(path, '/'))) {
-             virReportSystemError(errno,
-                                  _("Invalid value '%s' for '%s'"),
-                                  value, tmp + 1);
-             return -1;
-         }
-         virReportSystemError(errno,
--                             _("Unable to write to '%s'"), keypath);
-+                             _("Unable to write to '%s'"), path);
-         return -1;
-     }
- 
-@@ -489,6 +483,45 @@ virCgroupSetValueStr(virCgroupPtr group,
- }
- 
- 
-+int
-+virCgroupGetValueRaw(const char *path,
-+                     char **value)
-+{
-+    int rc;
-+
-+    *value = NULL;
-+
-+    VIR_DEBUG("Get value %s", path);
-+
-+    if ((rc = virFileReadAll(path, 1024*1024, value)) < 0) {
-+        virReportSystemError(errno,
-+                             _("Unable to read from '%s'"), path);
-+        return -1;
-+    }
-+
-+    /* Terminated with '\n' has sometimes harmful effects to the caller */
-+    if (rc > 0 && (*value)[rc - 1] == '\n')
-+        (*value)[rc - 1] = '\0';
-+
-+    return 0;
-+}
-+
-+
-+int
-+virCgroupSetValueStr(virCgroupPtr group,
-+                     int controller,
-+                     const char *key,
-+                     const char *value)
-+{
-+    VIR_AUTOFREE(char *) keypath = NULL;
-+
-+    if (virCgroupPathOfController(group, controller, key, &keypath) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueRaw(keypath, value);
-+}
-+
-+
- int
- virCgroupGetValueStr(virCgroupPtr group,
-                      int controller,
-@@ -496,26 +529,11 @@ virCgroupGetValueStr(virCgroupPtr group,
-                      char **value)
- {
-     VIR_AUTOFREE(char *) keypath = NULL;
--    int rc;
--
--    *value = NULL;
- 
-     if (virCgroupPathOfController(group, controller, key, &keypath) < 0)
-         return -1;
- 
--    VIR_DEBUG("Get value %s", keypath);
--
--    if ((rc = virFileReadAll(keypath, 1024*1024, value)) < 0) {
--        virReportSystemError(errno,
--                             _("Unable to read from '%s'"), keypath);
--        return -1;
--    }
--
--    /* Terminated with '\n' has sometimes harmful effects to the caller */
--    if (rc > 0 && (*value)[rc - 1] == '\n')
--        (*value)[rc - 1] = '\0';
--
--    return 0;
-+    return virCgroupGetValueRaw(keypath, value);
- }
- 
- 
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 6067f5cdc8..bdb3d493b1 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -62,6 +62,12 @@ struct _virCgroup {
-     virCgroupV2Controller unified;
- };
- 
-+int virCgroupSetValueRaw(const char *path,
-+                         const char *value);
-+
-+int virCgroupGetValueRaw(const char *path,
-+                         char **value);
-+
- int virCgroupSetValueStr(virCgroupPtr group,
-                          int controller,
-                          const char *key,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroup-move-virCgroupGetValueStr-out-of-virCgroupGetValueForBlkDev.patch b/SOURCES/libvirt-util-vircgroup-move-virCgroupGetValueStr-out-of-virCgroupGetValueForBlkDev.patch
deleted file mode 100644
index 6484836..0000000
--- a/SOURCES/libvirt-util-vircgroup-move-virCgroupGetValueStr-out-of-virCgroupGetValueForBlkDev.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-From 10bd6c74aa383403fae5ef7f4aec98d28246d972 Mon Sep 17 00:00:00 2001
-Message-Id: <10bd6c74aa383403fae5ef7f4aec98d28246d972@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Tue, 2 Jul 2019 15:13:25 +0200
-Subject: [PATCH] util: vircgroup: move virCgroupGetValueStr out of
- virCgroupGetValueForBlkDev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If we need to get a path of specific file and we need to check its
-existence before we use it then we can reuse that path to get value
-for specific device.  This way we will not build the path again in
-virCgroupGetValueForBlkDev.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c23829f18a9b104466af88eb909a3fd9660b9cbe)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1658890
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <72fe6534d0e19e271bac2aeb35bac028e67cfac2.1562073117.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c     |  8 +----
- src/util/vircgrouppriv.h |  6 ++--
- src/util/vircgroupv1.c   | 70 ++++++++++++++++++++++++++--------------
- src/util/vircgroupv2.c   | 65 +++++++++++++++++++++++--------------
- 4 files changed, 88 insertions(+), 61 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 769e23a523..37f6def08d 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -538,20 +538,14 @@ virCgroupGetValueStr(virCgroupPtr group,
- 
- 
- int
--virCgroupGetValueForBlkDev(virCgroupPtr group,
--                           int controller,
--                           const char *key,
-+virCgroupGetValueForBlkDev(const char *str,
-                            const char *path,
-                            char **value)
- {
-     VIR_AUTOFREE(char *) prefix = NULL;
--    VIR_AUTOFREE(char *) str = NULL;
-     char **lines = NULL;
-     int ret = -1;
- 
--    if (virCgroupGetValueStr(group, controller, key, &str) < 0)
--        goto error;
--
-     if (!(prefix = virCgroupGetBlockDevString(path)))
-         goto error;
- 
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index bdb3d493b1..aec38e2ac5 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -102,10 +102,8 @@ int virCgroupPartitionEscape(char **path);
- 
- char *virCgroupGetBlockDevString(const char *path);
- 
--int virCgroupGetValueForBlkDev(virCgroupPtr group,
--                               int controller,
--                               const char *key,
--                               const char *path,
-+int virCgroupGetValueForBlkDev(const char *str,
-+                               const char *devPath,
-                                char **value);
- 
- int virCgroupNew(pid_t pid,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 58bd20d636..e51db6ee1f 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1181,12 +1181,16 @@ virCgroupV1GetBlkioDeviceWeight(virCgroupPtr group,
-                                 unsigned int *weight)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.weight_device",
--                                   path,
--                                   &str) < 0)
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.weight_device",
-+                             &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-         return -1;
- 
-     if (!str) {
-@@ -1229,12 +1233,16 @@ virCgroupV1GetBlkioDeviceReadIops(virCgroupPtr group,
-                                   unsigned int *riops)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.read_iops_device",
--                                   path,
--                                   &str) < 0)
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.read_iops_device",
-+                             &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-         return -1;
- 
-     if (!str) {
-@@ -1277,12 +1285,16 @@ virCgroupV1GetBlkioDeviceWriteIops(virCgroupPtr group,
-                                    unsigned int *wiops)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.write_iops_device",
--                                   path,
--                                   &str) < 0)
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.write_iops_device",
-+                             &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-         return -1;
- 
-     if (!str) {
-@@ -1325,12 +1337,16 @@ virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr group,
-                                  unsigned long long *rbps)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.read_bps_device",
--                                   path,
--                                   &str) < 0)
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.read_bps_device",
-+                             &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-         return -1;
- 
-     if (!str) {
-@@ -1373,12 +1389,16 @@ virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group,
-                                   unsigned long long *wbps)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.write_bps_device",
--                                   path,
--                                   &str) < 0)
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.write_bps_device",
-+                             &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-         return -1;
- 
-     if (!str) {
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 749efa199b..e9bb331dd4 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -787,15 +787,18 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
-                                 unsigned int *weight)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "io.weight",
--                                   path,
--                                   &str) < 0) {
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.weight",
-+                             &value) < 0) {
-         return -1;
-     }
- 
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+        return -1;
-+
-     if (!str) {
-         *weight = 0;
-     } else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
-@@ -841,17 +844,20 @@ virCgroupV2GetBlkioDeviceReadIops(virCgroupPtr group,
-                                   unsigned int *riops)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
-     const char *name = "riops=";
-     char *tmp;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "io.max",
--                                   path,
--                                   &str) < 0) {
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.max",
-+                             &value) < 0) {
-         return -1;
-     }
- 
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+        return -1;
-+
-     if (!str) {
-         *riops = 0;
-     } else {
-@@ -909,17 +915,20 @@ virCgroupV2GetBlkioDeviceWriteIops(virCgroupPtr group,
-                                    unsigned int *wiops)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
-     const char *name = "wiops=";
-     char *tmp;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "io.max",
--                                   path,
--                                   &str) < 0) {
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.max",
-+                             &value) < 0) {
-         return -1;
-     }
- 
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+        return -1;
-+
-     if (!str) {
-         *wiops = 0;
-     } else {
-@@ -977,17 +986,20 @@ virCgroupV2GetBlkioDeviceReadBps(virCgroupPtr group,
-                                  unsigned long long *rbps)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
-     const char *name = "rbps=";
-     char *tmp;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "io.max",
--                                   path,
--                                   &str) < 0) {
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.max",
-+                             &value) < 0) {
-         return -1;
-     }
- 
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+        return -1;
-+
-     if (!str) {
-         *rbps = 0;
-     } else {
-@@ -1045,17 +1057,20 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroupPtr group,
-                                   unsigned long long *wbps)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
-     const char *name = "wbps=";
-     char *tmp;
- 
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "io.max",
--                                   path,
--                                   &str) < 0) {
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.max",
-+                             &value) < 0) {
-         return -1;
-     }
- 
-+    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+        return -1;
-+
-     if (!str) {
-         *wbps = 0;
-     } else {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch b/SOURCES/libvirt-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
deleted file mode 100644
index e184088..0000000
--- a/SOURCES/libvirt-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 6403a3028222b103d7ef8ecf89aabe92242667da Mon Sep 17 00:00:00 2001
-Message-Id: <6403a3028222b103d7ef8ecf89aabe92242667da@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:15 +0200
-Subject: [PATCH] util: vircgroup: pass parent cgroup into
- virCgroupDetectControllersCB
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In cgroups v2 we don't have to detect available controllers every single
-time if we are creating a new cgroup based on parent cgroup.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 7bca1c9bdc85247446129f856e27c80a32819e17)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <f31650dee05403189825c50e55daf3456c7de1cc.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  2 +-
- src/util/vircgroupbackend.h |  3 ++-
- src/util/vircgroupv1.c      |  3 ++-
- src/util/vircgroupv2.c      | 17 +++++++++++------
- 4 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 736b5043a8..4f71a1d197 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -388,7 +388,7 @@ virCgroupDetect(virCgroupPtr group,
- 
-     for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-         if (group->backends[i]) {
--            int rc = group->backends[i]->detectControllers(group, controllers);
-+            int rc = group->backends[i]->detectControllers(group, controllers, parent);
-             if (rc < 0)
-                 return -1;
-             controllersAvailable |= rc;
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index a825dc4be7..05af118ec1 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -96,7 +96,8 @@ typedef char *
- 
- typedef int
- (*virCgroupDetectControllersCB)(virCgroupPtr group,
--                                int controllers);
-+                                int controllers,
-+                                virCgroupPtr parent);
- 
- typedef bool
- (*virCgroupHasControllerCB)(virCgroupPtr cgroup,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 7098dc5644..784a963b79 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -419,7 +419,8 @@ virCgroupV1StealPlacement(virCgroupPtr group)
- 
- static int
- virCgroupV1DetectControllers(virCgroupPtr group,
--                             int controllers)
-+                             int controllers,
-+                             virCgroupPtr parent ATTRIBUTE_UNUSED)
- {
-     size_t i;
-     size_t j;
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 04638c4e50..60598712c8 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -284,16 +284,21 @@ virCgroupV2ParseControllersFile(virCgroupPtr group)
- 
- static int
- virCgroupV2DetectControllers(virCgroupPtr group,
--                             int controllers)
-+                             int controllers,
-+                             virCgroupPtr parent)
- {
-     size_t i;
- 
--    if (virCgroupV2ParseControllersFile(group) < 0)
--        return -1;
-+    if (parent) {
-+        group->unified.controllers = parent->unified.controllers;
-+    } else {
-+        if (virCgroupV2ParseControllersFile(group) < 0)
-+            return -1;
- 
--    /* In cgroup v2 there is no cpuacct controller, the cpu.stat file always
--     * exists with usage stats. */
--    group->unified.controllers |= 1 << VIR_CGROUP_CONTROLLER_CPUACCT;
-+        /* In cgroup v2 there is no cpuacct controller, the cpu.stat file always
-+         * exists with usage stats. */
-+        group->unified.controllers |= 1 << VIR_CGROUP_CONTROLLER_CPUACCT;
-+    }
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++)
-         VIR_DEBUG("Controller '%s' present=%s",
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv1-add-support-for-BFQ-blkio-files.patch b/SOURCES/libvirt-util-vircgroupv1-add-support-for-BFQ-blkio-files.patch
deleted file mode 100644
index 894ba09..0000000
--- a/SOURCES/libvirt-util-vircgroupv1-add-support-for-BFQ-blkio-files.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From a6c731357b9c74e5cc298f04267312ad3bb635fa Mon Sep 17 00:00:00 2001
-Message-Id: <a6c731357b9c74e5cc298f04267312ad3bb635fa@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Tue, 2 Jul 2019 15:13:26 +0200
-Subject: [PATCH] util: vircgroupv1: add support for BFQ blkio files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In kernel 4.12 there was introduced new BFQ scheduler and in kernel
-5.0 the old CFQ scheduler was removed.  This has an implication on
-the cgroups file names.
-
-If the CFQ controller is enabled we use these two files:
-
-    blkio.weight
-    blkio.weight_device
-
-The new BFQ controller expose only one file with different name:
-
-    blkio.bfq.weight
-
-The reason is that BFQ controller doesn't support per-device weight.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 035ebe9390a630964f391816f05c9cc7792212ad)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1658890
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b66aa3f8ec343e90f9ccd2e458707051c65b4d0d.1562073117.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv1.c | 114 ++++++++++++++++++++++++++++++++---------
- 1 file changed, 90 insertions(+), 24 deletions(-)
-
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index e51db6ee1f..a7d6c92e4c 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -949,10 +949,33 @@ static int
- virCgroupV1SetBlkioWeight(virCgroupPtr group,
-                           unsigned int weight)
- {
--    return virCgroupSetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_BLKIO,
--                                "blkio.weight",
--                                weight);
-+    VIR_AUTOFREE(char *) path = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
-+
-+    if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "blkio.bfq.weight", &path) < 0) {
-+        return -1;
-+    }
-+
-+    if (!virFileExists(path)) {
-+        VIR_FREE(path);
-+
-+        if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                        "blkio.weight", &path) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio device weight is valid only for bfq or cfq scheduler"));
-+        return -1;
-+    }
-+
-+    if (virAsprintf(&value, "%u", weight) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueRaw(path, value);
- }
- 
- 
-@@ -960,14 +983,40 @@ static int
- virCgroupV1GetBlkioWeight(virCgroupPtr group,
-                           unsigned int *weight)
- {
--    unsigned long long tmp;
--    int ret;
--    ret = virCgroupGetValueU64(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.weight", &tmp);
--    if (ret == 0)
--        *weight = tmp;
--    return ret;
-+    VIR_AUTOFREE(char *) path = NULL;
-+    VIR_AUTOFREE(char *) value = NULL;
-+
-+    if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "blkio.bfq.weight", &path) < 0) {
-+        return -1;
-+    }
-+
-+    if (!virFileExists(path)) {
-+        VIR_FREE(path);
-+
-+        if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                        "blkio.weight", &path) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio device weight is valid only for bfq or cfq scheduler"));
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueRaw(path, &value) < 0)
-+        return -1;
-+
-+    if (virStrToLong_ui(value, NULL, 10, weight) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       value);
-+        return -1;
-+    }
-+
-+    return 0;
- }
- 
- 
-@@ -1156,41 +1205,58 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroupPtr group,
- 
- static int
- virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group,
--                                const char *path,
-+                                const char *devPath,
-                                 unsigned int weight)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-     VIR_AUTOFREE(char *) blkstr = NULL;
-+    VIR_AUTOFREE(char *) path = NULL;
- 
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+    if (!(blkstr = virCgroupGetBlockDevString(devPath)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
-         return -1;
- 
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_BLKIO,
--                                "blkio.weight_device",
--                                str);
-+    if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "blkio.weight_device", &path) < 0) {
-+        return -1;
-+    }
-+
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio device weight is valid only for cfq scheduler"));
-+        return -1;
-+    }
-+
-+    return virCgroupSetValueRaw(path, str);
- }
- 
- 
- static int
- virCgroupV1GetBlkioDeviceWeight(virCgroupPtr group,
--                                const char *path,
-+                                const char *devPath,
-                                 unsigned int *weight)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-     VIR_AUTOFREE(char *) value = NULL;
-+    VIR_AUTOFREE(char *) path = NULL;
- 
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_BLKIO,
--                             "blkio.weight_device",
--                             &value) < 0) {
-+    if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "blkio.weight_device", &path) < 0) {
-         return -1;
-     }
- 
--    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio device weight is valid only for cfq scheduler"));
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueRaw(path, &value) < 0)
-+        return -1;
-+
-+    if (virCgroupGetValueForBlkDev(value, devPath, &str) < 0)
-         return -1;
- 
-     if (!str) {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-add-support-for-BFQ-files.patch b/SOURCES/libvirt-util-vircgroupv2-add-support-for-BFQ-files.patch
deleted file mode 100644
index 9ece80d..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-add-support-for-BFQ-files.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-From 785b8c27bef20182789d1715d0b3c1d3fe28a9f9 Mon Sep 17 00:00:00 2001
-Message-Id: <785b8c27bef20182789d1715d0b3c1d3fe28a9f9@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Tue, 2 Jul 2019 15:13:27 +0200
-Subject: [PATCH] util: vircgroupv2: add support for BFQ files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In kernel 4.12 there was introduced new BFQ scheduler and in kernel
-5.0 the old CFQ scheduler was removed.  This has an implication on
-the cgroups file names.
-
-If the CFQ controller is enabled we use one file:
-
-    io.weight
-
-The new BFQ controller expose one file with different name:
-
-    io.bfq.weight
-
-Except for different name they have different syntax.
-
-io.weight:
-
-    default $val
-    major:minor $val
-
-io.bfq.weight:
-
-    $val
-
-The difference is that BFQ doesn't support per-device weight.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 7e8a1a6e21cee67f6fa5bd2126ec17f96e5857d6)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1658890
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d41b50b6f3d3ef064b7f3274c762a7c41bf8e1ec.1562073117.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 101 +++++++++++++++++++++++++++++++----------
- 1 file changed, 78 insertions(+), 23 deletions(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index e9bb331dd4..b4e90ed46d 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -591,15 +591,35 @@ static int
- virCgroupV2SetBlkioWeight(virCgroupPtr group,
-                           unsigned int weight)
- {
-+    VIR_AUTOFREE(char *) path = NULL;
-     VIR_AUTOFREE(char *) value = NULL;
-+    const char *format = "%u";
- 
--    if (virAsprintf(&value, "default %u", weight) < 0)
-+    if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "io.bfq.weight", &path) < 0) {
-+        return -1;
-+    }
-+
-+    if (!virFileExists(path)) {
-+        VIR_FREE(path);
-+        format = "default %u";
-+
-+        if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                        "io.weight", &path) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio weight is valid only for bfq or cfq scheduler"));
-+        return -1;
-+    }
-+
-+    if (virAsprintf(&value, format, weight) < 0)
-         return -1;
- 
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_BLKIO,
--                                "io.weight",
--                                value);
-+    return virCgroupSetValueRaw(path, value);
- }
- 
- 
-@@ -607,20 +627,38 @@ static int
- virCgroupV2GetBlkioWeight(virCgroupPtr group,
-                           unsigned int *weight)
- {
-+    VIR_AUTOFREE(char *) path = NULL;
-     VIR_AUTOFREE(char *) value = NULL;
-     char *tmp;
- 
--    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO,
--                             "io.weight", &value) < 0) {
-+    if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "io.bfq.weight", &path) < 0) {
-         return -1;
-     }
- 
--    if (!(tmp = strstr(value, "default "))) {
--        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                       _("Cannot find default io weight."));
-+    if (!virFileExists(path)) {
-+        VIR_FREE(path);
-+
-+        if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                        "io.weight", &path) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio weight is valid only for bfq or cfq scheduler"));
-         return -1;
-     }
--    tmp += strlen("default ");
-+
-+    if (virCgroupGetValueRaw(path, &value) < 0)
-+        return -1;
-+
-+    if ((tmp = strstr(value, "default "))) {
-+        tmp += strlen("default ");
-+    } else {
-+        tmp = value;
-+    }
- 
-     if (virStrToLong_ui(tmp, NULL, 10, weight) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -762,41 +800,58 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroupPtr group,
- 
- static int
- virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group,
--                                const char *path,
-+                                const char *devPath,
-                                 unsigned int weight)
- {
-+    VIR_AUTOFREE(char *) path = NULL;
-     VIR_AUTOFREE(char *) str = NULL;
-     VIR_AUTOFREE(char *) blkstr = NULL;
- 
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+    if (!(blkstr = virCgroupGetBlockDevString(devPath)))
-         return -1;
- 
-     if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
-         return -1;
- 
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_BLKIO,
--                                "io.weight",
--                                str);
-+    if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "io.weight", &path) < 0) {
-+        return -1;
-+    }
-+
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio device weight is valid only for cfq scheduler"));
-+        return -1;
-+    }
-+
-+    return virCgroupSetValueRaw(path, str);
- }
- 
- 
- static int
- virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
--                                const char *path,
-+                                const char *devPath,
-                                 unsigned int *weight)
- {
-+    VIR_AUTOFREE(char *) path = NULL;
-     VIR_AUTOFREE(char *) str = NULL;
-     VIR_AUTOFREE(char *) value = NULL;
- 
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_BLKIO,
--                             "io.weight",
--                             &value) < 0) {
-+    if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                                    "io.weight", &path) < 0) {
-         return -1;
-     }
- 
--    if (virCgroupGetValueForBlkDev(value, path, &str) < 0)
-+    if (!virFileExists(path)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-+                       _("blkio device weight is valid only for cfq scheduler"));
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueRaw(path, &value) < 0)
-+        return -1;
-+
-+    if (virCgroupGetValueForBlkDev(value, devPath, &str) < 0)
-         return -1;
- 
-     if (!str) {
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-don-t-error-out-if-enabling-controller-fails.patch b/SOURCES/libvirt-util-vircgroupv2-don-t-error-out-if-enabling-controller-fails.patch
deleted file mode 100644
index d7545c6..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-don-t-error-out-if-enabling-controller-fails.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 02b2342b6b5e45e3f41cb145521f53118ba8430f Mon Sep 17 00:00:00 2001
-Message-Id: <02b2342b6b5e45e3f41cb145521f53118ba8430f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:21 +0200
-Subject: [PATCH] util: vircgroupv2: don't error out if enabling controller
- fails
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Currently CPU controller cannot be enabled if there is any real-time
-task running and is assigned to non-root cgroup which is the case on
-several distributions with graphical environment.
-
-Instead of erroring out treat it as the controller is not available.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 1d49cdcd116186e079db5668893da17f56141652)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <4a10dec59ca8cf5a2f81acf70d43f48b0a3bfd82.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index a67d5cfe04..e1ab1849ba 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -437,6 +437,8 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-         } else {
-             size_t i;
-             for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+                int rc;
-+
-                 if (!virCgroupV2HasController(parent, i))
-                     continue;
- 
-@@ -444,8 +446,17 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-                 if (i == VIR_CGROUP_CONTROLLER_CPUACCT)
-                     continue;
- 
--                if (virCgroupV2EnableController(parent, i, true) < 0)
-+                rc = virCgroupV2EnableController(parent, i, false);
-+                if (rc < 0) {
-+                    if (rc == -2) {
-+                        virResetLastError();
-+                        VIR_DEBUG("failed to enable '%s' controller, skipping",
-+                                  virCgroupV2ControllerTypeToString(i));
-+                        group->unified.controllers &= ~(1 << i);
-+                        continue;
-+                    }
-                     return -1;
-+                }
-             }
-         }
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-enable-CPU-controller-only-if-it-s-available.patch b/SOURCES/libvirt-util-vircgroupv2-enable-CPU-controller-only-if-it-s-available.patch
deleted file mode 100644
index e8f69c6..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-enable-CPU-controller-only-if-it-s-available.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From aa699de198c52868d08679176dd8355deb24ef82 Mon Sep 17 00:00:00 2001
-Message-Id: <aa699de198c52868d08679176dd8355deb24ef82@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:19 +0200
-Subject: [PATCH] util: vircgroupv2: enable CPU controller only if it's
- available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It might happen that we are not able to enable CPU controller so we
-can enable it for thread sub-cgroups only if it's available in parent
-cgroup.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f9d1c08557ddb981a0d889200431185a9c4920e0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2a13e05dfbbe52f05541c881964ce92709e5d36a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 04cbadd6a6..98d313bf82 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -403,7 +403,8 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-                 return -1;
-             }
- 
--            if (virCgroupV2EnableController(parent,
-+            if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPU) &&
-+                virCgroupV2EnableController(parent,
-                                             VIR_CGROUP_CONTROLLER_CPU) < 0) {
-                 return -1;
-             }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-mark-only-requested-controllers-as-available.patch b/SOURCES/libvirt-util-vircgroupv2-mark-only-requested-controllers-as-available.patch
deleted file mode 100644
index e055eca..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-mark-only-requested-controllers-as-available.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 54d26cd3d6839c67970d19559aaa13294c55f9a0 Mon Sep 17 00:00:00 2001
-Message-Id: <54d26cd3d6839c67970d19559aaa13294c55f9a0@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:22 +0200
-Subject: [PATCH] util: vircgroupv2: mark only requested controllers as
- available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When detecting available controllers on host we can be limited by list
-of controllers from qemu.conf file.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 05807e5d42f23832ab7dab17fb7e51b48b0a7c7b)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <40e05984144af026205a123c5b0f9cb841dcec67.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index e1ab1849ba..bdeab397a3 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -301,15 +301,15 @@ virCgroupV2DetectControllers(virCgroupPtr group,
-         group->unified.controllers |= 1 << VIR_CGROUP_CONTROLLER_CPUACCT;
-     }
- 
-+    if (controllers >= 0)
-+        group->unified.controllers &= controllers;
-+
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++)
-         VIR_DEBUG("Controller '%s' present=%s",
-                   virCgroupV2ControllerTypeToString(i),
-                   (group->unified.controllers & 1 << i) ? "yes" : "no");
- 
--    if (controllers >= 0)
--        return controllers & group->unified.controllers;
--    else
--        return group->unified.controllers;
-+    return group->unified.controllers;
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-separate-return-values-of-virCgroupV2EnableController.patch b/SOURCES/libvirt-util-vircgroupv2-separate-return-values-of-virCgroupV2EnableController.patch
deleted file mode 100644
index fad981f..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-separate-return-values-of-virCgroupV2EnableController.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 3980cde103a2804abc62a2eb3bcea39cccf20286 Mon Sep 17 00:00:00 2001
-Message-Id: <3980cde103a2804abc62a2eb3bcea39cccf20286@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:20 +0200
-Subject: [PATCH] util: vircgroupv2: separate return values of
- virCgroupV2EnableController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to skip controllers that we are not able to activate we need
-to return different return value so the caller can decide what to do.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 29a94a3fefeea0fb29b0b9f485c83c49b5bdae71)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d0356666404a39fd0d6499490f60df17f3ee90b5.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 32 ++++++++++++++++++++++++++------
- 1 file changed, 26 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 98d313bf82..a67d5cfe04 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -352,22 +352,40 @@ virCgroupV2PathOfController(virCgroupPtr group,
- }
- 
- 
-+/**
-+ * virCgroupV2EnableController:
-+ *
-+ * Returns: -1 on fatal error
-+ *          -2 if we failed to write into cgroup.subtree_control
-+ *          0 on success
-+ */
- static int
- virCgroupV2EnableController(virCgroupPtr parent,
--                            int controller)
-+                            int controller,
-+                            bool report)
- {
-     VIR_AUTOFREE(char *) val = NULL;
-+    VIR_AUTOFREE(char *) path = NULL;
- 
-     if (virAsprintf(&val, "+%s",
-                     virCgroupV2ControllerTypeToString(controller)) < 0) {
-         return -1;
-     }
- 
--    if (virCgroupSetValueStr(parent, controller,
--                             "cgroup.subtree_control", val) < 0) {
-+    if (virCgroupPathOfController(parent, controller,
-+                                  "cgroup.subtree_control", &path) < 0) {
-         return -1;
-     }
- 
-+    if (virFileWriteStr(path, val, 0) < 0) {
-+        if (report) {
-+            virReportSystemError(errno,
-+                                 _("Failed to enable controller '%s' for '%s'"),
-+                                 val, path);
-+        }
-+        return -2;
-+    }
-+
-     return 0;
- }
- 
-@@ -405,13 +423,15 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
- 
-             if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPU) &&
-                 virCgroupV2EnableController(parent,
--                                            VIR_CGROUP_CONTROLLER_CPU) < 0) {
-+                                            VIR_CGROUP_CONTROLLER_CPU,
-+                                            true) < 0) {
-                 return -1;
-             }
- 
-             if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPUSET) &&
-                 virCgroupV2EnableController(parent,
--                                            VIR_CGROUP_CONTROLLER_CPUSET) < 0) {
-+                                            VIR_CGROUP_CONTROLLER_CPUSET,
-+                                            true) < 0) {
-                 return -1;
-             }
-         } else {
-@@ -424,7 +444,7 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-                 if (i == VIR_CGROUP_CONTROLLER_CPUACCT)
-                     continue;
- 
--                if (virCgroupV2EnableController(parent, i) < 0)
-+                if (virCgroupV2EnableController(parent, i, true) < 0)
-                     return -1;
-             }
-         }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-stop-enabling-missing-controllers-with-systemd.patch b/SOURCES/libvirt-util-vircgroupv2-stop-enabling-missing-controllers-with-systemd.patch
deleted file mode 100644
index f724143..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-stop-enabling-missing-controllers-with-systemd.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From c06173bae3630cd1f953e69c4dd8df98904892a5 Mon Sep 17 00:00:00 2001
-Message-Id: <c06173bae3630cd1f953e69c4dd8df98904892a5@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:24 +0200
-Subject: [PATCH] util: vircgroupv2: stop enabling missing controllers with
- systemd
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Because of a systemd delegation policy [1] we should not write to any
-cgroups files owned by systemd which in case of cgroups v2 includes
-'cgroups.subtree_control'.
-
-systemd will enable controllers automatically for us to have them
-available for VM cgroups.
-
-[1] <https://github.com/systemd/systemd/blob/master/docs/CGROUP_DELEGATION.md>
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 62dd4d25a2bc5ee33ed22728dc79a5da99906748)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <273d20b3ced7f8b3ea0cc761cff25601f03e318f.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 2 +-
- src/util/vircgroupbackend.h | 3 +++
- src/util/vircgroupv2.c      | 5 +++++
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a7fb595bce..3c99934b25 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1075,7 +1075,7 @@ virCgroupEnableMissingControllers(char *path,
-                          &tmp) < 0)
-             goto cleanup;
- 
--        if (virCgroupMakeGroup(parent, tmp, true, VIR_CGROUP_NONE) < 0) {
-+        if (virCgroupMakeGroup(parent, tmp, true, VIR_CGROUP_SYSTEMD) < 0) {
-             virCgroupFree(&tmp);
-             goto cleanup;
-         }
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index a825dc4be7..2b5be21a76 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -35,6 +35,9 @@ typedef enum {
-                                        * attaching tasks
-                                        */
-     VIR_CGROUP_THREAD = 1 << 1, /* cgroup v2 handles threads differently */
-+    VIR_CGROUP_SYSTEMD = 1 << 2, /* with systemd and cgroups v2 we cannot
-+                                  * manually enable controllers that systemd
-+                                  * doesn't know how to delegate */
- } virCgroupBackendFlags;
- 
- typedef enum {
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index b0ed889cc8..749efa199b 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -394,6 +394,11 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-     VIR_AUTOFREE(char *) path = NULL;
-     int controller;
- 
-+    if (flags & VIR_CGROUP_SYSTEMD) {
-+        VIR_DEBUG("Running with systemd so we should not create cgroups ourselves.");
-+        return 0;
-+    }
-+
-     VIR_DEBUG("Make group %s", group->path);
- 
-     controller = virCgroupV2GetAnyController(group);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-vircgroupv2-use-any-controller-to-create-thread-directory.patch b/SOURCES/libvirt-util-vircgroupv2-use-any-controller-to-create-thread-directory.patch
deleted file mode 100644
index 40b3ee5..0000000
--- a/SOURCES/libvirt-util-vircgroupv2-use-any-controller-to-create-thread-directory.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 281c86a0556bd04ad2b3d7264f36c109c646a692 Mon Sep 17 00:00:00 2001
-Message-Id: <281c86a0556bd04ad2b3d7264f36c109c646a692@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:18 +0200
-Subject: [PATCH] util: vircgroupv2: use any controller to create thread
- directory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The assumption that CPU controller would be always enabled is wrong, we
-should use any available controller to create a new sub-cgroup.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 535bdf83c0b0372e725650c56b4996ff83406254)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c66a8d07101971e7842f3a6fa8a84373a0c9e90f.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 10f8a9bbdf..04cbadd6a6 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -398,7 +398,7 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
- 
-     if (create) {
-         if (flags & VIR_CGROUP_THREAD) {
--            if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-+            if (virCgroupSetValueStr(group, controller,
-                                      "cgroup.type", "threaded") < 0) {
-                 return -1;
-             }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-virnetdevopenvswitch-Drop-an-unused-variable-ovs_timeout.patch b/SOURCES/libvirt-util-virnetdevopenvswitch-Drop-an-unused-variable-ovs_timeout.patch
deleted file mode 100644
index f5032da..0000000
--- a/SOURCES/libvirt-util-virnetdevopenvswitch-Drop-an-unused-variable-ovs_timeout.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bf73e16686f339b35637aa6fd401d0ed8d9e191a Mon Sep 17 00:00:00 2001
-Message-Id: <bf73e16686f339b35637aa6fd401d0ed8d9e191a@dist-git>
-From: Erik Skultety <eskultet@redhat.com>
-Date: Tue, 30 Jul 2019 15:30:48 +0200
-Subject: [PATCH] util: virnetdevopenvswitch: Drop an unused variable
- @ovs_timeout
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Technically, it was never used ever since commit @f4d06ca8fd9 introduced
-it, but the fact that we called VIR_FREE on it was enough for Clang to
-never complain about it.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit cc4d44ab31ffb2500cf52081e87b137385ec76e6)
-
-Prerequisite of: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <a43450d34db47937012358004f45a6a17821883c.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index 36c587efdb..0dcd49d40f 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -420,7 +420,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
-     size_t ntokens = 0;
-     int status;
-     int ret = -1;
--    VIR_AUTOFREE(char *) ovs_timeout = NULL;
- 
-     /* Openvswitch vhostuser path are hardcoded to
-      * /<runstatedir>/openvswitch/<ifname>
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-util-virstoragefile-Add-data-structure-for-storing-storage-source-slices.patch b/SOURCES/libvirt-util-virstoragefile-Add-data-structure-for-storing-storage-source-slices.patch
new file mode 100644
index 0000000..0d94fbe
--- /dev/null
+++ b/SOURCES/libvirt-util-virstoragefile-Add-data-structure-for-storing-storage-source-slices.patch
@@ -0,0 +1,113 @@
+From 57dfcbb6715008f731deb02b8964fca5f38fd2fc Mon Sep 17 00:00:00 2001
+Message-Id: <57dfcbb6715008f731deb02b8964fca5f38fd2fc@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:15 +0100
+Subject: [PATCH] util: virstoragefile: Add data structure for storing storage
+ source slices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce virStorageSourceSlice which will store the 'offset' and 'size'
+of a virStorageSource and declare it as 'sliceStorage' and 'sliceFormat'
+attributes of a virStorageSource.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 6efa04616553c573700906cb7154a8ceb3bd2cb3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <c0e6db154dbb2087bd6dbcae2e232b61f36b7800.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 29 +++++++++++++++++++++++++++++
+ src/util/virstoragefile.h | 12 ++++++++++++
+ 2 files changed, 41 insertions(+)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index b02fad92b6..0be4168d6e 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2248,6 +2248,30 @@ virStorageSourcePoolDefCopy(const virStorageSourcePoolDef *src)
+ }
+ 
+ 
++static virStorageSourceSlicePtr
++virStorageSourceSliceCopy(const virStorageSourceSlice *src)
++{
++    virStorageSourceSlicePtr ret = g_new0(virStorageSourceSlice, 1);
++
++    ret->offset = src->offset;
++    ret->size = src->size;
++    ret->nodename = g_strdup(src->nodename);
++
++    return ret;
++}
++
++
++static void
++virStorageSourceSliceFree(virStorageSourceSlicePtr slice)
++{
++    if (!slice)
++        return;
++
++    g_free(slice->nodename);
++    g_free(slice);
++}
++
++
+ /**
+  * virStorageSourcePtr:
+  *
+@@ -2302,6 +2326,9 @@ virStorageSourceCopy(const virStorageSource *src,
+     def->tlsAlias = g_strdup(src->tlsAlias);
+     def->tlsCertdir = g_strdup(src->tlsCertdir);
+ 
++    if (src->sliceStorage)
++        def->sliceStorage = virStorageSourceSliceCopy(src->sliceStorage);
++
+     if (src->nhosts) {
+         if (!(def->hosts = virStorageNetHostDefCopy(src->nhosts, src->hosts)))
+             return NULL;
+@@ -2581,6 +2608,8 @@ virStorageSourceClear(virStorageSourcePtr def)
+     VIR_FREE(def->timestamps);
+     VIR_FREE(def->externalDataStoreRaw);
+ 
++    virStorageSourceSliceFree(def->sliceStorage);
++
+     virObjectUnref(def->externalDataStore);
+     def->externalDataStore = NULL;
+ 
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 39e50a989d..1f41e6e357 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -242,6 +242,16 @@ struct _virStorageSourceNVMeDef {
+     /* Don't forget to update virStorageSourceNVMeDefCopy */
+ };
+ 
++
++typedef struct _virStorageSourceSlice virStorageSourceSlice;
++typedef virStorageSourceSlice *virStorageSourceSlicePtr;
++struct _virStorageSourceSlice {
++    unsigned long long offset;
++    unsigned long long size;
++    char *nodename;
++};
++
++
+ typedef struct _virStorageDriverData virStorageDriverData;
+ typedef virStorageDriverData *virStorageDriverDataPtr;
+ 
+@@ -286,6 +296,8 @@ struct _virStorageSource {
+     bool nocow;
+     bool sparse;
+ 
++    virStorageSourceSlicePtr sliceStorage;
++
+     virStoragePermsPtr perms;
+     virStorageTimestampsPtr timestamps;
+     unsigned long long capacity; /* in bytes, 0 if unknown */
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-utils-Remove-arbitrary-limit-on-socket_id-core_id.patch b/SOURCES/libvirt-utils-Remove-arbitrary-limit-on-socket_id-core_id.patch
deleted file mode 100644
index ed455de..0000000
--- a/SOURCES/libvirt-utils-Remove-arbitrary-limit-on-socket_id-core_id.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fb4e8466ec0adc6e0aee55ab34e60e88d365d5de Mon Sep 17 00:00:00 2001
-Message-Id: <fb4e8466ec0adc6e0aee55ab34e60e88d365d5de@dist-git>
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Wed, 15 Aug 2018 14:04:43 +0200
-Subject: [PATCH] utils: Remove arbitrary limit on socket_id/core_id
-
-While in most cases the values are going to be much
-smaller than our arbitrary 4096 limit, there is really
-no guarantee that would be the case: in fact, a few
-aarch64 servers have been spotted in the wild with
-core_id as high as 6216.
-
-Take advantage of virBitmap's ability to automatically
-alter its size at runtime to accomodate such values.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit ba35ac2ebbc7f94abc50ffbf1d681458e2406444)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1608479
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virhostcpu.c | 23 ++++-------------------
- 1 file changed, 4 insertions(+), 19 deletions(-)
-
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index b644398e00..1e31be5900 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -294,9 +294,6 @@ virHostCPUParseNode(const char *node,
-                     int *threads,
-                     int *offline)
- {
--    /* Biggest value we can expect to be used as either socket id
--     * or core id. Bitmaps will need to be sized accordingly */
--    const int ID_MAX = 4095;
-     int ret = -1;
-     int processors = 0;
-     DIR *cpudir = NULL;
-@@ -325,7 +322,7 @@ virHostCPUParseNode(const char *node,
-         goto cleanup;
- 
-     /* enumerate sockets in the node */
--    if (!(sockets_map = virBitmapNew(ID_MAX + 1)))
-+    if (!(sockets_map = virBitmapNewEmpty()))
-         goto cleanup;
- 
-     while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) {
-@@ -344,14 +341,8 @@ virHostCPUParseNode(const char *node,
- 
-         if (virHostCPUGetSocket(cpu, &sock) < 0)
-             goto cleanup;
--        if (sock > ID_MAX) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Socket %d can't be handled (max socket is %d)"),
--                           sock, ID_MAX);
--            goto cleanup;
--        }
- 
--        if (virBitmapSetBit(sockets_map, sock) < 0)
-+        if (virBitmapSetBitExpand(sockets_map, sock) < 0)
-             goto cleanup;
- 
-         if (sock > sock_max)
-@@ -368,7 +359,7 @@ virHostCPUParseNode(const char *node,
-         goto cleanup;
- 
-     for (i = 0; i < sock_max; i++)
--        if (!(cores_maps[i] = virBitmapNew(ID_MAX + 1)))
-+        if (!(cores_maps[i] = virBitmapNewEmpty()))
-             goto cleanup;
- 
-     /* Iterate over all CPUs in the node, in ascending order */
-@@ -412,14 +403,8 @@ virHostCPUParseNode(const char *node,
-             if (virHostCPUGetCore(cpu, &core) < 0)
-                 goto cleanup;
-         }
--        if (core > ID_MAX) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Core %d can't be handled (max core is %d)"),
--                           core, ID_MAX);
--            goto cleanup;
--        }
- 
--        if (virBitmapSetBit(cores_maps[sock], core) < 0)
-+        if (virBitmapSetBitExpand(cores_maps[sock], core) < 0)
-             goto cleanup;
- 
-         if (!(siblings = virHostCPUCountThreadSiblings(cpu)))
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virCommand-use-procfs-to-learn-opened-FDs.patch b/SOURCES/libvirt-virCommand-use-procfs-to-learn-opened-FDs.patch
deleted file mode 100644
index 57a022d..0000000
--- a/SOURCES/libvirt-virCommand-use-procfs-to-learn-opened-FDs.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 53d2fa1d52ddc8d1d219a6882f84241a996ea752 Mon Sep 17 00:00:00 2001
-Message-Id: <53d2fa1d52ddc8d1d219a6882f84241a996ea752@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 30 Jul 2019 15:30:54 +0200
-Subject: [PATCH] virCommand: use procfs to learn opened FDs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When spawning a child process, between fork() and exec() we close
-all file descriptors and keep only those the caller wants us to
-pass onto the child. The problem is how we do that. Currently, we
-get the limit of opened files and then iterate through each one
-of them and either close() it or make it survive exec(). This
-approach is suboptimal (although, not that much in default
-configurations where the limit is pretty low - 1024). We have
-/proc where we can learn what FDs we hold open and thus we can
-selectively close only those.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 432faf259b696043ee5d7e8f657d855419a9a3fa)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <a9bee8e6412dc010caccef2bded857bb2a1c5eb0.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircommand.c | 86 +++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 78 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 8ae9a952a3..2353a4a554 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -491,27 +491,97 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups)
-     return ret;
- }
- 
-+# ifdef __linux__
-+/* On Linux, we can utilize procfs and read the table of opened
-+ * FDs and selectively close only those FDs we don't want to pass
-+ * onto child process (well, the one we will exec soon since this
-+ * is called from the child). */
-+static int
-+virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED,
-+                               virBitmapPtr fds)
-+{
-+    DIR *dp = NULL;
-+    struct dirent *entry;
-+    const char *dirName = "/proc/self/fd";
-+    int rc;
-+    int ret = -1;
-+
-+    if (virDirOpen(&dp, dirName) < 0)
-+        return -1;
-+
-+    while ((rc = virDirRead(dp, &entry, dirName)) > 0) {
-+        int fd;
-+
-+        if (virStrToLong_i(entry->d_name, NULL, 10, &fd) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("unable to parse FD: %s"),
-+                           entry->d_name);
-+            goto cleanup;
-+        }
-+
-+        if (virBitmapSetBit(fds, fd) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("unable to set FD as open: %d"),
-+                           fd);
-+            goto cleanup;
-+        }
-+    }
-+
-+    if (rc < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+ cleanup:
-+    VIR_DIR_CLOSE(dp);
-+    return ret;
-+}
-+
-+# else /* !__linux__ */
-+
-+static int
-+virCommandMassCloseGetFDsGeneric(virCommandPtr cmd ATTRIBUTE_UNUSED,
-+                                 virBitmapPtr fds)
-+{
-+    virBitmapSetAll(fds);
-+    return 0;
-+}
-+# endif /* !__linux__ */
-+
- static int
- virCommandMassClose(virCommandPtr cmd,
-                     int childin,
-                     int childout,
-                     int childerr)
- {
-+    VIR_AUTOPTR(virBitmap) fds = NULL;
-     int openmax = sysconf(_SC_OPEN_MAX);
--    int fd;
--    int tmpfd;
-+    int fd = -1;
- 
--    if (openmax < 0) {
--        virReportSystemError(errno,  "%s",
--                             _("sysconf(_SC_OPEN_MAX) failed"));
-+    /* In general, it is not safe to call malloc() between fork() and exec()
-+     * because the child might have forked at the worst possible time, i.e.
-+     * when another thread was in malloc() and thus held its lock. That is to
-+     * say, POSIX does not mandate malloc() to be async-safe. Fortunately,
-+     * glibc developers are aware of this and made malloc() async-safe.
-+     * Therefore we can safely allocate memory here (and transitively call
-+     * opendir/readdir) without a deadlock. */
-+
-+    if (!(fds = virBitmapNew(openmax)))
-         return -1;
--    }
- 
--    for (fd = 3; fd < openmax; fd++) {
-+# ifdef __linux__
-+    if (virCommandMassCloseGetFDsLinux(cmd, fds) < 0)
-+        return -1;
-+# else
-+    if (virCommandMassCloseGetFDsGeneric(cmd, fds) < 0)
-+        return -1;
-+# endif
-+
-+    fd = virBitmapNextSetBit(fds, 2);
-+    for (; fd >= 0; fd = virBitmapNextSetBit(fds, fd)) {
-         if (fd == childin || fd == childout || fd == childerr)
-             continue;
-         if (!virCommandFDIsSet(cmd, fd)) {
--            tmpfd = fd;
-+            int tmpfd = fd;
-             VIR_MASS_CLOSE(tmpfd);
-         } else if (virSetInherit(fd, true) < 0) {
-             virReportSystemError(errno, _("failed to preserve fd %d"), fd);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virDevMapperGetTargets-Don-t-ignore-EBADF.patch b/SOURCES/libvirt-virDevMapperGetTargets-Don-t-ignore-EBADF.patch
new file mode 100644
index 0000000..077da01
--- /dev/null
+++ b/SOURCES/libvirt-virDevMapperGetTargets-Don-t-ignore-EBADF.patch
@@ -0,0 +1,61 @@
+From 16b2178f23f82688b988c12bf7ee6caa97974669 Mon Sep 17 00:00:00 2001
+Message-Id: <16b2178f23f82688b988c12bf7ee6caa97974669@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 27 Jul 2020 12:36:53 +0200
+Subject: [PATCH] virDevMapperGetTargets: Don't ignore EBADF
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit e450ebb4c6eab1b7376a5ba873d10936ad563b75)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <6dc32e8797122ad9ecd44a60aaff8e70d060b3b9.1595846084.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/qemu/qemu_cgroup.c | 2 +-
+ src/qemu/qemu_domain.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
+index 57a1231855..3a62b4ac15 100644
+--- a/src/qemu/qemu_cgroup.c
++++ b/src/qemu/qemu_cgroup.c
+@@ -89,7 +89,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm,
+     }
+ 
+     if (virDevMapperGetTargets(path, &targetPaths) < 0 &&
+-        errno != ENOSYS && errno != EBADF) {
++        errno != ENOSYS) {
+         virReportSystemError(errno,
+                              _("Unable to get devmapper targets for %s"),
+                              path);
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index ffe88ff027..35b536868a 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -14924,7 +14924,7 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
+                 goto cleanup;
+ 
+             if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
+-                errno != ENOSYS && errno != EBADF) {
++                errno != ENOSYS) {
+                 virReportSystemError(errno,
+                                      _("Unable to get devmapper targets for %s"),
+                                      next->path);
+@@ -15985,7 +15985,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
+             tmpPath = g_strdup(next->path);
+ 
+             if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
+-                errno != ENOSYS && errno != EBADF) {
++                errno != ENOSYS) {
+                 virReportSystemError(errno,
+                                      _("Unable to get devmapper targets for %s"),
+                                      next->path);
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virDevMapperGetTargetsImpl-Check-for-dm-major-properly.patch b/SOURCES/libvirt-virDevMapperGetTargetsImpl-Check-for-dm-major-properly.patch
new file mode 100644
index 0000000..86c9233
--- /dev/null
+++ b/SOURCES/libvirt-virDevMapperGetTargetsImpl-Check-for-dm-major-properly.patch
@@ -0,0 +1,69 @@
+From e0f87dd97d0061eb2ea22b025c8bbf3310c78290 Mon Sep 17 00:00:00 2001
+Message-Id: <e0f87dd97d0061eb2ea22b025c8bbf3310c78290@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 19 Jun 2020 17:44:09 +0200
+Subject: [PATCH] virDevMapperGetTargetsImpl: Check for dm major properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In v6.4.0-rc1~143 I've introduced a check that is supposed to
+return from the function early, if given path is not a dm target.
+While the idea is still valid, the implementation had a flaw.
+It calls stat() over given path and the uses major(sb.st_dev) to
+learn the major of the device. This is then passed to
+dm_is_dm_major() which returns true or false depending whether
+the device is under devmapper's control or not.
+
+The problem with this approach is in how the major of the device
+is obtained - paths managed by devmapper are special files and
+thus we want to be using st_rdev instead of st_dev to obtain the
+major number. Well, that's what virIsDevMapperDevice() does
+already so might as well us that.
+
+Fixes: 01626c668ecfbe465d18799ac4628e6127ea1d47
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1839992
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit d53ab9f54ea8d6cc1e5c3b04c4eb743cae9518ce)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1849095
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <c3222a07d4259142dae4cf4f7f38730a101042b1.1592581422.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virdevmapper.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index 23b2a16057..c346432d86 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -66,7 +66,6 @@ virDevMapperGetTargetsImpl(const char *path,
+                            char ***devPaths_ret,
+                            unsigned int ttl)
+ {
+-    struct stat sb;
+     struct dm_task *dmt = NULL;
+     struct dm_deps *deps;
+     struct dm_info info;
+@@ -85,13 +84,7 @@ virDevMapperGetTargetsImpl(const char *path,
+         return ret;
+     }
+ 
+-    if (stat(path, &sb) < 0) {
+-        if (errno == ENOENT)
+-            return 0;
+-        return -1;
+-    }
+-
+-    if (!dm_is_dm_major(major(sb.st_dev)))
++    if (!virIsDevMapperDevice(path))
+         return 0;
+ 
+     if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) {
+-- 
+2.27.0
+
diff --git a/SOURCES/libvirt-virDevMapperGetTargetsImpl-Use-VIR_AUTOSTRINGLIST.patch b/SOURCES/libvirt-virDevMapperGetTargetsImpl-Use-VIR_AUTOSTRINGLIST.patch
new file mode 100644
index 0000000..2d72c75
--- /dev/null
+++ b/SOURCES/libvirt-virDevMapperGetTargetsImpl-Use-VIR_AUTOSTRINGLIST.patch
@@ -0,0 +1,73 @@
+From 318beaace7890f3ccf2d09c1afcdde40f4f0284f Mon Sep 17 00:00:00 2001
+Message-Id: <318beaace7890f3ccf2d09c1afcdde40f4f0284f@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 27 Jul 2020 12:36:51 +0200
+Subject: [PATCH] virDevMapperGetTargetsImpl: Use VIR_AUTOSTRINGLIST
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since we have VIR_AUTOSTRINGLIST we can use it to free string
+lists used in the function automatically.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit b8ebbe05451fde7ce541564f73437a29ffd5db0d)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <c93475780b29c50e19492521e3b9cd19498f119b.1595846084.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virdevmapper.c | 16 +++-------------
+ 1 file changed, 3 insertions(+), 13 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index 118dc82e94..44c4731fb4 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -67,8 +67,7 @@ virDevMapperGetTargetsImpl(const char *path,
+     struct dm_task *dmt = NULL;
+     struct dm_deps *deps;
+     struct dm_info info;
+-    char **devPaths = NULL;
+-    char **recursiveDevPaths = NULL;
++    VIR_AUTOSTRINGLIST devPaths = NULL;
+     size_t i;
+     int ret = -1;
+ 
+@@ -133,28 +132,19 @@ virDevMapperGetTargetsImpl(const char *path,
+                                       minor(deps->device[i]));
+     }
+ 
+-    recursiveDevPaths = NULL;
+     for (i = 0; i < deps->count; i++) {
+-        char **tmpPaths;
++        VIR_AUTOSTRINGLIST tmpPaths = NULL;
+ 
+         if (virDevMapperGetTargetsImpl(devPaths[i], &tmpPaths, ttl - 1) < 0)
+             goto cleanup;
+ 
+-        if (tmpPaths &&
+-            virStringListMerge(&recursiveDevPaths, &tmpPaths) < 0) {
+-            virStringListFree(tmpPaths);
++        if (virStringListMerge(&devPaths, &tmpPaths) < 0)
+             goto cleanup;
+-        }
+     }
+ 
+-    if (virStringListMerge(&devPaths, &recursiveDevPaths) < 0)
+-        goto cleanup;
+-
+     *devPaths_ret = g_steal_pointer(&devPaths);
+     ret = 0;
+  cleanup:
+-    virStringListFree(recursiveDevPaths);
+-    virStringListFree(devPaths);
+     dm_task_destroy(dmt);
+     return ret;
+ }
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-not-a-devmapper-target.patch b/SOURCES/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-not-a-devmapper-target.patch
new file mode 100644
index 0000000..c645ad1
--- /dev/null
+++ b/SOURCES/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-not-a-devmapper-target.patch
@@ -0,0 +1,68 @@
+From 7ea7ef99b8d3f9a7d83ea12a843d786b182f24e3 Mon Sep 17 00:00:00 2001
+Message-Id: <7ea7ef99b8d3f9a7d83ea12a843d786b182f24e3@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 11 May 2020 16:56:48 +0200
+Subject: [PATCH] virDevMapperGetTargetsImpl: quit early if device is not a
+ devmapper target
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As suggested in the linked bug, libvirt should firstly check
+whether the major number of the device is device mapper major.
+Because if it isn't subsequent DM_DEVICE_DEPS task may not only
+fail, but also yield different results. In the bugzilla this is
+demonstrated by creating a devmapper target named 'loop0' and
+then creating loop target /dev/loop0. When the latter is then
+passed to a domain, our virDevMapperGetTargetsImpl() function
+blindly asks devmapper to provide target dependencies for
+/dev/loop0 and because of the way devmapper APIs work, it will
+'sanitize' the input by using the last component only which is
+'loop0' and thus return different results than expected.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1823976
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 01626c668ecfbe465d18799ac4628e6127ea1d47)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1834353
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <bd8ec0d0b833b22d1117cdbdc3d39b7c3ba99fe6.1589208990.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virdevmapper.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index cc6a099faa..f000979ce0 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -66,6 +66,7 @@ virDevMapperGetTargetsImpl(const char *path,
+                            char ***devPaths_ret,
+                            unsigned int ttl)
+ {
++    struct stat sb;
+     struct dm_task *dmt = NULL;
+     struct dm_deps *deps;
+     struct dm_info info;
+@@ -84,6 +85,15 @@ virDevMapperGetTargetsImpl(const char *path,
+         return ret;
+     }
+ 
++    if (stat(path, &sb) < 0) {
++        if (errno == ENOENT)
++            return 0;
++        return -1;
++    }
++
++    if (!dm_is_dm_major(major(sb.st_dev)))
++        return 0;
++
+     if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) {
+         if (errno == ENOENT || errno == ENODEV) {
+             /* It's okay. Kernel is probably built without
+-- 
+2.26.2
+
diff --git a/SOURCES/libvirt-virDomainCheckpointRedefinePrep-Set-current-checkpoint-if-there-isn-t-any.patch b/SOURCES/libvirt-virDomainCheckpointRedefinePrep-Set-current-checkpoint-if-there-isn-t-any.patch
new file mode 100644
index 0000000..faded4a
--- /dev/null
+++ b/SOURCES/libvirt-virDomainCheckpointRedefinePrep-Set-current-checkpoint-if-there-isn-t-any.patch
@@ -0,0 +1,50 @@
+From da9c0f143d7c917c98b7352be7954e8b2489aa9e Mon Sep 17 00:00:00 2001
+Message-Id: <da9c0f143d7c917c98b7352be7954e8b2489aa9e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 3 Apr 2020 14:32:58 +0200
+Subject: [PATCH] virDomainCheckpointRedefinePrep: Set 'current' checkpoint if
+ there isn't any
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When redefining checkpoints from scratch we'd not set the 'current'
+checkpoint if there wasn't any. This meant that the code wasn't ever
+able to set a 'current' checkpoint as any other one looks up if the
+parent of the redefined checkpoint is current.
+
+Since the backup code then requires the current checkpoint to start the
+lookup we'd not be able to perform a backup after restoring the
+checkpoint hierarchy.
+
+Reported-by: Eyal Shenitzky <eshenitz@redhat.com>
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 9428c4609c7b23b3afe89566dca9ac237256d3df)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1819755
+
+Message-Id: <53c1d685b40f0f540eeb4d15a17e308aab2bf648.1585916255.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/checkpoint_conf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
+index 26bcfc16b7..d557fada49 100644
+--- a/src/conf/checkpoint_conf.c
++++ b/src/conf/checkpoint_conf.c
+@@ -550,6 +550,10 @@ virDomainCheckpointRedefinePrep(virDomainObjPtr vm,
+             *update_current = true;
+     }
+ 
++    /* set the first redefined checkpoint as current */
++    if (virDomainCheckpointGetCurrent(vm->checkpoints) == NULL)
++        *update_current = true;
++
+     other = virDomainCheckpointFindByName(vm->checkpoints, def->parent.name);
+     if (other) {
+         otherdef = virDomainCheckpointObjGetDef(other);
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-virDomainConfNWFilterInstantiate-initialize-xml-to-avoid-random-crash.patch b/SOURCES/libvirt-virDomainConfNWFilterInstantiate-initialize-xml-to-avoid-random-crash.patch
deleted file mode 100644
index 8599acc..0000000
--- a/SOURCES/libvirt-virDomainConfNWFilterInstantiate-initialize-xml-to-avoid-random-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0f3ca7bcaaec337a672b3a0660c0ceda5f55d807 Mon Sep 17 00:00:00 2001
-Message-Id: <0f3ca7bcaaec337a672b3a0660c0ceda5f55d807@dist-git>
-From: Luyao Huang <lhuang@redhat.com>
-Date: Wed, 11 Jul 2018 17:29:48 +0200
-Subject: [PATCH] virDomainConfNWFilterInstantiate: initialize @xml to avoid
- random crash
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1599545
-
-If the code jump to the cleanup before assigning value to @xml
-libvirtd may crash when it tries to free an uninitialized pointer.
-
-backtrace:
-
-0  0x00007ffff428d59c in free () from /lib64/libc.so.6
-1  0x00007ffff721314a in virFree (ptrptr=ptrptr@entry=0x7fffc67f1b00) at util/viralloc.c:582
-2  0x00007ffff7345ac4 in virDomainConfNWFilterInstantiate (vmname=<optimized out>,
-   vmuuid=vmuuid@entry=0x7fffc0181ca8 "߉\237\\۔H\262\206z\340\302f\265\233z", net=<optimized out>,
-   ignoreExists=ignoreExists@entry=true) at conf/domain_nwfilter.c:122
-3  0x00007fffca5a77f6 in qemuProcessFiltersInstantiate (ignoreExists=true, def=0x7fffc0181ca0) at qemu/qemu_process.c:3028
-4  qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:7653
-5  0x00007ffff72c4895 in virThreadHelper (data=<optimized out>) at util/virthread.c:206
-6  0x00007ffff45dcdd5 in start_thread () from /lib64/libpthread.so.0
-7  0x00007ffff4305ead in clone () from /lib64/libc.so.6
-
-Signed-off-by: Luyao Huang <lhuang@redhat.com>
-(cherry picked from commit d7557f5f6f51264c1b5623e97f7b4d5259d4d3b6)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_nwfilter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
-index 948b32481e..24b5f42ddd 100644
---- a/src/conf/domain_nwfilter.c
-+++ b/src/conf/domain_nwfilter.c
-@@ -90,7 +90,7 @@ virDomainConfNWFilterInstantiate(const char *vmname,
-     virConnectPtr conn = virGetConnectNWFilter();
-     virNWFilterBindingDefPtr def = NULL;
-     virNWFilterBindingPtr binding = NULL;
--    char *xml;
-+    char *xml = NULL;
-     int ret = -1;
- 
-     VIR_DEBUG("vmname=%s portdev=%s filter=%s ignoreExists=%d",
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virDomainDefCompatibleDevice-Relax-alias-change-check.patch b/SOURCES/libvirt-virDomainDefCompatibleDevice-Relax-alias-change-check.patch
deleted file mode 100644
index 7f974c0..0000000
--- a/SOURCES/libvirt-virDomainDefCompatibleDevice-Relax-alias-change-check.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bb036e3bd2e9c1febb2c1331c3221e1c8a5d7663 Mon Sep 17 00:00:00 2001
-Message-Id: <bb036e3bd2e9c1febb2c1331c3221e1c8a5d7663@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 4 Sep 2018 10:38:48 +0200
-Subject: [PATCH] virDomainDefCompatibleDevice: Relax alias change check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RHEL-7.6: https://bugzilla.redhat.com/show_bug.cgi?id=1621910
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1603133
-
-When introducing this check back in 4ad54a417a1 my mindset was
-that if an element is missing in update XML then user is
-requesting for removal of the corresponding setting. For
-instance, if <bandwidth/> is not present in update XML any QoS
-previously set on <interface/> is cleared out. Well this
-assumption is correct but only to some extent.
-
-Turns out, we have some users who when updating path to ISO
-image construct very minimalistic disk XML and pass it to device
-update API. Such XML is lacking a lot of information, and alias
-is one of them. This triggers error in
-virDomainDefCompatibleDevice() because we think that user is
-requesting to remove the alias. Well, they are not.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit b48d9e939bcf32a8d6e571313637e2eefe52e117)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 16e52d149d..35f944d92a 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -28397,9 +28397,9 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
- 
-     if (action == VIR_DOMAIN_DEVICE_ACTION_UPDATE &&
-         live &&
--        ((!!data.newInfo != !!data.oldInfo) ||
--         (data.newInfo && data.oldInfo &&
--          STRNEQ_NULLABLE(data.newInfo->alias, data.oldInfo->alias)))) {
-+        (data.newInfo && data.oldInfo &&
-+         data.newInfo->alias && data.oldInfo->alias &&
-+         STRNEQ(data.newInfo->alias, data.oldInfo->alias))) {
-         virReportError(VIR_ERR_OPERATION_DENIED, "%s",
-                        _("changing device alias is not allowed"));
-         return -1;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virDomainDetachDeviceFlags-Clarify-update-semantics.patch b/SOURCES/libvirt-virDomainDetachDeviceFlags-Clarify-update-semantics.patch
deleted file mode 100644
index bcedf36..0000000
--- a/SOURCES/libvirt-virDomainDetachDeviceFlags-Clarify-update-semantics.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 37b470d6e99ba9468054ae20524ed00014e6e0bb Mon Sep 17 00:00:00 2001
-Message-Id: <37b470d6e99ba9468054ae20524ed00014e6e0bb@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 4 Sep 2018 10:38:49 +0200
-Subject: [PATCH] virDomainDetachDeviceFlags: Clarify update semantics
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RHEL-7.6: https://bugzilla.redhat.com/show_bug.cgi?id=1621910
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1603133
-
-When users want to update a path to a CDROM they tend to
-construct a very minimal XML and feed the API with it. This is
-not a good practice as it breaks the assumptions the API is built
-on. Most notably, leaving an element out should be treated as a
-request for removal of the corresponding setting. Just like
-leaving out <bandwidth/> clears out any QoS previously set.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 2864b4cd1ccda9c12f0c0ceb340836c42a2a0e52)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt-domain.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index ab7266dc19..ad0ded9ee3 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -8315,6 +8315,14 @@ virDomainDetachDeviceFlags(virDomainPtr domain,
-  * media, altering the graphics configuration such as password,
-  * reconfiguring the NIC device backend connectivity, etc.
-  *
-+ * The supplied XML description of the device should contain all
-+ * the information that is found in the corresponding domain XML.
-+ * Leaving out any piece of information may be treated as a
-+ * request for its removal, which may be denied. For instance,
-+ * when users want to change CDROM media only for live XML, they
-+ * must provide live disk XML as found in the corresponding live
-+ * domain XML with only the disk path changed.
-+ *
-  * Returns 0 in case of success, -1 in case of failure.
-  */
- int
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-cleanup-label.patch b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-cleanup-label.patch
new file mode 100644
index 0000000..46b4dbb
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-cleanup-label.patch
@@ -0,0 +1,72 @@
+From eaf5a1634e29eb3c4c3267b7724038049dacadc7 Mon Sep 17 00:00:00 2001
+Message-Id: <eaf5a1634e29eb3c4c3267b7724038049dacadc7@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:55 +0100
+Subject: [PATCH] virDomainDiskAddISCSIPoolSourceHost: Remove 'cleanup' label
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4d5093ef75efdf87a941ffd3fbc1d974e031a0a3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <da07ec7957e5c8f502c43bf0542a0d42ae1f62ee.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index f0365329c6..436d094578 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31173,7 +31173,6 @@ static int
+ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+                                     virStoragePoolDefPtr pooldef)
+ {
+-    int ret = -1;
+     VIR_AUTOSTRINGLIST tokens = NULL;
+     size_t ntokens;
+ 
+@@ -31181,7 +31180,7 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+     if (pooldef->source.nhost != 1) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                        _("Expected exactly 1 host for the storage pool"));
+-        goto cleanup;
++        return -1;
+     }
+ 
+     /* iscsi pool only supports one host */
+@@ -31195,13 +31194,13 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+ 
+     /* iscsi volume has name like "unit:0:0:1" */
+     if (!(tokens = virStringSplitCount(def->src->srcpool->volume, ":", 0, &ntokens)))
+-        goto cleanup;
++        return -1;
+ 
+     if (ntokens != 4) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("unexpected iscsi volume name '%s'"),
+                        def->src->srcpool->volume);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     /* iscsi pool has only one source device path */
+@@ -31216,10 +31215,7 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+ 
+     def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
+ 
+-    ret = 0;
+-
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-ternary-operator.patch b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-ternary-operator.patch
new file mode 100644
index 0000000..8af602e
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-ternary-operator.patch
@@ -0,0 +1,40 @@
+From 6502a0a52ec29cffc819254b71bea4f5b2fbd5ce Mon Sep 17 00:00:00 2001
+Message-Id: <6502a0a52ec29cffc819254b71bea4f5b2fbd5ce@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:56 +0100
+Subject: [PATCH] virDomainDiskAddISCSIPoolSourceHost: Remove ternary operator
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit e20c5b17037acca0cfffd983c0bcdd0ee5b7e628)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <bddaa981eda3b5145d460711aaf366f360fd155b.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 436d094578..89f1e44536 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31189,8 +31189,10 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+ 
+     def->src->hosts[0].name = g_strdup(pooldef->source.hosts[0].name);
+ 
+-    def->src->hosts[0].port = pooldef->source.hosts[0].port ?
+-        pooldef->source.hosts[0].port : 3260;
++    if (pooldef->source.hosts[0].port != 0)
++        def->src->hosts[0].port = pooldef->source.hosts[0].port;
++    else
++        def->src->hosts[0].port = 3260;
+ 
+     /* iscsi volume has name like "unit:0:0:1" */
+     if (!(tokens = virStringSplitCount(def->src->srcpool->volume, ":", 0, &ntokens)))
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Sanitize-handling-of-string-list.patch b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Sanitize-handling-of-string-list.patch
new file mode 100644
index 0000000..4bb4e30
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Sanitize-handling-of-string-list.patch
@@ -0,0 +1,63 @@
+From 39a1710d9a757391e6ecfdd5e1d5abd359e5a153 Mon Sep 17 00:00:00 2001
+Message-Id: <39a1710d9a757391e6ecfdd5e1d5abd359e5a153@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:53 +0100
+Subject: [PATCH] virDomainDiskAddISCSIPoolSourceHost: Sanitize handling of
+ string list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use virStringSplitCount instead of virStringSplit so that we can drop
+the call to virStringListLength and use VIR_AUTOSTRINGLIST to declare
+it and allow removal of the cleanup section.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c5b1c14379994369f5cb92bbb3da36d7d19150c2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <a763fc4d91f223a097e8b709e46c066d348a9e31.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 68d9ce9c4e..6973d97e1d 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31174,7 +31174,8 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+                                     virStoragePoolDefPtr pooldef)
+ {
+     int ret = -1;
+-    char **tokens = NULL;
++    VIR_AUTOSTRINGLIST tokens = NULL;
++    size_t ntokens;
+ 
+     /* Only support one host */
+     if (pooldef->source.nhost != 1) {
+@@ -31195,10 +31196,10 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+         pooldef->source.hosts[0].port : 3260;
+ 
+     /* iscsi volume has name like "unit:0:0:1" */
+-    if (!(tokens = virStringSplit(def->src->srcpool->volume, ":", 0)))
++    if (!(tokens = virStringSplitCount(def->src->srcpool->volume, ":", 0, &ntokens)))
+         goto cleanup;
+ 
+-    if (virStringListLength((const char * const *)tokens) != 4) {
++    if (ntokens != 4) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("unexpected iscsi volume name '%s'"),
+                        def->src->srcpool->volume);
+@@ -31220,7 +31221,6 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+     ret = 0;
+ 
+  cleanup:
+-    virStringListFree(tokens);
+     return ret;
+ }
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
new file mode 100644
index 0000000..68ea47c
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
@@ -0,0 +1,99 @@
+From 80b9f2b4c38eb0cb96e7ebb5d8b2c8ddaa5f7927 Mon Sep 17 00:00:00 2001
+Message-Id: <80b9f2b4c38eb0cb96e7ebb5d8b2c8ddaa5f7927@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:57 +0100
+Subject: [PATCH] virDomainDiskAddISCSIPoolSourceHost: Take virStorageSourcePtr
+ instead of virDomainDiskDefPtr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only 'def->src' was ever used in this function. Use the source directly.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 47cad725536b9108f23f351fe9836d0469a70fc7)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <7079c5546d76a24c458729e54f408bec39877a3e.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 89f1e44536..9cbc7b47e7 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31170,7 +31170,7 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface)
+ 
+ 
+ static int
+-virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
++virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
+                                     virStoragePoolDefPtr pooldef)
+ {
+     VIR_AUTOSTRINGLIST tokens = NULL;
+@@ -31184,38 +31184,38 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+     }
+ 
+     /* iscsi pool only supports one host */
+-    def->src->nhosts = 1;
+-    def->src->hosts = g_new0(virStorageNetHostDef, 1);
++    src->nhosts = 1;
++    src->hosts = g_new0(virStorageNetHostDef, 1);
+ 
+-    def->src->hosts[0].name = g_strdup(pooldef->source.hosts[0].name);
++    src->hosts[0].name = g_strdup(pooldef->source.hosts[0].name);
+ 
+     if (pooldef->source.hosts[0].port != 0)
+-        def->src->hosts[0].port = pooldef->source.hosts[0].port;
++        src->hosts[0].port = pooldef->source.hosts[0].port;
+     else
+-        def->src->hosts[0].port = 3260;
++        src->hosts[0].port = 3260;
+ 
+     /* iscsi volume has name like "unit:0:0:1" */
+-    if (!(tokens = virStringSplitCount(def->src->srcpool->volume, ":", 0, &ntokens)))
++    if (!(tokens = virStringSplitCount(src->srcpool->volume, ":", 0, &ntokens)))
+         return -1;
+ 
+     if (ntokens != 4) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("unexpected iscsi volume name '%s'"),
+-                       def->src->srcpool->volume);
++                       src->srcpool->volume);
+         return -1;
+     }
+ 
+     /* iscsi pool has only one source device path */
+-    def->src->path = g_strdup_printf("%s/%s", pooldef->source.devices[0].path,
+-                                     tokens[3]);
++    src->path = g_strdup_printf("%s/%s", pooldef->source.devices[0].path,
++                                tokens[3]);
+ 
+     /* Storage pool have not supported these 2 attributes yet,
+      * use the defaults.
+      */
+-    def->src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
+-    def->src->hosts[0].socket = NULL;
++    src->hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
++    src->hosts[0].socket = NULL;
+ 
+-    def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
++    src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
+ 
+     return 0;
+ }
+@@ -31258,7 +31258,7 @@ virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
+         def->src->auth->secrettype = g_strdup(secrettype);
+     }
+ 
+-    if (virDomainDiskAddISCSIPoolSourceHost(def, pooldef) < 0)
++    if (virDomainDiskAddISCSIPoolSourceHost(def->src, pooldef) < 0)
+         return -1;
+ 
+     if (!def->src->initiator.iqn && pooldef->source.initiator.iqn &&
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-use-g_new0-instead-of-VIR_ALLOC_N.patch b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-use-g_new0-instead-of-VIR_ALLOC_N.patch
new file mode 100644
index 0000000..a2ae705
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskAddISCSIPoolSourceHost-use-g_new0-instead-of-VIR_ALLOC_N.patch
@@ -0,0 +1,39 @@
+From 93e06ede9932c53518c7b3c9bff01449f52e2be3 Mon Sep 17 00:00:00 2001
+Message-Id: <93e06ede9932c53518c7b3c9bff01449f52e2be3@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:54 +0100
+Subject: [PATCH] virDomainDiskAddISCSIPoolSourceHost: use g_new0 instead of
+ VIR_ALLOC_N
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5eda34f2e11f7ba4a26b0948dfa0fffa400dfadd)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <67e8bcdbcd5c9a22c75d6da6316a0d950664c2b8.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 6973d97e1d..f0365329c6 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31186,9 +31186,7 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
+ 
+     /* iscsi pool only supports one host */
+     def->src->nhosts = 1;
+-
+-    if (VIR_ALLOC_N(def->src->hosts, def->src->nhosts) < 0)
+-        goto cleanup;
++    def->src->hosts = g_new0(virStorageNetHostDef, 1);
+ 
+     def->src->hosts[0].name = g_strdup(pooldef->source.hosts[0].name);
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskSourceNVMeFormat-Format-only-valid-managed-values.patch b/SOURCES/libvirt-virDomainDiskSourceNVMeFormat-Format-only-valid-managed-values.patch
new file mode 100644
index 0000000..d7ae104
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskSourceNVMeFormat-Format-only-valid-managed-values.patch
@@ -0,0 +1,43 @@
+From 2eff64aa7a19da95b2f865a40010ab96f6e2e70e Mon Sep 17 00:00:00 2001
+Message-Id: <2eff64aa7a19da95b2f865a40010ab96f6e2e70e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 24 Mar 2020 16:25:57 +0100
+Subject: [PATCH] virDomainDiskSourceNVMeFormat: Format only valid 'managed'
+ values
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+VIR_TRISTATE_BOOL_ABSENT which maps to the 'default' string would not be
+parsed back, so we shouldn't format it either.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit fac9a8b4c45bffbda28c20c99c84542a5e16cba5)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804617
+Message-Id: <562a24096551a25b6c06e33a9afa3fd10ab1598b.1585063415.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 1e8518139c..e3755fa285 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -24442,8 +24442,9 @@ virDomainDiskSourceNVMeFormat(virBufferPtr attrBuf,
+                               const virStorageSourceNVMeDef *nvme)
+ {
+     virBufferAddLit(attrBuf, " type='pci'");
+-    virBufferAsprintf(attrBuf, " managed='%s'",
+-                      virTristateBoolTypeToString(nvme->managed));
++    if (nvme->managed != VIR_TRISTATE_BOOL_ABSENT)
++        virBufferAsprintf(attrBuf, " managed='%s'",
++                          virTristateBoolTypeToString(nvme->managed));
+     virBufferAsprintf(attrBuf, " namespace='%llu'", nvme->namespc);
+     virPCIDeviceAddressFormat(childBuf, nvme->pciAddr, false);
+ }
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-virDomainDiskTranslateISCSIDirect-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch b/SOURCES/libvirt-virDomainDiskTranslateISCSIDirect-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
new file mode 100644
index 0000000..6274246
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskTranslateISCSIDirect-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
@@ -0,0 +1,88 @@
+From 452599b446bb9725e1b3b95d7733353b0d76c12f Mon Sep 17 00:00:00 2001
+Message-Id: <452599b446bb9725e1b3b95d7733353b0d76c12f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:59 +0100
+Subject: [PATCH] virDomainDiskTranslateISCSIDirect: Take virStorageSourcePtr
+ instead of virDomainDiskDefPtr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only 'def->src' was ever used in this function. Use the source directly.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit bc42d88ffdef84a823092bfb35cd6bce39747366)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <6a9c4a227bb1ea5564bfb03d076b080d879239b4.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 14b675d5d6..68dd640dc5 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31239,30 +31239,30 @@ virDomainDiskTranslateSourcePoolAuth(virStorageSourcePtr src,
+ 
+ 
+ static int
+-virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
++virDomainDiskTranslateISCSIDirect(virStorageSourcePtr src,
+                                   virStoragePoolDefPtr pooldef)
+ {
+-    def->src->srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK;
+-    def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
++    src->srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK;
++    src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
+ 
+-    if (virDomainDiskTranslateSourcePoolAuth(def->src,
++    if (virDomainDiskTranslateSourcePoolAuth(src,
+                                              &pooldef->source) < 0)
+         return -1;
+ 
+     /* Source pool may not fill in the secrettype field,
+      * so we need to do so here
+      */
+-    if (def->src->auth && !def->src->auth->secrettype) {
++    if (src->auth && !src->auth->secrettype) {
+         const char *secrettype =
+             virSecretUsageTypeToString(VIR_SECRET_USAGE_TYPE_ISCSI);
+-        def->src->auth->secrettype = g_strdup(secrettype);
++        src->auth->secrettype = g_strdup(secrettype);
+     }
+ 
+-    if (virDomainDiskAddISCSIPoolSourceHost(def->src, pooldef) < 0)
++    if (virDomainDiskAddISCSIPoolSourceHost(src, pooldef) < 0)
+         return -1;
+ 
+-    if (!def->src->initiator.iqn && pooldef->source.initiator.iqn &&
+-        virStorageSourceInitiatorCopy(&def->src->initiator,
++    if (!src->initiator.iqn && pooldef->source.initiator.iqn &&
++        virStorageSourceInitiatorCopy(&src->initiator,
+                                       &pooldef->source.initiator) < 0) {
+         return -1;
+     }
+@@ -31387,7 +31387,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+             return -1;
+         }
+ 
+-        if (virDomainDiskTranslateISCSIDirect(def, pooldef) < 0)
++        if (virDomainDiskTranslateISCSIDirect(def->src, pooldef) < 0)
+             return -1;
+ 
+         break;
+@@ -31412,7 +31412,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+            break;
+ 
+        case VIR_STORAGE_SOURCE_POOL_MODE_DIRECT:
+-           if (virDomainDiskTranslateISCSIDirect(def, pooldef) < 0)
++           if (virDomainDiskTranslateISCSIDirect(def->src, pooldef) < 0)
+                return -1;
+            break;
+        }
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskTranslateSourcePool-Check-for-disk-type-correctly.patch b/SOURCES/libvirt-virDomainDiskTranslateSourcePool-Check-for-disk-type-correctly.patch
new file mode 100644
index 0000000..2f8cc1d
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskTranslateSourcePool-Check-for-disk-type-correctly.patch
@@ -0,0 +1,44 @@
+From 92d99bea060e3d86a6e3b2fdd2df089362303536 Mon Sep 17 00:00:00 2001
+Message-Id: <92d99bea060e3d86a6e3b2fdd2df089362303536@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 10 Mar 2020 08:03:12 +0100
+Subject: [PATCH] virDomainDiskTranslateSourcePool: Check for disk type
+ correctly
+
+When rewriting the virDomainDiskTranslateSourcePool() function in
+v6.1.0-rc1~184 a typo was introduced. Previously, we allowed
+startup policy only for those volumes which translated to
+VIR_STORAGE_TYPE_FILE. But starting with the referenced commit,
+the value we checked for was changed to VIR_STORAGE_VOL_FILE
+which comes from a different enum and has a different value too.
+This is wrong, because virStorageSourceGetActualType() returns a
+value from the original enum.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1811728
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 3918dbd84e4951b43f93fbf50ef52be00274850c)
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <ed47a6cb36e55e543ae4ed8cb9f55e1b100d7859.1583823787.git.mprivozn@redhat.com>
+Acked-by: Peter Krempa <pkrempa@redhat.com>
+---
+ src/conf/domain_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 3a370e6b90..77e3d25a2d 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31610,7 +31610,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+     }
+ 
+     if (def->startupPolicy != 0 &&
+-        virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) {
++        virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+                        _("'startupPolicy' is only valid for "
+                          "'file' type volume"));
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virDomainDiskTranslateSourcePool-Translate-volume-disks-in-whole-backing-chain.patch b/SOURCES/libvirt-virDomainDiskTranslateSourcePool-Translate-volume-disks-in-whole-backing-chain.patch
new file mode 100644
index 0000000..971b023
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskTranslateSourcePool-Translate-volume-disks-in-whole-backing-chain.patch
@@ -0,0 +1,64 @@
+From 9b5f10282394b3f3e2a54791f51c3eb8d21c40ce Mon Sep 17 00:00:00 2001
+Message-Id: <9b5f10282394b3f3e2a54791f51c3eb8d21c40ce@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:01 +0100
+Subject: [PATCH] virDomainDiskTranslateSourcePool: Translate 'volume' disks in
+ whole backing chain
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Now that we accept full backing chains on input nothing should prevent
+users from also using disk type 'VOLUME' for specifying the backing
+images.
+
+Do the translation for the whole backing chain.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 37f01262eed9f37dd5eb7de8b83edd2fea741054)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <68818efffb0a38e33237e0db9a2b370cef3b6eaa.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index ecd00aa8fc..b46b92aecf 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31407,18 +31407,20 @@ int
+ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+ {
+     g_autoptr(virConnect) conn = NULL;
++    virStorageSourcePtr n;
+ 
+-    if (def->src->type != VIR_STORAGE_TYPE_VOLUME)
+-        return 0;
++    for (n = def->src; virStorageSourceIsBacking(n); n = n->backingStore) {
++        if (n->type != VIR_STORAGE_TYPE_VOLUME || !n->srcpool)
++            continue;
+ 
+-    if (!def->src->srcpool)
+-        return 0;
++        if (!conn) {
++            if (!(conn = virGetConnectStorage()))
++                return -1;
++        }
+ 
+-    if (!(conn = virGetConnectStorage()))
+-        return -1;
+-
+-    if (virDomainStorageSourceTranslateSourcePool(def->src, conn) < 0)
+-        return -1;
++        if (virDomainStorageSourceTranslateSourcePool(n, conn) < 0)
++            return -1;
++    }
+ 
+     if (def->startupPolicy != 0 &&
+         virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) {
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskTranslateSourcePool-split-code-to-setup-one-storage-source.patch b/SOURCES/libvirt-virDomainDiskTranslateSourcePool-split-code-to-setup-one-storage-source.patch
new file mode 100644
index 0000000..0698684
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskTranslateSourcePool-split-code-to-setup-one-storage-source.patch
@@ -0,0 +1,228 @@
+From c6a7e638954bbcb8679966f31ce398d97fa1aca1 Mon Sep 17 00:00:00 2001
+Message-Id: <c6a7e638954bbcb8679966f31ce398d97fa1aca1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:00 +0100
+Subject: [PATCH] virDomainDiskTranslateSourcePool: split code to setup one
+ storage source
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Extract all the code setting up one storage source from the rest which
+sets up the whole disk. This will allow us to prepare the whole backing
+chain.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 63469116cc83d6d83a45b741826b48562b03a65f)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <ed85da5fc3820ff9d272034b74cb03a63b35d9de.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 112 ++++++++++++++++++++---------------------
+ 1 file changed, 55 insertions(+), 57 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 68dd640dc5..ecd00aa8fc 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31271,37 +31271,28 @@ virDomainDiskTranslateISCSIDirect(virStorageSourcePtr src,
+ }
+ 
+ 
+-int
+-virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
++static int
++virDomainStorageSourceTranslateSourcePool(virStorageSourcePtr src,
++                                          virConnectPtr conn)
+ {
+     virStorageVolInfo info;
+     g_autoptr(virStoragePoolDef) pooldef = NULL;
+     g_autofree char *poolxml = NULL;
+-    g_autoptr(virConnect) conn = NULL;
+     g_autoptr(virStoragePool) pool = NULL;
+     g_autoptr(virStorageVol) vol = NULL;
+ 
+-    if (def->src->type != VIR_STORAGE_TYPE_VOLUME)
+-        return 0;
+-
+-    if (!def->src->srcpool)
+-        return 0;
+-
+-    if (!(conn = virGetConnectStorage()))
+-        return -1;
+-
+-    if (!(pool = virStoragePoolLookupByName(conn, def->src->srcpool->pool)))
++    if (!(pool = virStoragePoolLookupByName(conn, src->srcpool->pool)))
+         return -1;
+ 
+     if (virStoragePoolIsActive(pool) != 1) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                        _("storage pool '%s' containing volume '%s' "
+                          "is not active"),
+-                       def->src->srcpool->pool, def->src->srcpool->volume);
++                       src->srcpool->pool, src->srcpool->volume);
+         return -1;
+     }
+ 
+-    if (!(vol = virStorageVolLookupByName(pool, def->src->srcpool->volume)))
++    if (!(vol = virStorageVolLookupByName(pool, src->srcpool->volume)))
+         return -1;
+ 
+     if (virStorageVolGetInfo(vol, &info) < 0)
+@@ -31313,22 +31304,22 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+     if (!(pooldef = virStoragePoolDefParseString(poolxml)))
+         return -1;
+ 
+-    def->src->srcpool->pooltype = pooldef->type;
+-    def->src->srcpool->voltype = info.type;
++    src->srcpool->pooltype = pooldef->type;
++    src->srcpool->voltype = info.type;
+ 
+-    if (def->src->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) {
++    if (src->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+                        _("disk source mode is only valid when "
+                          "storage pool is of iscsi type"));
+         return -1;
+     }
+ 
+-    VIR_FREE(def->src->path);
+-    virStorageNetHostDefFree(def->src->nhosts, def->src->hosts);
+-    def->src->nhosts = 0;
+-    def->src->hosts = NULL;
+-    virStorageAuthDefFree(def->src->auth);
+-    def->src->auth = NULL;
++    VIR_FREE(src->path);
++    virStorageNetHostDefFree(src->nhosts, src->hosts);
++    src->nhosts = 0;
++    src->hosts = NULL;
++    virStorageAuthDefFree(src->auth);
++    src->auth = NULL;
+ 
+     switch ((virStoragePoolType) pooldef->type) {
+     case VIR_STORAGE_POOL_DIR:
+@@ -31339,32 +31330,24 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+     case VIR_STORAGE_POOL_SCSI:
+     case VIR_STORAGE_POOL_ZFS:
+     case VIR_STORAGE_POOL_VSTORAGE:
+-        if (!(def->src->path = virStorageVolGetPath(vol)))
++        if (!(src->path = virStorageVolGetPath(vol)))
+             return -1;
+ 
+-        if (def->startupPolicy && info.type != VIR_STORAGE_VOL_FILE) {
+-            virReportError(VIR_ERR_XML_ERROR, "%s",
+-                           _("'startupPolicy' is only valid for "
+-                             "'file' type volume"));
+-            return -1;
+-        }
+-
+-
+         switch (info.type) {
+         case VIR_STORAGE_VOL_FILE:
+-            def->src->srcpool->actualtype = VIR_STORAGE_TYPE_FILE;
++            src->srcpool->actualtype = VIR_STORAGE_TYPE_FILE;
+             break;
+ 
+         case VIR_STORAGE_VOL_DIR:
+-            def->src->srcpool->actualtype = VIR_STORAGE_TYPE_DIR;
++            src->srcpool->actualtype = VIR_STORAGE_TYPE_DIR;
+             break;
+ 
+         case VIR_STORAGE_VOL_BLOCK:
+-            def->src->srcpool->actualtype = VIR_STORAGE_TYPE_BLOCK;
++            src->srcpool->actualtype = VIR_STORAGE_TYPE_BLOCK;
+             break;
+ 
+         case VIR_STORAGE_VOL_PLOOP:
+-            def->src->srcpool->actualtype = VIR_STORAGE_TYPE_FILE;
++            src->srcpool->actualtype = VIR_STORAGE_TYPE_FILE;
+             break;
+ 
+         case VIR_STORAGE_VOL_NETWORK:
+@@ -31380,39 +31363,25 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+         break;
+ 
+     case VIR_STORAGE_POOL_ISCSI_DIRECT:
+-        if (def->startupPolicy) {
+-            virReportError(VIR_ERR_XML_ERROR, "%s",
+-                           _("'startupPolicy' is only valid for "
+-                             "'file' type volume"));
+-            return -1;
+-        }
+-
+-        if (virDomainDiskTranslateISCSIDirect(def->src, pooldef) < 0)
++        if (virDomainDiskTranslateISCSIDirect(src, pooldef) < 0)
+             return -1;
+ 
+         break;
+ 
+     case VIR_STORAGE_POOL_ISCSI:
+-        if (def->startupPolicy) {
+-            virReportError(VIR_ERR_XML_ERROR, "%s",
+-                           _("'startupPolicy' is only valid for "
+-                             "'file' type volume"));
+-            return -1;
+-        }
+-
+-       switch (def->src->srcpool->mode) {
++       switch (src->srcpool->mode) {
+        case VIR_STORAGE_SOURCE_POOL_MODE_DEFAULT:
+        case VIR_STORAGE_SOURCE_POOL_MODE_LAST:
+-           def->src->srcpool->mode = VIR_STORAGE_SOURCE_POOL_MODE_HOST;
++           src->srcpool->mode = VIR_STORAGE_SOURCE_POOL_MODE_HOST;
+            G_GNUC_FALLTHROUGH;
+        case VIR_STORAGE_SOURCE_POOL_MODE_HOST:
+-           def->src->srcpool->actualtype = VIR_STORAGE_TYPE_BLOCK;
+-           if (!(def->src->path = virStorageVolGetPath(vol)))
++           src->srcpool->actualtype = VIR_STORAGE_TYPE_BLOCK;
++           if (!(src->path = virStorageVolGetPath(vol)))
+                return -1;
+            break;
+ 
+        case VIR_STORAGE_SOURCE_POOL_MODE_DIRECT:
+-           if (virDomainDiskTranslateISCSIDirect(def->src, pooldef) < 0)
++           if (virDomainDiskTranslateISCSIDirect(src, pooldef) < 0)
+                return -1;
+            break;
+        }
+@@ -31434,6 +31403,35 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+ }
+ 
+ 
++int
++virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
++{
++    g_autoptr(virConnect) conn = NULL;
++
++    if (def->src->type != VIR_STORAGE_TYPE_VOLUME)
++        return 0;
++
++    if (!def->src->srcpool)
++        return 0;
++
++    if (!(conn = virGetConnectStorage()))
++        return -1;
++
++    if (virDomainStorageSourceTranslateSourcePool(def->src, conn) < 0)
++        return -1;
++
++    if (def->startupPolicy != 0 &&
++        virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) {
++        virReportError(VIR_ERR_XML_ERROR, "%s",
++                       _("'startupPolicy' is only valid for "
++                         "'file' type volume"));
++        return -1;
++    }
++
++    return 0;
++}
++
++
+ /**
+  * virDomainDiskGetDetectZeroesMode:
+  * @discard: disk/image sector discard setting
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainDiskTranslateSourcePoolAuth-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch b/SOURCES/libvirt-virDomainDiskTranslateSourcePoolAuth-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
new file mode 100644
index 0000000..5f80d52
--- /dev/null
+++ b/SOURCES/libvirt-virDomainDiskTranslateSourcePoolAuth-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
@@ -0,0 +1,62 @@
+From c44dbb2ca444be1d655d41bcd8df8eec89784f81 Mon Sep 17 00:00:00 2001
+Message-Id: <c44dbb2ca444be1d655d41bcd8df8eec89784f81@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:09:58 +0100
+Subject: [PATCH] virDomainDiskTranslateSourcePoolAuth: Take
+ virStorageSourcePtr instead of virDomainDiskDefPtr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only 'def->src' was ever used in this function. Use the source directly.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4fca8299c5d83378fc950f23bdf9fcca605a8251)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804603
+Message-Id: <66d9f9fe057c447d3b1fc5e93fce513b33242c05.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_conf.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 9cbc7b47e7..14b675d5d6 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31222,18 +31222,18 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
+ 
+ 
+ static int
+-virDomainDiskTranslateSourcePoolAuth(virDomainDiskDefPtr def,
++virDomainDiskTranslateSourcePoolAuth(virStorageSourcePtr src,
+                                      virStoragePoolSourcePtr source)
+ {
+     /* Only necessary when authentication set */
+     if (!source->auth)
+         return 0;
+ 
+-    def->src->auth = virStorageAuthDefCopy(source->auth);
+-    if (!def->src->auth)
++    src->auth = virStorageAuthDefCopy(source->auth);
++    if (!src->auth)
+         return -1;
+     /* A <disk> doesn't use <auth type='%s', so clear that out for the disk */
+-    def->src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE;
++    src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE;
+     return 0;
+ }
+ 
+@@ -31245,7 +31245,7 @@ virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
+     def->src->srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK;
+     def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
+ 
+-    if (virDomainDiskTranslateSourcePoolAuth(def,
++    if (virDomainDiskTranslateSourcePoolAuth(def->src,
+                                              &pooldef->source) < 0)
+         return -1;
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virDomainFSDefFree-Unref-private-data.patch b/SOURCES/libvirt-virDomainFSDefFree-Unref-private-data.patch
new file mode 100644
index 0000000..e5a6dc1
--- /dev/null
+++ b/SOURCES/libvirt-virDomainFSDefFree-Unref-private-data.patch
@@ -0,0 +1,53 @@
+From 4fd89121cecafd23bb45c517d5b8ff90d9b40a8f Mon Sep 17 00:00:00 2001
+Message-Id: <4fd89121cecafd23bb45c517d5b8ff90d9b40a8f@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Wed, 4 Mar 2020 12:42:34 +0100
+Subject: [PATCH] virDomainFSDefFree: Unref private data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The privateData object is allocated in virDomainFSDefNew() but
+never unref'd.
+
+==119642== 480 bytes in 20 blocks are definitely lost in loss record 656 of 671
+==119642==    at 0x4837B86: calloc (vg_replace_malloc.c:762)
+==119642==    by 0x57806A0: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6000.7)
+==119642==    by 0x4AE7392: virAllocVar (viralloc.c:331)
+==119642==    by 0x4B64395: virObjectNew (virobject.c:241)
+==119642==    by 0x48F1464: qemuDomainFSPrivateNew (qemu_domain.c:1427)
+==119642==    by 0x4BBF004: virDomainFSDefNew (domain_conf.c:2307)
+==119642==    by 0x4BD859A: virDomainFSDefParseXML (domain_conf.c:11217)
+==119642==    by 0x4BF9DD1: virDomainDefParseXML (domain_conf.c:21179)
+==119642==    by 0x4BFCD5B: virDomainDefParseNode (domain_conf.c:21943)
+==119642==    by 0x4BFCC36: virDomainDefParse (domain_conf.c:21901)
+==119642==    by 0x4BFCCCB: virDomainDefParseFile (domain_conf.c:21924)
+==119642==    by 0x114A9D: testCompareXMLToArgv (qemuxml2argvtest.c:452)
+
+Fixes: 5120577ed79f89e172e3deed534fa9b585f4701f
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit d8b4f70e1e36772ef82dbe0f0706fa7845583e6c)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1694166
+Message-Id: <77519310a2e8c09b41bfcc0c8e37b1c2dcb35b5c.1583322090.git.jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_conf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 88117187c8..990c5bcc1e 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -2320,6 +2320,7 @@ void virDomainFSDefFree(virDomainFSDefPtr def)
+     VIR_FREE(def->dst);
+     virDomainDeviceInfoClear(&def->info);
+     VIR_FREE(def->virtio);
++    virObjectUnref(def->privateData);
+ 
+     VIR_FREE(def);
+ }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virDomainNetDefCheckABIStability-Check-for-MTU-change-too.patch b/SOURCES/libvirt-virDomainNetDefCheckABIStability-Check-for-MTU-change-too.patch
deleted file mode 100644
index 7f337c1..0000000
--- a/SOURCES/libvirt-virDomainNetDefCheckABIStability-Check-for-MTU-change-too.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b84c055e38c1075af7ff51c9809977a48118ded2 Mon Sep 17 00:00:00 2001
-Message-Id: <b84c055e38c1075af7ff51c9809977a48118ded2@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 4 Sep 2018 10:41:02 +0200
-Subject: [PATCH] virDomainNetDefCheckABIStability: Check for MTU change too
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RHEL-7.6: https://bugzilla.redhat.com/show_bug.cgi?id=1623157
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1623158
-
-Changing MTU on a running guest is not possible and trying to do
-so made us face many problems. That's why we forbid it in
-5f44d7e357f61f7. However, there is still one possible path where
-users can sneak in change: migration XML.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 4ea3693104c03ac40a6595f5b9bcda58fa18afe7)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 35f944d92a..a881b43b51 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -21628,6 +21628,13 @@ virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
-         return false;
-     }
- 
-+    if (src->mtu != dst->mtu) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("Target network card MTU %d does not match source %d"),
-+                       dst->mtu, src->mtu);
-+        return false;
-+    }
-+
-     if (src->virtio && dst->virtio &&
-         !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
-         return false;
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virDomainNetDefClear-Free-persistent-name.patch b/SOURCES/libvirt-virDomainNetDefClear-Free-persistent-name.patch
new file mode 100644
index 0000000..5b2f550
--- /dev/null
+++ b/SOURCES/libvirt-virDomainNetDefClear-Free-persistent-name.patch
@@ -0,0 +1,53 @@
+From 97d7066d53be18a9638d28217e2a4216fa422a53 Mon Sep 17 00:00:00 2001
+Message-Id: <97d7066d53be18a9638d28217e2a4216fa422a53@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 21 Feb 2020 14:32:11 +0100
+Subject: [PATCH] virDomainNetDefClear: Free @persistent name
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The persistent alias name @persistent is allocated in
+virDomainNetDefParseXML() but never freed.
+
+==119642== 22 bytes in 2 blocks are definitely lost in loss record 178 of 671
+==119642==    at 0x483579F: malloc (vg_replace_malloc.c:309)
+==119642==    by 0x58F89F1: xmlStrndup (in /usr/lib64/libxml2.so.2.9.9)
+==119642==    by 0x4BA3B74: virXMLPropString (virxml.c:520)
+==119642==    by 0x4BDB0C5: virDomainNetDefParseXML (domain_conf.c:11876)
+==119642==    by 0x4BF9EF4: virDomainDefParseXML (domain_conf.c:21196)
+==119642==    by 0x4BFCD5B: virDomainDefParseNode (domain_conf.c:21943)
+==119642==    by 0x4BFCC36: virDomainDefParse (domain_conf.c:21901)
+==119642==    by 0x4BFCCCB: virDomainDefParseFile (domain_conf.c:21924)
+==119642==    by 0x114A9D: testCompareXMLToArgv (qemuxml2argvtest.c:452)
+==119642==    by 0x13894F: virTestRun (testutils.c:143)
+==119642==    by 0x11F46E: mymain (qemuxml2argvtest.c:1316)
+==119642==    by 0x13A60E: virTestMain (testutils.c:839
+
+Fixes: fb0509d06ac57434c2edbd81ee63deb32a0e598a
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 2ab278ec758b09398ea335626a41b453cdda6da7)
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1805742
+Message-Id: <d64d26b106c91220bdcb95cd3dd90229fe449cd2.1582291906.git.jtomko@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/conf/domain_conf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 5c11f49463..8a5f14d6cb 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -2439,6 +2439,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
+ 
+     VIR_FREE(def->backend.tap);
+     VIR_FREE(def->backend.vhost);
++    VIR_FREE(def->teaming.persistent);
+     VIR_FREE(def->virtPortProfile);
+     VIR_FREE(def->script);
+     VIR_FREE(def->domain_name);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virDomainObjListAddLocked-Produce-better-error-message-than-Duplicate-key.patch b/SOURCES/libvirt-virDomainObjListAddLocked-Produce-better-error-message-than-Duplicate-key.patch
deleted file mode 100644
index 674e3b6..0000000
--- a/SOURCES/libvirt-virDomainObjListAddLocked-Produce-better-error-message-than-Duplicate-key.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 874617d278b58554feee567b2e79d208aaef214c Mon Sep 17 00:00:00 2001
-Message-Id: <874617d278b58554feee567b2e79d208aaef214c@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 6 Aug 2019 13:29:22 +0200
-Subject: [PATCH] virDomainObjListAddLocked: Produce better error message than
- 'Duplicate key'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If there are two concurrent threads, one of which is removing a
-domain from the list and the other is trying to add it back they
-may serialize in the following order:
-
-1) vm->removing is set and @vm is unlocked.
-2) The tread that's trying to add the domain onto the list locks
-   the list and tries to find, if the domain already exists.
-3) Our lookup functions say it doesn't, so the thread proceeds to
-   virHashAddEntry() which fails with 'Duplicate key' error.
-
-This is obviously not helpful error message at all.
-
-The problem lies in our lookup functions
-(virDomainObjListFindByUUIDLocked() and
-virDomainObjListFindByNameLocked()) which return NULL even if the
-object is still on the list. They do this so that the object is
-not mistakenly looked up by some driver. The fix consists of
-moving 'removing' check one level up and thus allowing
-virDomainObjListAddLocked() to produce meaningful error message.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
-(cherry picked from commit a5c71129bf2c12a827f1bc00149acd1c572ffe9c)
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1737790
-Message-Id: <c63ca487bf56af5240e273b5a112a753c2bc85a3.1565090956.git.jtomko@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/conf/virdomainobjlist.c | 35 +++++++++++++++++++++--------------
- 1 file changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
-index e7c3e326ca..3b388e2ba2 100644
---- a/src/conf/virdomainobjlist.c
-+++ b/src/conf/virdomainobjlist.c
-@@ -142,14 +142,9 @@ virDomainObjListFindByUUIDLocked(virDomainObjListPtr doms,
- 
-     virUUIDFormat(uuid, uuidstr);
-     obj = virHashLookup(doms->objs, uuidstr);
--    virObjectRef(obj);
-     if (obj) {
-+        virObjectRef(obj);
-         virObjectLock(obj);
--        if (obj->removing) {
--            virObjectUnlock(obj);
--            virObjectUnref(obj);
--            obj = NULL;
--        }
-     }
-     return obj;
- }
-@@ -173,6 +168,12 @@ virDomainObjListFindByUUID(virDomainObjListPtr doms,
-     obj = virDomainObjListFindByUUIDLocked(doms, uuid);
-     virObjectRWUnlock(doms);
- 
-+    if (obj && obj->removing) {
-+        virObjectUnlock(obj);
-+        virObjectUnref(obj);
-+        obj = NULL;
-+    }
-+
-     return obj;
- }
- 
-@@ -184,14 +185,9 @@ virDomainObjListFindByNameLocked(virDomainObjListPtr doms,
-     virDomainObjPtr obj;
- 
-     obj = virHashLookup(doms->objsName, name);
--    virObjectRef(obj);
-     if (obj) {
-+        virObjectRef(obj);
-         virObjectLock(obj);
--        if (obj->removing) {
--            virObjectUnlock(obj);
--            virObjectUnref(obj);
--            obj = NULL;
--        }
-     }
-     return obj;
- }
-@@ -215,6 +211,12 @@ virDomainObjListFindByName(virDomainObjListPtr doms,
-     obj = virDomainObjListFindByNameLocked(doms, name);
-     virObjectRWUnlock(doms);
- 
-+    if (obj && obj->removing) {
-+        virObjectUnlock(obj);
-+        virObjectUnref(obj);
-+        obj = NULL;
-+    }
-+
-     return obj;
- }
- 
-@@ -286,8 +288,13 @@ virDomainObjListAddLocked(virDomainObjListPtr doms,
- 
-     /* See if a VM with matching UUID already exists */
-     if ((vm = virDomainObjListFindByUUIDLocked(doms, def->uuid))) {
--        /* UUID matches, but if names don't match, refuse it */
--        if (STRNEQ(vm->def->name, def->name)) {
-+        if (vm->removing) {
-+            virReportError(VIR_ERR_OPERATION_FAILED,
-+                           _("domain '%s' is already being removed"),
-+                           vm->def->name);
-+            goto error;
-+        } else if (STRNEQ(vm->def->name, def->name)) {
-+            /* UUID matches, but if names don't match, refuse it */
-             virUUIDFormat(vm->def->uuid, uuidstr);
-             virReportError(VIR_ERR_OPERATION_FAILED,
-                            _("domain '%s' is already defined with uuid %s"),
--- 
-2.22.1
-
diff --git a/SOURCES/libvirt-virDomainObjListAddLocked-fix-double-free.patch b/SOURCES/libvirt-virDomainObjListAddLocked-fix-double-free.patch
deleted file mode 100644
index 0f08e90..0000000
--- a/SOURCES/libvirt-virDomainObjListAddLocked-fix-double-free.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From ad3f8f1d128f726d1504079ec34b68f6db297d3a Mon Sep 17 00:00:00 2001
-Message-Id: <ad3f8f1d128f726d1504079ec34b68f6db297d3a@dist-git>
-From: Marc Hartmayer <mhartmay@linux.ibm.com>
-Date: Wed, 10 Jul 2019 11:49:45 +0200
-Subject: [PATCH] virDomainObjListAddLocked: fix double free
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If @vm has flagged as "to be removed" virDomainObjListFindByNameLocked
-returns NULL (although the definition actually exists). Therefore, the
-possibility exits that "virHashAddEntry" will raise the error
-"Duplicate key" => virDomainObjListAddObjLocked fails =>
-virDomainObjEndAPI(&vm) is called and this leads to a freeing of @def
-since @def is already assigned to vm->def. But actually this leads to
-a double free since the common usage pattern is that the caller of
-virDomainObjListAdd(Locked) is responsible for freeing @def in case of
-an error.
-
-Let's fix this by setting vm->def to NULL in case of an error.
-
-Backtrace:
-
-   ➤  bt
-   #0  virFree (ptrptr=0x7575757575757575)
-   #1  0x000003ffb5b25b3e in virDomainResourceDefFree
-   #2  0x000003ffb5b37c34 in virDomainDefFree
-   #3  0x000003ff9123f734 in qemuDomainDefineXMLFlags
-   #4  0x000003ff9123f7f4 in qemuDomainDefineXML
-   #5  0x000003ffb5cd2c84 in virDomainDefineXML
-   #6  0x000000011745aa82 in remoteDispatchDomainDefineXML
-   ...
-
-Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
-Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-(cherry picked from commit 7e760f61577e6c4adbb0b015f8f7ac1796570cdd)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1728530
-Message-Id: <b651c347f5775c8298347ef8602d0205fab9c3e7.1562752178.git.jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/conf/virdomainobjlist.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
-index 72064d7c66..e7c3e326ca 100644
---- a/src/conf/virdomainobjlist.c
-+++ b/src/conf/virdomainobjlist.c
-@@ -329,8 +329,10 @@ virDomainObjListAddLocked(virDomainObjListPtr doms,
-             goto cleanup;
-         vm->def = def;
- 
--        if (virDomainObjListAddObjLocked(doms, vm) < 0)
-+        if (virDomainObjListAddObjLocked(doms, vm) < 0) {
-+            vm->def = NULL;
-             goto error;
-+        }
-     }
-  cleanup:
-     return vm;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virFileIsSharedFSType-Check-for-fuse.glusterfs-too.patch b/SOURCES/libvirt-virFileIsSharedFSType-Check-for-fuse.glusterfs-too.patch
deleted file mode 100644
index 4592e1b..0000000
--- a/SOURCES/libvirt-virFileIsSharedFSType-Check-for-fuse.glusterfs-too.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 40f76170e9b12f1d2f00cf05761fb56aec8b9494 Mon Sep 17 00:00:00 2001
-Message-Id: <40f76170e9b12f1d2f00cf05761fb56aec8b9494@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 3 Oct 2018 14:16:49 +0200
-Subject: [PATCH] virFileIsSharedFSType: Check for fuse.glusterfs too
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1632711
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-
-GlusterFS is typically safe when it comes to migration. It's a
-network FS after all. However, it can be mounted via FUSE driver
-they provide. If that is the case we fail to identify it and
-think migration is not safe and require VIR_MIGRATE_UNSAFE flag.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 478da65fb46c866973886848ae17f1e16199a77d)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virfile.c | 77 ++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 75 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 378d03ecf0..c87e26bf5b 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3534,6 +3534,76 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
- # ifndef HUGETLBFS_MAGIC
- #  define HUGETLBFS_MAGIC 0x958458f6
- # endif
-+# ifndef FUSE_SUPER_MAGIC
-+#  define FUSE_SUPER_MAGIC 0x65735546
-+# endif
-+
-+# define PROC_MOUNTS "/proc/mounts"
-+
-+static int
-+virFileIsSharedFixFUSE(const char *path,
-+                       long *f_type)
-+{
-+    char *dirpath = NULL;
-+    const char **mounts = NULL;
-+    size_t nmounts = 0;
-+    char *p;
-+    FILE *f = NULL;
-+    struct mntent mb;
-+    char mntbuf[1024];
-+    int ret = -1;
-+
-+    if (VIR_STRDUP(dirpath, path) < 0)
-+        return -1;
-+
-+    if (!(f = setmntent(PROC_MOUNTS, "r"))) {
-+        virReportSystemError(errno,
-+                             _("Unable to open %s"),
-+                             PROC_MOUNTS);
-+        goto cleanup;
-+    }
-+
-+    while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) {
-+        if (STRNEQ("fuse.glusterfs", mb.mnt_type))
-+            continue;
-+
-+        if (VIR_APPEND_ELEMENT_COPY(mounts, nmounts, mb.mnt_dir) < 0)
-+            goto cleanup;
-+    }
-+
-+    /* Add NULL sentinel so that this is a virStringList */
-+    if (VIR_REALLOC_N(mounts, nmounts + 1) < 0)
-+        goto cleanup;
-+    mounts[nmounts] = NULL;
-+
-+    do {
-+        if ((p = strrchr(dirpath, '/')) == NULL) {
-+            virReportSystemError(EINVAL,
-+                                 _("Invalid relative path '%s'"), path);
-+            goto cleanup;
-+        }
-+
-+        if (p == dirpath)
-+            *(p+1) = '\0';
-+        else
-+            *p = '\0';
-+
-+        if (virStringListHasString(mounts, dirpath)) {
-+            VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. "
-+                      "Fixing shared FS type", dirpath, path);
-+            *f_type = GFS2_MAGIC;
-+            break;
-+        }
-+    } while (p != dirpath);
-+
-+    ret = 0;
-+ cleanup:
-+    endmntent(f);
-+    VIR_FREE(mounts);
-+    VIR_FREE(dirpath);
-+    return ret;
-+}
-+
- 
- int
- virFileIsSharedFSType(const char *path,
-@@ -3581,6 +3651,11 @@ virFileIsSharedFSType(const char *path,
-         return -1;
-     }
- 
-+    if (sb.f_type == FUSE_SUPER_MAGIC) {
-+        VIR_DEBUG("Found FUSE mount for path=%s. Trying to fix it", path);
-+        virFileIsSharedFixFUSE(path, (long *) &sb.f_type);
-+    }
-+
-     VIR_DEBUG("Check if path %s with FS magic %lld is shared",
-               path, (long long int)sb.f_type);
- 
-@@ -3673,8 +3748,6 @@ virFileGetDefaultHugepageSize(unsigned long long *size)
-     return ret;
- }
- 
--# define PROC_MOUNTS "/proc/mounts"
--
- int
- virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs,
-                      size_t *ret_nfs)
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virFileIsSharedFSType-Detect-direct-mount-points.patch b/SOURCES/libvirt-virFileIsSharedFSType-Detect-direct-mount-points.patch
deleted file mode 100644
index 6bdd113..0000000
--- a/SOURCES/libvirt-virFileIsSharedFSType-Detect-direct-mount-points.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0525e60f94b22b8736961cb598242384010552c5 Mon Sep 17 00:00:00 2001
-Message-Id: <0525e60f94b22b8736961cb598242384010552c5@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 10 Oct 2018 17:25:55 +0200
-Subject: [PATCH] virFileIsSharedFSType: Detect direct mount points
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1632711
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1635705
-
-If the given path is already a mount point (e.g. a bind mount of
-a file, or simply a direct mount point of a FS), then our code
-fails to detect that because the first thing it does is cutting
-off part after last slash '/'.
-
-Conflicts:
-  src/util/virfile.c - VIR_AUTOFREE() stuff
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 98ca1d52a2a871e1c068504450b4dc15db063ef4)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virfile.c  | 9 +++++----
- tests/virfiletest.c | 3 +--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 46466ed136..05ecf7bf21 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3609,7 +3609,8 @@ int
- virFileIsSharedFSType(const char *path,
-                       int fstypes)
- {
--    char *dirpath, *p;
-+    char *dirpath;
-+    char *p = NULL;
-     struct statfs sb;
-     int statfs_ret;
-     long long f_type = 0;
-@@ -3617,8 +3618,9 @@ virFileIsSharedFSType(const char *path,
-     if (VIR_STRDUP(dirpath, path) < 0)
-         return -1;
- 
--    do {
-+    statfs_ret = statfs(dirpath, &sb);
- 
-+    while ((statfs_ret < 0) && (p != dirpath)) {
-         /* Try less and less of the path until we get to a
-          * directory we can stat. Even if we don't have 'x'
-          * permission on any directory in the path on the NFS
-@@ -3640,8 +3642,7 @@ virFileIsSharedFSType(const char *path,
-             *p = '\0';
- 
-         statfs_ret = statfs(dirpath, &sb);
--
--    } while ((statfs_ret < 0) && (p != dirpath));
-+    }
- 
-     VIR_FREE(dirpath);
- 
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index 85f22063fe..80ea34bfa4 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -454,8 +454,7 @@ mymain(void)
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts1.txt", "/boot/vmlinuz", false);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts2.txt", "/run/user/501/gvfs/some/file", false);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/file", true);
--    /* TODO Detect bind mounts */
--    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/blah", true);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/blah", false);
- 
-     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- }
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virHashAddOrUpdateEntry-Simplify-allocation-of-new-entry.patch b/SOURCES/libvirt-virHashAddOrUpdateEntry-Simplify-allocation-of-new-entry.patch
new file mode 100644
index 0000000..d3e1ca8
--- /dev/null
+++ b/SOURCES/libvirt-virHashAddOrUpdateEntry-Simplify-allocation-of-new-entry.patch
@@ -0,0 +1,53 @@
+From ca0f45dfc891bfb383e365376c6a2b4bb2ae3ba3 Mon Sep 17 00:00:00 2001
+Message-Id: <ca0f45dfc891bfb383e365376c6a2b4bb2ae3ba3@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:20 +0100
+Subject: [PATCH] virHashAddOrUpdateEntry: Simplify allocation of new entry
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use g_new0 and skip checking of the return value of keyCopy callback
+as both are bound to return a valid pointer.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 509ddcfde2af565a63ba193d41395aa99ea4744e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <3e351cf75e5514f54bd2e6dc799792248dfe1f82.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virhash.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/util/virhash.c b/src/util/virhash.c
+index c57d9f8292..36a2d312fc 100644
+--- a/src/util/virhash.c
++++ b/src/util/virhash.c
+@@ -344,7 +344,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
+     size_t key, len = 0;
+     virHashEntryPtr entry;
+     virHashEntryPtr last = NULL;
+-    void *new_name;
+ 
+     if ((table == NULL) || (name == NULL))
+         return -1;
+@@ -374,12 +373,8 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
+         len++;
+     }
+ 
+-    if (VIR_ALLOC(entry) < 0 || !(new_name = table->keyCopy(name))) {
+-        VIR_FREE(entry);
+-        return -1;
+-    }
+-
+-    entry->name = new_name;
++    entry = g_new0(virHashEntry, 1);
++    entry->name = table->keyCopy(name);
+     entry->payload = userdata;
+ 
+     if (last)
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virJSONValueNewArray-Use-g_new0-to-allocate-and-remove-NULL-checks-from-callers.patch b/SOURCES/libvirt-virJSONValueNewArray-Use-g_new0-to-allocate-and-remove-NULL-checks-from-callers.patch
new file mode 100644
index 0000000..3676fa0
--- /dev/null
+++ b/SOURCES/libvirt-virJSONValueNewArray-Use-g_new0-to-allocate-and-remove-NULL-checks-from-callers.patch
@@ -0,0 +1,472 @@
+From 500025205783acaa29d3c0e020ef8c6ce9579784 Mon Sep 17 00:00:00 2001
+Message-Id: <500025205783acaa29d3c0e020ef8c6ce9579784@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:18 +0100
+Subject: [PATCH] virJSONValueNewArray: Use g_new0 to allocate and remove NULL
+ checks from callers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the glib allocation function that never returns NULL and remove the
+now dead-code checks from all callers.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit d69470a18afa909a18f336e46a1817657b91635e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <1c666c563fe614b2c61bb47abb6d33dbcab91316.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/locking/lock_daemon.c        |  4 ++--
+ src/logging/log_handler.c        |  3 +--
+ src/network/leaseshelper.c       |  6 +-----
+ src/qemu/qemu_agent.c            |  6 +-----
+ src/qemu/qemu_backup.c           |  6 ++----
+ src/qemu/qemu_block.c            |  9 +++------
+ src/qemu/qemu_blockjob.c         |  3 +--
+ src/qemu/qemu_checkpoint.c       |  9 +++------
+ src/qemu/qemu_driver.c           |  3 +--
+ src/qemu/qemu_firmware.c         | 12 ++++--------
+ src/qemu/qemu_migration_params.c |  3 +--
+ src/qemu/qemu_monitor_json.c     |  3 +--
+ src/rpc/virnetserver.c           |  6 ++----
+ src/rpc/virnetserverservice.c    |  3 +--
+ src/util/virjson.c               | 13 ++-----------
+ src/util/virlockspace.c          |  6 ++----
+ src/util/virmacmap.c             |  8 ++++----
+ tests/qemublocktest.c            |  3 +--
+ tests/qemumonitorjsontest.c      |  5 ++---
+ 19 files changed, 35 insertions(+), 76 deletions(-)
+
+diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
+index 65c38139c4..75e24eb2f6 100644
+--- a/src/locking/lock_daemon.c
++++ b/src/locking/lock_daemon.c
+@@ -949,8 +949,8 @@ virLockDaemonPreExecRestart(const char *state_file,
+         goto cleanup;
+     }
+ 
+-    if (!(lockspaces = virJSONValueNewArray()))
+-        goto cleanup;
++    lockspaces = virJSONValueNewArray();
++
+     if (virJSONValueObjectAppend(object, "lockspaces", lockspaces) < 0) {
+         virJSONValueFree(lockspaces);
+         goto cleanup;
+diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
+index 030c9d66e3..973c52c7cd 100644
+--- a/src/logging/log_handler.c
++++ b/src/logging/log_handler.c
+@@ -619,8 +619,7 @@ virLogHandlerPreExecRestart(virLogHandlerPtr handler)
+     if (!ret)
+         return NULL;
+ 
+-    if (!(files = virJSONValueNewArray()))
+-        goto error;
++    files = virJSONValueNewArray();
+ 
+     if (virJSONValueObjectAppend(ret, "files", files) < 0) {
+         virJSONValueFree(files);
+diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
+index f1a061066e..dd1d5f70ee 100644
+--- a/src/network/leaseshelper.c
++++ b/src/network/leaseshelper.c
+@@ -200,11 +200,7 @@ main(int argc, char **argv)
+         break;
+     }
+ 
+-    if (!(leases_array_new = virJSONValueNewArray())) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                       _("failed to create json"));
+-        goto cleanup;
+-    }
++    leases_array_new = virJSONValueNewArray();
+ 
+     if (virLeaseReadCustomLeaseFile(leases_array_new, custom_lease_file,
+                                     delete ? ip : NULL, &server_duid) < 0)
+diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
+index 5fa8d24a91..f759785050 100644
+--- a/src/qemu/qemu_agent.c
++++ b/src/qemu/qemu_agent.c
+@@ -1203,9 +1203,6 @@ qemuAgentMakeStringsArray(const char **strings, unsigned int len)
+     size_t i;
+     virJSONValuePtr ret = virJSONValueNewArray(), str;
+ 
+-    if (!ret)
+-        return NULL;
+-
+     for (i = 0; i < len; i++) {
+         str = virJSONValueNewString(strings[i]);
+         if (!str)
+@@ -1536,8 +1533,7 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon,
+     *nmodified = 0;
+ 
+     /* create the key data array */
+-    if (!(cpus = virJSONValueNewArray()))
+-        goto cleanup;
++    cpus = virJSONValueNewArray();
+ 
+     for (i = 0; i < ninfo; i++) {
+         qemuAgentCPUInfoPtr in = &info[i];
+diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
+index 8b1e9a7e19..2cc6ff7a42 100644
+--- a/src/qemu/qemu_backup.c
++++ b/src/qemu/qemu_backup.c
+@@ -180,8 +180,7 @@ qemuBackupDiskPrepareOneBitmapsChain(virDomainMomentDefPtr *incremental,
+     g_autoptr(virJSONValue) ret = NULL;
+     size_t incridx = 0;
+ 
+-    if (!(ret = virJSONValueNewArray()))
+-        return NULL;
++    ret = virJSONValueNewArray();
+ 
+     if (!(bitmap = qemuBlockNamedNodeDataGetBitmapByName(blockNamedNodeData,
+                                                          backingChain,
+@@ -819,8 +818,7 @@ qemuBackupBegin(virDomainObjPtr vm,
+         !(incremental = qemuBackupBeginCollectIncrementalCheckpoints(vm, def->incremental)))
+         goto endjob;
+ 
+-    if (!(actions = virJSONValueNewArray()))
+-        goto endjob;
++    actions = virJSONValueNewArray();
+ 
+     /* The 'chk' checkpoint must be rolled back if the transaction command
+      * which creates it on disk is not executed or fails */
+diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
+index 13e240fdac..03f029368e 100644
+--- a/src/qemu/qemu_block.c
++++ b/src/qemu/qemu_block.c
+@@ -524,8 +524,7 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSourcePtr src,
+     virStorageNetHostDefPtr host;
+     size_t i;
+ 
+-    if (!(servers = virJSONValueNewArray()))
+-        return NULL;
++    servers = virJSONValueNewArray();
+ 
+     for (i = 0; i < src->nhosts; i++) {
+         host = src->hosts + i;
+@@ -590,8 +589,7 @@ qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(virStorageSourcePtr src)
+     virStorageNetHostDefPtr host;
+     size_t i;
+ 
+-    if (!(servers = virJSONValueNewArray()))
+-        return NULL;
++    servers = virJSONValueNewArray();
+ 
+     for (i = 0; i < src->nhosts; i++) {
+         host = src->hosts + i;
+@@ -837,8 +835,7 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src,
+         username = srcPriv->secinfo->s.aes.username;
+         keysecret = srcPriv->secinfo->s.aes.alias;
+         /* the auth modes are modelled after our old command line generator */
+-        if (!(authmodes = virJSONValueNewArray()))
+-            return NULL;
++        authmodes = virJSONValueNewArray();
+ 
+         if (!(mode = virJSONValueNewString("cephx")) ||
+             virJSONValueArrayAppend(authmodes, mode) < 0)
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index e04fcf69d1..3dc9222a6f 100644
+--- a/src/qemu/qemu_blockjob.c
++++ b/src/qemu/qemu_blockjob.c
+@@ -1344,8 +1344,7 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriverPtr driver,
+         return;
+ 
+     if (job->data.backup.bitmap) {
+-        if (!(actions = virJSONValueNewArray()))
+-            return;
++        actions = virJSONValueNewArray();
+ 
+         if (qemuMonitorTransactionBitmapRemove(actions,
+                                                job->disk->src->nodeformat,
+diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
+index 59b7f63fdc..c06bfe6a21 100644
+--- a/src/qemu/qemu_checkpoint.c
++++ b/src/qemu/qemu_checkpoint.c
+@@ -217,8 +217,7 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSourcePtr src,
+                     return -1;
+             }
+ 
+-            if (!(arr = virJSONValueNewArray()))
+-                return -1;
++            arr = virJSONValueNewArray();
+ 
+             if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr,
+                                                                  n->nodeformat,
+@@ -261,8 +260,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
+     g_autoptr(GSList) relabelimages = NULL;
+     GSList *next;
+ 
+-    if (!(actions = virJSONValueNewArray()))
+-        return -1;
++    actions = virJSONValueNewArray();
+ 
+     qemuDomainObjEnterMonitor(driver, vm);
+     blockNamedNodeData = qemuMonitorBlockGetNamedNodeData(priv->mon);
+@@ -535,8 +533,7 @@ qemuCheckpointCreateCommon(virQEMUDriverPtr driver,
+     if ((parent = virDomainCheckpointGetCurrent(vm->checkpoints)))
+         (*def)->parent.parent_name = g_strdup(parent->def->name);
+ 
+-    if (!(tmpactions = virJSONValueNewArray()))
+-        return -1;
++    tmpactions = virJSONValueNewArray();
+ 
+     if (qemuCheckpointAddActions(vm, tmpactions, parent, *def) < 0)
+         return -1;
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index f7ad2dca28..0667402ebb 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15619,8 +15619,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
+     if (virDomainObjCheckActive(vm) < 0)
+         return -1;
+ 
+-    if (!(actions = virJSONValueNewArray()))
+-        return -1;
++    actions = virJSONValueNewArray();
+ 
+     if (blockdev &&
+         !(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
+diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
+index 7fb57913e8..68e2c6b40f 100644
+--- a/src/qemu/qemu_firmware.c
++++ b/src/qemu/qemu_firmware.c
+@@ -651,8 +651,7 @@ qemuFirmwareInterfaceFormat(virJSONValuePtr doc,
+     g_autoptr(virJSONValue) interfacesJSON = NULL;
+     size_t i;
+ 
+-    if (!(interfacesJSON = virJSONValueNewArray()))
+-        return -1;
++    interfacesJSON = virJSONValueNewArray();
+ 
+     for (i = 0; i < fw->ninterfaces; i++) {
+         if (virJSONValueArrayAppendString(interfacesJSON,
+@@ -799,8 +798,7 @@ qemuFirmwareTargetFormat(virJSONValuePtr doc,
+     g_autoptr(virJSONValue) targetsJSON = NULL;
+     size_t i;
+ 
+-    if (!(targetsJSON = virJSONValueNewArray()))
+-        return -1;
++    targetsJSON = virJSONValueNewArray();
+ 
+     for (i = 0; i < fw->ntargets; i++) {
+         qemuFirmwareTargetPtr t = fw->targets[i];
+@@ -816,8 +814,7 @@ qemuFirmwareTargetFormat(virJSONValuePtr doc,
+                                            virQEMUCapsArchToString(t->architecture)) < 0)
+             return -1;
+ 
+-        if (!(machines = virJSONValueNewArray()))
+-            return -1;
++        machines = virJSONValueNewArray();
+ 
+         for (j = 0; j < t->nmachines; j++) {
+             if (virJSONValueArrayAppendString(machines,
+@@ -851,8 +848,7 @@ qemuFirmwareFeatureFormat(virJSONValuePtr doc,
+     g_autoptr(virJSONValue) featuresJSON = NULL;
+     size_t i;
+ 
+-    if (!(featuresJSON = virJSONValueNewArray()))
+-        return -1;
++    featuresJSON = virJSONValueNewArray();
+ 
+     for (i = 0; i < fw->nfeatures; i++) {
+         if (virJSONValueArrayAppendString(featuresJSON,
+diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
+index 9430ce1d00..45acf8cda2 100644
+--- a/src/qemu/qemu_migration_params.c
++++ b/src/qemu/qemu_migration_params.c
+@@ -785,8 +785,7 @@ qemuMigrationCapsToJSON(virBitmapPtr caps,
+     qemuMigrationCapability bit;
+     const char *name;
+ 
+-    if (!(json = virJSONValueNewArray()))
+-        return NULL;
++    json = virJSONValueNewArray();
+ 
+     for (bit = 0; bit < QEMU_MIGRATION_CAP_LAST; bit++) {
+         bool supported = false;
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 3fc0bcb80c..8cd98dbf26 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -4802,8 +4802,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon,
+     size_t i;
+ 
+     /* create the key data array */
+-    if (!(keys = virJSONValueNewArray()))
+-        goto cleanup;
++    keys = virJSONValueNewArray();
+ 
+     for (i = 0; i < nkeycodes; i++) {
+         if (keycodes[i] > 0xffff) {
+diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
+index 4122636805..c87dade1a8 100644
+--- a/src/rpc/virnetserver.c
++++ b/src/rpc/virnetserver.c
+@@ -603,8 +603,7 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv)
+         goto error;
+     }
+ 
+-    if (!(services = virJSONValueNewArray()))
+-        goto error;
++    services = virJSONValueNewArray();
+ 
+     if (virJSONValueObjectAppend(object, "services", services) < 0) {
+         virJSONValueFree(services);
+@@ -622,8 +621,7 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv)
+         }
+     }
+ 
+-    if (!(clients = virJSONValueNewArray()))
+-        goto error;
++    clients = virJSONValueNewArray();
+ 
+     if (virJSONValueObjectAppend(object, "clients", clients) < 0) {
+         virJSONValueFree(clients);
+diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
+index 5d1178f899..0a003e5814 100644
+--- a/src/rpc/virnetserverservice.c
++++ b/src/rpc/virnetserverservice.c
+@@ -353,8 +353,7 @@ virJSONValuePtr virNetServerServicePreExecRestart(virNetServerServicePtr svc)
+     if (virJSONValueObjectAppendNumberUint(object, "nrequests_client_max", svc->nrequests_client_max) < 0)
+         goto error;
+ 
+-    if (!(socks = virJSONValueNewArray()))
+-        goto error;
++    socks = virJSONValueNewArray();
+ 
+     if (virJSONValueObjectAppend(object, "socks", socks) < 0) {
+         virJSONValueFree(socks);
+diff --git a/src/util/virjson.c b/src/util/virjson.c
+index 50993648eb..ca57df816f 100644
+--- a/src/util/virjson.c
++++ b/src/util/virjson.c
+@@ -561,10 +561,7 @@ virJSONValueNewNull(void)
+ virJSONValuePtr
+ virJSONValueNewArray(void)
+ {
+-    virJSONValuePtr val;
+-
+-    if (VIR_ALLOC(val) < 0)
+-        return NULL;
++    virJSONValuePtr val = g_new0(virJSONValue, 1);
+ 
+     val->type = VIR_JSON_TYPE_ARRAY;
+ 
+@@ -1265,8 +1262,7 @@ virJSONValueNewArrayFromBitmap(virBitmapPtr bitmap)
+     virJSONValuePtr ret;
+     ssize_t pos = -1;
+ 
+-    if (!(ret = virJSONValueNewArray()))
+-        return NULL;
++    ret = virJSONValueNewArray();
+ 
+     if (!bitmap)
+         return ret;
+@@ -1522,8 +1518,6 @@ virJSONValueCopy(const virJSONValue *in)
+         break;
+     case VIR_JSON_TYPE_ARRAY:
+         out = virJSONValueNewArray();
+-        if (!out)
+-            return NULL;
+         for (i = 0; i < in->data.array.nvalues; i++) {
+             virJSONValuePtr val = NULL;
+             if (!(val = virJSONValueCopy(in->data.array.values[i])))
+@@ -1782,9 +1776,6 @@ virJSONParserHandleStartArray(void *ctx)
+ 
+     VIR_DEBUG("parser=%p", parser);
+ 
+-    if (!value)
+-        return 0;
+-
+     if (virJSONParserInsertValue(parser, value) < 0) {
+         virJSONValueFree(value);
+         return 0;
+diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
+index 59d47daae8..a44377f89e 100644
+--- a/src/util/virlockspace.c
++++ b/src/util/virlockspace.c
+@@ -443,8 +443,7 @@ virJSONValuePtr virLockSpacePreExecRestart(virLockSpacePtr lockspace)
+         virJSONValueObjectAppendString(object, "directory", lockspace->dir) < 0)
+         goto error;
+ 
+-    if (!(resources = virJSONValueNewArray()))
+-        goto error;
++    resources = virJSONValueNewArray();
+ 
+     if (virJSONValueObjectAppend(object, "resources", resources) < 0) {
+         virJSONValueFree(resources);
+@@ -479,8 +478,7 @@ virJSONValuePtr virLockSpacePreExecRestart(virLockSpacePtr lockspace)
+             goto error;
+         }
+ 
+-        if (!(owners = virJSONValueNewArray()))
+-            goto error;
++        owners = virJSONValueNewArray();
+ 
+         if (virJSONValueObjectAppend(child, "owners", owners) < 0) {
+             virJSONValueFree(owners);
+diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
+index cd74f67678..ec589334ea 100644
+--- a/src/util/virmacmap.c
++++ b/src/util/virmacmap.c
+@@ -206,10 +206,11 @@ virMACMapHashDumper(void *payload,
+     size_t i;
+     int ret = -1;
+ 
+-    if (!(obj = virJSONValueNewObject()) ||
+-        !(arr = virJSONValueNewArray()))
++    if (!(obj = virJSONValueNewObject()))
+         goto cleanup;
+ 
++    arr = virJSONValueNewArray();
++
+     for (i = 0; macs[i]; i++) {
+         virJSONValuePtr m = virJSONValueNewString(macs[i]);
+ 
+@@ -244,8 +245,7 @@ virMacMapDumpStrLocked(virMacMapPtr mgr,
+     virJSONValuePtr arr;
+     int ret = -1;
+ 
+-    if (!(arr = virJSONValueNewArray()))
+-        goto cleanup;
++    arr = virJSONValueNewArray();
+ 
+     if (virHashForEach(mgr->macs, virMACMapHashDumper, arr) < 0)
+         goto cleanup;
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index ed8b061e2e..5946cd6c6b 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -733,8 +733,7 @@ testQemuCheckpointDeleteMerge(const void *opaque)
+         return -1;
+     }
+ 
+-    if (!(actions = virJSONValueNewArray()))
+-        return -1;
++    actions = virJSONValueNewArray();
+ 
+     if (qemuCheckpointDiscardDiskBitmaps(data->chain,
+                                          nodedata,
+diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
+index 0334f83628..2c696a2e8b 100644
+--- a/tests/qemumonitorjsontest.c
++++ b/tests/qemumonitorjsontest.c
+@@ -2948,9 +2948,8 @@ testQemuMonitorJSONTransaction(const void *opaque)
+     if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema)))
+         return -1;
+ 
+-    if (!(actions = virJSONValueNewArray()) ||
+-        !(mergebitmaps = virJSONValueNewArray()))
+-        return -1;
++    actions = virJSONValueNewArray();
++    mergebitmaps = virJSONValueNewArray();
+ 
+     if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(mergebitmaps, "node1", "bitmap1") < 0 ||
+         qemuMonitorTransactionBitmapMergeSourceAddBitmap(mergebitmaps, "node2", "bitmap2") < 0)
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virNetDevOpenvswitchInterfaceStats-Optimize-for-speed.patch b/SOURCES/libvirt-virNetDevOpenvswitchInterfaceStats-Optimize-for-speed.patch
deleted file mode 100644
index 5b105e6..0000000
--- a/SOURCES/libvirt-virNetDevOpenvswitchInterfaceStats-Optimize-for-speed.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From dbcd08b082f3e96cf09328041549c0f1dc4e1335 Mon Sep 17 00:00:00 2001
-Message-Id: <dbcd08b082f3e96cf09328041549c0f1dc4e1335@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 30 Jul 2019 15:30:51 +0200
-Subject: [PATCH] virNetDevOpenvswitchInterfaceStats: Optimize for speed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We run 'ovs-vsctl' nine times (first to find if interface is
-there and then eight times = for each stats member separately).
-This is very inefficient. I've found a way to run it once and
-with a bit of help from virJSON module we can parse out stats
-we need.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c297eab52599c91a4cb26b66dbdfe9d07c3142d3)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <ba02a9b373ff7014e1edfc98da4edf11abe34a9e.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 111 +++++++++++++++++++++-----------
- 1 file changed, 74 insertions(+), 37 deletions(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index cb403aaf2e..dbd832053b 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -35,6 +35,7 @@
- #include "virmacaddr.h"
- #include "virstring.h"
- #include "virlog.h"
-+#include "virjson.h"
- 
- #define VIR_FROM_THIS VIR_FROM_NONE
- 
-@@ -318,58 +319,94 @@ int
- virNetDevOpenvswitchInterfaceStats(const char *ifname,
-                                    virDomainInterfaceStatsPtr stats)
- {
--    char *tmp;
--    bool gotStats = false;
-     VIR_AUTOPTR(virCommand) cmd = NULL;
-     VIR_AUTOFREE(char *) output = NULL;
-+    VIR_AUTOPTR(virJSONValue) jsonStats = NULL;
-+    virJSONValuePtr jsonMap = NULL;
-+    size_t i;
- 
--    /* Just ensure the interface exists in ovs */
-     cmd = virCommandNew(OVSVSCTL);
-     virNetDevOpenvswitchAddTimeout(cmd);
--    virCommandAddArgList(cmd, "get", "Interface", ifname, "name", NULL);
-+    virCommandAddArgList(cmd, "--if-exists", "--format=list", "--data=json",
-+                         "--no-headings", "--columns=statistics", "list",
-+                         "Interface", ifname, NULL);
-     virCommandSetOutputBuffer(cmd, &output);
- 
--    if (virCommandRun(cmd, NULL) < 0) {
-+    /* The above command returns either:
-+     * 1) empty string if @ifname doesn't exist, or
-+     * 2) a JSON array, for instance:
-+     *    ["map",[["collisions",0],["rx_bytes",0],["rx_crc_err",0],["rx_dropped",0],
-+     *    ["rx_errors",0],["rx_frame_err",0],["rx_over_err",0],["rx_packets",0],
-+     *    ["tx_bytes",12406],["tx_dropped",0],["tx_errors",0],["tx_packets",173]]]
-+     */
-+
-+    if (virCommandRun(cmd, NULL) < 0 ||
-+        STREQ_NULLABLE(output, "")) {
-         /* no ovs-vsctl or interface 'ifname' doesn't exists in ovs */
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Interface not found"));
-         return -1;
-     }
- 
--#define GET_STAT(name, member) \
--    do { \
--        VIR_FREE(output); \
--        virCommandFree(cmd); \
--        cmd = virCommandNew(OVSVSCTL); \
--        virNetDevOpenvswitchAddTimeout(cmd); \
--        virCommandAddArgList(cmd, "--if-exists", "get", "Interface", \
--                             ifname, "statistics:" name, NULL); \
--        virCommandSetOutputBuffer(cmd, &output); \
--        if (virCommandRun(cmd, NULL) < 0 || !output || !*output || *output == '\n') { \
--            stats->member = -1; \
--        } else { \
--            if (virStrToLong_ll(output, &tmp, 10, &stats->member) < 0 || \
--                *tmp != '\n') { \
--                virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \
--                               _("Fail to parse ovs-vsctl output")); \
--                return -1; \
--            } \
--            gotStats = true; \
--        } \
--    } while (0)
-+    if (!(jsonStats = virJSONValueFromString(output)) ||
-+        !virJSONValueIsArray(jsonStats) ||
-+        !(jsonMap = virJSONValueArrayGet(jsonStats, 1))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Unable to parse ovs-vsctl output"));
-+        return -1;
-+    }
- 
--    /* The TX/RX fields appear to be swapped here
--     * because this is the host view. */
--    GET_STAT("rx_bytes", tx_bytes);
--    GET_STAT("rx_packets", tx_packets);
--    GET_STAT("rx_errors", tx_errs);
--    GET_STAT("rx_dropped", tx_drop);
--    GET_STAT("tx_bytes", rx_bytes);
--    GET_STAT("tx_packets", rx_packets);
--    GET_STAT("tx_errors", rx_errs);
--    GET_STAT("tx_dropped", rx_drop);
-+    stats->rx_bytes = stats->rx_packets = stats->rx_errs = stats->rx_drop = -1;
-+    stats->tx_bytes = stats->tx_packets = stats->tx_errs = stats->tx_drop = -1;
- 
--    if (!gotStats) {
-+    for (i = 0; i < virJSONValueArraySize(jsonMap); i++) {
-+        virJSONValuePtr item = virJSONValueArrayGet(jsonMap, i);
-+        virJSONValuePtr jsonKey;
-+        virJSONValuePtr jsonVal;
-+        const char *key;
-+        long long val;
-+
-+        if (!item ||
-+            (!(jsonKey = virJSONValueArrayGet(item, 0))) ||
-+            (!(jsonVal = virJSONValueArrayGet(item, 1))) ||
-+            (!(key = virJSONValueGetString(jsonKey))) ||
-+            (virJSONValueGetNumberLong(jsonVal, &val) < 0)) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("Malformed ovs-vsctl output"));
-+            return -1;
-+        }
-+
-+        /* The TX/RX fields appear to be swapped here
-+         * because this is the host view. */
-+        if (STREQ(key, "rx_bytes")) {
-+            stats->tx_bytes = val;
-+        } else if (STREQ(key, "rx_packets")) {
-+            stats->tx_packets = val;
-+        } else if (STREQ(key, "rx_errors")) {
-+            stats->tx_errs = val;
-+        } else if (STREQ(key, "rx_dropped")) {
-+            stats->tx_drop = val;
-+        } else if (STREQ(key, "tx_bytes")) {
-+            stats->rx_bytes = val;
-+        } else if (STREQ(key, "tx_packets")) {
-+            stats->rx_packets = val;
-+        } else if (STREQ(key, "tx_errors")) {
-+            stats->rx_errs = val;
-+        } else if (STREQ(key, "tx_dropped")) {
-+            stats->rx_drop = val;
-+        } else {
-+            VIR_DEBUG("Unused ovs-vsctl stat key=%s val=%lld", key, val);
-+        }
-+    }
-+
-+    if (stats->rx_bytes == -1 &&
-+        stats->rx_packets == -1 &&
-+        stats->rx_errs == -1 &&
-+        stats->rx_drop == -1 &&
-+        stats->tx_bytes == -1 &&
-+        stats->tx_packets == -1 &&
-+        stats->tx_errs == -1 &&
-+        stats->tx_drop == -1) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Interface doesn't have any statistics"));
-         return -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virSecretLookupDefCopy-Remove-return-value.patch b/SOURCES/libvirt-virSecretLookupDefCopy-Remove-return-value.patch
new file mode 100644
index 0000000..d853a55
--- /dev/null
+++ b/SOURCES/libvirt-virSecretLookupDefCopy-Remove-return-value.patch
@@ -0,0 +1,79 @@
+From c671c037d06c761708374dba1b7e4ed4041fe9fb Mon Sep 17 00:00:00 2001
+Message-Id: <c671c037d06c761708374dba1b7e4ed4041fe9fb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 20 Mar 2020 10:28:51 +0100
+Subject: [PATCH] virSecretLookupDefCopy: Remove return value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function always returns succes so there's no need for a return
+value.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 02f909b8a6ad8c271693fed9ceab606f0dda2294)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1814923
+Message-Id: <a2f47ac4171ea9eaf3fbee12f22670ff10a1b98c.1584696274.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virsecret.c      | 3 +--
+ src/util/virsecret.h      | 4 ++--
+ src/util/virstoragefile.c | 3 +--
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/util/virsecret.c b/src/util/virsecret.c
+index 174ce544c0..167ad24fdf 100644
+--- a/src/util/virsecret.c
++++ b/src/util/virsecret.c
+@@ -47,7 +47,7 @@ virSecretLookupDefClear(virSecretLookupTypeDefPtr def)
+ }
+ 
+ 
+-int
++void
+ virSecretLookupDefCopy(virSecretLookupTypeDefPtr dst,
+                        const virSecretLookupTypeDef *src)
+ {
+@@ -57,7 +57,6 @@ virSecretLookupDefCopy(virSecretLookupTypeDefPtr dst,
+     } else if (dst->type == VIR_SECRET_LOOKUP_TYPE_USAGE) {
+         dst->u.usage = g_strdup(src->u.usage);
+     }
+-    return 0;
+ }
+ 
+ 
+diff --git a/src/util/virsecret.h b/src/util/virsecret.h
+index 8bc8a24e0f..780b5761f4 100644
+--- a/src/util/virsecret.h
++++ b/src/util/virsecret.h
+@@ -49,8 +49,8 @@ struct _virSecretLookupTypeDef {
+ };
+ 
+ void virSecretLookupDefClear(virSecretLookupTypeDefPtr def);
+-int virSecretLookupDefCopy(virSecretLookupTypeDefPtr dst,
+-                           const virSecretLookupTypeDef *src);
++void virSecretLookupDefCopy(virSecretLookupTypeDefPtr dst,
++                            const virSecretLookupTypeDef *src);
+ int virSecretLookupParseSecret(xmlNodePtr secretnode,
+                                virSecretLookupTypeDefPtr def);
+ void virSecretLookupFormatSecret(virBufferPtr buf,
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index ce126f5cba..fa37840532 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -1792,8 +1792,7 @@ virStorageAuthDefCopy(const virStorageAuthDef *src)
+     authdef->secrettype = g_strdup(src->secrettype);
+     authdef->authType = src->authType;
+ 
+-    if (virSecretLookupDefCopy(&authdef->seclookupdef, &src->seclookupdef) < 0)
+-        return NULL;
++    virSecretLookupDefCopy(&authdef->seclookupdef, &src->seclookupdef);
+ 
+     return g_steal_pointer(&authdef);
+ }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virSecurityManagerMetadataLock-Store-locked-paths.patch b/SOURCES/libvirt-virSecurityManagerMetadataLock-Store-locked-paths.patch
new file mode 100644
index 0000000..9a7d0ca
--- /dev/null
+++ b/SOURCES/libvirt-virSecurityManagerMetadataLock-Store-locked-paths.patch
@@ -0,0 +1,115 @@
+From 157a222a2001e3d5df4851ea3f43a00873f82be1 Mon Sep 17 00:00:00 2001
+Message-Id: <157a222a2001e3d5df4851ea3f43a00873f82be1@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Feb 2020 11:24:50 +0100
+Subject: [PATCH] virSecurityManagerMetadataLock: Store locked paths
+
+So far, in the lock state we are storing only the file
+descriptors of the files we've locked. Therefore, when unlocking
+them and something does wrong the only thing we can report is FD
+number, which is not user friendly at all. But if we store paths
+among with FDs we can do better error reporting.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+(cherry picked from commit 256e01e59e922ff70dce56284e53e3463d4dc072)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1804672
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <8b12c9adde3c8553b4a2b588ac1a657d0638336b.1582626185.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/security/security_manager.c | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/src/security/security_manager.c b/src/security/security_manager.c
+index f229d94570..05d20e36af 100644
+--- a/src/security/security_manager.c
++++ b/src/security/security_manager.c
+@@ -1246,8 +1246,9 @@ virSecurityManagerRestoreTPMLabels(virSecurityManagerPtr mgr,
+ 
+ 
+ struct _virSecurityManagerMetadataLockState {
+-    size_t nfds;
++    size_t nfds; /* Captures size of both @fds and @paths */
+     int *fds;
++    const char **paths;
+ };
+ 
+ 
+@@ -1278,6 +1279,7 @@ cmpstringp(const void *p1, const void *p2)
+  *
+  * Lock passed @paths for metadata change. The returned state
+  * should be passed to virSecurityManagerMetadataUnlock.
++ * Passed @paths must not be freed until the corresponding unlock call.
+  *
+  * NOTE: this function is not thread safe (because of usage of
+  * POSIX locks).
+@@ -1293,9 +1295,11 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
+     size_t i = 0;
+     size_t nfds = 0;
+     int *fds = NULL;
++    const char **locked_paths = NULL;
+     virSecurityManagerMetadataLockStatePtr ret = NULL;
+ 
+-    if (VIR_ALLOC_N(fds, npaths) < 0)
++    if (VIR_ALLOC_N(fds, npaths) < 0 ||
++        VIR_ALLOC_N(locked_paths, npaths) < 0)
+         return NULL;
+ 
+     /* Sort paths to lock in order to avoid deadlocks with other
+@@ -1372,12 +1376,14 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
+             break;
+         } while (1);
+ 
++        locked_paths[nfds] = p;
+         VIR_APPEND_ELEMENT_COPY_INPLACE(fds, nfds, fd);
+     }
+ 
+     if (VIR_ALLOC(ret) < 0)
+         goto cleanup;
+ 
++    ret->paths = g_steal_pointer(&locked_paths);
+     ret->fds = g_steal_pointer(&fds);
+     ret->nfds = nfds;
+     nfds = 0;
+@@ -1386,6 +1392,7 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
+     for (i = nfds; i > 0; i--)
+         VIR_FORCE_CLOSE(fds[i - 1]);
+     VIR_FREE(fds);
++    VIR_FREE(locked_paths);
+     return ret;
+ }
+ 
+@@ -1401,21 +1408,23 @@ virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
+ 
+     for (i = 0; i < (*state)->nfds; i++) {
+         char ebuf[1024];
++        const char *path = (*state)->paths[i];
+         int fd = (*state)->fds[i];
+ 
+         /* Technically, unlock is not needed because it will
+          * happen on VIR_CLOSE() anyway. But let's play it nice. */
+         if (virFileUnlock(fd, METADATA_OFFSET, METADATA_LEN) < 0) {
+-            VIR_WARN("Unable to unlock fd %d: %s",
+-                     fd, virStrerror(errno, ebuf, sizeof(ebuf)));
++            VIR_WARN("Unable to unlock fd %d path %s: %s",
++                     fd, path, virStrerror(errno, ebuf, sizeof(ebuf)));
+         }
+ 
+         if (VIR_CLOSE(fd) < 0) {
+-            VIR_WARN("Unable to close fd %d: %s",
+-                     fd, virStrerror(errno, ebuf, sizeof(ebuf)));
++            VIR_WARN("Unable to close fd %d path %s: %s",
++                     fd, path, virStrerror(errno, ebuf, sizeof(ebuf)));
+         }
+     }
+ 
+     VIR_FREE((*state)->fds);
++    VIR_FREE((*state)->paths);
+     VIR_FREE(*state);
+ }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageBackendGlusterRefreshVol-Refactor-handling-of-backing-store.patch b/SOURCES/libvirt-virStorageBackendGlusterRefreshVol-Refactor-handling-of-backing-store.patch
new file mode 100644
index 0000000..c7125d5
--- /dev/null
+++ b/SOURCES/libvirt-virStorageBackendGlusterRefreshVol-Refactor-handling-of-backing-store.patch
@@ -0,0 +1,65 @@
+From 315706837bdb6f11c0bb4b48612d35afa1965454 Mon Sep 17 00:00:00 2001
+Message-Id: <315706837bdb6f11c0bb4b48612d35afa1965454@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:39 +0100
+Subject: [PATCH] virStorageBackendGlusterRefreshVol: Refactor handling of
+ backing store
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Take the format of the backing store from the 'meta' object directly and
+use g_steal_pointer to steal the path.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit fee56942e2dacc64ed4b36aa2ea887f60c117659)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <8bf19c252bd0a49ef7e689c809314345d7831735.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/storage/storage_backend_gluster.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c
+index 4a8ee3870d..e92e9612bd 100644
+--- a/src/storage/storage_backend_gluster.c
++++ b/src/storage/storage_backend_gluster.c
+@@ -224,7 +224,6 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
+     int ret = -1;
+     glfs_fd_t *fd = NULL;
+     ssize_t len;
+-    int backingFormat;
+     g_autoptr(virStorageVolDef) vol = NULL;
+     g_autoptr(virStorageSource) meta = NULL;
+     g_autofree char *header = NULL;
+@@ -277,7 +276,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
+ 
+     if (!(meta = virStorageFileGetMetadataFromBuf(name, header, len,
+                                                   VIR_STORAGE_FILE_AUTO,
+-                                                  &backingFormat)))
++                                                  NULL)))
+         goto cleanup;
+ 
+     if (meta->backingStoreRaw) {
+@@ -286,13 +285,11 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
+ 
+         vol->target.backingStore->type = VIR_STORAGE_TYPE_NETWORK;
+ 
+-        vol->target.backingStore->path = meta->backingStoreRaw;
++        vol->target.backingStore->path = g_steal_pointer(&meta->backingStoreRaw);
++        vol->target.backingStore->format = meta->backingStoreRawFormat;
+ 
+-        if (backingFormat < 0)
++        if (vol->target.backingStore->format < 0)
+             vol->target.backingStore->format = VIR_STORAGE_FILE_RAW;
+-        else
+-            vol->target.backingStore->format = backingFormat;
+-        meta->backingStoreRaw = NULL;
+     }
+ 
+     vol->target.format = meta->format;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageEncryptionSecretCopy-Properly-copy-internals.patch b/SOURCES/libvirt-virStorageEncryptionSecretCopy-Properly-copy-internals.patch
new file mode 100644
index 0000000..ba630dd
--- /dev/null
+++ b/SOURCES/libvirt-virStorageEncryptionSecretCopy-Properly-copy-internals.patch
@@ -0,0 +1,50 @@
+From 914a920180c9803a57c06bd71f5270724c1dc900 Mon Sep 17 00:00:00 2001
+Message-Id: <914a920180c9803a57c06bd71f5270724c1dc900@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 20 Mar 2020 10:28:52 +0100
+Subject: [PATCH] virStorageEncryptionSecretCopy: Properly copy internals
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+virStorageEncryptionSecretPtr may have a string inside it, thus we must
+copy the string too. Use virSecretLookupDefCopy to do that.
+
+Caused by non-obvious code introduced in 756b46ddd24 and later 47e88b33b
+which added a string that needed to be copied.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1814923
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 299796328c34a30295d6cdc7ebce5d65843e921f)
+Message-Id: <2e350bb771f75d9fd068f69a595401907d92ca33.1584696274.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstorageencryption.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c
+index 74836d4a00..6765fdc23a 100644
+--- a/src/util/virstorageencryption.c
++++ b/src/util/virstorageencryption.c
+@@ -85,12 +85,10 @@ virStorageEncryptionFree(virStorageEncryptionPtr enc)
+ static virStorageEncryptionSecretPtr
+ virStorageEncryptionSecretCopy(const virStorageEncryptionSecret *src)
+ {
+-    virStorageEncryptionSecretPtr ret;
+-
+-    if (VIR_ALLOC(ret) < 0)
+-        return NULL;
++    virStorageEncryptionSecretPtr ret = g_new0(virStorageEncryptionSecret, 1);
+ 
+-    memcpy(ret, src, sizeof(*src));
++    ret->type = src->type;
++    virSecretLookupDefCopy(&ret->seclookupdef, &src->seclookupdef);
+ 
+     return ret;
+ }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataFromBuf-Remove-backingFormat-argument.patch b/SOURCES/libvirt-virStorageFileGetMetadataFromBuf-Remove-backingFormat-argument.patch
new file mode 100644
index 0000000..d97f609
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataFromBuf-Remove-backingFormat-argument.patch
@@ -0,0 +1,111 @@
+From dfcebf2ac266805c4e144091c04b27155972222f Mon Sep 17 00:00:00 2001
+Message-Id: <dfcebf2ac266805c4e144091c04b27155972222f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:40 +0100
+Subject: [PATCH] virStorageFileGetMetadataFromBuf: Remove 'backingFormat'
+ argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+None of the callers actually use it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 57df35aeadd2107a3c728fe0939e0779121168c0)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <67e0987c502a062fc17ee1d2701501bfdcd0cc92.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/storage/storage_backend_gluster.c |  3 +--
+ src/util/virstoragefile.c             | 16 ++++++----------
+ src/util/virstoragefile.h             |  3 +--
+ 3 files changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c
+index e92e9612bd..db3df82aad 100644
+--- a/src/storage/storage_backend_gluster.c
++++ b/src/storage/storage_backend_gluster.c
+@@ -275,8 +275,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
+         goto cleanup;
+ 
+     if (!(meta = virStorageFileGetMetadataFromBuf(name, header, len,
+-                                                  VIR_STORAGE_FILE_AUTO,
+-                                                  NULL)))
++                                                  VIR_STORAGE_FILE_AUTO)))
+         goto cleanup;
+ 
+     if (meta->backingStoreRaw) {
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index d80780e291..1b9bd12284 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -1109,7 +1109,6 @@ virStorageFileMetadataNew(const char *path,
+  * @buf: header bytes from @path
+  * @len: length of @buf
+  * @format: format of the storage file
+- * @backingFormat: format of @backing
+  *
+  * Extract metadata about the storage volume with the specified image format.
+  * If image format is VIR_STORAGE_FILE_AUTO, it will probe to automatically
+@@ -1119,9 +1118,10 @@ virStorageFileMetadataNew(const char *path,
+  * that might be raw if that file will then be passed to a guest, since a
+  * malicious guest can turn a raw file into any other non-raw format at will.
+  *
+- * If the returned @backingFormat is VIR_STORAGE_FILE_AUTO it indicates the
+- * image didn't specify an explicit format for its backing store. Callers are
+- * advised against probing for the backing store format in this case.
++ * If the 'backingStoreRawFormat' field of the returned structure is
++ * VIR_STORAGE_FILE_AUTO it indicates the image didn't specify an explicit
++ * format for its backing store. Callers are advised against probing for the
++ * backing store format in this case.
+  *
+  * Caller MUST free the result after use via virObjectUnref.
+  */
+@@ -1129,8 +1129,7 @@ virStorageSourcePtr
+ virStorageFileGetMetadataFromBuf(const char *path,
+                                  char *buf,
+                                  size_t len,
+-                                 int format,
+-                                 int *backingFormat)
++                                 int format)
+ {
+     virStorageSourcePtr ret = NULL;
+ 
+@@ -1142,9 +1141,6 @@ virStorageFileGetMetadataFromBuf(const char *path,
+         return NULL;
+     }
+ 
+-    if (backingFormat)
+-        *backingFormat = ret->backingStoreRawFormat;
+-
+     return ret;
+ }
+ 
+@@ -3991,7 +3987,7 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr src,
+     if (format == VIR_STORAGE_FILE_RAW && !src->encryption) {
+         src->capacity = src->physical;
+     } else if ((meta = virStorageFileGetMetadataFromBuf(src->path, buf,
+-                                                        len, format, NULL))) {
++                                                        len, format))) {
+         src->capacity = meta->capacity ? meta->capacity : src->physical;
+         if (src->encryption && meta->encryption)
+             src->encryption->payload_offset = meta->encryption->payload_offset;
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index ecba418bb3..32f2c82147 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -386,8 +386,7 @@ virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path,
+ virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path,
+                                                      char *buf,
+                                                      size_t len,
+-                                                     int format,
+-                                                     int *backingFormat)
++                                                     int format)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+ int virStorageFileChainGetBroken(virStorageSourcePtr chain,
+                                  char **broken_file);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataFromFD-Remove-unused-backingFormat-argument.patch b/SOURCES/libvirt-virStorageFileGetMetadataFromFD-Remove-unused-backingFormat-argument.patch
new file mode 100644
index 0000000..a54d876
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataFromFD-Remove-unused-backingFormat-argument.patch
@@ -0,0 +1,91 @@
+From c813373a8e6ab6efcd90fd65e7ea15431733280f Mon Sep 17 00:00:00 2001
+Message-Id: <c813373a8e6ab6efcd90fd65e7ea15431733280f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:41 +0100
+Subject: [PATCH] virStorageFileGetMetadataFromFD: Remove unused
+ 'backingFormat' argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c95656c995e9af260c6dfab69c6da0da8a3ae50c)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <7e26b363b7628de0f22e2fa45b2d1ce79a81d59e.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/storage/storage_util.c |  3 +--
+ src/util/virstoragefile.c  | 12 +-----------
+ src/util/virstoragefile.h  |  3 +--
+ 3 files changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
+index f3e899d0ca..0e80983f1f 100644
+--- a/src/storage/storage_util.c
++++ b/src/storage/storage_util.c
+@@ -3345,8 +3345,7 @@ storageBackendProbeTarget(virStorageSourcePtr target,
+ 
+     if (!(meta = virStorageFileGetMetadataFromFD(target->path,
+                                                  fd,
+-                                                 VIR_STORAGE_FILE_AUTO,
+-                                                 NULL)))
++                                                 VIR_STORAGE_FILE_AUTO)))
+         return -1;
+ 
+     if (meta->backingStoreRaw) {
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 1b9bd12284..0bfd9e16e9 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -1161,21 +1161,14 @@ virStorageFileGetMetadataFromBuf(const char *path,
+ virStorageSourcePtr
+ virStorageFileGetMetadataFromFD(const char *path,
+                                 int fd,
+-                                int format,
+-                                int *backingFormat)
++                                int format)
+ 
+ {
+     ssize_t len = VIR_STORAGE_MAX_HEADER;
+     struct stat sb;
+-    int dummy;
+     g_autofree char *buf = NULL;
+     g_autoptr(virStorageSource) meta = NULL;
+ 
+-    if (!backingFormat)
+-        backingFormat = &dummy;
+-
+-    *backingFormat = VIR_STORAGE_FILE_NONE;
+-
+     if (fstat(fd, &sb) < 0) {
+         virReportSystemError(errno,
+                              _("cannot stat file '%s'"), path);
+@@ -1206,9 +1199,6 @@ virStorageFileGetMetadataFromFD(const char *path,
+     if (virStorageFileGetMetadataInternal(meta, buf, len) < 0)
+         return NULL;
+ 
+-    if (backingFormat)
+-        *backingFormat = meta->backingStoreRawFormat;
+-
+     if (S_ISREG(sb.st_mode))
+         meta->type = VIR_STORAGE_TYPE_FILE;
+     else if (S_ISBLK(sb.st_mode))
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 32f2c82147..5b995d54ab 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -381,8 +381,7 @@ int virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid);
+ 
+ virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path,
+                                                     int fd,
+-                                                    int format,
+-                                                    int *backingFormat);
++                                                    int format);
+ virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path,
+                                                      char *buf,
+                                                      size_t len,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Allow-format-probing-under-special-circumstances.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Allow-format-probing-under-special-circumstances.patch
new file mode 100644
index 0000000..94131af
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Allow-format-probing-under-special-circumstances.patch
@@ -0,0 +1,148 @@
+From 1e3921f1065972dc236bc726f19be37492a145c6 Mon Sep 17 00:00:00 2001
+Message-Id: <1e3921f1065972dc236bc726f19be37492a145c6@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:43 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Allow format probing under
+ special circumstances
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow format probing to work around lazy clients which did not specify
+their format in the overlay. Format probing will be allowed only, if we
+are able to probe the image, the probing result was successful and the
+probed image does not have any backing or data file.
+
+This relaxes the restrictions which were imposed in commit 3615e8b39bad
+in cases when we know that the image probing will not result in security
+issues or data corruption.
+
+We perform the image format detection and in the case that we were able
+to probe the format and the format does not specify a backing store (or
+doesn't support backing store) we can use this format.
+
+With pre-blockdev configurations this will restore the previous
+behaviour for the images mentioned above as qemu would probe the format
+anyways. It also improves error reporting compared to the old state as
+we now report that the backing chain will be broken in case when there
+is a backing file.
+
+In blockdev configurations this ensures that libvirt will not cause data
+corruption by ending the chain prematurely without notifying the user,
+but still allows the old semantics when the users forgot to specify the
+format.
+
+Users thus don't have to re-invent when image format detection is safe
+to do.
+
+The price for this is that libvirt will need to keep the image format
+detector still current and working or replace it by invocation of
+qemu-img.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit ae9e6c2a2b75d958995c661f7bb64ed4353a6404)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <77d1d21a0ce64fd49c501b1ed3667307cbab0b73.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 52 ++++++++++++++++++++++-----------------
+ 1 file changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 0bfd9e16e9..b88763b267 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -4986,6 +4986,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+                                  virHashTablePtr cycle,
+                                  unsigned int depth)
+ {
++    virStorageFileFormat orig_format = src->format;
+     size_t headerLen;
+     int rv;
+     g_autofree char *buf = NULL;
+@@ -4995,10 +4996,17 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+               NULLSTR(src->path), src->format,
+               (unsigned int)uid, (unsigned int)gid);
+ 
++    if (src->format == VIR_STORAGE_FILE_AUTO_SAFE)
++        src->format = VIR_STORAGE_FILE_AUTO;
++
+     /* exit if we can't load information about the current image */
+     rv = virStorageFileSupportsBackingChainTraversal(src);
+-    if (rv <= 0)
++    if (rv <= 0) {
++        if (orig_format == VIR_STORAGE_FILE_AUTO)
++            return -2;
++
+         return rv;
++    }
+ 
+     if (virStorageFileGetMetadataRecurseReadHeader(src, parent, uid, gid,
+                                                    &buf, &headerLen, cycle) < 0)
+@@ -5007,6 +5015,18 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     if (virStorageFileGetMetadataInternal(src, buf, headerLen) < 0)
+         return -1;
+ 
++    /* If we probed the format we MUST ensure that nothing else than the current
++     * image (this includes both backing files and external data store) is
++     * considered for security labelling and/or recursion. */
++    if (orig_format == VIR_STORAGE_FILE_AUTO) {
++        if (src->backingStoreRaw || src->externalDataStoreRaw) {
++            src->format = VIR_STORAGE_FILE_RAW;
++            VIR_FREE(src->backingStoreRaw);
++            VIR_FREE(src->externalDataStoreRaw);
++            return -2;
++        }
++    }
++
+     if (src->backingStoreRaw) {
+         if ((rv = virStorageSourceNewFromBacking(src, &backingStore)) < 0)
+             return -1;
+@@ -5015,33 +5035,21 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+         if (rv == 1)
+             return 0;
+ 
+-        if (backingStore->format == VIR_STORAGE_FILE_AUTO) {
+-            /* Assuming the backing store to be raw can lead to failures. We do
+-             * it only when we must not report an error to prevent losing VMs.
+-             * Otherwise report an error.
+-             */
+-            if (report_broken) {
++        if ((rv = virStorageFileGetMetadataRecurse(backingStore, parent,
++                                                   uid, gid,
++                                                   report_broken,
++                                                   cycle, depth + 1)) < 0) {
++            if (!report_broken)
++                return 0;
++
++            if (rv == -2) {
+                 virReportError(VIR_ERR_OPERATION_INVALID,
+                                _("format of backing image '%s' of image '%s' was not specified in the image metadata "
+                                  "(See https://libvirt.org/kbase/backing_chains.html for troubleshooting)"),
+                                src->backingStoreRaw, NULLSTR(src->path));
+-                return -1;
+             }
+ 
+-            backingStore->format = VIR_STORAGE_FILE_RAW;
+-        }
+-
+-        if (backingStore->format == VIR_STORAGE_FILE_AUTO_SAFE)
+-            backingStore->format = VIR_STORAGE_FILE_AUTO;
+-
+-        if (virStorageFileGetMetadataRecurse(backingStore, parent,
+-                                             uid, gid,
+-                                             report_broken,
+-                                             cycle, depth + 1) < 0) {
+-            if (report_broken)
+-                return -1;
+-            else
+-                return 0;
++            return -1;
+         }
+ 
+         backingStore->id = depth;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Expect-NULL-src-path.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Expect-NULL-src-path.patch
new file mode 100644
index 0000000..7d0facd
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Expect-NULL-src-path.patch
@@ -0,0 +1,48 @@
+From b501151fe2fb1f3b3e8d9617fb1b5a160832f480 Mon Sep 17 00:00:00 2001
+Message-Id: <b501151fe2fb1f3b3e8d9617fb1b5a160832f480@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:31 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Expect NULL src->path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The path can be NULL e.g. for NBD disks. Use NULLSTR to prevent use of
+NULL in %s.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 157b8722cbcc57103d3dd9211aa94a2c592849b6)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <6f8aa7a68bbde2e405c83c53ee78e746d3efbf39.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 911f811ace..28d1d1aa1e 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -4973,7 +4973,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     g_autoptr(virStorageSource) backingStore = NULL;
+ 
+     VIR_DEBUG("path=%s format=%d uid=%u gid=%u",
+-              src->path, src->format,
++              NULLSTR(src->path), src->format,
+               (unsigned int)uid, (unsigned int)gid);
+ 
+     /* exit if we can't load information about the current image */
+@@ -4995,7 +4995,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     if (virHashLookup(cycle, uniqueName)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("backing store for %s (%s) is self-referential"),
+-                       src->path, uniqueName);
++                       NULLSTR(src->path), uniqueName);
+         goto cleanup;
+     }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Extract-storage-access.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Extract-storage-access.patch
new file mode 100644
index 0000000..8137719
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Extract-storage-access.patch
@@ -0,0 +1,128 @@
+From 811785bdc008e9d0df7e6f3e723c5f67b40cf6de Mon Sep 17 00:00:00 2001
+Message-Id: <811785bdc008e9d0df7e6f3e723c5f67b40cf6de@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:33 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Extract storage access
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Extract the code that directly deals with storage. This allows further
+simplification and clarification of virStorageFileGetMetadataRecurse.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 01adad0932a583b1e2183dd4401bddd8607e77c3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <716c58c00cec06dd469b079df124bc896665f169.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 71 ++++++++++++++++++++++++++-------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 46d55eda96..7295cebd08 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -4955,31 +4955,18 @@ virStorageFileReportBrokenChain(int errcode,
+ }
+ 
+ 
+-/* Recursive workhorse for virStorageFileGetMetadata.  */
+ static int
+-virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+-                                 virStorageSourcePtr parent,
+-                                 uid_t uid, gid_t gid,
+-                                 bool report_broken,
+-                                 virHashTablePtr cycle,
+-                                 unsigned int depth)
++virStorageFileGetMetadataRecurseReadHeader(virStorageSourcePtr src,
++                                           virStorageSourcePtr parent,
++                                           uid_t uid,
++                                           gid_t gid,
++                                           char **buf,
++                                           size_t *headerLen,
++                                           virHashTablePtr cycle)
+ {
+     int ret = -1;
+     const char *uniqueName;
+-    ssize_t headerLen;
+-    int backingFormat;
+-    int rv;
+-    g_autofree char *buf = NULL;
+-    g_autoptr(virStorageSource) backingStore = NULL;
+-
+-    VIR_DEBUG("path=%s format=%d uid=%u gid=%u",
+-              NULLSTR(src->path), src->format,
+-              (unsigned int)uid, (unsigned int)gid);
+-
+-    /* exit if we can't load information about the current image */
+-    rv = virStorageFileSupportsBackingChainTraversal(src);
+-    if (rv <= 0)
+-        return rv;
++    ssize_t len;
+ 
+     if (virStorageFileInitAs(src, uid, gid) < 0)
+         return -1;
+@@ -5002,10 +4989,47 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     if (virHashAddEntry(cycle, uniqueName, NULL) < 0)
+         goto cleanup;
+ 
+-    if ((headerLen = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER,
+-                                        &buf)) < 0)
++    if ((len = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER, buf)) < 0)
+         goto cleanup;
+ 
++    *headerLen = len;
++    ret = 0;
++
++ cleanup:
++    virStorageFileDeinit(src);
++    return ret;
++}
++
++
++/* Recursive workhorse for virStorageFileGetMetadata.  */
++static int
++virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
++                                 virStorageSourcePtr parent,
++                                 uid_t uid, gid_t gid,
++                                 bool report_broken,
++                                 virHashTablePtr cycle,
++                                 unsigned int depth)
++{
++    int ret = -1;
++    size_t headerLen;
++    int backingFormat;
++    int rv;
++    g_autofree char *buf = NULL;
++    g_autoptr(virStorageSource) backingStore = NULL;
++
++    VIR_DEBUG("path=%s format=%d uid=%u gid=%u",
++              NULLSTR(src->path), src->format,
++              (unsigned int)uid, (unsigned int)gid);
++
++    /* exit if we can't load information about the current image */
++    rv = virStorageFileSupportsBackingChainTraversal(src);
++    if (rv <= 0)
++        return rv;
++
++    if (virStorageFileGetMetadataRecurseReadHeader(src, parent, uid, gid,
++                                                   &buf, &headerLen, cycle) < 0)
++        return -1;
++
+     if (virStorageFileGetMetadataInternal(src, buf, headerLen,
+                                           &backingFormat) < 0)
+         goto cleanup;
+@@ -5081,7 +5105,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     ret = 0;
+ 
+  cleanup:
+-    virStorageFileDeinit(src);
+     return ret;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-cleanup-label.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-cleanup-label.patch
new file mode 100644
index 0000000..69739f3
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-cleanup-label.patch
@@ -0,0 +1,124 @@
+From 0b9e19e4d91694f3f55318409b120d132d1db987 Mon Sep 17 00:00:00 2001
+Message-Id: <0b9e19e4d91694f3f55318409b120d132d1db987@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:34 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Remove 'cleanup' label
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There's nothing to clean up. Make it obvious what is returned.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit a570dc67675618e3946bef7e49c685f56bb258e3)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <1aed0cf359219aa713ded5159d3f04b080e3042c.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 50 +++++++++++++++------------------------
+ 1 file changed, 19 insertions(+), 31 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 7295cebd08..5a74034ec4 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -5010,7 +5010,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+                                  virHashTablePtr cycle,
+                                  unsigned int depth)
+ {
+-    int ret = -1;
+     size_t headerLen;
+     int backingFormat;
+     int rv;
+@@ -5030,19 +5029,16 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+                                                    &buf, &headerLen, cycle) < 0)
+         return -1;
+ 
+-    if (virStorageFileGetMetadataInternal(src, buf, headerLen,
+-                                          &backingFormat) < 0)
+-        goto cleanup;
++    if (virStorageFileGetMetadataInternal(src, buf, headerLen, &backingFormat) < 0)
++        return -1;
+ 
+     if (src->backingStoreRaw) {
+         if ((rv = virStorageSourceNewFromBacking(src, &backingStore)) < 0)
+-            goto cleanup;
++            return -1;
+ 
+-        if (rv == 1) {
+-            /* the backing file would not be usable for VM usage */
+-            ret = 0;
+-            goto cleanup;
+-        }
++        /* the backing file would not be usable for VM usage */
++        if (rv == 1)
++            return 0;
+ 
+         backingStore->format = backingFormat;
+ 
+@@ -5065,17 +5061,14 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+         if (backingStore->format == VIR_STORAGE_FILE_AUTO_SAFE)
+             backingStore->format = VIR_STORAGE_FILE_AUTO;
+ 
+-        if ((ret = virStorageFileGetMetadataRecurse(backingStore, parent,
+-                                                    uid, gid,
+-                                                    report_broken,
+-                                                    cycle, depth + 1)) < 0) {
++        if (virStorageFileGetMetadataRecurse(backingStore, parent,
++                                             uid, gid,
++                                             report_broken,
++                                             cycle, depth + 1) < 0) {
+             if (report_broken)
+-                goto cleanup;
+-
+-            /* if we fail somewhere midway, just accept and return a
+-             * broken chain */
+-            ret = 0;
+-            goto cleanup;
++                return -1;
++            else
++                return 0;
+         }
+ 
+         backingStore->id = depth;
+@@ -5083,7 +5076,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     } else {
+         /* add terminator */
+         if (!(src->backingStore = virStorageSourceNew()))
+-            goto cleanup;
++            return -1;
+     }
+ 
+     if (src->externalDataStoreRaw) {
+@@ -5091,21 +5084,16 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+ 
+         if ((rv = virStorageSourceNewFromExternalData(src,
+                                                       &externalDataStore)) < 0)
+-            goto cleanup;
++            return -1;
+ 
+-        if (rv == 1) {
+-            /* the file would not be usable for VM usage */
+-            ret = 0;
+-            goto cleanup;
+-        }
++        /* the file would not be usable for VM usage */
++        if (rv == 1)
++            return 0;
+ 
+         src->externalDataStore = g_steal_pointer(&externalDataStore);
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-impossible-error-report.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-impossible-error-report.patch
new file mode 100644
index 0000000..26c07e9
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-impossible-error-report.patch
@@ -0,0 +1,49 @@
+From cf65fbfb12a209e760b8b2f2b16acfd8b33e8bee Mon Sep 17 00:00:00 2001
+Message-Id: <cf65fbfb12a209e760b8b2f2b16acfd8b33e8bee@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:29 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Remove impossible error
+ report
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We call virStorageFileSupportsBackingChainTraversal which already checks
+that the 'storageFileRead' callback is non-NULL, which in turn means
+that virStorageFileRead will not return -2.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 84df98f29e031d3b1e68e7e3c0d2651ccba14106)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <bb902dffc6692251cf12a14fcf5b25a62054a20b.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 6b83fc0e24..1f18320756 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -5003,15 +5003,8 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+         goto cleanup;
+ 
+     if ((headerLen = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER,
+-                                        &buf)) < 0) {
+-        if (headerLen == -2)
+-            virReportError(VIR_ERR_INTERNAL_ERROR,
+-                           _("storage file reading is not supported for "
+-                             "storage type %s (protocol: %s)"),
+-                           virStorageTypeToString(src->type),
+-                           virStorageNetProtocolTypeToString(src->protocol));
++                                        &buf)) < 0)
+         goto cleanup;
+-    }
+ 
+     if (virStorageFileGetMetadataInternal(src, buf, headerLen,
+                                           &backingFormat) < 0)
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Shuffle-around-assignment-of-backing-chain-depth.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Shuffle-around-assignment-of-backing-chain-depth.patch
new file mode 100644
index 0000000..5a62f0e
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Shuffle-around-assignment-of-backing-chain-depth.patch
@@ -0,0 +1,59 @@
+From e0c86b78dc5587263aeb10ae0fc8fbb5975135ee Mon Sep 17 00:00:00 2001
+Message-Id: <e0c86b78dc5587263aeb10ae0fc8fbb5975135ee@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:30 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Shuffle around assignment
+ of backing chain depth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move the assignment to a place where we know that the backing store is
+present rather than having to check in the cleanup section.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit b347e5c7dd69e3381b073c640ece2460632830cc)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <0432e2bd0f224cd1c55104e33699cb1602013a5d.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 1f18320756..911f811ace 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -5053,14 +5053,15 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+             ret = 0;
+             goto cleanup;
+         }
++
++        backingStore->id = depth;
++        src->backingStore = g_steal_pointer(&backingStore);
+     } else {
+         /* add terminator */
+-        if (!(backingStore = virStorageSourceNew()))
++        if (!(src->backingStore = virStorageSourceNew()))
+             goto cleanup;
+     }
+ 
+-    src->backingStore = g_steal_pointer(&backingStore);
+-
+     if (src->externalDataStoreRaw) {
+         g_autoptr(virStorageSource) externalDataStore = NULL;
+ 
+@@ -5080,8 +5081,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     ret = 0;
+ 
+  cleanup:
+-    if (virStorageSourceHasBacking(src))
+-        src->backingStore->id = depth;
+     virStorageFileDeinit(src);
+     return ret;
+ }
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Use-virHashHasEntry-instead-of-fake-pointers.patch b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Use-virHashHasEntry-instead-of-fake-pointers.patch
new file mode 100644
index 0000000..c7d655f
--- /dev/null
+++ b/SOURCES/libvirt-virStorageFileGetMetadataRecurse-Use-virHashHasEntry-instead-of-fake-pointers.patch
@@ -0,0 +1,49 @@
+From 20f764d1837f06b10c7c327b085234b6e5f876e2 Mon Sep 17 00:00:00 2001
+Message-Id: <20f764d1837f06b10c7c327b085234b6e5f876e2@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:32 +0100
+Subject: [PATCH] virStorageFileGetMetadataRecurse: Use virHashHasEntry instead
+ of fake pointers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replacing virHashLookup by virHashHasEntry allows us to use NULL as the
+payload of the hash table rather than putting a fake '1' pointer into
+the table.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit e3960f4b6d0b6d8cb8b2631f8358abf289c1cc18)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <af53b5ff04169cfa8e40664f2b66f110560486ee.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 28d1d1aa1e..46d55eda96 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -4992,14 +4992,14 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+     if (!(uniqueName = virStorageFileGetUniqueIdentifier(src)))
+         goto cleanup;
+ 
+-    if (virHashLookup(cycle, uniqueName)) {
++    if (virHashHasEntry(cycle, uniqueName)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("backing store for %s (%s) is self-referential"),
+                        NULLSTR(src->path), uniqueName);
+         goto cleanup;
+     }
+ 
+-    if (virHashAddEntry(cycle, uniqueName, (void *)1) < 0)
++    if (virHashAddEntry(cycle, uniqueName, NULL) < 0)
+         goto cleanup;
+ 
+     if ((headerLen = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER,
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStoragePRDefFormat-Suppress-path-formatting-for-migratable-XML.patch b/SOURCES/libvirt-virStoragePRDefFormat-Suppress-path-formatting-for-migratable-XML.patch
deleted file mode 100644
index d648657..0000000
--- a/SOURCES/libvirt-virStoragePRDefFormat-Suppress-path-formatting-for-migratable-XML.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 84e5ab0aa4547448e5428ddd05bace35cc57cc56 Mon Sep 17 00:00:00 2001
-Message-Id: <84e5ab0aa4547448e5428ddd05bace35cc57cc56@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 11 Jul 2018 17:27:25 +0200
-Subject: [PATCH] virStoragePRDefFormat: Suppress path formatting for
- migratable XML
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1470007
-
-If there are managed reservations for a disk source, the path to
-the pr-helper socket is generated automatically by libvirt when
-needed and points somewhere under priv->libDir. Therefore it is
-very unlikely that the path will work even on migration
-destination (the libDir is derived from domain short name and its
-ID).
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 0da435118cb2abe5b747818fc209c7a647590687)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c    | 3 ++-
- src/util/virstoragefile.c | 6 ++++--
- src/util/virstoragefile.h | 3 ++-
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index f4e59f6c91..70eb45f03a 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -23548,7 +23548,8 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
-         return -1;
- 
-     if (src->pr)
--        virStoragePRDefFormat(childBuf, src->pr);
-+        virStoragePRDefFormat(childBuf, src->pr,
-+                              flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE);
- 
-     return 0;
- }
-diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index 6ede542df6..58f67278da 100644
---- a/src/util/virstoragefile.c
-+++ b/src/util/virstoragefile.c
-@@ -1982,11 +1982,13 @@ virStoragePRDefParseXML(xmlXPathContextPtr ctxt)
- 
- void
- virStoragePRDefFormat(virBufferPtr buf,
--                      virStoragePRDefPtr prd)
-+                      virStoragePRDefPtr prd,
-+                      bool migratable)
- {
-     virBufferAsprintf(buf, "<reservations managed='%s'",
-                       virTristateBoolTypeToString(prd->managed));
--    if (prd->path) {
-+    if (prd->path &&
-+        (prd->managed == VIR_TRISTATE_BOOL_NO || !migratable)) {
-         virBufferAddLit(buf, ">\n");
-         virBufferAdjustIndent(buf, 2);
-         virBufferAddLit(buf, "<source type='unix'");
-diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
-index 592e19bd7f..991098e6c6 100644
---- a/src/util/virstoragefile.h
-+++ b/src/util/virstoragefile.h
-@@ -395,7 +395,8 @@ void virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authdef);
- void virStoragePRDefFree(virStoragePRDefPtr prd);
- virStoragePRDefPtr virStoragePRDefParseXML(xmlXPathContextPtr ctxt);
- void virStoragePRDefFormat(virBufferPtr buf,
--                           virStoragePRDefPtr prd);
-+                           virStoragePRDefPtr prd,
-+                           bool migratable);
- bool virStoragePRDefIsEqual(virStoragePRDefPtr a,
-                             virStoragePRDefPtr b);
- bool virStoragePRDefIsManaged(virStoragePRDefPtr prd);
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virStorageSourceJSONDriverParser-annotate-format-drivers.patch b/SOURCES/libvirt-virStorageSourceJSONDriverParser-annotate-format-drivers.patch
new file mode 100644
index 0000000..916802b
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceJSONDriverParser-annotate-format-drivers.patch
@@ -0,0 +1,79 @@
+From e551ad605fd99e92a85acdab53bc52efaa6facb2 Mon Sep 17 00:00:00 2001
+Message-Id: <e551ad605fd99e92a85acdab53bc52efaa6facb2@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:08 +0100
+Subject: [PATCH] virStorageSourceJSONDriverParser: annotate 'format' drivers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The parser was originally designed only for protocol parsers. Since
+we already have 'raw' format driver in the list we'll need to be able
+to parse it too. In later patches this will be used to prevent parsing
+nested format drivers.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 7e13ff8dc016dda5ffd50ff5c059f01c76486c82)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <ef05c98383c79aa7487ea97c7e1cbfb384c80440.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index c97a3a9d6e..b6749b150c 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3563,6 +3563,7 @@ virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr src,
+ 
+ struct virStorageSourceJSONDriverParser {
+     const char *drvname;
++    bool formatdriver;
+     /**
+      * The callback gets a pre-allocated storage source @src and the JSON
+      * object to parse. The callback shall return -1 on error and report error
+@@ -3575,22 +3576,22 @@ struct virStorageSourceJSONDriverParser {
+ };
+ 
+ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
+-    {"file", virStorageSourceParseBackingJSONPath, VIR_STORAGE_TYPE_FILE},
+-    {"host_device", virStorageSourceParseBackingJSONPath, VIR_STORAGE_TYPE_BLOCK},
+-    {"host_cdrom", virStorageSourceParseBackingJSONPath, VIR_STORAGE_TYPE_BLOCK},
+-    {"http", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_HTTP},
+-    {"https", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_HTTPS},
+-    {"ftp", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_FTP},
+-    {"ftps", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_FTPS},
+-    {"tftp", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_TFTP},
+-    {"gluster", virStorageSourceParseBackingJSONGluster, 0},
+-    {"iscsi", virStorageSourceParseBackingJSONiSCSI, 0},
+-    {"nbd", virStorageSourceParseBackingJSONNbd, 0},
+-    {"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0},
+-    {"ssh", virStorageSourceParseBackingJSONSSH, 0},
+-    {"rbd", virStorageSourceParseBackingJSONRBD, 0},
+-    {"raw", virStorageSourceParseBackingJSONRaw, 0},
+-    {"vxhs", virStorageSourceParseBackingJSONVxHS, 0},
++    {"file", false, virStorageSourceParseBackingJSONPath, VIR_STORAGE_TYPE_FILE},
++    {"host_device", false, virStorageSourceParseBackingJSONPath, VIR_STORAGE_TYPE_BLOCK},
++    {"host_cdrom", false, virStorageSourceParseBackingJSONPath, VIR_STORAGE_TYPE_BLOCK},
++    {"http", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_HTTP},
++    {"https", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_HTTPS},
++    {"ftp", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_FTP},
++    {"ftps", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_FTPS},
++    {"tftp", false, virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_TFTP},
++    {"gluster", false, virStorageSourceParseBackingJSONGluster, 0},
++    {"iscsi", false, virStorageSourceParseBackingJSONiSCSI, 0},
++    {"nbd", false, virStorageSourceParseBackingJSONNbd, 0},
++    {"sheepdog", false, virStorageSourceParseBackingJSONSheepdog, 0},
++    {"ssh", false, virStorageSourceParseBackingJSONSSH, 0},
++    {"rbd", false, virStorageSourceParseBackingJSONRBD, 0},
++    {"raw", true, virStorageSourceParseBackingJSONRaw, 0},
++    {"vxhs", false, virStorageSourceParseBackingJSONVxHS, 0},
+ };
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virStorageSourceNetCookieValidate-Accept-quoted-cookie-value.patch b/SOURCES/libvirt-virStorageSourceNetCookieValidate-Accept-quoted-cookie-value.patch
new file mode 100644
index 0000000..cf83fa6
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceNetCookieValidate-Accept-quoted-cookie-value.patch
@@ -0,0 +1,148 @@
+From ba88fc4f04428c1064bc4eee85acbdf1a3123c4c Mon Sep 17 00:00:00 2001
+Message-Id: <ba88fc4f04428c1064bc4eee85acbdf1a3123c4c@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:40 +0200
+Subject: [PATCH] virStorageSourceNetCookieValidate: Accept quoted cookie value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The quotes are forbidden only inside the value, but the value itself may
+be enclosed in quotes. Fix the RNG schema and validator and add a test
+case.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit b9166baebe70a4b3577ddb6b2ee6af0dd4f60759)
+Message-Id: <f8f910f4e61e0e9434591a02c5d2e50b3d78edc5.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ docs/schemas/domaincommon.rng                 |  2 +-
+ src/util/virstoragefile.c                     | 19 ++++++++++++++++++-
+ .../disk-network-http.x86_64-latest.args      |  4 ++--
+ tests/qemuxml2argvdata/disk-network-http.xml  |  4 ++--
+ .../disk-network-http.x86_64-latest.xml       |  4 ++--
+ 5 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 3a0edbed97..ac6f180382 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1846,7 +1846,7 @@
+             </data>
+           </attribute>
+           <data type="string">
+-            <param name="pattern">[!#$%&amp;'()*+\-./0-9:&gt;=&lt;?@A-Z\^_`\[\]a-z|~]+</param>
++            <param name="pattern">"?[!#$%&amp;'()*+\-./0-9:&gt;=&lt;?@A-Z\^_`\[\]a-z|~]+"?</param>
+           </data>
+         </element>
+       </oneOrMore>
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 3eb32edc2a..f8d741f040 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2217,6 +2217,10 @@ static const char virStorageSourceCookieNameInvalidChars[] =
+ static int
+ virStorageSourceNetCookieValidate(virStorageNetCookieDefPtr def)
+ {
++    g_autofree char *val = g_strdup(def->value);
++    const char *checkval = val;
++    size_t len = strlen(val);
++
+     /* name must have at least 1 character */
+     if (*(def->name) == '\0') {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+@@ -2233,8 +2237,21 @@ virStorageSourceNetCookieValidate(virStorageNetCookieDefPtr def)
+         return -1;
+     }
+ 
++    /* check for optional quotes around the cookie value string */
++    if (val[0] == '"') {
++        if (val[len - 1] != '"') {
++            virReportError(VIR_ERR_XML_ERROR,
++                           _("value of cookie '%s' contains invalid characters"),
++                           def->name);
++            return -1;
++        }
++
++        val[len - 1] = '\0';
++        checkval++;
++    }
++
+     /* check invalid characters in value */
+-    if (virStringHasChars(def->value, virStorageSourceCookieValueInvalidChars)) {
++    if (virStringHasChars(checkval, virStorageSourceCookieValueInvalidChars)) {
+         virReportError(VIR_ERR_XML_ERROR,
+                        _("value of cookie '%s' contains invalid characters"),
+                        def->name);
+diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+index 2f2849ebdf..46aa5f23ce 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+@@ -42,7 +42,7 @@ id=virtio-disk0,bootindex=1 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
+ id=virtio-disk1 \
+ -object secret,id=libvirt-2-storage-httpcookie-secret0,\
+-data=DrPR9NA6GKJb7qi1KbjHad3f3UIGTTDmAmOZHHv1F5w5T8rhnk3f+uSKStHe0J2O,\
++data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"http","url":"http://example.org:1234/test3.img",\
+ "cookie-secret":"libvirt-2-storage-httpcookie-secret0",\
+@@ -52,7 +52,7 @@ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-2-format,\
+ id=virtio-disk2 \
+ -object secret,id=libvirt-1-storage-httpcookie-secret0,\
+-data=DrPR9NA6GKJb7qi1KbjHad3f3UIGTTDmAmOZHHv1F5w5T8rhnk3f+uSKStHe0J2O,\
++data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
+ "sslverify":false,"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\
+diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
+index 20024c732e..93e6617433 100644
+--- a/tests/qemuxml2argvdata/disk-network-http.xml
++++ b/tests/qemuxml2argvdata/disk-network-http.xml
+@@ -35,7 +35,7 @@
+         <host name='example.org' port='1234'/>
+         <cookies>
+           <cookie name='test'>testcookievalue</cookie>
+-          <cookie name='test2'>blurb</cookie>
++          <cookie name='test2'>"blurb"</cookie>
+         </cookies>
+       </source>
+       <target dev='vdc' bus='virtio'/>
+@@ -47,7 +47,7 @@
+         <ssl verify='no'/>
+         <cookies>
+           <cookie name='test'>testcookievalue</cookie>
+-          <cookie name='test2'>blurb</cookie>
++          <cookie name='test2'>&quot;blurb&quot;</cookie>
+         </cookies>
+       </source>
+       <target dev='vdd' bus='virtio'/>
+diff --git a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+index 238a5fef58..60073c227c 100644
+--- a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+@@ -38,7 +38,7 @@
+         <host name='example.org' port='1234'/>
+         <cookies>
+           <cookie name='test'>testcookievalue</cookie>
+-          <cookie name='test2'>blurb</cookie>
++          <cookie name='test2'>&quot;blurb&quot;</cookie>
+         </cookies>
+       </source>
+       <target dev='vdc' bus='virtio'/>
+@@ -51,7 +51,7 @@
+         <ssl verify='no'/>
+         <cookies>
+           <cookie name='test'>testcookievalue</cookie>
+-          <cookie name='test2'>blurb</cookie>
++          <cookie name='test2'>&quot;blurb&quot;</cookie>
+         </cookies>
+       </source>
+       <target dev='vdd' bus='virtio'/>
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-virStorageSourceNewFromBacking-Also-transfer-the-format.patch b/SOURCES/libvirt-virStorageSourceNewFromBacking-Also-transfer-the-format.patch
new file mode 100644
index 0000000..7d975ae
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceNewFromBacking-Also-transfer-the-format.patch
@@ -0,0 +1,81 @@
+From 19778995ed94278db561db198a402d232027aeb8 Mon Sep 17 00:00:00 2001
+Message-Id: <19778995ed94278db561db198a402d232027aeb8@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:38 +0100
+Subject: [PATCH] virStorageSourceNewFromBacking: Also transfer the format
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When we create the new virStorageSource from the definitions stored in
+the parent we should also use the 'backingStoreRawFormat' field to
+populate the format.
+
+Callers which use virStorageSourceNewFromBacking are also fixed to stop
+setting the format manually.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 264b79c63a518df8ce32a78dda51ae554cd2d5f2)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <c9015f51f31c9a088983562298aaf61b1c43d927.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/storage/storage_util.c | 5 +----
+ src/util/virstoragefile.c  | 3 +--
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
+index c562cf313f..f3e899d0ca 100644
+--- a/src/storage/storage_util.c
++++ b/src/storage/storage_util.c
+@@ -3316,7 +3316,6 @@ static int
+ storageBackendProbeTarget(virStorageSourcePtr target,
+                           virStorageEncryptionPtr *encryption)
+ {
+-    int backingStoreFormat;
+     int rc;
+     struct stat sb;
+     g_autoptr(virStorageSource) meta = NULL;
+@@ -3347,15 +3346,13 @@ storageBackendProbeTarget(virStorageSourcePtr target,
+     if (!(meta = virStorageFileGetMetadataFromFD(target->path,
+                                                  fd,
+                                                  VIR_STORAGE_FILE_AUTO,
+-                                                 &backingStoreFormat)))
++                                                 NULL)))
+         return -1;
+ 
+     if (meta->backingStoreRaw) {
+         if (virStorageSourceNewFromBacking(meta, &target->backingStore) < 0)
+             return -1;
+ 
+-        target->backingStore->format = backingStoreFormat;
+-
+         /* XXX: Remote storage doesn't play nicely with volumes backed by
+          * remote storage. To avoid trouble, just fake the backing store is RAW
+          * and put the string from the metadata as the path of the target. */
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index d594ee3695..d80780e291 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3824,6 +3824,7 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent,
+                                            backing)) < 0)
+         return rc;
+ 
++    (*backing)->format = parent->backingStoreRawFormat;
+     (*backing)->readonly = true;
+     return rc;
+ }
+@@ -5028,8 +5029,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
+         if (rv == 1)
+             return 0;
+ 
+-        backingStore->format = src->backingStoreRawFormat;
+-
+         if (backingStore->format == VIR_STORAGE_FILE_AUTO) {
+             /* Assuming the backing store to be raw can lead to failures. We do
+              * it only when we must not report an error to prevent losing VMs.
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingJSON-Allow-json-pseudo-URIs-without-file-wrapper.patch b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Allow-json-pseudo-URIs-without-file-wrapper.patch
new file mode 100644
index 0000000..4932b4c
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Allow-json-pseudo-URIs-without-file-wrapper.patch
@@ -0,0 +1,115 @@
+From 3a01f1148ea3da0a572a196f987f29f12e397ec1 Mon Sep 17 00:00:00 2001
+Message-Id: <3a01f1148ea3da0a572a196f987f29f12e397ec1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:09 +0100
+Subject: [PATCH] virStorageSourceParseBackingJSON: Allow 'json:' pseudo URIs
+ without 'file' wrapper
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are two possibilities:
+1) json:{"file":{"driver":...}}
+2) json:{"driver":...}
+
+Our code didn't work properly with the second one as it was expecting
+the 'file' wrapper. Conditionalize the removal to only the situation
+when the top level doesn't have "driver".
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit f8e097570ea9eb0b446f9ff5159b4e9c337e6b07)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <26a21da3bf0642ed6ac80184f97337fba98b0c14.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 41 +++++++++++++++++++++++++--------------
+ 1 file changed, 26 insertions(+), 15 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index b6749b150c..dd05de188f 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3521,10 +3521,17 @@ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
+                                     const char *jsonstr,
+                                     int opaque G_GNUC_UNUSED)
+ {
+-    /* There are no interesting attributes in raw driver.
+-     * Treat it as pass-through.
+-     */
+-    return virStorageSourceParseBackingJSONInternal(src, json, jsonstr);
++    virJSONValuePtr file;
++
++    /* 'raw' is a format driver so it can have protocol driver children */
++    if (!(file = virJSONValueObjectGetObject(json, "file"))) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("JSON backing volume definition '%s' lacks 'file' object"),
++                       jsonstr);
++        return -1;
++    }
++
++    return virStorageSourceParseBackingJSONInternal(src, file, jsonstr);
+ }
+ 
+ 
+@@ -3601,18 +3608,10 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+                                          virJSONValuePtr json,
+                                          const char *jsonstr)
+ {
+-    virJSONValuePtr file;
+     const char *drvname;
+     size_t i;
+ 
+-    if (!(file = virJSONValueObjectGetObject(json, "file"))) {
+-        virReportError(VIR_ERR_INVALID_ARG,
+-                       _("JSON backing volume definition '%s' lacks 'file' object"),
+-                       jsonstr);
+-        return -1;
+-    }
+-
+-    if (!(drvname = virJSONValueObjectGetString(file, "driver"))) {
++    if (!(drvname = virJSONValueObjectGetString(json, "driver"))) {
+         virReportError(VIR_ERR_INVALID_ARG,
+                        _("JSON backing volume definition '%s' lacks driver name"),
+                        jsonstr);
+@@ -3621,7 +3620,7 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+ 
+     for (i = 0; i < G_N_ELEMENTS(jsonParsers); i++) {
+         if (STREQ(drvname, jsonParsers[i].drvname))
+-            return jsonParsers[i].func(src, file, jsonstr, jsonParsers[i].opaque);
++            return jsonParsers[i].func(src, json, jsonstr, jsonParsers[i].opaque);
+     }
+ 
+     virReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -3637,6 +3636,7 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr src,
+ {
+     g_autoptr(virJSONValue) root = NULL;
+     g_autoptr(virJSONValue) deflattened = NULL;
++    virJSONValuePtr file = NULL;
+ 
+     if (!(root = virJSONValueFromString(json)))
+         return -1;
+@@ -3644,7 +3644,18 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr src,
+     if (!(deflattened = virJSONValueObjectDeflatten(root)))
+         return -1;
+ 
+-    return virStorageSourceParseBackingJSONInternal(src, deflattened, json);
++    /* There are 2 possible syntaxes:
++     * 1) json:{"file":{"driver":...}}
++     * 2) json:{"driver":...}
++     * Remove the 'file' wrapper object in case 1.
++     */
++    if (!virJSONValueObjectHasKey(deflattened, "driver"))
++        file = virJSONValueObjectGetObject(deflattened, "file");
++
++    if (!file)
++        file = deflattened;
++
++    return virStorageSourceParseBackingJSONInternal(src, file, json);
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingJSON-Move-deflattening-of-json-URIs-out-of-recursion.patch b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Move-deflattening-of-json-URIs-out-of-recursion.patch
new file mode 100644
index 0000000..d762fcc
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Move-deflattening-of-json-URIs-out-of-recursion.patch
@@ -0,0 +1,69 @@
+From dd5ec4a68ef2858ff8d98942d87b59fa09ab819f Mon Sep 17 00:00:00 2001
+Message-Id: <dd5ec4a68ef2858ff8d98942d87b59fa09ab819f@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:07 +0100
+Subject: [PATCH] virStorageSourceParseBackingJSON: Move deflattening of json:
+ URIs out of recursion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originally virStorageSourceParseBackingJSON didn't recurse, but when
+the 'raw' driver support was added we need to parse it's information
+which contains nested 'file' object.
+
+Since the deflattening helper recurses already there's no need to call
+it again. Move it one level up to the entry point.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit aadb34be3428a5e467289709290b536ae6bf5d2a)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <be49eb68dbd29d1075713483472f32d5e995a263.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 05f17224f4..c97a3a9d6e 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3600,15 +3600,11 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+                                          virJSONValuePtr json,
+                                          const char *jsonstr)
+ {
+-    g_autoptr(virJSONValue) deflattened = NULL;
+     virJSONValuePtr file;
+     const char *drvname;
+     size_t i;
+ 
+-    if (!(deflattened = virJSONValueObjectDeflatten(json)))
+-        return -1;
+-
+-    if (!(file = virJSONValueObjectGetObject(deflattened, "file"))) {
++    if (!(file = virJSONValueObjectGetObject(json, "file"))) {
+         virReportError(VIR_ERR_INVALID_ARG,
+                        _("JSON backing volume definition '%s' lacks 'file' object"),
+                        jsonstr);
+@@ -3639,11 +3635,15 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr src,
+                                  const char *json)
+ {
+     g_autoptr(virJSONValue) root = NULL;
++    g_autoptr(virJSONValue) deflattened = NULL;
+ 
+     if (!(root = virJSONValueFromString(json)))
+         return -1;
+ 
+-    return virStorageSourceParseBackingJSONInternal(src, root, json);
++    if (!(deflattened = virJSONValueObjectDeflatten(root)))
++        return -1;
++
++    return virStorageSourceParseBackingJSONInternal(src, deflattened, json);
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingJSON-Pass-around-original-backing-file-string.patch b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Pass-around-original-backing-file-string.patch
new file mode 100644
index 0000000..33fa270
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Pass-around-original-backing-file-string.patch
@@ -0,0 +1,186 @@
+From 5322d68b1c1ce4b8db415e691b666e1aae14ce8b Mon Sep 17 00:00:00 2001
+Message-Id: <5322d68b1c1ce4b8db415e691b666e1aae14ce8b@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:06 +0100
+Subject: [PATCH] virStorageSourceParseBackingJSON: Pass around original
+ backing file string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are a few error messages which might want to report the original
+backing store string. Pass it around rather than trying to re-generate
+it.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4a6bc568cd485f8f252a4750c5a67735f15ff82d)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <09648d6aeb27261a420b144c53360158b1e367d0.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 31 ++++++++++++++++++++-----------
+ 1 file changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 7a2af0ad94..05f17224f4 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3051,12 +3051,14 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src,
+ 
+ static int
+ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+-                                         virJSONValuePtr json);
++                                         virJSONValuePtr json,
++                                         const char *jsonstr);
+ 
+ 
+ static int
+ virStorageSourceParseBackingJSONPath(virStorageSourcePtr src,
+                                      virJSONValuePtr json,
++                                     const char *jsonstr G_GNUC_UNUSED,
+                                      int type)
+ {
+     const char *path;
+@@ -3101,6 +3103,7 @@ virStorageSourceParseBackingJSONUriStr(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
+                                     virJSONValuePtr json,
++                                    const char *jsonstr G_GNUC_UNUSED,
+                                     int protocol)
+ {
+     const char *uri;
+@@ -3204,6 +3207,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
+ static int
+ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
+                                         virJSONValuePtr json,
++                                        const char *jsonstr G_GNUC_UNUSED,
+                                         int opaque G_GNUC_UNUSED)
+ {
+     const char *uri = virJSONValueObjectGetString(json, "filename");
+@@ -3257,6 +3261,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src,
+                                       virJSONValuePtr json,
++                                      const char *jsonstr G_GNUC_UNUSED,
+                                       int opaque G_GNUC_UNUSED)
+ {
+     const char *transport = virJSONValueObjectGetString(json, "transport");
+@@ -3326,6 +3331,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
+                                     virJSONValuePtr json,
++                                    const char *jsonstr G_GNUC_UNUSED,
+                                     int opaque G_GNUC_UNUSED)
+ {
+     const char *path = virJSONValueObjectGetString(json, "path");
+@@ -3373,6 +3379,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src,
+                                          virJSONValuePtr json,
++                                         const char *jsonstr G_GNUC_UNUSED,
+                                          int opaque G_GNUC_UNUSED)
+ {
+     const char *filename;
+@@ -3416,6 +3423,7 @@ virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
+                                     virJSONValuePtr json,
++                                    const char *jsonstr G_GNUC_UNUSED,
+                                     int opaque G_GNUC_UNUSED)
+ {
+     const char *path = virJSONValueObjectGetString(json, "path");
+@@ -3458,6 +3466,7 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src,
+                                     virJSONValuePtr json,
++                                    const char *jsonstr G_GNUC_UNUSED,
+                                     int opaque G_GNUC_UNUSED)
+ {
+     const char *filename;
+@@ -3509,18 +3518,20 @@ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
+                                     virJSONValuePtr json,
++                                    const char *jsonstr,
+                                     int opaque G_GNUC_UNUSED)
+ {
+     /* There are no interesting attributes in raw driver.
+      * Treat it as pass-through.
+      */
+-    return virStorageSourceParseBackingJSONInternal(src, json);
++    return virStorageSourceParseBackingJSONInternal(src, json, jsonstr);
+ }
+ 
+ 
+ static int
+ virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr src,
+                                      virJSONValuePtr json,
++                                     const char *jsonstr G_GNUC_UNUSED,
+                                      int opaque G_GNUC_UNUSED)
+ {
+     const char *vdisk_id = virJSONValueObjectGetString(json, "vdisk-id");
+@@ -3559,7 +3570,7 @@ struct virStorageSourceJSONDriverParser {
+      * can't be converted to libvirt's configuration (e.g. inline authentication
+      * credentials are present).
+      */
+-    int (*func)(virStorageSourcePtr src, virJSONValuePtr json, int opaque);
++    int (*func)(virStorageSourcePtr src, virJSONValuePtr json, const char *jsonstr, int opaque);
+     int opaque;
+ };
+ 
+@@ -3586,36 +3597,34 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
+ 
+ static int
+ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+-                                         virJSONValuePtr json)
++                                         virJSONValuePtr json,
++                                         const char *jsonstr)
+ {
+     g_autoptr(virJSONValue) deflattened = NULL;
+     virJSONValuePtr file;
+     const char *drvname;
+     size_t i;
+-    g_autofree char *str = NULL;
+ 
+     if (!(deflattened = virJSONValueObjectDeflatten(json)))
+         return -1;
+ 
+     if (!(file = virJSONValueObjectGetObject(deflattened, "file"))) {
+-        str = virJSONValueToString(json, false);
+         virReportError(VIR_ERR_INVALID_ARG,
+                        _("JSON backing volume definition '%s' lacks 'file' object"),
+-                       NULLSTR(str));
++                       jsonstr);
+         return -1;
+     }
+ 
+     if (!(drvname = virJSONValueObjectGetString(file, "driver"))) {
+-        str = virJSONValueToString(json, false);
+         virReportError(VIR_ERR_INVALID_ARG,
+                        _("JSON backing volume definition '%s' lacks driver name"),
+-                       NULLSTR(str));
++                       jsonstr);
+         return -1;
+     }
+ 
+     for (i = 0; i < G_N_ELEMENTS(jsonParsers); i++) {
+         if (STREQ(drvname, jsonParsers[i].drvname))
+-            return jsonParsers[i].func(src, file, jsonParsers[i].opaque);
++            return jsonParsers[i].func(src, file, jsonstr, jsonParsers[i].opaque);
+     }
+ 
+     virReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -3634,7 +3643,7 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr src,
+     if (!(root = virJSONValueFromString(json)))
+         return -1;
+ 
+-    return virStorageSourceParseBackingJSONInternal(src, root);
++    return virStorageSourceParseBackingJSONInternal(src, root, json);
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingJSON-Prevent-arbitrary-nesting-with-format-drivers.patch b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Prevent-arbitrary-nesting-with-format-drivers.patch
new file mode 100644
index 0000000..331ad39
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingJSON-Prevent-arbitrary-nesting-with-format-drivers.patch
@@ -0,0 +1,93 @@
+From 57eb21eb48d76798f0c990c839df148301e9cb0e Mon Sep 17 00:00:00 2001
+Message-Id: <57eb21eb48d76798f0c990c839df148301e9cb0e@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:10 +0100
+Subject: [PATCH] virStorageSourceParseBackingJSON: Prevent arbitrary nesting
+ with format drivers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since we parse attributes for 'raw' which is a format driver and thus
+has nested 'file' structure we must prevent that this isn't nested
+arbitrarily.
+
+Add a flag for the function which allows parsing of 'format' type
+drivers only on the first pass.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit fd70f1b4d324361bb9a708762631690aca043178)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+Message-Id: <b5ed395d736eb8570467e2eafb44288d77d416e7.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index dd05de188f..b02fad92b6 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3052,7 +3052,8 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src,
+ static int
+ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+                                          virJSONValuePtr json,
+-                                         const char *jsonstr);
++                                         const char *jsonstr,
++                                         bool allowformat);
+ 
+ 
+ static int
+@@ -3531,7 +3532,7 @@ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
+         return -1;
+     }
+ 
+-    return virStorageSourceParseBackingJSONInternal(src, file, jsonstr);
++    return virStorageSourceParseBackingJSONInternal(src, file, jsonstr, false);
+ }
+ 
+ 
+@@ -3606,7 +3607,8 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = {
+ static int
+ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+                                          virJSONValuePtr json,
+-                                         const char *jsonstr)
++                                         const char *jsonstr,
++                                         bool allowformat)
+ {
+     const char *drvname;
+     size_t i;
+@@ -3619,8 +3621,17 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
+     }
+ 
+     for (i = 0; i < G_N_ELEMENTS(jsonParsers); i++) {
+-        if (STREQ(drvname, jsonParsers[i].drvname))
+-            return jsonParsers[i].func(src, json, jsonstr, jsonParsers[i].opaque);
++        if (STRNEQ(drvname, jsonParsers[i].drvname))
++            continue;
++
++        if (jsonParsers[i].formatdriver && !allowformat) {
++            virReportError(VIR_ERR_INVALID_ARG,
++                           _("JSON backing volume definition '%s' must not have nested format drivers"),
++                           jsonstr);
++            return -1;
++        }
++
++        return jsonParsers[i].func(src, json, jsonstr, jsonParsers[i].opaque);
+     }
+ 
+     virReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -3655,7 +3666,7 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr src,
+     if (!file)
+         file = deflattened;
+ 
+-    return virStorageSourceParseBackingJSONInternal(src, file, json);
++    return virStorageSourceParseBackingJSONInternal(src, file, json, true);
+ }
+ 
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingJSONRaw-Parse-offset-and-size-attributes.patch b/SOURCES/libvirt-virStorageSourceParseBackingJSONRaw-Parse-offset-and-size-attributes.patch
new file mode 100644
index 0000000..2a16358
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingJSONRaw-Parse-offset-and-size-attributes.patch
@@ -0,0 +1,78 @@
+From 32d58910c9d5a775315a42a76666844927c4dad1 Mon Sep 17 00:00:00 2001
+Message-Id: <32d58910c9d5a775315a42a76666844927c4dad1@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Wed, 19 Feb 2020 15:10:26 +0100
+Subject: [PATCH] virStorageSourceParseBackingJSONRaw: Parse 'offset' and
+ 'size' attributes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the parsed 'raw' format JSON string has 'offset' or 'size' attributes
+parse them as the format slice.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1791788
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit e8a819e87f806e6c6690614c40dbeab0bd2e800e)
+Message-Id: <88f7d393b22949a8d6afdae44f8215aa06e65329.1582120424.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 20 ++++++++++++++++++++
+ tests/virstoragetest.c    |  6 +++++-
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 0be4168d6e..fcbc97d96a 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3551,8 +3551,28 @@ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
+                                     const char *jsonstr,
+                                     int opaque G_GNUC_UNUSED)
+ {
++    bool has_offset = virJSONValueObjectHasKey(json, "offset");
++    bool has_size = virJSONValueObjectHasKey(json, "size");
+     virJSONValuePtr file;
+ 
++    if (has_offset || has_size) {
++        src->sliceStorage = g_new0(virStorageSourceSlice, 1);
++
++        if (has_offset &&
++            virJSONValueObjectGetNumberUlong(json, "offset", &src->sliceStorage->offset) < 0) {
++            virReportError(VIR_ERR_INVALID_ARG, "%s",
++                           _("malformed 'offset' property of 'raw' driver"));
++            return -1;
++        }
++
++        if (has_size &&
++            virJSONValueObjectGetNumberUlong(json, "size", &src->sliceStorage->size) < 0) {
++            virReportError(VIR_ERR_INVALID_ARG, "%s",
++                           _("malformed 'size' property of 'raw' driver"));
++            return -1;
++        }
++    }
++
+     /* 'raw' is a format driver so it can have protocol driver children */
+     if (!(file = virJSONValueObjectGetObject(json, "file"))) {
+         virReportError(VIR_ERR_INVALID_ARG,
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 25d41f0de4..39040bf4cb 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1600,7 +1600,11 @@ mymain(void)
+                                                 "\"filename\": \"/tmp/testfle\""
+                                               "}"
+                                   "}",
+-                            "<source file='/tmp/testfle'/>\n", 0);
++                            "<source file='/tmp/testfle'>\n"
++                            "  <slices>\n"
++                            "    <slice type='storage' offset='10752' size='4063232'/>\n"
++                            "  </slices>\n"
++                            "</source>\n", 0);
+ 
+ #endif /* WITH_YAJL */
+ 
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingJSONUri-Handle-undocumented-value-off-for-sslverify.patch b/SOURCES/libvirt-virStorageSourceParseBackingJSONUri-Handle-undocumented-value-off-for-sslverify.patch
new file mode 100644
index 0000000..8627659
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingJSONUri-Handle-undocumented-value-off-for-sslverify.patch
@@ -0,0 +1,92 @@
+From a5496b797498dc5393ccbf2775a2947e67a804eb Mon Sep 17 00:00:00 2001
+Message-Id: <a5496b797498dc5393ccbf2775a2947e67a804eb@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:08 +0100
+Subject: [PATCH] virStorageSourceParseBackingJSONUri: Handle undocumented
+ value 'off' for sslverify
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libguestfs abuses a quirk of qemu's parser to accept also other variants
+of the 'sslverify' field which would be valid on the command line but
+are not documented in the QMP schema.
+
+If we encounter the 'off' string instead of an boolean handle it rather
+than erroring out to continue support of pre-blockdev configurations.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 5179cc6b08a06fad92e8674d048fc0327d48f79e)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <8f277a7bede59b7c8b6de9db9c7726b6cbe02192.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 21 ++++++++++++++-------
+ tests/virstoragetest.c    | 15 +++++++++++++++
+ 2 files changed, 29 insertions(+), 7 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 931f2db6e9..9eca186e99 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3278,16 +3278,23 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
+     if (protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
+         protocol == VIR_STORAGE_NET_PROTOCOL_FTPS) {
+         if (virJSONValueObjectHasKey(json, "sslverify")) {
++            const char *tmpstr;
+             bool tmp;
+ 
+-            if (virJSONValueObjectGetBoolean(json, "sslverify", &tmp) < 0) {
+-                virReportError(VIR_ERR_INVALID_ARG,
+-                               _("malformed 'sslverify' field in backing store definition '%s'"),
+-                               jsonstr);
+-                return -1;
+-            }
++            /* libguestfs still uses undocumented legacy value of 'off' */
++            if ((tmpstr = virJSONValueObjectGetString(json, "sslverify")) &&
++                STREQ(tmpstr, "off")) {
++                src->sslverify = VIR_TRISTATE_BOOL_NO;
++            } else {
++                if (virJSONValueObjectGetBoolean(json, "sslverify", &tmp) < 0) {
++                    virReportError(VIR_ERR_INVALID_ARG,
++                                   _("malformed 'sslverify' field in backing store definition '%s'"),
++                                   jsonstr);
++                    return -1;
++                }
+ 
+-            src->sslverify = virTristateBoolFromBool(tmp);
++                src->sslverify = virTristateBoolFromBool(tmp);
++            }
+         }
+     }
+ 
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 63b991eb71..ca428f5ca7 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1621,6 +1621,21 @@ mymain(void)
+                            "  <timeout seconds='2000'/>\n"
+                            "</source>\n", 0);
+ 
++    TEST_BACKING_PARSE_FULL("json:{ \"file.cookie\": \"vmware_soap_session=\\\"0c8db85112873a79b7ef74f294cb70ef7f\\\"\","
++                                   "\"file.sslverify\": \"off\","
++                                   "\"file.driver\": \"https\","
++                                   "\"file.url\": \"https://host/folder/esx6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=data&dsName=esx6.5-matrix\","
++                                   "\"file.timeout\": 2000"
++                                 "}",
++                           "<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk'>\n"
++                           "  <host name='host' port='443'/>\n"
++                           "  <ssl verify='no'/>\n"
++                           "  <cookies>\n"
++                           "    <cookie name='vmware_soap_session'>&quot;0c8db85112873a79b7ef74f294cb70ef7f&quot;</cookie>\n"
++                           "  </cookies>\n"
++                           "  <timeout seconds='2000'/>\n"
++                           "</source>\n", 0);
++
+ #endif /* WITH_YAJL */
+ 
+  cleanup:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virStorageSourceParseBackingURI-Preserve-query-string-of-URI-for-http-s.patch b/SOURCES/libvirt-virStorageSourceParseBackingURI-Preserve-query-string-of-URI-for-http-s.patch
new file mode 100644
index 0000000..4cd7559
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceParseBackingURI-Preserve-query-string-of-URI-for-http-s.patch
@@ -0,0 +1,73 @@
+From a08b866ca5b7ae45d25a584d5e61855015b80794 Mon Sep 17 00:00:00 2001
+Message-Id: <a08b866ca5b7ae45d25a584d5e61855015b80794@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 30 Mar 2020 17:21:47 +0200
+Subject: [PATCH] virStorageSourceParseBackingURI: Preserve query string of URI
+ for http(s)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For http/https URIs we need to preserve the query part as it may be
+important to refer to the image.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 544ef82d05a675d9c6f939c67635ed46c094b164)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <ecddbeb737c76791d4372c861343da2fc8611371.1585581552.git.pkrempa@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virstoragefile.c | 13 ++++++++++---
+ tests/virstoragetest.c    |  4 ++--
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 4082e3f5f7..aba315d93b 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -2853,9 +2853,16 @@ virStorageSourceParseBackingURI(virStorageSourcePtr src,
+         return -1;
+     }
+ 
+-    /* handle socket stored as a query */
+-    if (uri->query)
+-        src->hosts->socket = g_strdup(STRSKIP(uri->query, "socket="));
++    if (uri->query) {
++        if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
++            src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS) {
++            src->query = g_strdup(uri->query);
++        } else {
++            /* handle socket stored as a query */
++            if (STRPREFIX(uri->query, "socket="))
++                src->hosts->socket = g_strdup(STRSKIP(uri->query, "socket="));
++        }
++    }
+ 
+     /* uri->path is NULL if the URI does not contain slash after host:
+      * transport://host:port */
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index d9244fdfe8..fe8f6dd36f 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1613,7 +1613,7 @@ mymain(void)
+                                    "\"file.url\": \"https://host/folder/esx6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=data&dsName=esx6.5-matrix\","
+                                    "\"file.timeout\": 2000"
+                                  "}",
+-                           "<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk'>\n"
++                           "<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk' query='dcPath=data&amp;dsName=esx6.5-matrix'>\n"
+                            "  <host name='host' port='443'/>\n"
+                            "  <ssl verify='no'/>\n"
+                            "  <cookies>\n"
+@@ -1628,7 +1628,7 @@ mymain(void)
+                                    "\"file.url\": \"https://host/folder/esx6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=data&dsName=esx6.5-matrix\","
+                                    "\"file.timeout\": 2000"
+                                  "}",
+-                           "<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk'>\n"
++                           "<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk' query='dcPath=data&amp;dsName=esx6.5-matrix'>\n"
+                            "  <host name='host' port='443'/>\n"
+                            "  <ssl verify='no'/>\n"
+                            "  <cookies>\n"
+-- 
+2.26.0
+
diff --git a/SOURCES/libvirt-virStorageSourceUpdateCapacity-Drop-probe-argument.patch b/SOURCES/libvirt-virStorageSourceUpdateCapacity-Drop-probe-argument.patch
new file mode 100644
index 0000000..05c9a1f
--- /dev/null
+++ b/SOURCES/libvirt-virStorageSourceUpdateCapacity-Drop-probe-argument.patch
@@ -0,0 +1,117 @@
+From f27731da867f6a0784c1f2a222d5b7663c418784 Mon Sep 17 00:00:00 2001
+Message-Id: <f27731da867f6a0784c1f2a222d5b7663c418784@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 28 Feb 2020 10:24:36 +0100
+Subject: [PATCH] virStorageSourceUpdateCapacity: Drop 'probe' argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both callers pass false. Since we frown upon format probing, remove the
+unused possibility to do the probing.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 35d1f5bd145163edf4f05c377b488ffa50d527d6)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1798148
+Message-Id: <c2cfa21552eee3b2cfca74096dfe9d301bbf4e61.1582881363.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/qemu/qemu_driver.c     |  2 +-
+ src/storage/storage_util.c |  2 +-
+ src/util/virstoragefile.c  | 23 ++++++-----------------
+ src/util/virstoragefile.h  |  3 +--
+ 4 files changed, 9 insertions(+), 21 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ac3a7ad282..d346446444 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -12221,7 +12221,7 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver,
+     if (virStorageSourceUpdateBackingSizes(src, fd, &sb) < 0)
+         goto cleanup;
+ 
+-    if (virStorageSourceUpdateCapacity(src, buf, len, false) < 0)
++    if (virStorageSourceUpdateCapacity(src, buf, len) < 0)
+         goto cleanup;
+ 
+     /* If guest is not using raw disk format and is on a host block
+diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
+index ebc262278d..c562cf313f 100644
+--- a/src/storage/storage_util.c
++++ b/src/storage/storage_util.c
+@@ -1755,7 +1755,7 @@ storageBackendUpdateVolTargetInfo(virStorageVolType voltype,
+             }
+         }
+ 
+-        if (virStorageSourceUpdateCapacity(target, buf, len, false) < 0)
++        if (virStorageSourceUpdateCapacity(target, buf, len) < 0)
+             return -1;
+     }
+ 
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 5a74034ec4..391e2ce86f 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3964,18 +3964,15 @@ virStorageSourceUpdateBackingSizes(virStorageSourcePtr src,
+  * @src: disk source definition structure
+  * @buf: buffer to the storage file header
+  * @len: length of the storage file header
+- * @probe: allow probe
+  *
+- * Update the storage @src capacity. This may involve probing the storage
+- * @src in order to "see" if we can recognize what exists.
++ * Update the storage @src capacity.
+  *
+  * Returns 0 on success, -1 on error.
+  */
+ int
+ virStorageSourceUpdateCapacity(virStorageSourcePtr src,
+                                char *buf,
+-                               ssize_t len,
+-                               bool probe)
++                               ssize_t len)
+ {
+     int format = src->format;
+     g_autoptr(virStorageSource) meta = NULL;
+@@ -3984,18 +3981,10 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr src,
+      * the metadata has a capacity, use that, otherwise fall back to
+      * physical size.  */
+     if (format == VIR_STORAGE_FILE_NONE) {
+-        if (!probe) {
+-            virReportError(VIR_ERR_INTERNAL_ERROR,
+-                           _("no disk format for %s and probing is disabled"),
+-                           src->path);
+-            return -1;
+-        }
+-
+-        if ((format = virStorageFileProbeFormatFromBuf(src->path,
+-                                                       buf, len)) < 0)
+-            return -1;
+-
+-        src->format = format;
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("no disk format for %s was specified"),
++                       src->path);
++        return -1;
+     }
+ 
+     if (format == VIR_STORAGE_FILE_RAW && !src->encryption) {
+diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
+index 1f41e6e357..2a684fd746 100644
+--- a/src/util/virstoragefile.h
++++ b/src/util/virstoragefile.h
+@@ -472,8 +472,7 @@ int virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
+ int virStorageSourceUpdateBackingSizes(virStorageSourcePtr src,
+                                        int fd, struct stat const *sb);
+ int virStorageSourceUpdateCapacity(virStorageSourcePtr src,
+-                                   char *buf, ssize_t len,
+-                                   bool probe);
++                                   char *buf, ssize_t len);
+ 
+ int virStorageSourceNewFromBacking(virStorageSourcePtr parent,
+                                    virStorageSourcePtr *backing);
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virWaitForDevices-Drop-confusing-part-of-comment.patch b/SOURCES/libvirt-virWaitForDevices-Drop-confusing-part-of-comment.patch
deleted file mode 100644
index 40d598d..0000000
--- a/SOURCES/libvirt-virWaitForDevices-Drop-confusing-part-of-comment.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a72b338a9127075ea9ededcdc201dc87b65fe731 Mon Sep 17 00:00:00 2001
-Message-Id: <a72b338a9127075ea9ededcdc201dc87b65fe731@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Jun 2019 15:55:36 +0200
-Subject: [PATCH] virWaitForDevices: Drop confusing part of comment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's not true that there is a backup loop. There isn't. Drop this
-part of the comment to not confuse anybody.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0cabcd98f1ef82588016a692afbe5a47a4a0b42e)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1710575
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <3faa00d11315ede9c72b32b1aa1f8797e1638dfe.1561643698.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virutil.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 88e17e2c0f..d37c1ac632 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1637,8 +1637,6 @@ void virWaitForDevices(void)
-     /*
-      * NOTE: we ignore errors here; this is just to make sure that any device
-      * nodes that are being created finish before we try to scan them.
--     * If this fails for any reason, we still have the backup of polling for
--     * 5 seconds for device nodes.
-      */
-     ignore_value(virRun(settleprog, &exitstatus));
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virbuftest-declare-testBufAddStrData-earlier.patch b/SOURCES/libvirt-virbuftest-declare-testBufAddStrData-earlier.patch
new file mode 100644
index 0000000..74889f6
--- /dev/null
+++ b/SOURCES/libvirt-virbuftest-declare-testBufAddStrData-earlier.patch
@@ -0,0 +1,55 @@
+From 2056fea539669061bec0d707511ff0f1391953b0 Mon Sep 17 00:00:00 2001
+Message-Id: <2056fea539669061bec0d707511ff0f1391953b0@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:05 +0100
+Subject: [PATCH] virbuftest: declare testBufAddStrData earlier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move the declaration to the beginning of the file for reuse.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit ebd44715f19a81f16b2e263b262c0099fe94a0b6)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <5bd2b1b3dfb32ca39c8e1d10810385d483d0643a.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virbuftest.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/virbuftest.c b/tests/virbuftest.c
+index bb7fa9e2e9..bb606c1c28 100644
+--- a/tests/virbuftest.c
++++ b/tests/virbuftest.c
+@@ -9,6 +9,11 @@
+ 
+ #define VIR_FROM_THIS VIR_FROM_NONE
+ 
++struct testBufAddStrData {
++    const char *data;
++    const char *expect;
++};
++
+ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
+ {
+     virBuffer bufinit = VIR_BUFFER_INITIALIZER;
+@@ -235,11 +240,6 @@ static int testBufAddBuffer(const void *data G_GNUC_UNUSED)
+     return ret;
+ }
+ 
+-struct testBufAddStrData {
+-    const char *data;
+-    const char *expect;
+-};
+-
+ static int
+ testBufAddStr(const void *opaque)
+ {
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virbuftest-remove-extra-G_GNUC_UNUSED-markers.patch b/SOURCES/libvirt-virbuftest-remove-extra-G_GNUC_UNUSED-markers.patch
new file mode 100644
index 0000000..b9da409
--- /dev/null
+++ b/SOURCES/libvirt-virbuftest-remove-extra-G_GNUC_UNUSED-markers.patch
@@ -0,0 +1,49 @@
+From f6916b32bbbd89fb3faf6ad2c21cb975e15a8b18 Mon Sep 17 00:00:00 2001
+Message-Id: <f6916b32bbbd89fb3faf6ad2c21cb975e15a8b18@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:02 +0100
+Subject: [PATCH] virbuftest: remove extra G_GNUC_UNUSED markers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These functions do use the opaque argument.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 08de39a9c7a65f17292eeef783d0598c2dfc8260)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <64efa6130de1732be0feeaf4f2e78c0aecaf38c5.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virbuftest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/virbuftest.c b/tests/virbuftest.c
+index 56a6ece8f6..f8eadea25a 100644
+--- a/tests/virbuftest.c
++++ b/tests/virbuftest.c
+@@ -244,7 +244,7 @@ struct testBufAddStrData {
+ };
+ 
+ static int
+-testBufAddStr(const void *opaque G_GNUC_UNUSED)
++testBufAddStr(const void *opaque)
+ {
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+@@ -277,7 +277,7 @@ testBufAddStr(const void *opaque G_GNUC_UNUSED)
+ 
+ 
+ static int
+-testBufEscapeStr(const void *opaque G_GNUC_UNUSED)
++testBufEscapeStr(const void *opaque)
+ {
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virbuftest-remove-unnecessary-labels.patch b/SOURCES/libvirt-virbuftest-remove-unnecessary-labels.patch
new file mode 100644
index 0000000..fa5f2bf
--- /dev/null
+++ b/SOURCES/libvirt-virbuftest-remove-unnecessary-labels.patch
@@ -0,0 +1,152 @@
+From 868b112fabc71f2247d2e4880f207f31727b549c Mon Sep 17 00:00:00 2001
+Message-Id: <868b112fabc71f2247d2e4880f207f31727b549c@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:04 +0100
+Subject: [PATCH] virbuftest: remove unnecessary labels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove the ret variables and labels from functions that no longer need
+them.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 662876723cdfb138ca31847fdb3a84bbe3cadea5)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <8d02662ab00fa2c7088912148fb1131f24623d32.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virbuftest.c | 40 ++++++++++++----------------------------
+ 1 file changed, 12 insertions(+), 28 deletions(-)
+
+diff --git a/tests/virbuftest.c b/tests/virbuftest.c
+index 2b241424ad..bb7fa9e2e9 100644
+--- a/tests/virbuftest.c
++++ b/tests/virbuftest.c
+@@ -246,7 +246,6 @@ testBufAddStr(const void *opaque)
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     g_autofree char *actual = NULL;
+-    int ret = -1;
+ 
+     virBufferAddLit(&buf, "<c>\n");
+     virBufferAdjustIndent(&buf, 2);
+@@ -256,19 +255,16 @@ testBufAddStr(const void *opaque)
+ 
+     if (!(actual = virBufferContentAndReset(&buf))) {
+         VIR_TEST_DEBUG("buf is empty");
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (STRNEQ_NULLABLE(actual, data->expect)) {
+         VIR_TEST_DEBUG("testBufAddStr(): Strings don't match:");
+         virTestDifference(stderr, data->expect, actual);
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+@@ -278,7 +274,6 @@ testBufEscapeStr(const void *opaque)
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     g_autofree char *actual = NULL;
+-    int ret = -1;
+ 
+     virBufferAddLit(&buf, "<c>\n");
+     virBufferAdjustIndent(&buf, 2);
+@@ -288,19 +283,16 @@ testBufEscapeStr(const void *opaque)
+ 
+     if (!(actual = virBufferContentAndReset(&buf))) {
+         VIR_TEST_DEBUG("buf is empty");
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (STRNEQ_NULLABLE(actual, data->expect)) {
+         VIR_TEST_DEBUG("testBufEscapeStr(): Strings don't match:");
+         virTestDifference(stderr, data->expect, actual);
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+@@ -310,25 +302,21 @@ testBufEscapeRegex(const void *opaque)
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     g_autofree char *actual = NULL;
+-    int ret = -1;
+ 
+     virBufferEscapeRegex(&buf, "%s", data->data);
+ 
+     if (!(actual = virBufferContentAndReset(&buf))) {
+         VIR_TEST_DEBUG("testBufEscapeRegex: buf is empty");
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (STRNEQ_NULLABLE(actual, data->expect)) {
+         VIR_TEST_DEBUG("testBufEscapeRegex: Strings don't match:");
+         virTestDifference(stderr, data->expect, actual);
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+@@ -337,7 +325,6 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED)
+ {
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     g_autofree char *actual = NULL;
+-    int ret = -1;
+ 
+     virBufferSetIndent(&buf, 11);
+     virBufferAddLit(&buf, "test\n");
+@@ -345,17 +332,14 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED)
+     virBufferAddLit(&buf, "test2\n");
+ 
+     if (!(actual = virBufferContentAndReset(&buf)))
+-        goto cleanup;
++        return -1;
+ 
+     if (STRNEQ(actual, "           test\n  test2\n")) {
+         VIR_TEST_DEBUG("testBufSetIndent: expected indent not set");
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virbuftest-use-field-names-when-initalizing-test-info.patch b/SOURCES/libvirt-virbuftest-use-field-names-when-initalizing-test-info.patch
new file mode 100644
index 0000000..77364f5
--- /dev/null
+++ b/SOURCES/libvirt-virbuftest-use-field-names-when-initalizing-test-info.patch
@@ -0,0 +1,74 @@
+From 401d5f108c69a01fca8843868e12d102e75e8dd2 Mon Sep 17 00:00:00 2001
+Message-Id: <401d5f108c69a01fca8843868e12d102e75e8dd2@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:06 +0100
+Subject: [PATCH] virbuftest: use field names when initalizing test info
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allow adding new fields without changing all the macros.
+
+Otherwise the compiler complains that not all have been initialized:
+../../tests/virbuftest.c:419:5: error: missing field 'arg' initializer [-Werror,-Wmissing-field-initializers]
+    DO_TEST_ESCAPE("<td></td><td></td>",
+    ^
+../../tests/virbuftest.c:414:56: note: expanded from macro 'DO_TEST_ESCAPE'
+        struct testBufAddStrData info = { data, expect }; \
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 46afdc21207d3276f0e100b6e54ca41ee5f12e99)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <b5da3d53ae4fc1a592b41230f3b838357cc57d30.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virbuftest.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/virbuftest.c b/tests/virbuftest.c
+index bb606c1c28..1780b62bf4 100644
+--- a/tests/virbuftest.c
++++ b/tests/virbuftest.c
+@@ -372,9 +372,9 @@ mymain(void)
+     DO_TEST("set indent", testBufSetIndent);
+     DO_TEST("autoclean", testBufferAutoclean);
+ 
+-#define DO_TEST_ADD_STR(DATA, EXPECT) \
++#define DO_TEST_ADD_STR(_data, _expect) \
+     do { \
+-        struct testBufAddStrData info = { DATA, EXPECT }; \
++        struct testBufAddStrData info = { .data = _data, .expect = _expect }; \
+         if (virTestRun("Buf: AddStr", testBufAddStr, &info) < 0) \
+             ret = -1; \
+     } while (0)
+@@ -384,9 +384,9 @@ mymain(void)
+     DO_TEST_ADD_STR("<a/>\n", "<c>\n  <a/>\n</c>");
+     DO_TEST_ADD_STR("<b>\n  <a/>\n</b>\n", "<c>\n  <b>\n    <a/>\n  </b>\n</c>");
+ 
+-#define DO_TEST_ESCAPE(data, expect) \
++#define DO_TEST_ESCAPE(_data, _expect) \
+     do { \
+-        struct testBufAddStrData info = { data, expect }; \
++        struct testBufAddStrData info = { .data = _data, .expect = _expect }; \
+         if (virTestRun("Buf: EscapeStr", testBufEscapeStr, &info) < 0) \
+             ret = -1; \
+     } while (0)
+@@ -400,9 +400,9 @@ mymain(void)
+     DO_TEST_ESCAPE("\x01\x01\x02\x03\x05\x08",
+                    "<c>\n  <el></el>\n</c>");
+ 
+-#define DO_TEST_ESCAPE_REGEX(data, expect) \
++#define DO_TEST_ESCAPE_REGEX(_data, _expect) \
+     do { \
+-        struct testBufAddStrData info = { data, expect }; \
++        struct testBufAddStrData info = { .data = _data, .expect = _expect }; \
+         if (virTestRun("Buf: EscapeRegex", testBufEscapeRegex, &info) < 0) \
+             ret = -1; \
+     } while (0)
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virbuftest-use-g_autofree.patch b/SOURCES/libvirt-virbuftest-use-g_autofree.patch
new file mode 100644
index 0000000..9a0065f
--- /dev/null
+++ b/SOURCES/libvirt-virbuftest-use-g_autofree.patch
@@ -0,0 +1,148 @@
+From e3824886db80dba4e524aa737abb3188373076a6 Mon Sep 17 00:00:00 2001
+Message-Id: <e3824886db80dba4e524aa737abb3188373076a6@dist-git>
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 13 Mar 2020 13:08:03 +0100
+Subject: [PATCH] virbuftest: use g_autofree
+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: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit b0138d55f72ae64c2bf1abb4ab8cc7eea217ca04)
+
+Prerequisite for: https://bugzilla.redhat.com/show_bug.cgi?id=1808499
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <e2251697da65f2cd0566647d3270117744ff0b21.1584101247.git.mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ tests/virbuftest.c | 21 +++++++--------------
+ 1 file changed, 7 insertions(+), 14 deletions(-)
+
+diff --git a/tests/virbuftest.c b/tests/virbuftest.c
+index f8eadea25a..2b241424ad 100644
+--- a/tests/virbuftest.c
++++ b/tests/virbuftest.c
+@@ -15,7 +15,7 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
+     virBufferPtr buf = &bufinit;
+     const char expected[] =
+         "  1\n  2\n  3\n  4\n  5\n  6\n  7\n  &amp;\n  8\n  9\n  10\n  ' 11'\n";
+-    char *result = NULL;
++    g_autofree char *result = NULL;
+     int ret = 0;
+ 
+     if (virBufferGetIndent(buf) != 0 ||
+@@ -85,7 +85,6 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
+         virTestDifference(stderr, expected, result);
+         ret = -1;
+     }
+-    VIR_FREE(result);
+     return ret;
+ }
+ 
+@@ -93,7 +92,7 @@ static int testBufTrim(const void *data G_GNUC_UNUSED)
+ {
+     virBuffer bufinit = VIR_BUFFER_INITIALIZER;
+     virBufferPtr buf = NULL;
+-    char *result = NULL;
++    g_autofree char *result = NULL;
+     const char *expected = "a,b";
+     int ret = -1;
+ 
+@@ -123,7 +122,6 @@ static int testBufTrim(const void *data G_GNUC_UNUSED)
+ 
+  cleanup:
+     virBufferFreeAndReset(buf);
+-    VIR_FREE(result);
+     return ret;
+ }
+ 
+@@ -133,7 +131,7 @@ static int testBufAddBuffer(const void *data G_GNUC_UNUSED)
+     virBuffer buf2 = VIR_BUFFER_INITIALIZER;
+     virBuffer buf3 = VIR_BUFFER_INITIALIZER;
+     int ret = -1;
+-    char *result = NULL;
++    g_autofree char *result = NULL;
+     const char *expected = \
+ "  A long time ago, in a galaxy far,\n" \
+ "  far away...\n" \
+@@ -234,7 +232,6 @@ static int testBufAddBuffer(const void *data G_GNUC_UNUSED)
+  cleanup:
+     virBufferFreeAndReset(&buf1);
+     virBufferFreeAndReset(&buf2);
+-    VIR_FREE(result);
+     return ret;
+ }
+ 
+@@ -248,7 +245,7 @@ testBufAddStr(const void *opaque)
+ {
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    char *actual;
++    g_autofree char *actual = NULL;
+     int ret = -1;
+ 
+     virBufferAddLit(&buf, "<c>\n");
+@@ -271,7 +268,6 @@ testBufAddStr(const void *opaque)
+     ret = 0;
+ 
+  cleanup:
+-    VIR_FREE(actual);
+     return ret;
+ }
+ 
+@@ -281,7 +277,7 @@ testBufEscapeStr(const void *opaque)
+ {
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    char *actual;
++    g_autofree char *actual = NULL;
+     int ret = -1;
+ 
+     virBufferAddLit(&buf, "<c>\n");
+@@ -304,7 +300,6 @@ testBufEscapeStr(const void *opaque)
+     ret = 0;
+ 
+  cleanup:
+-    VIR_FREE(actual);
+     return ret;
+ }
+ 
+@@ -314,7 +309,7 @@ testBufEscapeRegex(const void *opaque)
+ {
+     const struct testBufAddStrData *data = opaque;
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    char *actual;
++    g_autofree char *actual = NULL;
+     int ret = -1;
+ 
+     virBufferEscapeRegex(&buf, "%s", data->data);
+@@ -333,7 +328,6 @@ testBufEscapeRegex(const void *opaque)
+     ret = 0;
+ 
+  cleanup:
+-    VIR_FREE(actual);
+     return ret;
+ }
+ 
+@@ -342,7 +336,7 @@ static int
+ testBufSetIndent(const void *opaque G_GNUC_UNUSED)
+ {
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    char *actual;
++    g_autofree char *actual = NULL;
+     int ret = -1;
+ 
+     virBufferSetIndent(&buf, 11);
+@@ -361,7 +355,6 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED)
+     ret = 0;
+ 
+  cleanup:
+-    VIR_FREE(actual);
+     return ret;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-vircgroup-Call-virCgroupRemove-inside-virCgroupMakeGroup.patch b/SOURCES/libvirt-vircgroup-Call-virCgroupRemove-inside-virCgroupMakeGroup.patch
deleted file mode 100644
index cebbe6b..0000000
--- a/SOURCES/libvirt-vircgroup-Call-virCgroupRemove-inside-virCgroupMakeGroup.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 9831bda48172881b14f3c473b625ce5ddbd04300 Mon Sep 17 00:00:00 2001
-Message-Id: <9831bda48172881b14f3c473b625ce5ddbd04300@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:08 +0200
-Subject: [PATCH] vircgroup: Call virCgroupRemove inside virCgroupMakeGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes virCgroupEnableMissingControllers where virCgroupRemove
-was not called in case virCgroupMakeGroup failed.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b013bdfd797489e6c254917da299842fe051d058)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <09accbd84f3da1d7c6682357cf6c9a720631a247.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 8646a4a479..dde9ed21a2 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1052,7 +1052,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
-         }
- 
-         if (virCgroupPathOfController(group, i, "", &path) < 0)
--            return -1;
-+            goto error;
- 
-         /* As of Feb 2011, clang can't see that the above function
-          * call did not modify group. */
-@@ -1076,7 +1076,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                     virReportSystemError(errno,
-                                          _("Failed to create controller %s for group"),
-                                          virCgroupControllerTypeToString(i));
--                    return -1;
-+                    goto error;
-                 }
-             }
-             if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL &&
-@@ -1084,7 +1084,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                  STREQ(group->controllers[i].mountPoint,
-                        group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) {
-                 if (virCgroupCpuSetInherit(parent, group) < 0)
--                    return -1;
-+                    goto error;
-             }
-             /*
-              * Note that virCgroupSetMemoryUseHierarchy should always be
-@@ -1096,13 +1096,17 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                  STREQ(group->controllers[i].mountPoint,
-                        group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) {
-                 if (virCgroupSetMemoryUseHierarchy(group) < 0)
--                    return -1;
-+                    goto error;
-             }
-         }
-     }
- 
-     VIR_DEBUG("Done making controllers for group");
-     return 0;
-+
-+ error:
-+    virCgroupRemove(group);
-+    return -1;
- }
- 
- 
-@@ -1316,10 +1320,8 @@ virCgroupNewPartition(const char *path,
-         if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0)
-             goto cleanup;
- 
--        if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) {
--            virCgroupRemove(*group);
-+        if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0)
-             goto cleanup;
--        }
-     }
- 
-     ret = 0;
-@@ -1389,7 +1391,6 @@ virCgroupNewDomainPartition(virCgroupPtr partition,
-      */
-     if (virCgroupMakeGroup(partition, *group, create,
-                            VIR_CGROUP_MEM_HIERACHY) < 0) {
--        virCgroupRemove(*group);
-         virCgroupFree(group);
-         return -1;
-     }
-@@ -1446,7 +1447,6 @@ virCgroupNewThread(virCgroupPtr domain,
-         return -1;
- 
-     if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) {
--        virCgroupRemove(*group);
-         virCgroupFree(group);
-         return -1;
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Duplicate-string-before-modifying.patch b/SOURCES/libvirt-vircgroup-Duplicate-string-before-modifying.patch
deleted file mode 100644
index 9e0a069..0000000
--- a/SOURCES/libvirt-vircgroup-Duplicate-string-before-modifying.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d0add5355b434df64c5f9fb28b9ab4bdd86f93f2 Mon Sep 17 00:00:00 2001
-Message-Id: <d0add5355b434df64c5f9fb28b9ab4bdd86f93f2@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:04 +0200
-Subject: [PATCH] vircgroup: Duplicate string before modifying
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The 'mntDir' is part of 'struct mntent' as a result of getmntent_r
-therefore we should not mangle with it.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 4b2fb60777bdad70df2871dad1d0e604cda078c6)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b57526226460be172899f5a6e14f185eabb18cea.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index df38bb77e0..45b854e864 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -350,18 +350,22 @@ virCgroupCopyMounts(virCgroupPtr group,
- 
- 
- static int
--virCgroupResolveMountLink(char *mntDir,
-+virCgroupResolveMountLink(const char *mntDir,
-                           const char *typeStr,
-                           virCgroupControllerPtr controller)
- {
-     VIR_AUTOFREE(char *) linkSrc = NULL;
-+    VIR_AUTOFREE(char *) tmp = NULL;
-     char *dirName;
-     struct stat sb;
- 
--    dirName = strrchr(mntDir, '/');
-+    if (VIR_STRDUP(tmp, mntDir) < 0)
-+        return -1;
-+
-+    dirName = strrchr(tmp, '/');
-     if (!dirName) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Missing '/' separator in cgroup mount '%s'"), mntDir);
-+                       _("Missing '/' separator in cgroup mount '%s'"), tmp);
-         return -1;
-     }
- 
-@@ -369,14 +373,14 @@ virCgroupResolveMountLink(char *mntDir,
-         return 0;
- 
-     *dirName = '\0';
--    if (virAsprintf(&linkSrc, "%s/%s", mntDir, typeStr) < 0)
-+    if (virAsprintf(&linkSrc, "%s/%s", tmp, typeStr) < 0)
-         return -1;
-     *dirName = '/';
- 
-     if (lstat(linkSrc, &sb) < 0) {
-         if (errno == ENOENT) {
-             VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s",
--                     typeStr, mntDir, linkSrc);
-+                     typeStr, tmp, linkSrc);
-         } else {
-             virReportSystemError(errno, _("Cannot stat %s"), linkSrc);
-             return -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Extract-controller-detection-into-function.patch b/SOURCES/libvirt-vircgroup-Extract-controller-detection-into-function.patch
deleted file mode 100644
index e6a7b90..0000000
--- a/SOURCES/libvirt-vircgroup-Extract-controller-detection-into-function.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 931ae6bf56044020c057716e1db59288beca2bc8 Mon Sep 17 00:00:00 2001
-Message-Id: <931ae6bf56044020c057716e1db59288beca2bc8@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:05 +0200
-Subject: [PATCH] vircgroup: Extract controller detection into function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit bddf975c7615a30da0709b6c1509b43440d72393)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <484f007f9f43d727b829bb18fa4ad2f116a7fae1.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 48 +++++++++++++++++++++++++++++---------------
- 1 file changed, 32 insertions(+), 16 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 45b854e864..6f27c50cbd 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -631,24 +631,11 @@ virCgroupDetectPlacement(virCgroupPtr group,
- 
- 
- static int
--virCgroupDetect(virCgroupPtr group,
--                pid_t pid,
--                int controllers,
--                const char *path,
--                virCgroupPtr parent)
-+virCgroupDetectControllers(virCgroupPtr group,
-+                           int controllers)
- {
-     size_t i;
-     size_t j;
--    VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
--              group, controllers, path, parent);
--
--    if (parent) {
--        if (virCgroupCopyMounts(group, parent) < 0)
--            return -1;
--    } else {
--        if (virCgroupDetectMounts(group) < 0)
--            return -1;
--    }
- 
-     if (controllers >= 0) {
-         VIR_DEBUG("Filtering controllers %d", controllers);
-@@ -703,8 +690,37 @@ virCgroupDetect(virCgroupPtr group,
-         }
-     }
- 
-+    return controllers;
-+}
-+
-+
-+static int
-+virCgroupDetect(virCgroupPtr group,
-+                pid_t pid,
-+                int controllers,
-+                const char *path,
-+                virCgroupPtr parent)
-+{
-+    size_t i;
-+    int rc;
-+
-+    VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
-+              group, controllers, path, parent);
-+
-+    if (parent) {
-+        if (virCgroupCopyMounts(group, parent) < 0)
-+            return -1;
-+    } else {
-+        if (virCgroupDetectMounts(group) < 0)
-+            return -1;
-+    }
-+
-+    rc = virCgroupDetectControllers(group, controllers);
-+    if (rc < 0)
-+        return -1;
-+
-     /* Check that at least 1 controller is available */
--    if (!controllers) {
-+    if (rc == 0) {
-         virReportSystemError(ENXIO, "%s",
-                              _("At least one cgroup controller is required"));
-         return -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Extract-file-link-resolving-into-separate-function.patch b/SOURCES/libvirt-vircgroup-Extract-file-link-resolving-into-separate-function.patch
deleted file mode 100644
index 65a6823..0000000
--- a/SOURCES/libvirt-vircgroup-Extract-file-link-resolving-into-separate-function.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From d7a8cd2fdafd168eb1672e7ecde1700463792518 Mon Sep 17 00:00:00 2001
-Message-Id: <d7a8cd2fdafd168eb1672e7ecde1700463792518@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:50 +0200
-Subject: [PATCH] vircgroup: Extract file link resolving into separate function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 00a0085aa17677003e89cdafceb6a0260af43fb8)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <6d3c5594a53824ceac258a0f54162ec8af5aef37.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 85 +++++++++++++++++++++++++-------------------
- 1 file changed, 48 insertions(+), 37 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 5144b33d43..8ddedbfe7c 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -356,6 +356,51 @@ virCgroupCopyMounts(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupResolveMountLink(char *mntDir,
-+                          const char *typeStr,
-+                          virCgroupControllerPtr controller)
-+{
-+    VIR_AUTOFREE(char *) linkSrc = NULL;
-+    char *dirName;
-+    struct stat sb;
-+
-+    dirName = strrchr(mntDir, '/');
-+    if (!dirName) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing '/' separator in cgroup mount '%s'"), mntDir);
-+        return -1;
-+    }
-+
-+    if (!strchr(dirName + 1, ','))
-+        return 0;
-+
-+    *dirName = '\0';
-+    if (virAsprintf(&linkSrc, "%s/%s", mntDir, typeStr) < 0)
-+        return -1;
-+    *dirName = '/';
-+
-+    if (lstat(linkSrc, &sb) < 0) {
-+        if (errno == ENOENT) {
-+            VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s",
-+                     typeStr, mntDir, linkSrc);
-+        } else {
-+            virReportSystemError(errno, _("Cannot stat %s"), linkSrc);
-+            return -1;
-+        }
-+    } else {
-+        if (!S_ISLNK(sb.st_mode)) {
-+            VIR_WARN("Expecting a symlink at %s for controller %s",
-+                     linkSrc, typeStr);
-+        } else {
-+            VIR_STEAL_PTR(controller->linkPoint, linkSrc);
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- /*
-  * Process /proc/mounts figuring out what controllers are
-  * mounted and where
-@@ -397,8 +442,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                 }
- 
-                 if (typelen == len && STREQLEN(typestr, tmp, len)) {
--                    struct stat sb;
--                    char *tmp2;
- 
-                     /* Note that the lines in /proc/mounts have the same
-                      * order than the mount operations, and that there may
-@@ -412,44 +455,12 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                     if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
-                         goto cleanup;
- 
--                    tmp2 = strrchr(entry.mnt_dir, '/');
--                    if (!tmp2) {
--                        virReportError(VIR_ERR_INTERNAL_ERROR,
--                                       _("Missing '/' separator in cgroup mount '%s'"),
--                                       entry.mnt_dir);
--                        goto cleanup;
--                    }
--
-                     /* If it is a co-mount it has a filename like "cpu,cpuacct"
-                      * and we must identify the symlink path */
--                    if (checkLinks && strchr(tmp2 + 1, ',')) {
--                        VIR_AUTOFREE(char *) linksrc = NULL;
--
--                        *tmp2 = '\0';
--                        if (virAsprintf(&linksrc, "%s/%s",
--                                        entry.mnt_dir, typestr) < 0)
-+                    if (checkLinks &&
-+                        virCgroupResolveMountLink(entry.mnt_dir, typestr,
-+                                                  controller) < 0) {
-                             goto cleanup;
--                        *tmp2 = '/';
--
--                        if (lstat(linksrc, &sb) < 0) {
--                            if (errno == ENOENT) {
--                                VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s",
--                                         typestr, entry.mnt_dir, linksrc);
--                            } else {
--                                virReportSystemError(errno,
--                                                     _("Cannot stat %s"),
--                                                     linksrc);
--                                goto cleanup;
--                            }
--                        } else {
--                            if (!S_ISLNK(sb.st_mode)) {
--                                VIR_WARN("Expecting a symlink at %s for controller %s",
--                                         linksrc, typestr);
--                            } else {
--                                controller->linkPoint = linksrc;
--                                linksrc = NULL;
--                            }
--                        }
-                     }
-                 }
-                 tmp = next;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Extract-mount-options-matching-into-function.patch b/SOURCES/libvirt-vircgroup-Extract-mount-options-matching-into-function.patch
deleted file mode 100644
index c513497..0000000
--- a/SOURCES/libvirt-vircgroup-Extract-mount-options-matching-into-function.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 75f8c320bb6a09f111db513c52c71bbb5b3b7b9f Mon Sep 17 00:00:00 2001
-Message-Id: <75f8c320bb6a09f111db513c52c71bbb5b3b7b9f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:56 +0200
-Subject: [PATCH] vircgroup: Extract mount options matching into function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 6d5b91f0f5527ed79b39f1f1a375a35869e75356)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <6c5aa678b08ceb1efd6d1bda2350a979ca59035b.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 84 ++++++++++++++++++++++++++------------------
- 1 file changed, 49 insertions(+), 35 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 9032bcbb63..ec9994780a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -399,6 +399,33 @@ virCgroupResolveMountLink(char *mntDir,
- }
- 
- 
-+static bool
-+virCgroupMountOptsMatchController(const char *mntOpts,
-+                                  const char *typeStr)
-+{
-+    const char *tmp = mntOpts;
-+    int typeLen = strlen(typeStr);
-+
-+    while (tmp) {
-+        const char *next = strchr(tmp, ',');
-+        int len;
-+        if (next) {
-+            len = next - tmp;
-+            next++;
-+        } else {
-+            len = strlen(tmp);
-+        }
-+
-+        if (typeLen == len && STREQLEN(typeStr, tmp, len))
-+            return true;
-+
-+        tmp = next;
-+    }
-+
-+    return false;
-+}
-+
-+
- /*
-  * Process /proc/mounts figuring out what controllers are
-  * mounted and where
-@@ -426,42 +453,29 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
- 
-         for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-             const char *typestr = virCgroupControllerTypeToString(i);
--            int typelen = strlen(typestr);
--            char *tmp = entry.mnt_opts;
--            virCgroupControllerPtr controller = &group->controllers[i];
--            while (tmp) {
--                char *next = strchr(tmp, ',');
--                int len;
--                if (next) {
--                    len = next-tmp;
--                    next++;
--                } else {
--                    len = strlen(tmp);
-+
-+            if (virCgroupMountOptsMatchController(entry.mnt_opts, typestr)) {
-+                /* Note that the lines in /proc/mounts have the same
-+                 * order than the mount operations, and that there may
-+                 * be duplicates due to bind mounts. This means
-+                 * that the same mount point may be processed more than
-+                 * once. We need to save the results of the last one,
-+                 * and we need to be careful to release the memory used
-+                 * by previous processing. */
-+                virCgroupControllerPtr controller = &group->controllers[i];
-+
-+                VIR_FREE(controller->mountPoint);
-+                VIR_FREE(controller->linkPoint);
-+                if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
-+                    goto cleanup;
-+
-+                /* If it is a co-mount it has a filename like "cpu,cpuacct"
-+                 * and we must identify the symlink path */
-+                if (checkLinks &&
-+                    virCgroupResolveMountLink(entry.mnt_dir, typestr,
-+                                              controller) < 0) {
-+                    goto cleanup;
-                 }
--
--                if (typelen == len && STREQLEN(typestr, tmp, len)) {
--
--                    /* Note that the lines in /proc/mounts have the same
--                     * order than the mount operations, and that there may
--                     * be duplicates due to bind mounts. This means
--                     * that the same mount point may be processed more than
--                     * once. We need to save the results of the last one,
--                     * and we need to be careful to release the memory used
--                     * by previous processing. */
--                    VIR_FREE(controller->mountPoint);
--                    VIR_FREE(controller->linkPoint);
--                    if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
--                        goto cleanup;
--
--                    /* If it is a co-mount it has a filename like "cpu,cpuacct"
--                     * and we must identify the symlink path */
--                    if (checkLinks &&
--                        virCgroupResolveMountLink(entry.mnt_dir, typestr,
--                                                  controller) < 0) {
--                            goto cleanup;
--                    }
--                }
--                tmp = next;
-             }
-         }
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Extract-placement-validation-into-function.patch b/SOURCES/libvirt-vircgroup-Extract-placement-validation-into-function.patch
deleted file mode 100644
index 8513ce4..0000000
--- a/SOURCES/libvirt-vircgroup-Extract-placement-validation-into-function.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 489202ad9fe2dd9e417335c7274ba522adfc490b Mon Sep 17 00:00:00 2001
-Message-Id: <489202ad9fe2dd9e417335c7274ba522adfc490b@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:06 +0200
-Subject: [PATCH] vircgroup: Extract placement validation into function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 3ae7b99094dc72616f902289afc407df738c9ce9)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5728512c8e969952c0502fb4119f2930ae4bc49c.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 52 +++++++++++++++++++++++++++-----------------
- 1 file changed, 32 insertions(+), 20 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 6f27c50cbd..2bc4febf23 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -630,6 +630,36 @@ virCgroupDetectPlacement(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupValidatePlacement(virCgroupPtr group,
-+                           pid_t pid)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+
-+        if (!group->controllers[i].placement) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Could not find placement for controller %s at %s"),
-+                           virCgroupControllerTypeToString(i),
-+                           group->controllers[i].placement);
-+            return -1;
-+        }
-+
-+        VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
-+                  i,
-+                  virCgroupControllerTypeToString(i),
-+                  group->controllers[i].mountPoint,
-+                  group->controllers[i].placement,
-+                  (long long) pid);
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- virCgroupDetectControllers(virCgroupPtr group,
-                            int controllers)
-@@ -701,7 +731,6 @@ virCgroupDetect(virCgroupPtr group,
-                 const char *path,
-                 virCgroupPtr parent)
- {
--    size_t i;
-     int rc;
- 
-     VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
-@@ -738,25 +767,8 @@ virCgroupDetect(virCgroupPtr group,
-         return -1;
- 
-     /* Check that for every mounted controller, we found our placement */
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
--            continue;
--
--        if (!group->controllers[i].placement) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Could not find placement for controller %s at %s"),
--                           virCgroupControllerTypeToString(i),
--                           group->controllers[i].placement);
--            return -1;
--        }
--
--        VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
--                  i,
--                  virCgroupControllerTypeToString(i),
--                  group->controllers[i].mountPoint,
--                  group->controllers[i].placement,
--                  (long long) pid);
--    }
-+    if (virCgroupValidatePlacement(group, pid) < 0)
-+        return -1;
- 
-     return 0;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Introduce-standard-set-of-typedefs-and-use-them.patch b/SOURCES/libvirt-vircgroup-Introduce-standard-set-of-typedefs-and-use-them.patch
deleted file mode 100644
index d57c77a..0000000
--- a/SOURCES/libvirt-vircgroup-Introduce-standard-set-of-typedefs-and-use-them.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From aeec7565df4f246c937f494c99a8d2d1ff03168d Mon Sep 17 00:00:00 2001
-Message-Id: <aeec7565df4f246c937f494c99a8d2d1ff03168d@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:49 +0200
-Subject: [PATCH] vircgroup: Introduce standard set of typedefs and use them
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit cd77242504c8f3ba8d4ff7d1a7d4234f0aa5ede3)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <7e482b4826c05db78d1136bfa6091ab5d3097f47.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c     | 2 +-
- src/util/vircgroup.h     | 3 ++-
- src/util/vircgrouppriv.h | 4 +++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 7602641713..5144b33d43 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -385,7 +385,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-             const char *typestr = virCgroupControllerTypeToString(i);
-             int typelen = strlen(typestr);
-             char *tmp = entry.mnt_opts;
--            struct _virCgroupController *controller = &group->controllers[i];
-+            virCgroupControllerPtr controller = &group->controllers[i];
-             while (tmp) {
-                 char *next = strchr(tmp, ',');
-                 int len;
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index cfa69b67cb..af93316197 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -29,7 +29,8 @@
- # include "virbitmap.h"
- 
- struct _virCgroup;
--typedef struct _virCgroup *virCgroupPtr;
-+typedef struct _virCgroup virCgroup;
-+typedef virCgroup *virCgroupPtr;
- 
- enum {
-     VIR_CGROUP_CONTROLLER_CPU,
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 71788639d6..1b47d3b858 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -41,11 +41,13 @@ struct _virCgroupController {
-     char *linkPoint;
-     char *placement;
- };
-+typedef struct _virCgroupController virCgroupController;
-+typedef virCgroupController *virCgroupControllerPtr;
- 
- struct _virCgroup {
-     char *path;
- 
--    struct _virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
-+    virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
- int virCgroupDetectMountsFromFile(virCgroupPtr group,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Introduce-virCgroupEnableMissingControllers.patch b/SOURCES/libvirt-vircgroup-Introduce-virCgroupEnableMissingControllers.patch
deleted file mode 100644
index fa468a2..0000000
--- a/SOURCES/libvirt-vircgroup-Introduce-virCgroupEnableMissingControllers.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From cef7b5074c5638c67828d44357809fae84354000 Mon Sep 17 00:00:00 2001
-Message-Id: <cef7b5074c5638c67828d44357809fae84354000@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:58 +0200
-Subject: [PATCH] vircgroup: Introduce virCgroupEnableMissingControllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit fc221c053ba3a0f5b9ce609936e010180bbda64f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c00a45e34f017f784f46831dba6275942f973bd8.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 127 ++++++++++++++++++++++++-------------------
- 1 file changed, 70 insertions(+), 57 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 7888dab716..a2c971fbf4 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1494,68 +1494,22 @@ virCgroupNewDetectMachine(const char *name,
- }
- 
- 
--/*
-- * Returns 0 on success, -1 on fatal error, -2 on systemd not available
-- */
- static int
--virCgroupNewMachineSystemd(const char *name,
--                           const char *drivername,
--                           const unsigned char *uuid,
--                           const char *rootdir,
--                           pid_t pidleader,
--                           bool isContainer,
--                           size_t nnicindexes,
--                           int *nicindexes,
--                           const char *partition,
--                           int controllers,
--                           virCgroupPtr *group)
-+virCgroupEnableMissingControllers(char *path,
-+                                  pid_t pidleader,
-+                                  int controllers,
-+                                  virCgroupPtr *group)
- {
-+    virCgroupPtr parent = NULL;
-+    char *offset = path;
-     int ret = -1;
--    int rv;
--    virCgroupPtr init, parent = NULL;
--    VIR_AUTOFREE(char *) path = NULL;
--    char *offset;
--
--    VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
--    if ((rv = virSystemdCreateMachine(name,
--                                      drivername,
--                                      uuid,
--                                      rootdir,
--                                      pidleader,
--                                      isContainer,
--                                      nnicindexes,
--                                      nicindexes,
--                                      partition)) < 0)
--        return rv;
--
--    if (controllers != -1)
--        controllers |= (1 << VIR_CGROUP_CONTROLLER_SYSTEMD);
--
--    VIR_DEBUG("Detecting systemd placement");
--    if (virCgroupNewDetect(pidleader,
--                           controllers,
--                           &init) < 0)
--        return -1;
--
--    path = init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement;
--    init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement = NULL;
--    virCgroupFree(&init);
--
--    if (!path || STREQ(path, "/") || path[0] != '/') {
--        VIR_DEBUG("Systemd didn't setup its controller");
--        ret = -2;
--        goto cleanup;
--    }
--
--    offset = path;
- 
-     if (virCgroupNew(pidleader,
-                      "",
-                      NULL,
-                      controllers,
-                      &parent) < 0)
--        goto cleanup;
--
-+        return ret;
- 
-     for (;;) {
-         virCgroupPtr tmp;
-@@ -1585,6 +1539,68 @@ virCgroupNewMachineSystemd(const char *name,
-         }
-     }
- 
-+    ret = 0;
-+ cleanup:
-+    virCgroupFree(&parent);
-+    return ret;
-+}
-+
-+
-+/*
-+ * Returns 0 on success, -1 on fatal error, -2 on systemd not available
-+ */
-+static int
-+virCgroupNewMachineSystemd(const char *name,
-+                           const char *drivername,
-+                           const unsigned char *uuid,
-+                           const char *rootdir,
-+                           pid_t pidleader,
-+                           bool isContainer,
-+                           size_t nnicindexes,
-+                           int *nicindexes,
-+                           const char *partition,
-+                           int controllers,
-+                           virCgroupPtr *group)
-+{
-+    int rv;
-+    virCgroupPtr init;
-+    VIR_AUTOFREE(char *) path = NULL;
-+
-+    VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
-+    if ((rv = virSystemdCreateMachine(name,
-+                                      drivername,
-+                                      uuid,
-+                                      rootdir,
-+                                      pidleader,
-+                                      isContainer,
-+                                      nnicindexes,
-+                                      nicindexes,
-+                                      partition)) < 0)
-+        return rv;
-+
-+    if (controllers != -1)
-+        controllers |= (1 << VIR_CGROUP_CONTROLLER_SYSTEMD);
-+
-+    VIR_DEBUG("Detecting systemd placement");
-+    if (virCgroupNewDetect(pidleader,
-+                           controllers,
-+                           &init) < 0)
-+        return -1;
-+
-+    path = init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement;
-+    init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement = NULL;
-+    virCgroupFree(&init);
-+
-+    if (!path || STREQ(path, "/") || path[0] != '/') {
-+        VIR_DEBUG("Systemd didn't setup its controller");
-+        return -2;
-+    }
-+
-+    if (virCgroupEnableMissingControllers(path, pidleader,
-+                                          controllers, group) < 0) {
-+        return -1;
-+    }
-+
-     if (virCgroupAddTask(*group, pidleader) < 0) {
-         virErrorPtr saved = virSaveLastError();
-         virCgroupRemove(*group);
-@@ -1595,10 +1611,7 @@ virCgroupNewMachineSystemd(const char *name,
-         }
-     }
- 
--    ret = 0;
-- cleanup:
--    virCgroupFree(&parent);
--    return ret;
-+    return 0;
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Introduce-virCgroupGetMemoryStat.patch b/SOURCES/libvirt-vircgroup-Introduce-virCgroupGetMemoryStat.patch
deleted file mode 100644
index 903d5ac..0000000
--- a/SOURCES/libvirt-vircgroup-Introduce-virCgroupGetMemoryStat.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From d91df2c6090f79ef0135f2240181b8dbf87597b0 Mon Sep 17 00:00:00 2001
-Message-Id: <d91df2c6090f79ef0135f2240181b8dbf87597b0@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:01 +0200
-Subject: [PATCH] vircgroup: Introduce virCgroupGetMemoryStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 901d2b9c8716f2717439d5843cab412ab8d7b247)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b70cd9890f218f943b094bc6b040867c6d69bc6b.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/vircgroup.c     | 88 ++++++++++++++++++++++++++++++++++++++++
- src/util/vircgroup.h     |  7 ++++
- 3 files changed, 96 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 47695eb507..2ec9d8f4bf 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1551,6 +1551,7 @@ virCgroupGetDomainTotalCpuStats;
- virCgroupGetFreezerState;
- virCgroupGetMemoryHardLimit;
- virCgroupGetMemorySoftLimit;
-+virCgroupGetMemoryStat;
- virCgroupGetMemoryUsage;
- virCgroupGetMemSwapHardLimit;
- virCgroupGetMemSwapUsage;
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a94f958d75..0ed83932ac 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2427,6 +2427,94 @@ virCgroupSetMemory(virCgroupPtr group, unsigned long long kb)
- }
- 
- 
-+/**
-+ * virCgroupGetMemoryStat:
-+ *
-+ * @group: The cgroup to change memory for
-+ * @cache: page cache memory in KiB
-+ * @activeAnon: anonymous and swap cache memory in KiB
-+ * @inactiveAnon: anonymous and swap cache memory in KiB
-+ * @activeFile: file-backed memory in KiB
-+ * @inactiveFile: file-backed memory in KiB
-+ * @unevictable: memory that cannot be reclaimed KiB
-+ *
-+ * Returns: 0 on success, -1 on error
-+ */
-+int
-+virCgroupGetMemoryStat(virCgroupPtr group,
-+                       unsigned long long *cache,
-+                       unsigned long long *activeAnon,
-+                       unsigned long long *inactiveAnon,
-+                       unsigned long long *activeFile,
-+                       unsigned long long *inactiveFile,
-+                       unsigned long long *unevictable)
-+{
-+    int ret = -1;
-+    char *stat = NULL;
-+    char *line = NULL;
-+    unsigned long long cacheVal = 0;
-+    unsigned long long activeAnonVal = 0;
-+    unsigned long long inactiveAnonVal = 0;
-+    unsigned long long activeFileVal = 0;
-+    unsigned long long inactiveFileVal = 0;
-+    unsigned long long unevictableVal = 0;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.stat",
-+                             &stat) < 0) {
-+        return -1;
-+    }
-+
-+    line = stat;
-+
-+    while (line) {
-+        char *newLine = strchr(line, '\n');
-+        char *valueStr = strchr(line, ' ');
-+        unsigned long long value;
-+
-+        if (newLine)
-+            *newLine = '\0';
-+
-+        if (!valueStr) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("Cannot parse 'memory.stat' cgroup file."));
-+            goto cleanup;
-+        }
-+        *valueStr = '\0';
-+
-+        if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0)
-+            goto cleanup;
-+
-+        if (STREQ(line, "cache"))
-+            cacheVal = value >> 10;
-+        else if (STREQ(line, "active_anon"))
-+            activeAnonVal = value >> 10;
-+        else if (STREQ(line, "inactive_anon"))
-+            inactiveAnonVal = value >> 10;
-+        else if (STREQ(line, "active_file"))
-+            activeFileVal = value >> 10;
-+        else if (STREQ(line, "inactive_file"))
-+            inactiveFileVal = value >> 10;
-+        else if (STREQ(line, "unevictable"))
-+            unevictableVal = value >> 10;
-+    }
-+
-+    *cache = cacheVal;
-+    *activeAnon = activeAnonVal;
-+    *inactiveAnon = inactiveAnonVal;
-+    *activeFile = activeFileVal;
-+    *inactiveFile = inactiveFileVal;
-+    *unevictable = unevictableVal;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    VIR_FREE(stat);
-+    return ret;
-+}
-+
-+
- /**
-  * virCgroupGetMemoryUsage:
-  *
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index 48be077aba..c7fdaaede4 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -177,6 +177,13 @@ int virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
-                                     unsigned long long *wbps);
- 
- int virCgroupSetMemory(virCgroupPtr group, unsigned long long kb);
-+int virCgroupGetMemoryStat(virCgroupPtr group,
-+                           unsigned long long *cache,
-+                           unsigned long long *activeAnon,
-+                           unsigned long long *inactiveAnon,
-+                           unsigned long long *activeFile,
-+                           unsigned long long *inactiveFile,
-+                           unsigned long long *unevictable);
- int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb);
- 
- int virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Move-function-used-in-tests-into-vircgrouppriv.h.patch b/SOURCES/libvirt-vircgroup-Move-function-used-in-tests-into-vircgrouppriv.h.patch
deleted file mode 100644
index 73f8b2d..0000000
--- a/SOURCES/libvirt-vircgroup-Move-function-used-in-tests-into-vircgrouppriv.h.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 0a488720d9702ccedf9e37f639772f67e0180d33 Mon Sep 17 00:00:00 2001
-Message-Id: <0a488720d9702ccedf9e37f639772f67e0180d33@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:54 +0200
-Subject: [PATCH] vircgroup: Move function used in tests into vircgrouppriv.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8ea2d5a6cbe9d14f30ffb8dbe0922945f0f490cb)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2f8afe33e9c7db8173b360eeaac3ae2e2385eda5.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.h     | 13 -------------
- src/util/vircgrouppriv.h | 13 +++++++++++++
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index 138bb3c076..48be077aba 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -64,22 +64,9 @@ typedef enum {
- 
- bool virCgroupAvailable(void);
- 
--int virCgroupNewPartition(const char *path,
--                          bool create,
--                          int controllers,
--                          virCgroupPtr *group)
--    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
--
- int virCgroupNewSelf(virCgroupPtr *group)
-     ATTRIBUTE_NONNULL(1);
- 
--int virCgroupNewDomainPartition(virCgroupPtr partition,
--                                const char *driver,
--                                const char *name,
--                                bool create,
--                                virCgroupPtr *group)
--    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
--
- int virCgroupNewThread(virCgroupPtr domain,
-                        virCgroupThreadName nameval,
-                        int id,
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 1b47d3b858..a0034f3889 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -54,4 +54,17 @@ int virCgroupDetectMountsFromFile(virCgroupPtr group,
-                                   const char *path,
-                                   bool checkLinks);
- 
-+int virCgroupNewPartition(const char *path,
-+                          bool create,
-+                          int controllers,
-+                          virCgroupPtr *group)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
-+
-+int virCgroupNewDomainPartition(virCgroupPtr partition,
-+                                const char *driver,
-+                                const char *name,
-+                                bool create,
-+                                virCgroupPtr *group)
-+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
-+
- #endif /* __VIR_CGROUP_PRIV_H__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Remove-obsolete-sa_assert.patch b/SOURCES/libvirt-vircgroup-Remove-obsolete-sa_assert.patch
deleted file mode 100644
index 5dca2d2..0000000
--- a/SOURCES/libvirt-vircgroup-Remove-obsolete-sa_assert.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 45fd4b2e1b694ca15bfd124f6b5e24e79a670a47 Mon Sep 17 00:00:00 2001
-Message-Id: <45fd4b2e1b694ca15bfd124f6b5e24e79a670a47@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:10 +0200
-Subject: [PATCH] vircgroup: Remove obsolete sa_assert
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b14b88b74c10c9e20f87218c5994681fc35c2c57)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3e004259ee462b47a9e1069ac2f4e9d67a914f6e.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 02de33f74f..64507bf8aa 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1054,10 +1054,6 @@ virCgroupMakeGroup(virCgroupPtr parent,
-         if (virCgroupPathOfController(group, i, "", &path) < 0)
-             goto error;
- 
--        /* As of Feb 2011, clang can't see that the above function
--         * call did not modify group. */
--        sa_assert(group->controllers[i].mountPoint);
--
-         VIR_DEBUG("Make controller %s", path);
-         if (!virFileExists(path)) {
-             if (!create ||
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Remove-pointless-bool-parameter.patch b/SOURCES/libvirt-vircgroup-Remove-pointless-bool-parameter.patch
deleted file mode 100644
index 675d861..0000000
--- a/SOURCES/libvirt-vircgroup-Remove-pointless-bool-parameter.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7191b04edf95dd3180657ec45aec17c80dfdf083 Mon Sep 17 00:00:00 2001
-Message-Id: <7191b04edf95dd3180657ec45aec17c80dfdf083@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:55 +0200
-Subject: [PATCH] vircgroup: Remove pointless bool parameter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0490a74aa11a2d993c50da266b8c2234c5a447ca)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <19e5a131d50721e94d43b37e139dda8dd9994df3.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 7d8bf3419a..9032bcbb63 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -251,7 +251,6 @@ static bool
- virCgroupValidateMachineGroup(virCgroupPtr group,
-                               const char *name,
-                               const char *drivername,
--                              bool stripEmulatorSuffix,
-                               const char *machinename)
- {
-     size_t i;
-@@ -303,10 +302,9 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
-         if (!tmp)
-             return false;
- 
--        if (stripEmulatorSuffix &&
--            (i == VIR_CGROUP_CONTROLLER_CPU ||
--             i == VIR_CGROUP_CONTROLLER_CPUACCT ||
--             i == VIR_CGROUP_CONTROLLER_CPUSET)) {
-+        if (i == VIR_CGROUP_CONTROLLER_CPU ||
-+            i == VIR_CGROUP_CONTROLLER_CPUACCT ||
-+            i == VIR_CGROUP_CONTROLLER_CPUSET) {
-             if (STREQ(tmp, "/emulator"))
-                 *tmp = '\0';
-             tmp = strrchr(group->controllers[i].placement, '/');
-@@ -1486,8 +1484,7 @@ virCgroupNewDetectMachine(const char *name,
-         return -1;
-     }
- 
--    if (!virCgroupValidateMachineGroup(*group, name, drivername,
--                                       true, machinename)) {
-+    if (!virCgroupValidateMachineGroup(*group, name, drivername, machinename)) {
-         VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'",
-                   name, drivername);
-         virCgroupFree(group);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Remove-unused-function-virCgroupKill.patch b/SOURCES/libvirt-vircgroup-Remove-unused-function-virCgroupKill.patch
deleted file mode 100644
index eb61496..0000000
--- a/SOURCES/libvirt-vircgroup-Remove-unused-function-virCgroupKill.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From a4ed662c80b9241f4bc599fded59ace585db25c9 Mon Sep 17 00:00:00 2001
-Message-Id: <a4ed662c80b9241f4bc599fded59ace585db25c9@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:51 +0200
-Subject: [PATCH] vircgroup: Remove unused function virCgroupKill()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit c8b1ae607d638b958dc51ba2041bd87ea72683de)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <9f04fae641e673c68253864c858e2123c2252296.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 -
- src/util/vircgroup.c     | 37 -------------------------------------
- src/util/vircgroup.h     |  1 -
- 3 files changed, 39 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index f158a17b49..3117c8009a 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1558,7 +1558,6 @@ virCgroupGetMemSwapUsage;
- virCgroupGetPercpuStats;
- virCgroupHasController;
- virCgroupHasEmptyTasks;
--virCgroupKill;
- virCgroupKillPainfully;
- virCgroupKillRecursive;
- virCgroupNewDetect;
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 8ddedbfe7c..5f949edec8 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3510,33 +3510,6 @@ virCgroupPidCopy(const void *name)
- }
- 
- 
--/*
-- * Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error
-- */
--int
--virCgroupKill(virCgroupPtr group, int signum)
--{
--    VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum);
--    int ret;
--    /* The 'tasks' file in cgroups can contain duplicated
--     * pids, so we use a hash to track which we've already
--     * killed.
--     */
--    virHashTablePtr pids = virHashCreateFull(100,
--                                             NULL,
--                                             virCgroupPidCode,
--                                             virCgroupPidEqual,
--                                             virCgroupPidCopy,
--                                             NULL);
--
--    ret = virCgroupKillInternal(group, signum, pids);
--
--    virHashFree(pids);
--
--    return ret;
--}
--
--
- static int
- virCgroupKillRecursiveInternal(virCgroupPtr group,
-                                int signum,
-@@ -4585,16 +4558,6 @@ virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED)
- }
- 
- 
--int
--virCgroupKill(virCgroupPtr group ATTRIBUTE_UNUSED,
--              int signum ATTRIBUTE_UNUSED)
--{
--    virReportSystemError(ENOSYS, "%s",
--                         _("Control groups not supported on this platform"));
--    return -1;
--}
--
--
- int
- virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED,
-                        int signum ATTRIBUTE_UNUSED)
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index af93316197..a23a491d95 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -280,7 +280,6 @@ int virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus);
- int virCgroupRemoveRecursively(char *grppath);
- int virCgroupRemove(virCgroupPtr group);
- 
--int virCgroupKill(virCgroupPtr group, int signum);
- int virCgroupKillRecursive(virCgroupPtr group, int signum);
- int virCgroupKillPainfully(virCgroupPtr group);
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Remove-virCgroupAddTaskController.patch b/SOURCES/libvirt-vircgroup-Remove-virCgroupAddTaskController.patch
deleted file mode 100644
index ed026fa..0000000
--- a/SOURCES/libvirt-vircgroup-Remove-virCgroupAddTaskController.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 88322908f3dfad6217b1c2a2a0f8968b079d0795 Mon Sep 17 00:00:00 2001
-Message-Id: <88322908f3dfad6217b1c2a2a0f8968b079d0795@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:00 +0200
-Subject: [PATCH] vircgroup: Remove virCgroupAddTaskController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There is no need for this function, both of the checks are done
-later by virCgroupGetControllerPath.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit db868852fdb32c76955c925dcbd92b2d6d9bfeb2)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b6c7c27ed52a39343d7d0f14feab71726ff0c279.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 31 +------------------------------
- 1 file changed, 1 insertion(+), 30 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 5adf9d3c11..a94f958d75 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1128,35 +1128,6 @@ virCgroupNew(pid_t pid,
- }
- 
- 
--/**
-- * virCgroupAddTaskController:
-- *
-- * @group: The cgroup to add a task to
-- * @pid: The pid of the task to add
-- * @controller: The cgroup controller to be operated on
-- *
-- * Returns: 0 on success or -1 on error
-- */
--static int
--virCgroupAddTaskController(virCgroupPtr group, pid_t pid, int controller)
--{
--    if (controller < 0 || controller >= VIR_CGROUP_CONTROLLER_LAST) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Controller %d out of range"), controller);
--        return -1;
--    }
--
--    if (!group->controllers[controller].mountPoint) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Controller '%s' not mounted"),
--                       virCgroupControllerTypeToString(controller));
--        return -1;
--    }
--
--    return virCgroupSetValueI64(group, controller, "tasks", pid);
--}
--
--
- static int
- virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
- {
-@@ -1174,7 +1145,7 @@ virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
-         if (i == VIR_CGROUP_CONTROLLER_SYSTEMD && !withSystemd)
-             continue;
- 
--        if (virCgroupAddTaskController(group, pid, i) < 0)
-+        if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)
-             goto cleanup;
-     }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Rename-structs-to-start-with-underscore.patch b/SOURCES/libvirt-vircgroup-Rename-structs-to-start-with-underscore.patch
deleted file mode 100644
index 870aba6..0000000
--- a/SOURCES/libvirt-vircgroup-Rename-structs-to-start-with-underscore.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From b47ae363dedecaf569906aa3a1349f6e32f4b520 Mon Sep 17 00:00:00 2001
-Message-Id: <b47ae363dedecaf569906aa3a1349f6e32f4b520@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:48 +0200
-Subject: [PATCH] vircgroup: Rename structs to start with underscore
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 70dc671a276ba90099bd1c8ba05e450f092244ff)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <49ff9517362f541da5580fe9acc132319872e732.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c     | 2 +-
- src/util/vircgroup.h     | 4 ++--
- src/util/vircgrouppriv.h | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 6bf4e88da1..7602641713 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -385,7 +385,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-             const char *typestr = virCgroupControllerTypeToString(i);
-             int typelen = strlen(typestr);
-             char *tmp = entry.mnt_opts;
--            struct virCgroupController *controller = &group->controllers[i];
-+            struct _virCgroupController *controller = &group->controllers[i];
-             while (tmp) {
-                 char *next = strchr(tmp, ',');
-                 int len;
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index d833927678..cfa69b67cb 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -28,8 +28,8 @@
- # include "virutil.h"
- # include "virbitmap.h"
- 
--struct virCgroup;
--typedef struct virCgroup *virCgroupPtr;
-+struct _virCgroup;
-+typedef struct _virCgroup *virCgroupPtr;
- 
- enum {
-     VIR_CGROUP_CONTROLLER_CPU,
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 722863e5b6..71788639d6 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -31,7 +31,7 @@
- 
- # include "vircgroup.h"
- 
--struct virCgroupController {
-+struct _virCgroupController {
-     int type;
-     char *mountPoint;
-     /* If mountPoint holds several controllers co-mounted,
-@@ -42,10 +42,10 @@ struct virCgroupController {
-     char *placement;
- };
- 
--struct virCgroup {
-+struct _virCgroup {
-     char *path;
- 
--    struct virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
-+    struct _virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
- int virCgroupDetectMountsFromFile(virCgroupPtr group,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Simplify-if-conditions-in-virCgroupMakeGroup.patch b/SOURCES/libvirt-vircgroup-Simplify-if-conditions-in-virCgroupMakeGroup.patch
deleted file mode 100644
index 27c69fb..0000000
--- a/SOURCES/libvirt-vircgroup-Simplify-if-conditions-in-virCgroupMakeGroup.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From af1714ac39a383b8a8fb0bc577fbe5e85fd8be10 Mon Sep 17 00:00:00 2001
-Message-Id: <af1714ac39a383b8a8fb0bc577fbe5e85fd8be10@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:09 +0200
-Subject: [PATCH] vircgroup: Simplify if conditions in virCgroupMakeGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0ec8416f04460f3bbf7907231b28028c3daed7e7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b6f7814df6e28a2b68e07c0eb490bda3f340ab7c.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 20 ++++++++------------
- 1 file changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index dde9ed21a2..02de33f74f 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1079,24 +1079,20 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                     goto error;
-                 }
-             }
--            if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL &&
--                (i == VIR_CGROUP_CONTROLLER_CPUSET ||
--                 STREQ(group->controllers[i].mountPoint,
--                       group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) {
--                if (virCgroupCpuSetInherit(parent, group) < 0)
--                    goto error;
-+            if (i == VIR_CGROUP_CONTROLLER_CPUSET &&
-+                group->controllers[i].mountPoint != NULL &&
-+                virCgroupCpuSetInherit(parent, group) < 0) {
-+                goto error;
-             }
-             /*
-              * Note that virCgroupSetMemoryUseHierarchy should always be
-              * called prior to creating subcgroups and attaching tasks.
-              */
-             if ((flags & VIR_CGROUP_MEM_HIERACHY) &&
--                (group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint != NULL) &&
--                (i == VIR_CGROUP_CONTROLLER_MEMORY ||
--                 STREQ(group->controllers[i].mountPoint,
--                       group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) {
--                if (virCgroupSetMemoryUseHierarchy(group) < 0)
--                    goto error;
-+                i == VIR_CGROUP_CONTROLLER_MEMORY &&
-+                group->controllers[i].mountPoint != NULL &&
-+                virCgroupSetMemoryUseHierarchy(group) < 0) {
-+                goto error;
-             }
-         }
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Split-virCgroupPathOfController-into-two-functions.patch b/SOURCES/libvirt-vircgroup-Split-virCgroupPathOfController-into-two-functions.patch
deleted file mode 100644
index 6ec3520..0000000
--- a/SOURCES/libvirt-vircgroup-Split-virCgroupPathOfController-into-two-functions.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 51e0205bf57346f381143b498cfe0a77852a8da1 Mon Sep 17 00:00:00 2001
-Message-Id: <51e0205bf57346f381143b498cfe0a77852a8da1@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:07 +0200
-Subject: [PATCH] vircgroup: Split virCgroupPathOfController into two functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The case where we need path of any controller is only for internal use
-so move it out to a different function.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 998658bd1ebdc5fd9ec43131c381cece1a3893cf)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <7578336183563ecf49d686f6705724db25037191.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 54 ++++++++++++++++++++++++++------------------
- src/util/vircgroup.h |  2 +-
- 2 files changed, 33 insertions(+), 23 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 2bc4febf23..8646a4a479 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1772,28 +1772,13 @@ virCgroupHasController(virCgroupPtr cgroup, int controller)
- 
- int
- virCgroupPathOfController(virCgroupPtr group,
--                          int controller,
-+                          unsigned int controller,
-                           const char *key,
-                           char **path)
- {
--    if (controller == -1) {
--        size_t i;
--        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--            /* Reject any controller with a placement
--             * of '/' to avoid doing bad stuff to the root
--             * cgroup
--             */
--            if (group->controllers[i].mountPoint &&
--                group->controllers[i].placement &&
--                STRNEQ(group->controllers[i].placement, "/")) {
--                controller = i;
--                break;
--            }
--        }
--    }
--    if (controller == -1) {
--        virReportSystemError(ENOSYS, "%s",
--                             _("No controllers are mounted"));
-+    if (controller >= VIR_CGROUP_CONTROLLER_LAST) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Invalid controller id '%d'"), controller);
-         return -1;
-     }
- 
-@@ -3505,6 +3490,31 @@ virCgroupRemove(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupPathOfAnyController(virCgroupPtr group,
-+                             const char *name,
-+                             char **keypath)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        /* Reject any controller with a placement
-+         * of '/' to avoid doing bad stuff to the root
-+         * cgroup
-+         */
-+        if (group->controllers[i].mountPoint &&
-+            group->controllers[i].placement &&
-+            STRNEQ(group->controllers[i].placement, "/")) {
-+            return virCgroupPathOfController(group, i, name, keypath);
-+        }
-+    }
-+
-+    virReportSystemError(ENOSYS, "%s",
-+                         _("No controllers are mounted"));
-+    return -1;
-+}
-+
-+
- /*
-  * Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error
-  */
-@@ -3519,7 +3529,7 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
-     VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
-               group, group->path, signum, pids);
- 
--    if (virCgroupPathOfController(group, -1, "tasks", &keypath) < 0)
-+    if (virCgroupPathOfAnyController(group, "tasks", &keypath) < 0)
-         return -1;
- 
-     /* PIDs may be forking as we kill them, so loop
-@@ -3622,7 +3632,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
-     VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
-               group, group->path, signum, pids);
- 
--    if (virCgroupPathOfController(group, -1, "", &keypath) < 0)
-+    if (virCgroupPathOfAnyController(group, "", &keypath) < 0)
-         return -1;
- 
-     if ((rc = virCgroupKillInternal(group, signum, pids)) < 0)
-@@ -4180,7 +4190,7 @@ virCgroupHasController(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
- 
- int
- virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED,
--                          int controller ATTRIBUTE_UNUSED,
-+                          unsigned int controller ATTRIBUTE_UNUSED,
-                           const char *key ATTRIBUTE_UNUSED,
-                           char **path ATTRIBUTE_UNUSED)
- {
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index c7fdaaede4..ee3b7c7222 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -114,7 +114,7 @@ void virCgroupFree(virCgroupPtr *group);
- 
- bool virCgroupHasController(virCgroupPtr cgroup, int controller);
- int virCgroupPathOfController(virCgroupPtr group,
--                              int controller,
-+                              unsigned int controller,
-                               const char *key,
-                               char **path);
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupAddTaskController.patch b/SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupAddTaskController.patch
deleted file mode 100644
index 509f992..0000000
--- a/SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupAddTaskController.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 7dd9c146f4713fd15b6d6642b910af29846d96e2 Mon Sep 17 00:00:00 2001
-Message-Id: <7dd9c146f4713fd15b6d6642b910af29846d96e2@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:52 +0200
-Subject: [PATCH] vircgroup: Unexport unused function
- virCgroupAddTaskController()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0aaac42a6eb3fb8b5aa412d5153e0d6ae459c631)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <30f7f52a9e7d0b9ce838a2d32cc6ec0a0cf97788.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 -
- src/util/vircgroup.c     | 69 +++++++++++++++++-----------------------
- src/util/vircgroup.h     |  4 ---
- 3 files changed, 29 insertions(+), 45 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 3117c8009a..41fca88d09 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1515,7 +1515,6 @@ virBufferVasprintf;
- # util/vircgroup.h
- virCgroupAddMachineTask;
- virCgroupAddTask;
--virCgroupAddTaskController;
- virCgroupAllowAllDevices;
- virCgroupAllowDevice;
- virCgroupAllowDevicePath;
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 5f949edec8..8ef6fb5e1a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1136,6 +1136,35 @@ virCgroupNew(pid_t pid,
- }
- 
- 
-+/**
-+ * virCgroupAddTaskController:
-+ *
-+ * @group: The cgroup to add a task to
-+ * @pid: The pid of the task to add
-+ * @controller: The cgroup controller to be operated on
-+ *
-+ * Returns: 0 on success or -1 on error
-+ */
-+static int
-+virCgroupAddTaskController(virCgroupPtr group, pid_t pid, int controller)
-+{
-+    if (controller < 0 || controller >= VIR_CGROUP_CONTROLLER_LAST) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Controller %d out of range"), controller);
-+        return -1;
-+    }
-+
-+    if (!group->controllers[controller].mountPoint) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Controller '%s' not mounted"),
-+                       virCgroupControllerTypeToString(controller));
-+        return -1;
-+    }
-+
-+    return virCgroupSetValueI64(group, controller, "tasks", pid);
-+}
-+
-+
- static int
- virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
- {
-@@ -1197,35 +1226,6 @@ virCgroupAddMachineTask(virCgroupPtr group, pid_t pid)
- }
- 
- 
--/**
-- * virCgroupAddTaskController:
-- *
-- * @group: The cgroup to add a task to
-- * @pid: The pid of the task to add
-- * @controller: The cgroup controller to be operated on
-- *
-- * Returns: 0 on success or -1 on error
-- */
--int
--virCgroupAddTaskController(virCgroupPtr group, pid_t pid, int controller)
--{
--    if (controller < 0 || controller >= VIR_CGROUP_CONTROLLER_LAST) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Controller %d out of range"), controller);
--        return -1;
--    }
--
--    if (!group->controllers[controller].mountPoint) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Controller '%s' not mounted"),
--                       virCgroupControllerTypeToString(controller));
--        return -1;
--    }
--
--    return virCgroupSetValueI64(group, controller, "tasks", pid);
--}
--
--
- static int
- virCgroupSetPartitionSuffix(const char *path, char **res)
- {
-@@ -4115,17 +4115,6 @@ virCgroupAddMachineTask(virCgroupPtr group ATTRIBUTE_UNUSED,
- }
- 
- 
--int
--virCgroupAddTaskController(virCgroupPtr group ATTRIBUTE_UNUSED,
--                           pid_t pid ATTRIBUTE_UNUSED,
--                           int controller ATTRIBUTE_UNUSED)
--{
--    virReportSystemError(ENXIO, "%s",
--                         _("Control groups not supported on this platform"));
--    return -1;
--}
--
--
- int
- virCgroupGetBlkioIoServiced(virCgroupPtr group ATTRIBUTE_UNUSED,
-                             long long *bytes_read ATTRIBUTE_UNUSED,
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index a23a491d95..74c7dbcccc 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -134,10 +134,6 @@ int virCgroupPathOfController(virCgroupPtr group,
- int virCgroupAddTask(virCgroupPtr group, pid_t pid);
- int virCgroupAddMachineTask(virCgroupPtr group, pid_t pid);
- 
--int virCgroupAddTaskController(virCgroupPtr group,
--                               pid_t pid,
--                               int controller);
--
- int virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight);
- int virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight);
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupRemoveRecursively.patch b/SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupRemoveRecursively.patch
deleted file mode 100644
index efe0168..0000000
--- a/SOURCES/libvirt-vircgroup-Unexport-unused-function-virCgroupRemoveRecursively.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 6ee7a399fe93348c24c4535a2ada43ea67144a22 Mon Sep 17 00:00:00 2001
-Message-Id: <6ee7a399fe93348c24c4535a2ada43ea67144a22@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:53 +0200
-Subject: [PATCH] vircgroup: Unexport unused function
- virCgroupRemoveRecursively
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 32686849fcdc2faca8735869eaa8d5453283a84c)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <0e830b8383a92e496cd492d8b91b26172dd0e667.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 -
- src/util/vircgroup.c     | 11 +----------
- src/util/vircgroup.h     |  1 -
- 3 files changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 41fca88d09..47695eb507 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1569,7 +1569,6 @@ virCgroupNewSelf;
- virCgroupNewThread;
- virCgroupPathOfController;
- virCgroupRemove;
--virCgroupRemoveRecursively;
- virCgroupSetBlkioDeviceReadBps;
- virCgroupSetBlkioDeviceReadIops;
- virCgroupSetBlkioDeviceWeight;
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 8ef6fb5e1a..7d8bf3419a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3312,7 +3312,7 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
- }
- 
- 
--int
-+static int
- virCgroupRemoveRecursively(char *grppath)
- {
-     DIR *grpdir;
-@@ -4529,15 +4529,6 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,
- }
- 
- 
--int
--virCgroupRemoveRecursively(char *grppath ATTRIBUTE_UNUSED)
--{
--    virReportSystemError(ENXIO, "%s",
--                         _("Control groups not supported on this platform"));
--    return -1;
--}
--
--
- int
- virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED)
- {
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index 74c7dbcccc..138bb3c076 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -273,7 +273,6 @@ int virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate);
- int virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus);
- int virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus);
- 
--int virCgroupRemoveRecursively(char *grppath);
- int virCgroupRemove(virCgroupPtr group);
- 
- int virCgroupKillRecursive(virCgroupPtr group, int signum);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-Use-virCgroupMountOptsMatchController-in-virCgroupDetectPlacement.patch b/SOURCES/libvirt-vircgroup-Use-virCgroupMountOptsMatchController-in-virCgroupDetectPlacement.patch
deleted file mode 100644
index 4e1ce1e..0000000
--- a/SOURCES/libvirt-vircgroup-Use-virCgroupMountOptsMatchController-in-virCgroupDetectPlacement.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From dc8f41bf6bb689d86bc91d5aca7fb854a5ef847f Mon Sep 17 00:00:00 2001
-Message-Id: <dc8f41bf6bb689d86bc91d5aca7fb854a5ef847f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:57 +0200
-Subject: [PATCH] vircgroup: Use virCgroupMountOptsMatchController in
- virCgroupDetectPlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 801d95d2597572612c346508446320a33aebc50d)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <9c2bb230e14ced391b0731bc2964155960025aa5.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 43 ++++++++++++++-----------------------------
- 1 file changed, 14 insertions(+), 29 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index ec9994780a..7888dab716 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -598,42 +598,27 @@ virCgroupDetectPlacement(virCgroupPtr group,
- 
-         for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-             const char *typestr = virCgroupControllerTypeToString(i);
--            int typelen = strlen(typestr);
--            char *tmp = controllers;
--
--            while (tmp) {
--                char *next = strchr(tmp, ',');
--                int len;
--                if (next) {
--                    len = next - tmp;
--                    next++;
--                } else {
--                    len = strlen(tmp);
--                }
- 
-+            if (virCgroupMountOptsMatchController(controllers, typestr) &&
-+                group->controllers[i].mountPoint != NULL &&
-+                group->controllers[i].placement == NULL) {
-                 /*
-                  * selfpath == "/" + path="" -> "/"
-                  * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service"
-                  * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo"
-                  */
--                if (typelen == len && STREQLEN(typestr, tmp, len) &&
--                    group->controllers[i].mountPoint != NULL &&
--                    group->controllers[i].placement == NULL) {
--                    if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
--                        if (VIR_STRDUP(group->controllers[i].placement,
--                                       selfpath) < 0)
--                            goto cleanup;
--                    } else {
--                        if (virAsprintf(&group->controllers[i].placement,
--                                        "%s%s%s", selfpath,
--                                        (STREQ(selfpath, "/") ||
--                                         STREQ(path, "") ? "" : "/"),
--                                        path) < 0)
--                            goto cleanup;
--                    }
-+                if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
-+                    if (VIR_STRDUP(group->controllers[i].placement,
-+                                   selfpath) < 0)
-+                        goto cleanup;
-+                } else {
-+                    if (virAsprintf(&group->controllers[i].placement,
-+                                    "%s%s%s", selfpath,
-+                                    (STREQ(selfpath, "/") ||
-+                                     STREQ(path, "") ? "" : "/"),
-+                                    path) < 0)
-+                        goto cleanup;
-                 }
--
--                tmp = next;
-             }
-         }
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-add-support-for-hybrid-configuration.patch b/SOURCES/libvirt-vircgroup-add-support-for-hybrid-configuration.patch
deleted file mode 100644
index 413c5a0..0000000
--- a/SOURCES/libvirt-vircgroup-add-support-for-hybrid-configuration.patch
+++ /dev/null
@@ -1,985 +0,0 @@
-From 50c5a71ce4a4400d08deff481c8781f3fca755c8 Mon Sep 17 00:00:00 2001
-Message-Id: <50c5a71ce4a4400d08deff481c8781f3fca755c8@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:53 +0200
-Subject: [PATCH] vircgroup: add support for hybrid configuration
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This enables to use both cgroup v1 and v2 at the same time together
-with libvirt.  It is supported by kernel and there is valid use-case,
-not all controllers are implemented in cgroup v2 so there might be
-configurations where administrator would enable these missing
-controllers in cgroup v1.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b79d858518ed15b1a4271457fc9f39463dd99230)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c84d8624633d438daa6b4de651eb6bb9e0afa25c.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 351 ++++++++++++++++++++++++++----------
- src/util/vircgroupbackend.c |  20 ++
- src/util/vircgroupbackend.h |  16 +-
- src/util/vircgrouppriv.h    |   2 +-
- 4 files changed, 291 insertions(+), 98 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a859628241..069f1ae396 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -232,6 +232,7 @@ virCgroupDetectMounts(virCgroupPtr group)
-     struct mntent entry;
-     char buf[CGROUP_MAX_VAL];
-     int ret = -1;
-+    size_t i;
- 
-     mounts = fopen("/proc/mounts", "r");
-     if (mounts == NULL) {
-@@ -240,11 +241,14 @@ virCgroupDetectMounts(virCgroupPtr group)
-     }
- 
-     while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
--        if (group->backend->detectMounts(group,
--                                         entry.mnt_type,
--                                         entry.mnt_opts,
--                                         entry.mnt_dir) < 0) {
--            goto cleanup;
-+        for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+            if (group->backends[i] &&
-+                group->backends[i]->detectMounts(group,
-+                                                 entry.mnt_type,
-+                                                 entry.mnt_opts,
-+                                                 entry.mnt_dir) < 0) {
-+                goto cleanup;
-+            }
-         }
-     }
- 
-@@ -307,6 +311,7 @@ virCgroupDetectPlacement(virCgroupPtr group,
-     }
- 
-     while (fgets(line, sizeof(line), mapping) != NULL) {
-+        size_t i;
-         char *controllers = strchr(line, ':');
-         char *selfpath = controllers ? strchr(controllers + 1, ':') : NULL;
-         char *nl = selfpath ? strchr(selfpath, '\n') : NULL;
-@@ -321,9 +326,12 @@ virCgroupDetectPlacement(virCgroupPtr group,
-         controllers++;
-         selfpath++;
- 
--        if (group->backend->detectPlacement(group, path, controllers,
--                                            selfpath) < 0) {
--            goto cleanup;
-+        for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+            if (group->backends[i] &&
-+                group->backends[i]->detectPlacement(group, path, controllers,
-+                                                    selfpath) < 0) {
-+                goto cleanup;
-+            }
-         }
-     }
- 
-@@ -342,8 +350,9 @@ virCgroupDetect(virCgroupPtr group,
-                 const char *path,
-                 virCgroupPtr parent)
- {
--    int rc;
-     size_t i;
-+    bool backendAvailable = false;
-+    int controllersAvailable = 0;
-     virCgroupBackendPtr *backends = virCgroupBackendGetAll();
- 
-     VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
-@@ -354,31 +363,40 @@ virCgroupDetect(virCgroupPtr group,
- 
-     for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-         if (backends[i] && backends[i]->available()) {
--            group->backend = backends[i];
--            break;
-+            group->backends[i] = backends[i];
-+            backendAvailable = true;
-         }
-     }
- 
--    if (!group->backend) {
-+    if (!backendAvailable) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("no cgroup backend available"));
-         return -1;
-     }
- 
-     if (parent) {
--        if (group->backend->copyMounts(group, parent) < 0)
--            return -1;
-+        for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+            if (group->backends[i] &&
-+                group->backends[i]->copyMounts(group, parent) < 0) {
-+                return -1;
-+            }
-+        }
-     } else {
-         if (virCgroupDetectMounts(group) < 0)
-             return -1;
-     }
- 
--    rc = group->backend->detectControllers(group, controllers);
--    if (rc < 0)
--        return -1;
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i]) {
-+            int rc = group->backends[i]->detectControllers(group, controllers);
-+            if (rc < 0)
-+                return -1;
-+            controllersAvailable |= rc;
-+        }
-+    }
- 
-     /* Check that at least 1 controller is available */
--    if (rc == 0) {
-+    if (controllersAvailable == 0) {
-         virReportSystemError(ENXIO, "%s",
-                              _("At least one cgroup controller is required"));
-         return -1;
-@@ -387,17 +405,26 @@ virCgroupDetect(virCgroupPtr group,
-     /* In some cases we can copy part of the placement info
-      * based on the parent cgroup...
-      */
--    if ((parent || path[0] == '/') &&
--        group->backend->copyPlacement(group, path, parent) < 0)
--        return -1;
-+    if (parent || path[0] == '/') {
-+        for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+            if (group->backends[i] &&
-+                group->backends[i]->copyPlacement(group, path, parent) < 0) {
-+                return -1;
-+            }
-+        }
-+    }
- 
-     /* ... but use /proc/cgroups to fill in the rest */
-     if (virCgroupDetectPlacement(group, pid, path) < 0)
-         return -1;
- 
-     /* Check that for every mounted controller, we found our placement */
--    if (group->backend->validatePlacement(group, pid) < 0)
--        return -1;
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i] &&
-+            group->backends[i]->validatePlacement(group, pid) < 0) {
-+            return -1;
-+        }
-+    }
- 
-     return 0;
- }
-@@ -603,9 +630,14 @@ virCgroupMakeGroup(virCgroupPtr parent,
-                    bool create,
-                    unsigned int flags)
- {
--    if (group->backend->makeGroup(parent, group, create, flags) < 0) {
--        virCgroupRemove(group);
--        return -1;
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i] &&
-+            group->backends[i]->makeGroup(parent, group, create, flags) < 0) {
-+            virCgroupRemove(group);
-+            return -1;
-+        }
-     }
- 
-     return 0;
-@@ -666,6 +698,24 @@ virCgroupNew(pid_t pid,
- }
- 
- 
-+static int
-+virCgroupAddTaskInternal(virCgroupPtr group,
-+                         pid_t pid,
-+                         unsigned int flags)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i] &&
-+            group->backends[i]->addTask(group, pid, flags) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- /**
-  * virCgroupAddProcess:
-  *
-@@ -680,7 +730,7 @@ virCgroupNew(pid_t pid,
- int
- virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- {
--    return group->backend->addTask(group, pid, VIR_CGROUP_TASK_PROCESS);
-+    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_PROCESS);
- }
- 
- /**
-@@ -697,9 +747,9 @@ virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- int
- virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid)
- {
--    return group->backend->addTask(group, pid,
--                                   VIR_CGROUP_TASK_PROCESS |
--                                   VIR_CGROUP_TASK_SYSTEMD);
-+    return virCgroupAddTaskInternal(group, pid,
-+                                    VIR_CGROUP_TASK_PROCESS |
-+                                    VIR_CGROUP_TASK_SYSTEMD);
- }
- 
- /**
-@@ -717,7 +767,7 @@ int
- virCgroupAddThread(virCgroupPtr group,
-                    pid_t pid)
- {
--    return group->backend->addTask(group, pid, VIR_CGROUP_TASK_THREAD);
-+    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_THREAD);
- }
- 
- 
-@@ -971,17 +1021,24 @@ virCgroupNewDetectMachine(const char *name,
-                           char *machinename,
-                           virCgroupPtr *group)
- {
-+    size_t i;
-+
-     if (virCgroupNewDetect(pid, controllers, group) < 0) {
-         if (virCgroupNewIgnoreError())
-             return 0;
-         return -1;
-     }
- 
--    if (!(*group)->backend->validateMachineGroup(*group, name, drivername, machinename)) {
--        VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'",
--                  name, drivername);
--        virCgroupFree(group);
--        return 0;
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if ((*group)->backends[i] &&
-+            !(*group)->backends[i]->validateMachineGroup(*group, name,
-+                                                         drivername,
-+                                                         machinename)) {
-+            VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'",
-+                      name, drivername);
-+            virCgroupFree(group);
-+            return 0;
-+        }
-     }
- 
-     return 0;
-@@ -1059,6 +1116,7 @@ virCgroupNewMachineSystemd(const char *name,
-     int rv;
-     virCgroupPtr init;
-     VIR_AUTOFREE(char *) path = NULL;
-+    size_t i;
- 
-     VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
-     if ((rv = virSystemdCreateMachine(name,
-@@ -1081,7 +1139,12 @@ virCgroupNewMachineSystemd(const char *name,
-                            &init) < 0)
-         return -1;
- 
--    path = init->backend->stealPlacement(init);
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (init->backends[i] &&
-+            (path = init->backends[i]->stealPlacement(init))) {
-+            break;
-+        }
-+    }
-     virCgroupFree(&init);
- 
-     if (!path || STREQ(path, "/") || path[0] != '/') {
-@@ -1260,12 +1323,21 @@ virCgroupFree(virCgroupPtr *group)
- bool
- virCgroupHasController(virCgroupPtr cgroup, int controller)
- {
-+    size_t i;
-+
-     if (!cgroup)
-         return false;
-     if (controller < 0 || controller >= VIR_CGROUP_CONTROLLER_LAST)
-         return false;
- 
--    return cgroup->backend->hasController(cgroup, controller);
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (cgroup->backends[i] &&
-+            cgroup->backends[i]->hasController(cgroup, controller)) {
-+            return true;
-+        }
-+    }
-+
-+    return false;
- }
- 
- 
-@@ -1281,7 +1353,8 @@ virCgroupPathOfController(virCgroupPtr group,
-         return -1;
-     }
- 
--    return group->backend->pathOfController(group, controller, key, path);
-+    VIR_CGROUP_BACKEND_CALL(group, controller, pathOfController, -1,
-+                            controller, key, path);
- }
- 
- 
-@@ -1303,7 +1376,8 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                             long long *requests_read,
-                             long long *requests_write)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioIoServiced, -1,
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioIoServiced, -1,
-                             bytes_read, bytes_write,
-                             requests_read, requests_write);
- }
-@@ -1329,7 +1403,8 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
-                                   long long *requests_read,
-                                   long long *requests_write)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioIoDeviceServiced, -1,
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioIoDeviceServiced, -1,
-                             path, bytes_read, bytes_write,
-                             requests_read, requests_write);
- }
-@@ -1346,7 +1421,8 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
- int
- virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setBlkioWeight, -1, weight);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            setBlkioWeight, -1, weight);
- }
- 
- 
-@@ -1361,7 +1437,8 @@ virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight)
- int
- virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioWeight, -1, weight);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioWeight, -1, weight);
- }
- 
- /**
-@@ -1377,7 +1454,8 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned int riops)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceReadIops, -1, path, riops);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            setBlkioDeviceReadIops, -1, path, riops);
- }
- 
- 
-@@ -1394,7 +1472,8 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
-                                  const char *path,
-                                  unsigned int wiops)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteIops, -1, path, wiops);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            setBlkioDeviceWriteIops, -1, path, wiops);
- }
- 
- 
-@@ -1411,7 +1490,8 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
-                                const char *path,
-                                unsigned long long rbps)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceReadBps, -1, path, rbps);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            setBlkioDeviceReadBps, -1, path, rbps);
- }
- 
- /**
-@@ -1427,7 +1507,8 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned long long wbps)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteBps, -1, path, wbps);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            setBlkioDeviceWriteBps, -1, path, wbps);
- }
- 
- 
-@@ -1445,7 +1526,8 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
-                               const char *path,
-                               unsigned int weight)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWeight, -1, path, weight);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            setBlkioDeviceWeight, -1, path, weight);
- }
- 
- /**
-@@ -1461,7 +1543,8 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned int *riops)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceReadIops, -1, path, riops);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioDeviceReadIops, -1, path, riops);
- }
- 
- /**
-@@ -1477,7 +1560,8 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
-                                  const char *path,
-                                  unsigned int *wiops)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteIops, -1, path, wiops);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioDeviceWriteIops, -1, path, wiops);
- }
- 
- /**
-@@ -1493,7 +1577,8 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
-                                const char *path,
-                                unsigned long long *rbps)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceReadBps, -1, path, rbps);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioDeviceReadBps, -1, path, rbps);
- }
- 
- /**
-@@ -1509,7 +1594,8 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned long long *wbps)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteBps, -1, path, wbps);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioDeviceWriteBps, -1, path, wbps);
- }
- 
- /**
-@@ -1525,7 +1611,8 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
-                               const char *path,
-                               unsigned int *weight)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWeight, -1, path, weight);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                            getBlkioDeviceWeight, -1, path, weight);
- }
- 
- 
-@@ -1540,7 +1627,8 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
- int
- virCgroupSetMemory(virCgroupPtr group, unsigned long long kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setMemory, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            setMemory, -1, kb);
- }
- 
- 
-@@ -1566,7 +1654,8 @@ virCgroupGetMemoryStat(virCgroupPtr group,
-                        unsigned long long *inactiveFile,
-                        unsigned long long *unevictable)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getMemoryStat, -1, cache,
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            getMemoryStat, -1, cache,
-                             activeAnon, inactiveAnon,
-                             activeFile, inactiveFile,
-                             unevictable);
-@@ -1584,7 +1673,8 @@ virCgroupGetMemoryStat(virCgroupPtr group,
- int
- virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getMemoryUsage, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            getMemoryUsage, -1, kb);
- }
- 
- 
-@@ -1599,7 +1689,8 @@ virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb)
- int
- virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setMemoryHardLimit, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            setMemoryHardLimit, -1, kb);
- }
- 
- 
-@@ -1614,7 +1705,8 @@ virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb)
- int
- virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getMemoryHardLimit, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            getMemoryHardLimit, -1, kb);
- }
- 
- 
-@@ -1629,7 +1721,8 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupSetMemorySoftLimit(virCgroupPtr group, unsigned long long kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setMemorySoftLimit, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            setMemorySoftLimit, -1, kb);
- }
- 
- 
-@@ -1644,7 +1737,8 @@ virCgroupSetMemorySoftLimit(virCgroupPtr group, unsigned long long kb)
- int
- virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getMemorySoftLimit, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            getMemorySoftLimit, -1, kb);
- }
- 
- 
-@@ -1659,7 +1753,8 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupSetMemSwapHardLimit(virCgroupPtr group, unsigned long long kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setMemSwapHardLimit, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            setMemSwapHardLimit, -1, kb);
- }
- 
- 
-@@ -1674,7 +1769,8 @@ virCgroupSetMemSwapHardLimit(virCgroupPtr group, unsigned long long kb)
- int
- virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getMemSwapHardLimit, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            getMemSwapHardLimit, -1, kb);
- }
- 
- 
-@@ -1689,7 +1785,8 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupGetMemSwapUsage(virCgroupPtr group, unsigned long long *kb)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getMemSwapUsage, -1, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_MEMORY,
-+                            getMemSwapUsage, -1, kb);
- }
- 
- 
-@@ -1704,7 +1801,8 @@ virCgroupGetMemSwapUsage(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupSetCpusetMems(virCgroupPtr group, const char *mems)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setCpusetMems, -1, mems);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET,
-+                            setCpusetMems, -1, mems);
- }
- 
- 
-@@ -1719,7 +1817,8 @@ virCgroupSetCpusetMems(virCgroupPtr group, const char *mems)
- int
- virCgroupGetCpusetMems(virCgroupPtr group, char **mems)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpusetMems, -1, mems);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET,
-+                            getCpusetMems, -1, mems);
- }
- 
- 
-@@ -1734,7 +1833,8 @@ virCgroupGetCpusetMems(virCgroupPtr group, char **mems)
- int
- virCgroupSetCpusetMemoryMigrate(virCgroupPtr group, bool migrate)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setCpusetMemoryMigrate, -1, migrate);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET,
-+                            setCpusetMemoryMigrate, -1, migrate);
- }
- 
- 
-@@ -1749,7 +1849,8 @@ virCgroupSetCpusetMemoryMigrate(virCgroupPtr group, bool migrate)
- int
- virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpusetMemoryMigrate, -1, migrate);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET,
-+                            getCpusetMemoryMigrate, -1, migrate);
- }
- 
- 
-@@ -1764,7 +1865,8 @@ virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate)
- int
- virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setCpusetCpus, -1, cpus);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET,
-+                            setCpusetCpus, -1, cpus);
- }
- 
- 
-@@ -1779,7 +1881,8 @@ virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus)
- int
- virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpusetCpus, -1, cpus);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUSET,
-+                            getCpusetCpus, -1, cpus);
- }
- 
- 
-@@ -1793,7 +1896,8 @@ virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus)
- int
- virCgroupDenyAllDevices(virCgroupPtr group)
- {
--    VIR_CGROUP_BACKEND_CALL(group, denyAllDevices, -1);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES,
-+                            denyAllDevices, -1);
- }
- 
- /**
-@@ -1813,7 +1917,8 @@ virCgroupDenyAllDevices(virCgroupPtr group)
- int
- virCgroupAllowAllDevices(virCgroupPtr group, int perms)
- {
--    VIR_CGROUP_BACKEND_CALL(group, allowAllDevices, -1, perms);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES,
-+                            allowAllDevices, -1, perms);
- }
- 
- 
-@@ -1832,7 +1937,8 @@ int
- virCgroupAllowDevice(virCgroupPtr group, char type, int major, int minor,
-                      int perms)
- {
--    VIR_CGROUP_BACKEND_CALL(group, allowDevice, -1, type, major, minor, perms);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES,
-+                            allowDevice, -1, type, major, minor, perms);
- }
- 
- 
-@@ -1871,7 +1977,8 @@ virCgroupAllowDevicePath(virCgroupPtr group,
-     if (!S_ISCHR(sb.st_mode) && !S_ISBLK(sb.st_mode))
-         return 1;
- 
--    VIR_CGROUP_BACKEND_CALL(group, allowDevice, -1,
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES,
-+                            allowDevice, -1,
-                             S_ISCHR(sb.st_mode) ? 'c' : 'b',
-                             major(sb.st_rdev),
-                             minor(sb.st_rdev),
-@@ -1894,7 +2001,8 @@ int
- virCgroupDenyDevice(virCgroupPtr group, char type, int major, int minor,
-                     int perms)
- {
--    VIR_CGROUP_BACKEND_CALL(group, denyDevice, -1, type, major, minor, perms);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES,
-+                            denyDevice, -1, type, major, minor, perms);
- }
- 
- 
-@@ -1933,7 +2041,8 @@ virCgroupDenyDevicePath(virCgroupPtr group,
-     if (!S_ISCHR(sb.st_mode) && !S_ISBLK(sb.st_mode))
-         return 1;
- 
--    VIR_CGROUP_BACKEND_CALL(group, denyDevice, -1,
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_DEVICES,
-+                            denyDevice, -1,
-                             S_ISCHR(sb.st_mode) ? 'c' : 'b',
-                             major(sb.st_rdev),
-                             minor(sb.st_rdev),
-@@ -2176,14 +2285,16 @@ virCgroupGetDomainTotalCpuStats(virCgroupPtr group,
- int
- virCgroupSetCpuShares(virCgroupPtr group, unsigned long long shares)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setCpuShares, -1, shares);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU,
-+                            setCpuShares, -1, shares);
- }
- 
- 
- int
- virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpuShares, -1, shares);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU,
-+                            getCpuShares, -1, shares);
- }
- 
- 
-@@ -2198,7 +2309,8 @@ virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares)
- int
- virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setCpuCfsPeriod, -1, cfs_period);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU,
-+                            setCpuCfsPeriod, -1, cfs_period);
- }
- 
- 
-@@ -2213,7 +2325,8 @@ virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period)
- int
- virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpuCfsPeriod, -1, cfs_period);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU,
-+                            getCpuCfsPeriod, -1, cfs_period);
- }
- 
- 
-@@ -2229,14 +2342,16 @@ virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period)
- int
- virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setCpuCfsQuota, -1, cfs_quota);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU,
-+                            setCpuCfsQuota, -1, cfs_quota);
- }
- 
- 
- int
- virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpuacctPercpuUsage, -1, usage);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                            getCpuacctPercpuUsage, -1, usage);
- }
- 
- 
-@@ -2303,7 +2418,16 @@ virCgroupRemoveRecursively(char *grppath)
- int
- virCgroupRemove(virCgroupPtr group)
- {
--    return group->backend->remove(group);
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i] &&
-+            group->backends[i]->remove(group) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
- }
- 
- 
-@@ -2312,11 +2436,16 @@ virCgroupPathOfAnyController(virCgroupPtr group,
-                              const char *name,
-                              char **keypath)
- {
-+    size_t i;
-     int controller;
- 
--    controller = group->backend->getAnyController(group);
--    if (controller >= 0)
--        return virCgroupPathOfController(group, controller, name, keypath);
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i]) {
-+            controller = group->backends[i]->getAnyController(group);
-+            if (controller >= 0)
-+                return virCgroupPathOfController(group, controller, name, keypath);
-+        }
-+    }
- 
-     virReportSystemError(ENOSYS, "%s",
-                          _("No controllers are mounted"));
-@@ -2552,14 +2681,16 @@ virCgroupKillPainfully(virCgroupPtr group)
- int
- virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpuCfsQuota, -1, cfs_quota);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPU,
-+                            getCpuCfsQuota, -1, cfs_quota);
- }
- 
- 
- int
- virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpuacctUsage, -1, usage);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                            getCpuacctUsage, -1, usage);
- }
- 
- 
-@@ -2567,21 +2698,24 @@ int
- virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
-                         unsigned long long *sys)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getCpuacctStat, -1, user, sys);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                            getCpuacctStat, -1, user, sys);
- }
- 
- 
- int
- virCgroupSetFreezerState(virCgroupPtr group, const char *state)
- {
--    VIR_CGROUP_BACKEND_CALL(group, setFreezerState, -1, state);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_FREEZER,
-+                            setFreezerState, -1, state);
- }
- 
- 
- int
- virCgroupGetFreezerState(virCgroupPtr group, char **state)
- {
--    VIR_CGROUP_BACKEND_CALL(group, getFreezerState, -1, state);
-+    VIR_CGROUP_BACKEND_CALL(group, VIR_CGROUP_CONTROLLER_FREEZER,
-+                            getFreezerState, -1, state);
- }
- 
- 
-@@ -2589,7 +2723,16 @@ int
- virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                    const char *mountopts)
- {
--    return group->backend->bindMount(group, oldroot, mountopts);
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i] &&
-+            group->backends[i]->bindMount(group, oldroot, mountopts) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
- }
- 
- 
-@@ -2598,7 +2741,16 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
-                       gid_t gid,
-                       int controllers)
- {
--    return cgroup->backend->setOwner(cgroup, uid, gid, controllers);
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (cgroup->backends[i] &&
-+            cgroup->backends[i]->setOwner(cgroup, uid, gid, controllers) < 0) {
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
- }
- 
- 
-@@ -2612,13 +2764,24 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
- bool
- virCgroupSupportsCpuBW(virCgroupPtr cgroup)
- {
--    VIR_CGROUP_BACKEND_CALL(cgroup, supportsCpuBW, false);
-+    VIR_CGROUP_BACKEND_CALL(cgroup, VIR_CGROUP_CONTROLLER_CPU,
-+                            supportsCpuBW, false);
- }
- 
- int
- virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller)
- {
--    return cgroup->backend->hasEmptyTasks(cgroup, controller);
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (cgroup->backends[i]) {
-+            int rc = cgroup->backends[i]->hasEmptyTasks(cgroup, controller);
-+            if (rc <= 0)
-+                return rc;
-+        }
-+    }
-+
-+    return 1;
- }
- 
- bool
-diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
-index 7ee39ac8ca..2e90781dc3 100644
---- a/src/util/vircgroupbackend.c
-+++ b/src/util/vircgroupbackend.c
-@@ -20,6 +20,9 @@
- #include <config.h>
- 
- #include "vircgroupbackend.h"
-+#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
-+#include "vircgrouppriv.h"
-+#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
- #include "vircgroupv1.h"
- #include "vircgroupv2.h"
- #include "virerror.h"
-@@ -67,3 +70,20 @@ virCgroupBackendGetAll(void)
-     }
-     return virCgroupBackends;
- }
-+
-+
-+virCgroupBackendPtr
-+virCgroupBackendForController(virCgroupPtr group,
-+                              unsigned int controller)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (group->backends[i] &&
-+            group->backends[i]->hasController(group, controller)) {
-+            return group->backends[i];
-+        }
-+    }
-+
-+    return NULL;
-+}
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 86d1539e07..bc60b44643 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -436,12 +436,22 @@ virCgroupBackendRegister(virCgroupBackendPtr backend);
- virCgroupBackendPtr *
- virCgroupBackendGetAll(void);
- 
--# define VIR_CGROUP_BACKEND_CALL(group, func, ret, ...) \
--    if (!group->backend->func) { \
-+virCgroupBackendPtr
-+virCgroupBackendForController(virCgroupPtr group,
-+                              unsigned int controller);
-+
-+# define VIR_CGROUP_BACKEND_CALL(group, controller, func, ret, ...) \
-+    virCgroupBackendPtr backend = virCgroupBackendForController(group, controller); \
-+    if (!backend) { \
-+        virReportError(VIR_ERR_INTERNAL_ERROR, \
-+                       _("failed to get cgroup backend for '%s'"), #func); \
-+        return ret; \
-+    } \
-+    if (!backend->func) { \
-         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \
-                        _("operation '%s' not supported"), #func); \
-         return ret; \
-     } \
--    return group->backend->func(group, ##__VA_ARGS__);
-+    return backend->func(group, ##__VA_ARGS__);
- 
- #endif /* __VIR_CGROUP_BACKEND_H__ */
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 4a0d75ddbc..8f24b0891e 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -56,7 +56,7 @@ typedef virCgroupV2Controller *virCgroupV2ControllerPtr;
- struct _virCgroup {
-     char *path;
- 
--    virCgroupBackendPtr backend;
-+    virCgroupBackendPtr backends[VIR_CGROUP_BACKEND_TYPE_LAST];
- 
-     virCgroupV1Controller legacy[VIR_CGROUP_CONTROLLER_LAST];
-     virCgroupV2Controller unified;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch b/SOURCES/libvirt-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
deleted file mode 100644
index ac36ae5..0000000
--- a/SOURCES/libvirt-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b77a6e6821bc45e4761fc7b23665f585761570ca Mon Sep 17 00:00:00 2001
-Message-Id: <b77a6e6821bc45e4761fc7b23665f585761570ca@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:12 +0200
-Subject: [PATCH] vircgroup: cleanup controllers not managed by systemd on
- error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If virCgroupEnableMissingControllers() fails it could have already
-created some directories, we should clean it up as well.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 1602aa28f820ada66f707cef3e536e8572fbda1e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e056c233653eaf09f55643fc075e17506bb754e2.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 64507bf8aa..6aa30a82be 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1555,6 +1555,7 @@ virCgroupNewMachineSystemd(const char *name,
-     int rv;
-     virCgroupPtr init;
-     VIR_AUTOFREE(char *) path = NULL;
-+    virErrorPtr saved = NULL;
- 
-     VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
-     if ((rv = virSystemdCreateMachine(name,
-@@ -1588,20 +1589,24 @@ virCgroupNewMachineSystemd(const char *name,
- 
-     if (virCgroupEnableMissingControllers(path, pidleader,
-                                           controllers, group) < 0) {
--        return -1;
-+        goto error;
-     }
- 
--    if (virCgroupAddTask(*group, pidleader) < 0) {
--        virErrorPtr saved = virSaveLastError();
--        virCgroupRemove(*group);
--        virCgroupFree(group);
--        if (saved) {
--            virSetError(saved);
--            virFreeError(saved);
--        }
--    }
-+    if (virCgroupAddTask(*group, pidleader) < 0)
-+        goto error;
- 
-     return 0;
-+
-+ error:
-+    saved = virSaveLastError();
-+    virCgroupRemove(*group);
-+    virCgroupFree(group);
-+    if (saved) {
-+        virSetError(saved);
-+        virFreeError(saved);
-+    }
-+
-+    return -1;
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-detect-available-backend-for-cgroup.patch b/SOURCES/libvirt-vircgroup-detect-available-backend-for-cgroup.patch
deleted file mode 100644
index 790edb2..0000000
--- a/SOURCES/libvirt-vircgroup-detect-available-backend-for-cgroup.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 81bf1dade08ee40a9ecc32f5d384fdf35e3edbf3 Mon Sep 17 00:00:00 2001
-Message-Id: <81bf1dade08ee40a9ecc32f5d384fdf35e3edbf3@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:24 +0200
-Subject: [PATCH] vircgroup: detect available backend for cgroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We need to update one test-case because now new cgroup object will be
-created only if there is any cgroup backend available.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit f60af21594801088fff217aebf33b58825bd8a80)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2815d54d5cffdef81bf9a41136b2d6a7e1d75b55.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c     | 18 ++++++++++++++++++
- src/util/vircgrouppriv.h |  3 +++
- tests/vircgrouptest.c    | 38 +++-----------------------------------
- 3 files changed, 24 insertions(+), 35 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 47a3b9ed58..15d0cb65ac 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -711,10 +711,28 @@ virCgroupDetect(virCgroupPtr group,
-                 virCgroupPtr parent)
- {
-     int rc;
-+    size_t i;
-+    virCgroupBackendPtr *backends = virCgroupBackendGetAll();
- 
-     VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
-               group, controllers, path, parent);
- 
-+    if (!backends)
-+        return -1;
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (backends[i] && backends[i]->available()) {
-+            group->backend = backends[i];
-+            break;
-+        }
-+    }
-+
-+    if (!group->backend) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("no cgroup backend available"));
-+        return -1;
-+    }
-+
-     if (parent) {
-         if (virCgroupCopyMounts(group, parent) < 0)
-             return -1;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 046c96c52c..2caa966fee 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -30,6 +30,7 @@
- # define __VIR_CGROUP_PRIV_H__
- 
- # include "vircgroup.h"
-+# include "vircgroupbackend.h"
- 
- struct _virCgroupController {
-     int type;
-@@ -47,6 +48,8 @@ typedef virCgroupController *virCgroupControllerPtr;
- struct _virCgroup {
-     char *path;
- 
-+    virCgroupBackendPtr backend;
-+
-     virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 5031a2973d..588a6e824d 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -114,16 +114,6 @@ const char *mountsAllInOne[VIR_CGROUP_CONTROLLER_LAST] = {
-     [VIR_CGROUP_CONTROLLER_BLKIO] = "/not/really/sys/fs/cgroup",
-     [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL,
- };
--const char *mountsLogind[VIR_CGROUP_CONTROLLER_LAST] = {
--    [VIR_CGROUP_CONTROLLER_CPU] = NULL,
--    [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL,
--    [VIR_CGROUP_CONTROLLER_CPUSET] = NULL,
--    [VIR_CGROUP_CONTROLLER_MEMORY] = NULL,
--    [VIR_CGROUP_CONTROLLER_DEVICES] = NULL,
--    [VIR_CGROUP_CONTROLLER_FREEZER] = NULL,
--    [VIR_CGROUP_CONTROLLER_BLKIO] = NULL,
--    [VIR_CGROUP_CONTROLLER_SYSTEMD] = "/not/really/sys/fs/cgroup/systemd",
--};
- 
- const char *links[VIR_CGROUP_CONTROLLER_LAST] = {
-     [VIR_CGROUP_CONTROLLER_CPU] = "/not/really/sys/fs/cgroup/cpu",
-@@ -147,17 +137,6 @@ const char *linksAllInOne[VIR_CGROUP_CONTROLLER_LAST] = {
-     [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL,
- };
- 
--const char *linksLogind[VIR_CGROUP_CONTROLLER_LAST] = {
--    [VIR_CGROUP_CONTROLLER_CPU] = NULL,
--    [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL,
--    [VIR_CGROUP_CONTROLLER_CPUSET] = NULL,
--    [VIR_CGROUP_CONTROLLER_MEMORY] = NULL,
--    [VIR_CGROUP_CONTROLLER_DEVICES] = NULL,
--    [VIR_CGROUP_CONTROLLER_FREEZER] = NULL,
--    [VIR_CGROUP_CONTROLLER_BLKIO] = NULL,
--    [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL,
--};
--
- 
- struct _detectMountsData {
-     const char *file;
-@@ -555,24 +534,13 @@ static int testCgroupNewForSelfLogind(const void *args ATTRIBUTE_UNUSED)
- {
-     virCgroupPtr cgroup = NULL;
-     int ret = -1;
--    const char *placement[VIR_CGROUP_CONTROLLER_LAST] = {
--        [VIR_CGROUP_CONTROLLER_CPU] = NULL,
--        [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL,
--        [VIR_CGROUP_CONTROLLER_CPUSET] = NULL,
--        [VIR_CGROUP_CONTROLLER_MEMORY] = NULL,
--        [VIR_CGROUP_CONTROLLER_DEVICES] = NULL,
--        [VIR_CGROUP_CONTROLLER_FREEZER] = NULL,
--        [VIR_CGROUP_CONTROLLER_BLKIO] = NULL,
--        [VIR_CGROUP_CONTROLLER_SYSTEMD] = "/",
--    };
- 
--    if (virCgroupNewSelf(&cgroup) < 0) {
--        fprintf(stderr, "Cannot create cgroup for self\n");
-+    if (virCgroupNewSelf(&cgroup) == 0) {
-+        fprintf(stderr, "Expected cgroup creation to fail.\n");
-         goto cleanup;
-     }
- 
--    ret = validateCgroup(cgroup, "", mountsLogind, linksLogind, placement);
--
-+    ret = 0;
-  cleanup:
-     virCgroupFree(&cgroup);
-     return ret;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-v1-detect-functions.patch b/SOURCES/libvirt-vircgroup-extract-v1-detect-functions.patch
deleted file mode 100644
index 845153a..0000000
--- a/SOURCES/libvirt-vircgroup-extract-v1-detect-functions.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From e1184bde63a7ed92fb99fc4eba4b4abdf6a01815 Mon Sep 17 00:00:00 2001
-Message-Id: <e1184bde63a7ed92fb99fc4eba4b4abdf6a01815@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:27 +0200
-Subject: [PATCH] vircgroup: extract v1 detect functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 42a3fcc02bcaec4a0c037a5c59ca63f3fc90e90f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3a918fc4eda51c5e9aff5efc93fe14886470578e.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 138 ++-----------------------------
- src/util/vircgroupbackend.h |  14 ++++
- src/util/vircgroupv1.c      | 158 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 180 insertions(+), 130 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 9d644d37d1..10c99a66fd 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -235,82 +235,6 @@ virCgroupPartitionEscape(char **path)
- }
- 
- 
--static int
--virCgroupResolveMountLink(const char *mntDir,
--                          const char *typeStr,
--                          virCgroupControllerPtr controller)
--{
--    VIR_AUTOFREE(char *) linkSrc = NULL;
--    VIR_AUTOFREE(char *) tmp = NULL;
--    char *dirName;
--    struct stat sb;
--
--    if (VIR_STRDUP(tmp, mntDir) < 0)
--        return -1;
--
--    dirName = strrchr(tmp, '/');
--    if (!dirName) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Missing '/' separator in cgroup mount '%s'"), tmp);
--        return -1;
--    }
--
--    if (!strchr(dirName + 1, ','))
--        return 0;
--
--    *dirName = '\0';
--    if (virAsprintf(&linkSrc, "%s/%s", tmp, typeStr) < 0)
--        return -1;
--    *dirName = '/';
--
--    if (lstat(linkSrc, &sb) < 0) {
--        if (errno == ENOENT) {
--            VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s",
--                     typeStr, tmp, linkSrc);
--        } else {
--            virReportSystemError(errno, _("Cannot stat %s"), linkSrc);
--            return -1;
--        }
--    } else {
--        if (!S_ISLNK(sb.st_mode)) {
--            VIR_WARN("Expecting a symlink at %s for controller %s",
--                     linkSrc, typeStr);
--        } else {
--            VIR_STEAL_PTR(controller->linkPoint, linkSrc);
--        }
--    }
--
--    return 0;
--}
--
--
--static bool
--virCgroupMountOptsMatchController(const char *mntOpts,
--                                  const char *typeStr)
--{
--    const char *tmp = mntOpts;
--    int typeLen = strlen(typeStr);
--
--    while (tmp) {
--        const char *next = strchr(tmp, ',');
--        int len;
--        if (next) {
--            len = next - tmp;
--            next++;
--        } else {
--            len = strlen(tmp);
--        }
--
--        if (typeLen == len && STREQLEN(typeStr, tmp, len))
--            return true;
--
--        tmp = next;
--    }
--
--    return false;
--}
--
--
- /*
-  * Process /proc/mounts figuring out what controllers are
-  * mounted and where
-@@ -318,7 +242,6 @@ virCgroupMountOptsMatchController(const char *mntOpts,
- static int
- virCgroupDetectMounts(virCgroupPtr group)
- {
--    size_t i;
-     FILE *mounts = NULL;
-     struct mntent entry;
-     char buf[CGROUP_MAX_VAL];
-@@ -331,34 +254,11 @@ virCgroupDetectMounts(virCgroupPtr group)
-     }
- 
-     while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
--        if (STRNEQ(entry.mnt_type, "cgroup"))
--            continue;
--
--        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--            const char *typestr = virCgroupControllerTypeToString(i);
--
--            if (virCgroupMountOptsMatchController(entry.mnt_opts, typestr)) {
--                /* Note that the lines in /proc/mounts have the same
--                 * order than the mount operations, and that there may
--                 * be duplicates due to bind mounts. This means
--                 * that the same mount point may be processed more than
--                 * once. We need to save the results of the last one,
--                 * and we need to be careful to release the memory used
--                 * by previous processing. */
--                virCgroupControllerPtr controller = &group->controllers[i];
--
--                VIR_FREE(controller->mountPoint);
--                VIR_FREE(controller->linkPoint);
--                if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
--                    goto cleanup;
--
--                /* If it is a co-mount it has a filename like "cpu,cpuacct"
--                 * and we must identify the symlink path */
--                if (virCgroupResolveMountLink(entry.mnt_dir, typestr,
--                                              controller) < 0) {
--                    goto cleanup;
--                }
--            }
-+        if (group->backend->detectMounts(group,
-+                                         entry.mnt_type,
-+                                         entry.mnt_opts,
-+                                         entry.mnt_dir) < 0) {
-+            goto cleanup;
-         }
-     }
- 
-@@ -432,7 +332,6 @@ virCgroupDetectPlacement(virCgroupPtr group,
-                          pid_t pid,
-                          const char *path)
- {
--    size_t i;
-     FILE *mapping  = NULL;
-     char line[1024];
-     int ret = -1;
-@@ -472,30 +371,9 @@ virCgroupDetectPlacement(virCgroupPtr group,
-         controllers++;
-         selfpath++;
- 
--        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--            const char *typestr = virCgroupControllerTypeToString(i);
--
--            if (virCgroupMountOptsMatchController(controllers, typestr) &&
--                group->controllers[i].mountPoint != NULL &&
--                group->controllers[i].placement == NULL) {
--                /*
--                 * selfpath == "/" + path="" -> "/"
--                 * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service"
--                 * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo"
--                 */
--                if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
--                    if (VIR_STRDUP(group->controllers[i].placement,
--                                   selfpath) < 0)
--                        goto cleanup;
--                } else {
--                    if (virAsprintf(&group->controllers[i].placement,
--                                    "%s%s%s", selfpath,
--                                    (STREQ(selfpath, "/") ||
--                                     STREQ(path, "") ? "" : "/"),
--                                    path) < 0)
--                        goto cleanup;
--                }
--            }
-+        if (group->backend->detectPlacement(group, path, controllers,
-+                                            selfpath) < 0) {
-+            goto cleanup;
-         }
-     }
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 81ee597fc8..fadc7efdcf 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -45,6 +45,18 @@ typedef int
- (*virCgroupCopyMountsCB)(virCgroupPtr group,
-                          virCgroupPtr parent);
- 
-+typedef int
-+(*virCgroupDetectMountsCB)(virCgroupPtr group,
-+                           const char *mntType,
-+                           const char *mntOpts,
-+                           const char *mntDir);
-+
-+typedef int
-+(*virCgroupDetectPlacementCB)(virCgroupPtr group,
-+                              const char *path,
-+                              const char *controllers,
-+                              const char *selfpath);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -52,6 +64,8 @@ struct _virCgroupBackend {
-     virCgroupAvailableCB available;
-     virCgroupValidateMachineGroupCB validateMachineGroup;
-     virCgroupCopyMountsCB copyMounts;
-+    virCgroupDetectMountsCB detectMounts;
-+    virCgroupDetectPlacementCB detectPlacement;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 50b58ab413..bd9f28f6e9 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -23,6 +23,7 @@
- #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
- # include <mntent.h>
- #endif
-+#include <sys/stat.h>
- 
- #include "internal.h"
- 
-@@ -38,6 +39,7 @@
- #include "virlog.h"
- #include "virstring.h"
- #include "virsystemd.h"
-+#include "virerror.h"
- 
- VIR_LOG_INIT("util.cgroup");
- 
-@@ -181,12 +183,168 @@ virCgroupV1CopyMounts(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1ResolveMountLink(const char *mntDir,
-+                            const char *typeStr,
-+                            virCgroupControllerPtr controller)
-+{
-+    VIR_AUTOFREE(char *) linkSrc = NULL;
-+    VIR_AUTOFREE(char *) tmp = NULL;
-+    char *dirName;
-+    struct stat sb;
-+
-+    if (VIR_STRDUP(tmp, mntDir) < 0)
-+        return -1;
-+
-+    dirName = strrchr(tmp, '/');
-+    if (!dirName) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing '/' separator in cgroup mount '%s'"), tmp);
-+        return -1;
-+    }
-+
-+    if (!strchr(dirName + 1, ','))
-+        return 0;
-+
-+    *dirName = '\0';
-+    if (virAsprintf(&linkSrc, "%s/%s", tmp, typeStr) < 0)
-+        return -1;
-+    *dirName = '/';
-+
-+    if (lstat(linkSrc, &sb) < 0) {
-+        if (errno == ENOENT) {
-+            VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s",
-+                     typeStr, tmp, linkSrc);
-+        } else {
-+            virReportSystemError(errno, _("Cannot stat %s"), linkSrc);
-+            return -1;
-+        }
-+    } else {
-+        if (!S_ISLNK(sb.st_mode)) {
-+            VIR_WARN("Expecting a symlink at %s for controller %s",
-+                     linkSrc, typeStr);
-+        } else {
-+            VIR_STEAL_PTR(controller->linkPoint, linkSrc);
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static bool
-+virCgroupV1MountOptsMatchController(const char *mntOpts,
-+                                    const char *typeStr)
-+{
-+    const char *tmp = mntOpts;
-+    int typeLen = strlen(typeStr);
-+
-+    while (tmp) {
-+        const char *next = strchr(tmp, ',');
-+        int len;
-+        if (next) {
-+            len = next - tmp;
-+            next++;
-+        } else {
-+            len = strlen(tmp);
-+        }
-+
-+        if (typeLen == len && STREQLEN(typeStr, tmp, len))
-+            return true;
-+
-+        tmp = next;
-+    }
-+
-+    return false;
-+}
-+
-+
-+static int
-+virCgroupV1DetectMounts(virCgroupPtr group,
-+                        const char *mntType,
-+                        const char *mntOpts,
-+                        const char *mntDir)
-+{
-+    size_t i;
-+
-+    if (STRNEQ(mntType, "cgroup"))
-+        return 0;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        const char *typestr = virCgroupV1ControllerTypeToString(i);
-+
-+        if (virCgroupV1MountOptsMatchController(mntOpts, typestr)) {
-+            /* Note that the lines in /proc/mounts have the same
-+             * order than the mount operations, and that there may
-+             * be duplicates due to bind mounts. This means
-+             * that the same mount point may be processed more than
-+             * once. We need to save the results of the last one,
-+             * and we need to be careful to release the memory used
-+             * by previous processing. */
-+            virCgroupControllerPtr controller = &group->controllers[i];
-+
-+            VIR_FREE(controller->mountPoint);
-+            VIR_FREE(controller->linkPoint);
-+            if (VIR_STRDUP(controller->mountPoint, mntDir) < 0)
-+                return -1;
-+
-+            /* If it is a co-mount it has a filename like "cpu,cpuacct"
-+             * and we must identify the symlink path */
-+            if (virCgroupV1ResolveMountLink(mntDir, typestr, controller) < 0)
-+                return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV1DetectPlacement(virCgroupPtr group,
-+                           const char *path,
-+                           const char *controllers,
-+                           const char *selfpath)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        const char *typestr = virCgroupV1ControllerTypeToString(i);
-+
-+        if (virCgroupV1MountOptsMatchController(controllers, typestr) &&
-+            group->controllers[i].mountPoint != NULL &&
-+            group->controllers[i].placement == NULL) {
-+            /*
-+             * selfpath == "/" + path="" -> "/"
-+             * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service"
-+             * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo"
-+             */
-+            if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
-+                if (VIR_STRDUP(group->controllers[i].placement,
-+                               selfpath) < 0)
-+                    return -1;
-+            } else {
-+                if (virAsprintf(&group->controllers[i].placement,
-+                                "%s%s%s", selfpath,
-+                                (STREQ(selfpath, "/") ||
-+                                 STREQ(path, "") ? "" : "/"),
-+                                path) < 0)
-+                    return -1;
-+            }
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-     .available = virCgroupV1Available,
-     .validateMachineGroup = virCgroupV1ValidateMachineGroup,
-     .copyMounts = virCgroupV1CopyMounts,
-+    .detectMounts = virCgroupV1DetectMounts,
-+    .detectPlacement = virCgroupV1DetectPlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-AllDevices.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-AllDevices.patch
deleted file mode 100644
index d4dbcdf..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-AllDevices.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 4cf3b3d335b83b5feb49e71775b6a8f1fddbbce9 Mon Sep 17 00:00:00 2001
-Message-Id: <4cf3b3d335b83b5feb49e71775b6a8f1fddbbce9@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:55 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Allow|Deny)AllDevices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit fd9a0368b91c425f860115c0451067ee917574d1)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <cec0c47305736e9da14175d4002509b5583e4ab0.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 18 ++----------------
- src/util/vircgroupbackend.h |  9 +++++++++
- src/util/vircgroupv1.c      | 31 +++++++++++++++++++++++++++++++
- 3 files changed, 42 insertions(+), 16 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a30fc6241d..67c68f3dc6 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1822,10 +1822,7 @@ virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus)
- int
- virCgroupDenyAllDevices(virCgroupPtr group)
- {
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_DEVICES,
--                                "devices.deny",
--                                "a");
-+    VIR_CGROUP_BACKEND_CALL(group, denyAllDevices, -1);
- }
- 
- /**
-@@ -1845,18 +1842,7 @@ virCgroupDenyAllDevices(virCgroupPtr group)
- int
- virCgroupAllowAllDevices(virCgroupPtr group, int perms)
- {
--    int ret = -1;
--
--    if (virCgroupAllowDevice(group, 'b', -1, -1, perms) < 0)
--        goto cleanup;
--
--    if (virCgroupAllowDevice(group, 'c', -1, -1, perms) < 0)
--        goto cleanup;
--
--    ret = 0;
--
-- cleanup:
--    return ret;
-+    VIR_CGROUP_BACKEND_CALL(group, allowAllDevices, -1, perms);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 04897b5895..436c83f6fa 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -269,6 +269,13 @@ typedef int
-                          int minor,
-                          int perms);
- 
-+typedef int
-+(*virCgroupAllowAllDevicesCB)(virCgroupPtr group,
-+                              int perms);
-+
-+typedef int
-+(*virCgroupDenyAllDevicesCB)(virCgroupPtr group);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -321,6 +328,8 @@ struct _virCgroupBackend {
- 
-     virCgroupAllowDeviceCB allowDevice;
-     virCgroupDenyDeviceCB denyDevice;
-+    virCgroupAllowAllDevicesCB allowAllDevices;
-+    virCgroupDenyAllDevicesCB denyAllDevices;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 02cd7ab956..34393812d2 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1737,6 +1737,35 @@ virCgroupV1DenyDevice(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1AllowAllDevices(virCgroupPtr group,
-+                           int perms)
-+{
-+    int ret = -1;
-+
-+    if (virCgroupV1AllowDevice(group, 'b', -1, -1, perms) < 0)
-+        goto cleanup;
-+
-+    if (virCgroupV1AllowDevice(group, 'c', -1, -1, perms) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    return ret;
-+}
-+
-+
-+static int
-+virCgroupV1DenyAllDevices(virCgroupPtr group)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_DEVICES,
-+                                "devices.deny",
-+                                "a");
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1787,6 +1816,8 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .allowDevice = virCgroupV1AllowDevice,
-     .denyDevice = virCgroupV1DenyDevice,
-+    .allowAllDevices = virCgroupV1AllowAllDevices,
-+    .denyAllDevices = virCgroupV1DenyAllDevices,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-Device.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-Device.patch
deleted file mode 100644
index 234d5f8..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-Device.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 43695c7877a99d12bab96ec17c7d7de250ffc39a Mon Sep 17 00:00:00 2001
-Message-Id: <43695c7877a99d12bab96ec17c7d7de250ffc39a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:54 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Allow|Deny)Device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8cbb0c76ba24878229830c8d53b365cf4dc1b54d)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <9a4073085dbeb674b24544aa253960bb2b1b53dc.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 68 +++++++-----------------------------
- src/util/vircgroupbackend.h | 17 +++++++++
- src/util/vircgroupv1.c      | 69 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 98 insertions(+), 56 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 088e97cb3f..a30fc6241d 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1875,29 +1875,7 @@ int
- virCgroupAllowDevice(virCgroupPtr group, char type, int major, int minor,
-                      int perms)
- {
--    VIR_AUTOFREE(char *) devstr = NULL;
--    VIR_AUTOFREE(char *) majorstr = NULL;
--    VIR_AUTOFREE(char *) minorstr = NULL;
--
--    if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
--        (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
--        return -1;
--
--    if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
--        (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
--        return -1;
--
--    if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
--                    virCgroupGetDevicePermsString(perms)) < 0)
--        return -1;
--
--    if (virCgroupSetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_DEVICES,
--                             "devices.allow",
--                             devstr) < 0)
--        return -1;
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, allowDevice, -1, type, major, minor, perms);
- }
- 
- 
-@@ -1936,11 +1914,11 @@ virCgroupAllowDevicePath(virCgroupPtr group,
-     if (!S_ISCHR(sb.st_mode) && !S_ISBLK(sb.st_mode))
-         return 1;
- 
--    return virCgroupAllowDevice(group,
--                                S_ISCHR(sb.st_mode) ? 'c' : 'b',
--                                major(sb.st_rdev),
--                                minor(sb.st_rdev),
--                                perms);
-+    VIR_CGROUP_BACKEND_CALL(group, allowDevice, -1,
-+                            S_ISCHR(sb.st_mode) ? 'c' : 'b',
-+                            major(sb.st_rdev),
-+                            minor(sb.st_rdev),
-+                            perms);
- }
- 
- 
-@@ -1959,29 +1937,7 @@ int
- virCgroupDenyDevice(virCgroupPtr group, char type, int major, int minor,
-                     int perms)
- {
--    VIR_AUTOFREE(char *) devstr = NULL;
--    VIR_AUTOFREE(char *) majorstr = NULL;
--    VIR_AUTOFREE(char *) minorstr = NULL;
--
--    if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
--        (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
--        return -1;
--
--    if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
--        (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
--        return -1;
--
--    if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
--                    virCgroupGetDevicePermsString(perms)) < 0)
--        return -1;
--
--    if (virCgroupSetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_DEVICES,
--                             "devices.deny",
--                             devstr) < 0)
--        return -1;
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, denyDevice, -1, type, major, minor, perms);
- }
- 
- 
-@@ -2020,11 +1976,11 @@ virCgroupDenyDevicePath(virCgroupPtr group,
-     if (!S_ISCHR(sb.st_mode) && !S_ISBLK(sb.st_mode))
-         return 1;
- 
--    return virCgroupDenyDevice(group,
--                               S_ISCHR(sb.st_mode) ? 'c' : 'b',
--                               major(sb.st_rdev),
--                               minor(sb.st_rdev),
--                               perms);
-+    VIR_CGROUP_BACKEND_CALL(group, denyDevice, -1,
-+                            S_ISCHR(sb.st_mode) ? 'c' : 'b',
-+                            major(sb.st_rdev),
-+                            minor(sb.st_rdev),
-+                            perms);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 27e6b18ea2..04897b5895 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -255,6 +255,20 @@ typedef int
- (*virCgroupGetMemSwapUsageCB)(virCgroupPtr group,
-                               unsigned long long *kb);
- 
-+typedef int
-+(*virCgroupAllowDeviceCB)(virCgroupPtr group,
-+                          char type,
-+                          int major,
-+                          int minor,
-+                          int perms);
-+
-+typedef int
-+(*virCgroupDenyDeviceCB)(virCgroupPtr group,
-+                         char type,
-+                         int major,
-+                         int minor,
-+                         int perms);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -304,6 +318,9 @@ struct _virCgroupBackend {
-     virCgroupSetMemSwapHardLimitCB setMemSwapHardLimit;
-     virCgroupGetMemSwapHardLimitCB getMemSwapHardLimit;
-     virCgroupGetMemSwapUsageCB getMemSwapUsage;
-+
-+    virCgroupAllowDeviceCB allowDevice;
-+    virCgroupDenyDeviceCB denyDevice;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 55b1d3ebd0..02cd7ab956 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1671,6 +1671,72 @@ virCgroupV1GetMemSwapUsage(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1AllowDevice(virCgroupPtr group,
-+                       char type,
-+                       int major,
-+                       int minor,
-+                       int perms)
-+{
-+    VIR_AUTOFREE(char *) devstr = NULL;
-+    VIR_AUTOFREE(char *) majorstr = NULL;
-+    VIR_AUTOFREE(char *) minorstr = NULL;
-+
-+    if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
-+        (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
-+        return -1;
-+
-+    if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
-+        (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
-+        return -1;
-+
-+    if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
-+                    virCgroupGetDevicePermsString(perms)) < 0)
-+        return -1;
-+
-+    if (virCgroupSetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_DEVICES,
-+                             "devices.allow",
-+                             devstr) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV1DenyDevice(virCgroupPtr group,
-+                      char type,
-+                      int major,
-+                      int minor,
-+                      int perms)
-+{
-+    VIR_AUTOFREE(char *) devstr = NULL;
-+    VIR_AUTOFREE(char *) majorstr = NULL;
-+    VIR_AUTOFREE(char *) minorstr = NULL;
-+
-+    if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) ||
-+        (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0))
-+        return -1;
-+
-+    if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) ||
-+        (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0))
-+        return -1;
-+
-+    if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr,
-+                    virCgroupGetDevicePermsString(perms)) < 0)
-+        return -1;
-+
-+    if (virCgroupSetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_DEVICES,
-+                             "devices.deny",
-+                             devstr) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1718,6 +1784,9 @@ virCgroupBackend virCgroupV1Backend = {
-     .setMemSwapHardLimit = virCgroupV1SetMemSwapHardLimit,
-     .getMemSwapHardLimit = virCgroupV1GetMemSwapHardLimit,
-     .getMemSwapUsage = virCgroupV1GetMemSwapUsage,
-+
-+    .allowDevice = virCgroupV1AllowDevice,
-+    .denyDevice = virCgroupV1DenyDevice,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadBps.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadBps.patch
deleted file mode 100644
index 13c3c14..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadBps.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From d18c1d955b505493213e540d427868cc74e03c64 Mon Sep 17 00:00:00 2001
-Message-Id: <d18c1d955b505493213e540d427868cc74e03c64@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:47 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceReadBps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 32f199250bd52fe52cba6bfbc3ee6a7f6c88c2ff)
-
-Conflicts:
-    src/util/vircgroup.c - missing commit 34e9c29357
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <562851da4866890cef588cf7f6f890118f3f81f4.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 34 ++-----------------------
- src/util/vircgroupbackend.h | 12 +++++++++
- src/util/vircgroupv1.c      | 50 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 64 insertions(+), 32 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 4b682d72d7..ab587ea306 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1419,19 +1419,7 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
-                                const char *path,
-                                unsigned long long rbps)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--    VIR_AUTOFREE(char *) blkstr = NULL;
--
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
--        return -1;
--
--    if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0)
--        return -1;
--
--    return virCgroupSetValueStr(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.throttle.read_bps_device",
--                               str);
-+    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceReadBps, -1, path, rbps);
- }
- 
- /**
-@@ -1525,25 +1513,7 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
-                                const char *path,
-                                unsigned long long *rbps)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.read_bps_device",
--                                   path,
--                                   &str) < 0)
--        return -1;
--
--    if (!str) {
--        *rbps = 0;
--    } else if (virStrToLong_ull(str, NULL, 10, rbps) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Unable to parse '%s' as an integer"),
--                       str);
--        return -1;
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceReadBps, -1, path, rbps);
- }
- 
- /**
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 58e1828e01..3f1055a5d8 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -190,6 +190,16 @@ typedef int
-                                       const char *path,
-                                       unsigned int *wiops);
- 
-+typedef int
-+(*virCgroupSetBlkioDeviceReadBpsCB)(virCgroupPtr group,
-+                                    const char *path,
-+                                    unsigned long long rbps);
-+
-+typedef int
-+(*virCgroupGetBlkioDeviceReadBpsCB)(virCgroupPtr group,
-+                                    const char *path,
-+                                    unsigned long long *rbps);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -224,6 +234,8 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioDeviceReadIopsCB getBlkioDeviceReadIops;
-     virCgroupSetBlkioDeviceWriteIopsCB setBlkioDeviceWriteIops;
-     virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
-+    virCgroupSetBlkioDeviceReadBpsCB setBlkioDeviceReadBps;
-+    virCgroupGetBlkioDeviceReadBpsCB getBlkioDeviceReadBps;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 5b0199a89f..e5663ccfb9 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1282,6 +1282,54 @@ virCgroupV1GetBlkioDeviceWriteIops(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group,
-+                                 const char *path,
-+                                 unsigned long long rbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "blkio.throttle.read_bps_device",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr group,
-+                                 const char *path,
-+                                 unsigned long long *rbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "blkio.throttle.read_bps_device",
-+                                   path,
-+                                   &str) < 0)
-+        return -1;
-+
-+    if (!str) {
-+        *rbps = 0;
-+    } else if (virStrToLong_ull(str, NULL, 10, rbps) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1314,6 +1362,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioDeviceReadIops = virCgroupV1GetBlkioDeviceReadIops,
-     .setBlkioDeviceWriteIops = virCgroupV1SetBlkioDeviceWriteIops,
-     .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
-+    .setBlkioDeviceReadBps = virCgroupV1SetBlkioDeviceReadBps,
-+    .getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadBps,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadIops.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadIops.patch
deleted file mode 100644
index 878a5cd..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadIops.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 0528d90148bcacba3fdbaa831ba89e043da94790 Mon Sep 17 00:00:00 2001
-Message-Id: <0528d90148bcacba3fdbaa831ba89e043da94790@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:45 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceReadIops
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit dfaf5c6de1afa04fee1d9d97e79925fcc63682de)
-
-Conflicts:
-    src/util/vircgroup.c - missing commit 34e9c29357
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <52a494fa2de2835abd887d804f4047febc87bb60.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 34 ++-----------------------
- src/util/vircgroupbackend.h | 12 +++++++++
- src/util/vircgroupv1.c      | 50 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 64 insertions(+), 32 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 83ceb3a9cb..b8cbd95e0c 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1385,19 +1385,7 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned int riops)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--    VIR_AUTOFREE(char *) blkstr = NULL;
--
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
--        return -1;
--
--    if (virAsprintf(&str, "%s%u", blkstr, riops) < 0)
--        return -1;
--
--    return virCgroupSetValueStr(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.throttle.read_iops_device",
--                               str);
-+    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceReadIops, -1, path, riops);
- }
- 
- 
-@@ -1517,25 +1505,7 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned int *riops)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.read_iops_device",
--                                   path,
--                                   &str) < 0)
--        return -1;
--
--    if (!str) {
--        *riops = 0;
--    } else if (virStrToLong_ui(str, NULL, 10, riops) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Unable to parse '%s' as an integer"),
--                       str);
--        return -1;
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceReadIops, -1, path, riops);
- }
- 
- /**
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index aef2a87c61..0b7b4db1a4 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -170,6 +170,16 @@ typedef int
-                                    const char *path,
-                                    unsigned int *weight);
- 
-+typedef int
-+(*virCgroupSetBlkioDeviceReadIopsCB)(virCgroupPtr group,
-+                                     const char *path,
-+                                     unsigned int riops);
-+
-+typedef int
-+(*virCgroupGetBlkioDeviceReadIopsCB)(virCgroupPtr group,
-+                                     const char *path,
-+                                     unsigned int *riops);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -200,6 +210,8 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioIoDeviceServicedCB getBlkioIoDeviceServiced;
-     virCgroupSetBlkioDeviceWeightCB setBlkioDeviceWeight;
-     virCgroupGetBlkioDeviceWeightCB getBlkioDeviceWeight;
-+    virCgroupSetBlkioDeviceReadIopsCB setBlkioDeviceReadIops;
-+    virCgroupGetBlkioDeviceReadIopsCB getBlkioDeviceReadIops;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 1e5f38a2ee..47b0c13f38 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1186,6 +1186,54 @@ virCgroupV1GetBlkioDeviceWeight(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetBlkioDeviceReadIops(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned int riops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (virAsprintf(&str, "%s%u", blkstr, riops) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "blkio.throttle.read_iops_device",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV1GetBlkioDeviceReadIops(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned int *riops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "blkio.throttle.read_iops_device",
-+                                   path,
-+                                   &str) < 0)
-+        return -1;
-+
-+    if (!str) {
-+        *riops = 0;
-+    } else if (virStrToLong_ui(str, NULL, 10, riops) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1214,6 +1262,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioIoDeviceServiced = virCgroupV1GetBlkioIoDeviceServiced,
-     .setBlkioDeviceWeight = virCgroupV1SetBlkioDeviceWeight,
-     .getBlkioDeviceWeight = virCgroupV1GetBlkioDeviceWeight,
-+    .setBlkioDeviceReadIops = virCgroupV1SetBlkioDeviceReadIops,
-+    .getBlkioDeviceReadIops = virCgroupV1GetBlkioDeviceReadIops,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWeight.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWeight.patch
deleted file mode 100644
index 7d870b2..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWeight.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From af26c5b793fcd0206a105e75c6583ddfe57557c2 Mon Sep 17 00:00:00 2001
-Message-Id: <af26c5b793fcd0206a105e75c6583ddfe57557c2@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:44 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWeight
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8f50f9ca24596c838082c7d8da4ffe7104d22b23)
-
-Conflicts:
-    src/util/vircgroup.c - missing commit 34e9c29357
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <1ad5f481f00748a6808760b50f4d1d0116191073.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 36 +++-----------------------
- src/util/vircgroupbackend.h | 12 +++++++++
- src/util/vircgrouppriv.h    |  6 +++++
- src/util/vircgroupv1.c      | 50 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 71 insertions(+), 33 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index fd39144ed2..83ceb3a9cb 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -498,7 +498,7 @@ virCgroupGetValueStr(virCgroupPtr group,
- }
- 
- 
--static int
-+int
- virCgroupGetValueForBlkDev(virCgroupPtr group,
-                            int controller,
-                            const char *key,
-@@ -1501,19 +1501,7 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
-                               const char *path,
-                               unsigned int weight)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--    VIR_AUTOFREE(char *) blkstr = NULL;
--
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
--        return -1;
--
--    if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
--        return -1;
--
--    return virCgroupSetValueStr(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.weight_device",
--                               str);
-+    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWeight, -1, path, weight);
- }
- 
- /**
-@@ -1665,25 +1653,7 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
-                               const char *path,
-                               unsigned int *weight)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.weight_device",
--                                   path,
--                                   &str) < 0)
--        return -1;
--
--    if (!str) {
--        *weight = 0;
--    } else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Unable to parse '%s' as an integer"),
--                       str);
--        return -1;
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWeight, -1, path, weight);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index e16d631a0f..aef2a87c61 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -160,6 +160,16 @@ typedef int
-                                        long long *requests_read,
-                                        long long *requests_write);
- 
-+typedef int
-+(*virCgroupSetBlkioDeviceWeightCB)(virCgroupPtr group,
-+                                   const char *path,
-+                                   unsigned int weight);
-+
-+typedef int
-+(*virCgroupGetBlkioDeviceWeightCB)(virCgroupPtr group,
-+                                   const char *path,
-+                                   unsigned int *weight);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -188,6 +198,8 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioWeightCB getBlkioWeight;
-     virCgroupGetBlkioIoServicedCB getBlkioIoServiced;
-     virCgroupGetBlkioIoDeviceServicedCB getBlkioIoDeviceServiced;
-+    virCgroupSetBlkioDeviceWeightCB setBlkioDeviceWeight;
-+    virCgroupGetBlkioDeviceWeightCB getBlkioDeviceWeight;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 525c288a9a..3a968c1ce2 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -82,6 +82,12 @@ int virCgroupPartitionEscape(char **path);
- 
- char *virCgroupGetBlockDevString(const char *path);
- 
-+int virCgroupGetValueForBlkDev(virCgroupPtr group,
-+                               int controller,
-+                               const char *key,
-+                               const char *path,
-+                               char **value);
-+
- int virCgroupNewPartition(const char *path,
-                           bool create,
-                           int controllers,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 79c4812aef..1e5f38a2ee 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1138,6 +1138,54 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group,
-+                                const char *path,
-+                                unsigned int weight)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "blkio.weight_device",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV1GetBlkioDeviceWeight(virCgroupPtr group,
-+                                const char *path,
-+                                unsigned int *weight)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "blkio.weight_device",
-+                                   path,
-+                                   &str) < 0)
-+        return -1;
-+
-+    if (!str) {
-+        *weight = 0;
-+    } else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1164,6 +1212,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioWeight = virCgroupV1GetBlkioWeight,
-     .getBlkioIoServiced = virCgroupV1GetBlkioIoServiced,
-     .getBlkioIoDeviceServiced = virCgroupV1GetBlkioIoDeviceServiced,
-+    .setBlkioDeviceWeight = virCgroupV1SetBlkioDeviceWeight,
-+    .getBlkioDeviceWeight = virCgroupV1GetBlkioDeviceWeight,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteBps.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteBps.patch
deleted file mode 100644
index 273253a..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteBps.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From a9c415edc1bc386ac6f4be91e98fe23469b62011 Mon Sep 17 00:00:00 2001
-Message-Id: <a9c415edc1bc386ac6f4be91e98fe23469b62011@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:48 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteBps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 02fe32d3aa965b21342bc2dee245e6e8e5ca8bf7)
-
-Conflicts:
-    src/util/vircgroup.c - missing commit 34e9c29357
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3bbdc28fe71070c8e351679a17d6889b866b46fd.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 34 ++-----------------------
- src/util/vircgroupbackend.h | 12 +++++++++
- src/util/vircgroupv1.c      | 50 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 64 insertions(+), 32 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index ab587ea306..684bce4997 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1435,19 +1435,7 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned long long wbps)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--    VIR_AUTOFREE(char *) blkstr = NULL;
--
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
--        return -1;
--
--    if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
--        return -1;
--
--    return virCgroupSetValueStr(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.throttle.write_bps_device",
--                               str);
-+    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteBps, -1, path, wbps);
- }
- 
- 
-@@ -1529,25 +1517,7 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
-                                 const char *path,
-                                 unsigned long long *wbps)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.write_bps_device",
--                                   path,
--                                   &str) < 0)
--        return -1;
--
--    if (!str) {
--        *wbps = 0;
--    } else if (virStrToLong_ull(str, NULL, 10, wbps) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Unable to parse '%s' as an integer"),
--                       str);
--        return -1;
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteBps, -1, path, wbps);
- }
- 
- /**
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 3f1055a5d8..67e795a2b7 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -200,6 +200,16 @@ typedef int
-                                     const char *path,
-                                     unsigned long long *rbps);
- 
-+typedef int
-+(*virCgroupSetBlkioDeviceWriteBpsCB)(virCgroupPtr group,
-+                                     const char *path,
-+                                     unsigned long long wbps);
-+
-+typedef int
-+(*virCgroupGetBlkioDeviceWriteBpsCB)(virCgroupPtr group,
-+                                     const char *path,
-+                                     unsigned long long *wbps);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -236,6 +246,8 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
-     virCgroupSetBlkioDeviceReadBpsCB setBlkioDeviceReadBps;
-     virCgroupGetBlkioDeviceReadBpsCB getBlkioDeviceReadBps;
-+    virCgroupSetBlkioDeviceWriteBpsCB setBlkioDeviceWriteBps;
-+    virCgroupGetBlkioDeviceWriteBpsCB getBlkioDeviceWriteBps;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index e5663ccfb9..c044414dfd 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1330,6 +1330,54 @@ virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned long long wbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "blkio.throttle.write_bps_device",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned long long *wbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "blkio.throttle.write_bps_device",
-+                                   path,
-+                                   &str) < 0)
-+        return -1;
-+
-+    if (!str) {
-+        *wbps = 0;
-+    } else if (virStrToLong_ull(str, NULL, 10, wbps) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1364,6 +1412,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
-     .setBlkioDeviceReadBps = virCgroupV1SetBlkioDeviceReadBps,
-     .getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadBps,
-+    .setBlkioDeviceWriteBps = virCgroupV1SetBlkioDeviceWriteBps,
-+    .getBlkioDeviceWriteBps = virCgroupV1GetBlkioDeviceWriteBps,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteIops.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteIops.patch
deleted file mode 100644
index caffe32..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteIops.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From b80aeea66090c760fb2863d8bb7d682ff40a8361 Mon Sep 17 00:00:00 2001
-Message-Id: <b80aeea66090c760fb2863d8bb7d682ff40a8361@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:46 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteIops
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 2edd0bcda65122ba16f92c2b95f06ae7dad072ba)
-
-Conflicts:
-    src/util/vircgroup.c - missing commit 34e9c29357
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <10671a59ba137b61325a9d5a730f53a2032dd49b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 34 ++-----------------------
- src/util/vircgroupbackend.h | 12 +++++++++
- src/util/vircgroupv1.c      | 50 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 64 insertions(+), 32 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index b8cbd95e0c..4b682d72d7 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1402,19 +1402,7 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
-                                  const char *path,
-                                  unsigned int wiops)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--    VIR_AUTOFREE(char *) blkstr = NULL;
--
--    if (!(blkstr = virCgroupGetBlockDevString(path)))
--        return -1;
--
--    if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)
--        return -1;
--
--    return virCgroupSetValueStr(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.throttle.write_iops_device",
--                               str);
-+    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteIops, -1, path, wiops);
- }
- 
- 
-@@ -1521,25 +1509,7 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
-                                  const char *path,
-                                  unsigned int *wiops)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--
--    if (virCgroupGetValueForBlkDev(group,
--                                   VIR_CGROUP_CONTROLLER_BLKIO,
--                                   "blkio.throttle.write_iops_device",
--                                   path,
--                                   &str) < 0)
--        return -1;
--
--    if (!str) {
--        *wiops = 0;
--    } else if (virStrToLong_ui(str, NULL, 10, wiops) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Unable to parse '%s' as an integer"),
--                       str);
--        return -1;
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteIops, -1, path, wiops);
- }
- 
- /**
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 0b7b4db1a4..58e1828e01 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -180,6 +180,16 @@ typedef int
-                                      const char *path,
-                                      unsigned int *riops);
- 
-+typedef int
-+(*virCgroupSetBlkioDeviceWriteIopsCB)(virCgroupPtr group,
-+                                      const char *path,
-+                                      unsigned int wiops);
-+
-+typedef int
-+(*virCgroupGetBlkioDeviceWriteIopsCB)(virCgroupPtr group,
-+                                      const char *path,
-+                                      unsigned int *wiops);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -212,6 +222,8 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioDeviceWeightCB getBlkioDeviceWeight;
-     virCgroupSetBlkioDeviceReadIopsCB setBlkioDeviceReadIops;
-     virCgroupGetBlkioDeviceReadIopsCB getBlkioDeviceReadIops;
-+    virCgroupSetBlkioDeviceWriteIopsCB setBlkioDeviceWriteIops;
-+    virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 47b0c13f38..5b0199a89f 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1234,6 +1234,54 @@ virCgroupV1GetBlkioDeviceReadIops(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group,
-+                                   const char *path,
-+                                   unsigned int wiops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "blkio.throttle.write_iops_device",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV1GetBlkioDeviceWriteIops(virCgroupPtr group,
-+                                   const char *path,
-+                                   unsigned int *wiops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "blkio.throttle.write_iops_device",
-+                                   path,
-+                                   &str) < 0)
-+        return -1;
-+
-+    if (!str) {
-+        *wiops = 0;
-+    } else if (virStrToLong_ui(str, NULL, 10, wiops) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1264,6 +1312,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioDeviceWeight = virCgroupV1GetBlkioDeviceWeight,
-     .setBlkioDeviceReadIops = virCgroupV1SetBlkioDeviceReadIops,
-     .getBlkioDeviceReadIops = virCgroupV1GetBlkioDeviceReadIops,
-+    .setBlkioDeviceWriteIops = virCgroupV1SetBlkioDeviceWriteIops,
-+    .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioWeight.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioWeight.patch
deleted file mode 100644
index e58c368..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioWeight.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 7fae41a63cd97501e3a4bf8fade48949d754f738 Mon Sep 17 00:00:00 2001
-Message-Id: <7fae41a63cd97501e3a4bf8fade48949d754f738@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:41 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioWeight
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit c57b0be0cc200abb21cbe0473d96f447fd37b27d)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <23b514919f71ed2a44c04d7f62a031c4edc14365.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 14 ++------------
- src/util/vircgroupbackend.h | 20 ++++++++++++++++++++
- src/util/vircgroupv1.c      | 29 +++++++++++++++++++++++++++++
- 3 files changed, 51 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index e57aecb08a..d2ffa8aefe 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1510,10 +1510,7 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
- int
- virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight)
- {
--    return virCgroupSetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_BLKIO,
--                                "blkio.weight",
--                                weight);
-+    VIR_CGROUP_BACKEND_CALL(group, setBlkioWeight, -1, weight);
- }
- 
- 
-@@ -1528,14 +1525,7 @@ virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight)
- int
- virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight)
- {
--    unsigned long long tmp;
--    int ret;
--    ret = virCgroupGetValueU64(group,
--                               VIR_CGROUP_CONTROLLER_BLKIO,
--                               "blkio.weight", &tmp);
--    if (ret == 0)
--        *weight = tmp;
--    return ret;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioWeight, -1, weight);
- }
- 
- /**
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 74af796c2f..ccce65f1e2 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -137,6 +137,14 @@ typedef int
-                        gid_t gid,
-                        int controllers);
- 
-+typedef int
-+(*virCgroupSetBlkioWeightCB)(virCgroupPtr group,
-+                             unsigned int weight);
-+
-+typedef int
-+(*virCgroupGetBlkioWeightCB)(virCgroupPtr group,
-+                             unsigned int *weight);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -159,6 +167,10 @@ struct _virCgroupBackend {
-     virCgroupHasEmptyTasksCB hasEmptyTasks;
-     virCgroupBindMountCB bindMount;
-     virCgroupSetOwnerCB setOwner;
-+
-+    /* Optional cgroup controller specific callbacks. */
-+    virCgroupSetBlkioWeightCB setBlkioWeight;
-+    virCgroupGetBlkioWeightCB getBlkioWeight;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-@@ -169,4 +181,12 @@ virCgroupBackendRegister(virCgroupBackendPtr backend);
- virCgroupBackendPtr *
- virCgroupBackendGetAll(void);
- 
-+# define VIR_CGROUP_BACKEND_CALL(group, func, ret, ...) \
-+    if (!group->backend->func) { \
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \
-+                       _("operation '%s' not supported"), #func); \
-+        return ret; \
-+    } \
-+    return group->backend->func(group, ##__VA_ARGS__);
-+
- #endif /* __VIR_CGROUP_BACKEND_H__ */
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index c1e2583912..d67b3164ce 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -929,6 +929,32 @@ virCgroupV1SetOwner(virCgroupPtr cgroup,
- }
- 
- 
-+static int
-+virCgroupV1SetBlkioWeight(virCgroupPtr group,
-+                          unsigned int weight)
-+{
-+    return virCgroupSetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "blkio.weight",
-+                                weight);
-+}
-+
-+
-+static int
-+virCgroupV1GetBlkioWeight(virCgroupPtr group,
-+                          unsigned int *weight)
-+{
-+    unsigned long long tmp;
-+    int ret;
-+    ret = virCgroupGetValueU64(group,
-+                               VIR_CGROUP_CONTROLLER_BLKIO,
-+                               "blkio.weight", &tmp);
-+    if (ret == 0)
-+        *weight = tmp;
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -950,6 +976,9 @@ virCgroupBackend virCgroupV1Backend = {
-     .hasEmptyTasks = virCgroupV1HasEmptyTasks,
-     .bindMount = virCgroupV1BindMount,
-     .setOwner = virCgroupV1SetOwner,
-+
-+    .setBlkioWeight = virCgroupV1SetBlkioWeight,
-+    .getBlkioWeight = virCgroupV1GetBlkioWeight,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsPeriod.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsPeriod.patch
deleted file mode 100644
index eeb8623..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsPeriod.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 39640f2e78035b667588513395187a96ae71d6c4 Mon Sep 17 00:00:00 2001
-Message-Id: <39640f2e78035b667588513395187a96ae71d6c4@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:57 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)CpuCfsPeriod
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit c840448ebbeb3d4c34eafecf9c9c31c86f2f020f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <93321a564a636498ef3e4144af737bcfc6e0f07a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 18 ++----------------
- src/util/vircgroupbackend.h | 10 ++++++++++
- src/util/vircgroupv1.c      | 32 ++++++++++++++++++++++++++++++++
- 3 files changed, 44 insertions(+), 16 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 953e353ec3..f4d995b22a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2227,19 +2227,7 @@ virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares)
- int
- virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period)
- {
--    /* The cfs_period should be greater or equal than 1ms, and less or equal
--     * than 1s.
--     */
--    if (cfs_period < 1000 || cfs_period > 1000000) {
--        virReportError(VIR_ERR_INVALID_ARG,
--                       _("cfs_period '%llu' must be in range (1000, 1000000)"),
--                       cfs_period);
--        return -1;
--    }
--
--    return virCgroupSetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_CPU,
--                                "cpu.cfs_period_us", cfs_period);
-+    VIR_CGROUP_BACKEND_CALL(group, setCpuCfsPeriod, -1, cfs_period);
- }
- 
- 
-@@ -2254,9 +2242,7 @@ virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period)
- int
- virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period)
- {
--    return virCgroupGetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_CPU,
--                                "cpu.cfs_period_us", cfs_period);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpuCfsPeriod, -1, cfs_period);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 54fbead8a2..7dc1f77bfd 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -284,6 +284,14 @@ typedef int
- (*virCgroupGetCpuSharesCB)(virCgroupPtr group,
-                            unsigned long long *shares);
- 
-+typedef int
-+(*virCgroupSetCpuCfsPeriodCB)(virCgroupPtr group,
-+                              unsigned long long cfs_period);
-+
-+typedef int
-+(*virCgroupGetCpuCfsPeriodCB)(virCgroupPtr group,
-+                              unsigned long long *cfs_period);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -341,6 +349,8 @@ struct _virCgroupBackend {
- 
-     virCgroupSetCpuSharesCB setCpuShares;
-     virCgroupGetCpuSharesCB getCpuShares;
-+    virCgroupSetCpuCfsPeriodCB setCpuCfsPeriod;
-+    virCgroupGetCpuCfsPeriodCB getCpuCfsPeriod;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 537845bafe..dc4cf1e9db 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1786,6 +1786,36 @@ virCgroupV1GetCpuShares(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetCpuCfsPeriod(virCgroupPtr group,
-+                           unsigned long long cfs_period)
-+{
-+    /* The cfs_period should be greater or equal than 1ms, and less or equal
-+     * than 1s.
-+     */
-+    if (cfs_period < 1000 || cfs_period > 1000000) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("cfs_period '%llu' must be in range (1000, 1000000)"),
-+                       cfs_period);
-+        return -1;
-+    }
-+
-+    return virCgroupSetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.cfs_period_us", cfs_period);
-+}
-+
-+
-+static int
-+virCgroupV1GetCpuCfsPeriod(virCgroupPtr group,
-+                           unsigned long long *cfs_period)
-+{
-+    return virCgroupGetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.cfs_period_us", cfs_period);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1841,6 +1871,8 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .setCpuShares = virCgroupV1SetCpuShares,
-     .getCpuShares = virCgroupV1GetCpuShares,
-+    .setCpuCfsPeriod = virCgroupV1SetCpuCfsPeriod,
-+    .getCpuCfsPeriod = virCgroupV1GetCpuCfsPeriod,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsQuota.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsQuota.patch
deleted file mode 100644
index 6782693..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsQuota.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 1ae8ce96561e368af7e68d3837d9e794b023c530 Mon Sep 17 00:00:00 2001
-Message-Id: <1ae8ce96561e368af7e68d3837d9e794b023c530@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:58 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)CpuCfsQuota
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 5436fd75d808ad7b595a06bfd727e8de3283ef1a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <cb76fa8f21f7a46d9e3b9fa19bcfb5c22652a53a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 20 +++-----------------
- src/util/vircgroupbackend.h | 10 ++++++++++
- src/util/vircgrouppriv.h    |  5 +++++
- src/util/vircgroupv1.c      | 32 ++++++++++++++++++++++++++++++++
- 4 files changed, 50 insertions(+), 17 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index f4d995b22a..a3e7954d03 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -559,7 +559,7 @@ virCgroupSetValueI64(virCgroupPtr group,
- }
- 
- 
--static int
-+int
- virCgroupGetValueI64(virCgroupPtr group,
-                      int controller,
-                      const char *key,
-@@ -2258,19 +2258,7 @@ virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period)
- int
- virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota)
- {
--    /* The cfs_quota should be greater or equal than 1ms */
--    if (cfs_quota >= 0 &&
--        (cfs_quota < 1000 ||
--         cfs_quota > ULLONG_MAX / 1000)) {
--        virReportError(VIR_ERR_INVALID_ARG,
--                       _("cfs_quota '%lld' must be in range (1000, %llu)"),
--                       cfs_quota, ULLONG_MAX / 1000);
--        return -1;
--    }
--
--    return virCgroupSetValueI64(group,
--                                VIR_CGROUP_CONTROLLER_CPU,
--                                "cpu.cfs_quota_us", cfs_quota);
-+    VIR_CGROUP_BACKEND_CALL(group, setCpuCfsQuota, -1, cfs_quota);
- }
- 
- 
-@@ -2594,9 +2582,7 @@ virCgroupKillPainfully(virCgroupPtr group)
- int
- virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota)
- {
--    return virCgroupGetValueI64(group,
--                                VIR_CGROUP_CONTROLLER_CPU,
--                                "cpu.cfs_quota_us", cfs_quota);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpuCfsQuota, -1, cfs_quota);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 7dc1f77bfd..f7c230db76 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -292,6 +292,14 @@ typedef int
- (*virCgroupGetCpuCfsPeriodCB)(virCgroupPtr group,
-                               unsigned long long *cfs_period);
- 
-+typedef int
-+(*virCgroupSetCpuCfsQuotaCB)(virCgroupPtr group,
-+                             long long cfs_quota);
-+
-+typedef int
-+(*virCgroupGetCpuCfsQuotaCB)(virCgroupPtr group,
-+                             long long *cfs_quota);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -351,6 +359,8 @@ struct _virCgroupBackend {
-     virCgroupGetCpuSharesCB getCpuShares;
-     virCgroupSetCpuCfsPeriodCB setCpuCfsPeriod;
-     virCgroupGetCpuCfsPeriodCB getCpuCfsPeriod;
-+    virCgroupSetCpuCfsQuotaCB setCpuCfsQuota;
-+    virCgroupGetCpuCfsQuotaCB getCpuCfsQuota;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 7b985280e1..38c911e8ed 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -78,6 +78,11 @@ int virCgroupSetValueI64(virCgroupPtr group,
-                          const char *key,
-                          long long int value);
- 
-+int virCgroupGetValueI64(virCgroupPtr group,
-+                         int controller,
-+                         const char *key,
-+                         long long int *value);
-+
- int virCgroupPartitionEscape(char **path);
- 
- char *virCgroupGetBlockDevString(const char *path);
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index dc4cf1e9db..25f7376026 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1816,6 +1816,36 @@ virCgroupV1GetCpuCfsPeriod(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetCpuCfsQuota(virCgroupPtr group,
-+                          long long cfs_quota)
-+{
-+    /* The cfs_quota should be greater or equal than 1ms */
-+    if (cfs_quota >= 0 &&
-+        (cfs_quota < 1000 ||
-+         cfs_quota > ULLONG_MAX / 1000)) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("cfs_quota '%lld' must be in range (1000, %llu)"),
-+                       cfs_quota, ULLONG_MAX / 1000);
-+        return -1;
-+    }
-+
-+    return virCgroupSetValueI64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.cfs_quota_us", cfs_quota);
-+}
-+
-+
-+static int
-+virCgroupV1GetCpuCfsQuota(virCgroupPtr group,
-+                          long long *cfs_quota)
-+{
-+    return virCgroupGetValueI64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.cfs_quota_us", cfs_quota);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1873,6 +1903,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getCpuShares = virCgroupV1GetCpuShares,
-     .setCpuCfsPeriod = virCgroupV1SetCpuCfsPeriod,
-     .getCpuCfsPeriod = virCgroupV1GetCpuCfsPeriod,
-+    .setCpuCfsQuota = virCgroupV1SetCpuCfsQuota,
-+    .getCpuCfsQuota = virCgroupV1GetCpuCfsQuota,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuShares.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuShares.patch
deleted file mode 100644
index 7ca2ec0..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuShares.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 86865e9638ec63808b1f68e4bd9b4896b5438ece Mon Sep 17 00:00:00 2001
-Message-Id: <86865e9638ec63808b1f68e4bd9b4896b5438ece@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:56 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)CpuShares
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 857aac1f55bc1c44be4c03c4b721632caedd2a23)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d43fdbd54cb3c387df54c11d2bd24483c717bd5a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  8 ++------
- src/util/vircgroupbackend.h | 11 +++++++++++
- src/util/vircgroupv1.c      | 23 +++++++++++++++++++++++
- 3 files changed, 36 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 67c68f3dc6..953e353ec3 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2205,18 +2205,14 @@ virCgroupGetDomainTotalCpuStats(virCgroupPtr group,
- int
- virCgroupSetCpuShares(virCgroupPtr group, unsigned long long shares)
- {
--    return virCgroupSetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_CPU,
--                                "cpu.shares", shares);
-+    VIR_CGROUP_BACKEND_CALL(group, setCpuShares, -1, shares);
- }
- 
- 
- int
- virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares)
- {
--    return virCgroupGetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_CPU,
--                                "cpu.shares", shares);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpuShares, -1, shares);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 436c83f6fa..54fbead8a2 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -276,6 +276,14 @@ typedef int
- typedef int
- (*virCgroupDenyAllDevicesCB)(virCgroupPtr group);
- 
-+typedef int
-+(*virCgroupSetCpuSharesCB)(virCgroupPtr group,
-+                           unsigned long long shares);
-+
-+typedef int
-+(*virCgroupGetCpuSharesCB)(virCgroupPtr group,
-+                           unsigned long long *shares);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -330,6 +338,9 @@ struct _virCgroupBackend {
-     virCgroupDenyDeviceCB denyDevice;
-     virCgroupAllowAllDevicesCB allowAllDevices;
-     virCgroupDenyAllDevicesCB denyAllDevices;
-+
-+    virCgroupSetCpuSharesCB setCpuShares;
-+    virCgroupGetCpuSharesCB getCpuShares;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 34393812d2..537845bafe 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1766,6 +1766,26 @@ virCgroupV1DenyAllDevices(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV1SetCpuShares(virCgroupPtr group,
-+                        unsigned long long shares)
-+{
-+    return virCgroupSetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.shares", shares);
-+}
-+
-+
-+static int
-+virCgroupV1GetCpuShares(virCgroupPtr group,
-+                        unsigned long long *shares)
-+{
-+    return virCgroupGetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.shares", shares);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1818,6 +1838,9 @@ virCgroupBackend virCgroupV1Backend = {
-     .denyDevice = virCgroupV1DenyDevice,
-     .allowAllDevices = virCgroupV1AllowAllDevices,
-     .denyAllDevices = virCgroupV1DenyAllDevices,
-+
-+    .setCpuShares = virCgroupV1SetCpuShares,
-+    .getCpuShares = virCgroupV1GetCpuShares,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetCpus.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetCpus.patch
deleted file mode 100644
index 0f05e83..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetCpus.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From d45a116567b6ad1cc87060651a4d1c8d83384ba8 Mon Sep 17 00:00:00 2001
-Message-Id: <d45a116567b6ad1cc87060651a4d1c8d83384ba8@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:05 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)CpusetCpus
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 2b09065e0fb4b40e05a46f0592d978d3cb72278f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e68c2c6509b0e9e76c923c980f2d73f0a756cfd1.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 10 ++--------
- src/util/vircgroupbackend.h | 10 ++++++++++
- src/util/vircgroupv1.c      | 24 ++++++++++++++++++++++++
- 3 files changed, 36 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 1a5ed472df..b159bda1bb 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1772,10 +1772,7 @@ virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate)
- int
- virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus)
- {
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_CPUSET,
--                                "cpuset.cpus",
--                                cpus);
-+    VIR_CGROUP_BACKEND_CALL(group, setCpusetCpus, -1, cpus);
- }
- 
- 
-@@ -1790,10 +1787,7 @@ virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus)
- int
- virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus)
- {
--    return virCgroupGetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_CPUSET,
--                                "cpuset.cpus",
--                                cpus);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpusetCpus, -1, cpus);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index d4e4c4a6cc..1c5744ef76 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -340,6 +340,14 @@ typedef int
- (*virCgroupGetCpusetMemoryMigrateCB)(virCgroupPtr group,
-                                      bool *migrate);
- 
-+typedef int
-+(*virCgroupSetCpusetCpusCB)(virCgroupPtr group,
-+                            const char *cpus);
-+
-+typedef int
-+(*virCgroupGetCpusetCpusCB)(virCgroupPtr group,
-+                            char **cpus);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -414,6 +422,8 @@ struct _virCgroupBackend {
-     virCgroupGetCpusetMemsCB getCpusetMems;
-     virCgroupSetCpusetMemoryMigrateCB setCpusetMemoryMigrate;
-     virCgroupGetCpusetMemoryMigrateCB getCpusetMemoryMigrate;
-+    virCgroupSetCpusetCpusCB setCpusetCpus;
-+    virCgroupGetCpusetCpusCB getCpusetCpus;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 3a41899dd8..54e7d6ea9a 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1996,6 +1996,28 @@ virCgroupV1GetCpusetMemoryMigrate(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetCpusetCpus(virCgroupPtr group,
-+                         const char *cpus)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.cpus",
-+                                cpus);
-+}
-+
-+
-+static int
-+virCgroupV1GetCpusetCpus(virCgroupPtr group,
-+                         char **cpus)
-+{
-+    return virCgroupGetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.cpus",
-+                                cpus);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -2068,6 +2090,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getCpusetMems = virCgroupV1GetCpusetMems,
-     .setCpusetMemoryMigrate = virCgroupV1SetCpusetMemoryMigrate,
-     .getCpusetMemoryMigrate = virCgroupV1GetCpusetMemoryMigrate,
-+    .setCpusetCpus = virCgroupV1SetCpusetCpus,
-+    .getCpusetCpus = virCgroupV1GetCpusetCpus,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMemoryMigrate.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMemoryMigrate.patch
deleted file mode 100644
index 0b0a5c9..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMemoryMigrate.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From e8af2c7b172894ae3cfacd6de98b01af63947b05 Mon Sep 17 00:00:00 2001
-Message-Id: <e8af2c7b172894ae3cfacd6de98b01af63947b05@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:04 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)CpusetMemoryMigrate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7f3aedacac33fd4775d7def3734422108d6cd93e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <0067ed0a20d90451ab63112dc273ddb8344569ca.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 13 ++-----------
- src/util/vircgroupbackend.h | 10 ++++++++++
- src/util/vircgroupv1.c      | 27 +++++++++++++++++++++++++++
- 3 files changed, 39 insertions(+), 11 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 700e597157..1a5ed472df 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1742,10 +1742,7 @@ virCgroupGetCpusetMems(virCgroupPtr group, char **mems)
- int
- virCgroupSetCpusetMemoryMigrate(virCgroupPtr group, bool migrate)
- {
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_CPUSET,
--                                "cpuset.memory_migrate",
--                                migrate ? "1" : "0");
-+    VIR_CGROUP_BACKEND_CALL(group, setCpusetMemoryMigrate, -1, migrate);
- }
- 
- 
-@@ -1760,13 +1757,7 @@ virCgroupSetCpusetMemoryMigrate(virCgroupPtr group, bool migrate)
- int
- virCgroupGetCpusetMemoryMigrate(virCgroupPtr group, bool *migrate)
- {
--    unsigned long long value = 0;
--    int ret = virCgroupGetValueU64(group,
--                                   VIR_CGROUP_CONTROLLER_CPUSET,
--                                   "cpuset.memory_migrate",
--                                   &value);
--    *migrate = !!value;
--    return ret;
-+    VIR_CGROUP_BACKEND_CALL(group, getCpusetMemoryMigrate, -1, migrate);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 35221e90df..d4e4c4a6cc 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -332,6 +332,14 @@ typedef int
- (*virCgroupGetCpusetMemsCB)(virCgroupPtr group,
-                             char **mems);
- 
-+typedef int
-+(*virCgroupSetCpusetMemoryMigrateCB)(virCgroupPtr group,
-+                                     bool migrate);
-+
-+typedef int
-+(*virCgroupGetCpusetMemoryMigrateCB)(virCgroupPtr group,
-+                                     bool *migrate);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -404,6 +412,8 @@ struct _virCgroupBackend {
- 
-     virCgroupSetCpusetMemsCB setCpusetMems;
-     virCgroupGetCpusetMemsCB getCpusetMems;
-+    virCgroupSetCpusetMemoryMigrateCB setCpusetMemoryMigrate;
-+    virCgroupGetCpusetMemoryMigrateCB getCpusetMemoryMigrate;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index be9a6b82b4..3a41899dd8 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1971,6 +1971,31 @@ virCgroupV1GetCpusetMems(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetCpusetMemoryMigrate(virCgroupPtr group,
-+                                  bool migrate)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.memory_migrate",
-+                                migrate ? "1" : "0");
-+}
-+
-+
-+static int
-+virCgroupV1GetCpusetMemoryMigrate(virCgroupPtr group,
-+                                  bool *migrate)
-+{
-+    unsigned long long value = 0;
-+    int ret = virCgroupGetValueU64(group,
-+                                   VIR_CGROUP_CONTROLLER_CPUSET,
-+                                   "cpuset.memory_migrate",
-+                                   &value);
-+    *migrate = !!value;
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -2041,6 +2066,8 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .setCpusetMems = virCgroupV1SetCpusetMems,
-     .getCpusetMems = virCgroupV1GetCpusetMems,
-+    .setCpusetMemoryMigrate = virCgroupV1SetCpusetMemoryMigrate,
-+    .getCpusetMemoryMigrate = virCgroupV1GetCpusetMemoryMigrate,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMems.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMems.patch
deleted file mode 100644
index 4577480..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMems.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 1f5aa6a591ba44492813f5a1a92d0fd2480ae3e7 Mon Sep 17 00:00:00 2001
-Message-Id: <1f5aa6a591ba44492813f5a1a92d0fd2480ae3e7@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:03 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)CpusetMems
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 41510b1b74b9d15a64aaefa83826ddf00c999fe0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <163d30216cc48d77abac54b014faa779c64aa629.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 10 ++--------
- src/util/vircgroupbackend.h | 11 +++++++++++
- src/util/vircgroupv1.c      | 25 +++++++++++++++++++++++++
- 3 files changed, 38 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 8b14c053e9..700e597157 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1712,10 +1712,7 @@ virCgroupGetMemSwapUsage(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupSetCpusetMems(virCgroupPtr group, const char *mems)
- {
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_CPUSET,
--                                "cpuset.mems",
--                                mems);
-+    VIR_CGROUP_BACKEND_CALL(group, setCpusetMems, -1, mems);
- }
- 
- 
-@@ -1730,10 +1727,7 @@ virCgroupSetCpusetMems(virCgroupPtr group, const char *mems)
- int
- virCgroupGetCpusetMems(virCgroupPtr group, char **mems)
- {
--    return virCgroupGetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_CPUSET,
--                                "cpuset.mems",
--                                mems);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpusetMems, -1, mems);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 2c16706c96..35221e90df 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -324,6 +324,14 @@ typedef int
- (*virCgroupGetFreezerStateCB)(virCgroupPtr group,
-                               char **state);
- 
-+typedef int
-+(*virCgroupSetCpusetMemsCB)(virCgroupPtr group,
-+                            const char *mems);
-+
-+typedef int
-+(*virCgroupGetCpusetMemsCB)(virCgroupPtr group,
-+                            char **mems);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -393,6 +401,9 @@ struct _virCgroupBackend {
- 
-     virCgroupSetFreezerStateCB setFreezerState;
-     virCgroupGetFreezerStateCB getFreezerState;
-+
-+    virCgroupSetCpusetMemsCB setCpusetMems;
-+    virCgroupGetCpusetMemsCB getCpusetMems;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 7580f8b756..be9a6b82b4 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1949,6 +1949,28 @@ virCgroupV1GetFreezerState(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetCpusetMems(virCgroupPtr group,
-+                         const char *mems)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.mems",
-+                                mems);
-+}
-+
-+
-+static int
-+virCgroupV1GetCpusetMems(virCgroupPtr group,
-+                         char **mems)
-+{
-+    return virCgroupGetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_CPUSET,
-+                                "cpuset.mems",
-+                                mems);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -2016,6 +2038,9 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .setFreezerState = virCgroupV1SetFreezerState,
-     .getFreezerState = virCgroupV1GetFreezerState,
-+
-+    .setCpusetMems = virCgroupV1SetCpusetMems,
-+    .getCpusetMems = virCgroupV1GetCpusetMems,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-FreezerState.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-FreezerState.patch
deleted file mode 100644
index c2bf1c6..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-FreezerState.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From c68fdfdc5432ec922ca9ead1e3a0880a6112fea6 Mon Sep 17 00:00:00 2001
-Message-Id: <c68fdfdc5432ec922ca9ead1e3a0880a6112fea6@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:02 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)FreezerState
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 269a8e2718f96d5c015ad5d792fdf6759b7faee5)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a3223b27d03cc952fcf5d7aedbc7fbfd95052b1a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  8 ++------
- src/util/vircgroupbackend.h | 11 +++++++++++
- src/util/vircgroupv1.c      | 23 +++++++++++++++++++++++
- 3 files changed, 36 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 090fe140bb..8b14c053e9 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2603,18 +2603,14 @@ virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
- int
- virCgroupSetFreezerState(virCgroupPtr group, const char *state)
- {
--    return virCgroupSetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_FREEZER,
--                                "freezer.state", state);
-+    VIR_CGROUP_BACKEND_CALL(group, setFreezerState, -1, state);
- }
- 
- 
- int
- virCgroupGetFreezerState(virCgroupPtr group, char **state)
- {
--    return virCgroupGetValueStr(group,
--                                VIR_CGROUP_CONTROLLER_FREEZER,
--                                "freezer.state", state);
-+    VIR_CGROUP_BACKEND_CALL(group, getFreezerState, -1, state);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 3e3a73777d..2c16706c96 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -316,6 +316,14 @@ typedef int
-                              unsigned long long *user,
-                              unsigned long long *sys);
- 
-+typedef int
-+(*virCgroupSetFreezerStateCB)(virCgroupPtr group,
-+                              const char *state);
-+
-+typedef int
-+(*virCgroupGetFreezerStateCB)(virCgroupPtr group,
-+                              char **state);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -382,6 +390,9 @@ struct _virCgroupBackend {
-     virCgroupGetCpuacctUsageCB getCpuacctUsage;
-     virCgroupGetCpuacctPercpuUsageCB getCpuacctPercpuUsage;
-     virCgroupGetCpuacctStatCB getCpuacctStat;
-+
-+    virCgroupSetFreezerStateCB setFreezerState;
-+    virCgroupGetFreezerStateCB getFreezerState;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 23a91adf60..7580f8b756 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1929,6 +1929,26 @@ virCgroupV1GetCpuacctStat(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetFreezerState(virCgroupPtr group,
-+                           const char *state)
-+{
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_FREEZER,
-+                                "freezer.state", state);
-+}
-+
-+
-+static int
-+virCgroupV1GetFreezerState(virCgroupPtr group,
-+                           char **state)
-+{
-+    return virCgroupGetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_FREEZER,
-+                                "freezer.state", state);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1993,6 +2013,9 @@ virCgroupBackend virCgroupV1Backend = {
-     .getCpuacctUsage = virCgroupV1GetCpuacctUsage,
-     .getCpuacctPercpuUsage = virCgroupV1GetCpuacctPercpuUsage,
-     .getCpuacctStat = virCgroupV1GetCpuacctStat,
-+
-+    .setFreezerState = virCgroupV1SetFreezerState,
-+    .getFreezerState = virCgroupV1GetFreezerState,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-Memory-Limit.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-Memory-Limit.patch
deleted file mode 100644
index c316c2d..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1-Set-Get-Memory-Limit.patch
+++ /dev/null
@@ -1,478 +0,0 @@
-From 5101d214a63b31847f80048d4ee34b5e62176ddd Mon Sep 17 00:00:00 2001
-Message-Id: <5101d214a63b31847f80048d4ee34b5e62176ddd@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:52 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)Memory*Limit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-They all need virCgroupV1GetMemoryUnlimitedKB() so it's easier to
-move them in one commit.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 900c58b7f963d5054921e31bbd0b6005155b284a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c85e4973bb1718a5c9a36f971f9544b46b213183.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 128 ++-------------------------
- src/util/vircgroupbackend.h |  30 +++++++
- src/util/vircgrouppriv.h    |   6 ++
- src/util/vircgroupv1.c      | 168 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 211 insertions(+), 121 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index ed7252243c..6708eef0da 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -634,7 +634,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
-  *
-  * Returns 0 on success, -1 on error
-  */
--static int
-+int
- virCgroupNew(pid_t pid,
-              const char *path,
-              virCgroupPtr parent,
-@@ -1537,51 +1537,6 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
- }
- 
- 
--/*
-- * Retrieve the "memory.limit_in_bytes" value from the memory controller
-- * root dir. This value cannot be modified by userspace and therefore
-- * is the maximum limit value supported by cgroups on the local system.
-- * Returns this value scaled to KB or falls back to the original
-- * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED. Either way, remember the return
-- * value to avoid unnecessary cgroup filesystem access.
-- */
--static unsigned long long int virCgroupMemoryUnlimitedKB;
--static virOnceControl virCgroupMemoryOnce = VIR_ONCE_CONTROL_INITIALIZER;
--
--static void
--virCgroupMemoryOnceInit(void)
--{
--    virCgroupPtr group;
--    unsigned long long int mem_unlimited = 0ULL;
--
--    if (virCgroupNew(-1, "/", NULL, -1, &group) < 0)
--        goto cleanup;
--
--    if (!virCgroupHasController(group, VIR_CGROUP_CONTROLLER_MEMORY))
--        goto cleanup;
--
--    ignore_value(virCgroupGetValueU64(group,
--                                      VIR_CGROUP_CONTROLLER_MEMORY,
--                                      "memory.limit_in_bytes",
--                                      &mem_unlimited));
-- cleanup:
--    virCgroupFree(&group);
--    virCgroupMemoryUnlimitedKB = mem_unlimited >> 10;
--}
--
--static unsigned long long int
--virCgroupGetMemoryUnlimitedKB(void)
--{
--    if (virOnce(&virCgroupMemoryOnce, virCgroupMemoryOnceInit) < 0)
--        VIR_DEBUG("Init failed, will fall back to defaults.");
--
--    if (virCgroupMemoryUnlimitedKB)
--        return virCgroupMemoryUnlimitedKB;
--    else
--        return VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--}
--
--
- /**
-  * virCgroupSetMemory:
-  *
-@@ -1652,7 +1607,7 @@ virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb)
- int
- virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb)
- {
--    return virCgroupSetMemory(group, kb);
-+    VIR_CGROUP_BACKEND_CALL(group, setMemoryHardLimit, -1, kb);
- }
- 
- 
-@@ -1667,18 +1622,7 @@ virCgroupSetMemoryHardLimit(virCgroupPtr group, unsigned long long kb)
- int
- virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb)
- {
--    long long unsigned int limit_in_bytes;
--
--    if (virCgroupGetValueU64(group,
--                             VIR_CGROUP_CONTROLLER_MEMORY,
--                             "memory.limit_in_bytes", &limit_in_bytes) < 0)
--        return -1;
--
--    *kb = limit_in_bytes >> 10;
--    if (*kb >= virCgroupGetMemoryUnlimitedKB())
--        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getMemoryHardLimit, -1, kb);
- }
- 
- 
-@@ -1693,25 +1637,7 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupSetMemorySoftLimit(virCgroupPtr group, unsigned long long kb)
- {
--    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--
--    if (kb > maxkb) {
--        virReportError(VIR_ERR_INVALID_ARG,
--                       _("Memory '%llu' must be less than %llu"),
--                       kb, maxkb);
--        return -1;
--    }
--
--    if (kb == maxkb)
--        return virCgroupSetValueI64(group,
--                                    VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.soft_limit_in_bytes",
--                                    -1);
--    else
--        return virCgroupSetValueU64(group,
--                                    VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.soft_limit_in_bytes",
--                                    kb << 10);
-+    VIR_CGROUP_BACKEND_CALL(group, setMemorySoftLimit, -1, kb);
- }
- 
- 
-@@ -1726,18 +1652,7 @@ virCgroupSetMemorySoftLimit(virCgroupPtr group, unsigned long long kb)
- int
- virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb)
- {
--    long long unsigned int limit_in_bytes;
--
--    if (virCgroupGetValueU64(group,
--                             VIR_CGROUP_CONTROLLER_MEMORY,
--                             "memory.soft_limit_in_bytes", &limit_in_bytes) < 0)
--        return -1;
--
--    *kb = limit_in_bytes >> 10;
--    if (*kb >= virCgroupGetMemoryUnlimitedKB())
--        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getMemorySoftLimit, -1, kb);
- }
- 
- 
-@@ -1752,25 +1667,7 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupSetMemSwapHardLimit(virCgroupPtr group, unsigned long long kb)
- {
--    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--
--    if (kb > maxkb) {
--        virReportError(VIR_ERR_INVALID_ARG,
--                       _("Memory '%llu' must be less than %llu"),
--                       kb, maxkb);
--        return -1;
--    }
--
--    if (kb == maxkb)
--        return virCgroupSetValueI64(group,
--                                    VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.memsw.limit_in_bytes",
--                                    -1);
--    else
--        return virCgroupSetValueU64(group,
--                                    VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.memsw.limit_in_bytes",
--                                    kb << 10);
-+    VIR_CGROUP_BACKEND_CALL(group, setMemSwapHardLimit, -1, kb);
- }
- 
- 
-@@ -1785,18 +1682,7 @@ virCgroupSetMemSwapHardLimit(virCgroupPtr group, unsigned long long kb)
- int
- virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb)
- {
--    long long unsigned int limit_in_bytes;
--
--    if (virCgroupGetValueU64(group,
--                             VIR_CGROUP_CONTROLLER_MEMORY,
--                             "memory.memsw.limit_in_bytes", &limit_in_bytes) < 0)
--        return -1;
--
--    *kb = limit_in_bytes >> 10;
--    if (*kb >= virCgroupGetMemoryUnlimitedKB())
--        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getMemSwapHardLimit, -1, kb);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 8bdfc5c835..cdbca4b907 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -227,6 +227,30 @@ typedef int
- (*virCgroupGetMemoryUsageCB)(virCgroupPtr group,
-                              unsigned long *kb);
- 
-+typedef int
-+(*virCgroupSetMemoryHardLimitCB)(virCgroupPtr group,
-+                                 unsigned long long kb);
-+
-+typedef int
-+(*virCgroupGetMemoryHardLimitCB)(virCgroupPtr group,
-+                                 unsigned long long *kb);
-+
-+typedef int
-+(*virCgroupSetMemorySoftLimitCB)(virCgroupPtr group,
-+                                 unsigned long long kb);
-+
-+typedef int
-+(*virCgroupGetMemorySoftLimitCB)(virCgroupPtr group,
-+                                 unsigned long long *kb);
-+
-+typedef int
-+(*virCgroupSetMemSwapHardLimitCB)(virCgroupPtr group,
-+                                  unsigned long long kb);
-+
-+typedef int
-+(*virCgroupGetMemSwapHardLimitCB)(virCgroupPtr group,
-+                                  unsigned long long *kb);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -269,6 +293,12 @@ struct _virCgroupBackend {
-     virCgroupSetMemoryCB setMemory;
-     virCgroupGetMemoryStatCB getMemoryStat;
-     virCgroupGetMemoryUsageCB getMemoryUsage;
-+    virCgroupSetMemoryHardLimitCB setMemoryHardLimit;
-+    virCgroupGetMemoryHardLimitCB getMemoryHardLimit;
-+    virCgroupSetMemorySoftLimitCB setMemorySoftLimit;
-+    virCgroupGetMemorySoftLimitCB getMemorySoftLimit;
-+    virCgroupSetMemSwapHardLimitCB setMemSwapHardLimit;
-+    virCgroupGetMemSwapHardLimitCB getMemSwapHardLimit;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 3a968c1ce2..7b985280e1 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -88,6 +88,12 @@ int virCgroupGetValueForBlkDev(virCgroupPtr group,
-                                const char *path,
-                                char **value);
- 
-+int virCgroupNew(pid_t pid,
-+                 const char *path,
-+                 virCgroupPtr parent,
-+                 int controllers,
-+                 virCgroupPtr *group);
-+
- int virCgroupNewPartition(const char *path,
-                           bool create,
-                           int controllers,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 4f1d79a758..779288fb97 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1378,6 +1378,51 @@ virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group,
- }
- 
- 
-+/*
-+ * Retrieve the "memory.limit_in_bytes" value from the memory controller
-+ * root dir. This value cannot be modified by userspace and therefore
-+ * is the maximum limit value supported by cgroups on the local system.
-+ * Returns this value scaled to KB or falls back to the original
-+ * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED. Either way, remember the return
-+ * value to avoid unnecessary cgroup filesystem access.
-+ */
-+static unsigned long long int virCgroupV1MemoryUnlimitedKB;
-+static virOnceControl virCgroupV1MemoryOnce = VIR_ONCE_CONTROL_INITIALIZER;
-+
-+static void
-+virCgroupV1MemoryOnceInit(void)
-+{
-+    virCgroupPtr group;
-+    unsigned long long int mem_unlimited = 0ULL;
-+
-+    if (virCgroupNew(-1, "/", NULL, -1, &group) < 0)
-+        goto cleanup;
-+
-+    if (!virCgroupV1HasController(group, VIR_CGROUP_CONTROLLER_MEMORY))
-+        goto cleanup;
-+
-+    ignore_value(virCgroupGetValueU64(group,
-+                                      VIR_CGROUP_CONTROLLER_MEMORY,
-+                                      "memory.limit_in_bytes",
-+                                      &mem_unlimited));
-+ cleanup:
-+    virCgroupFree(&group);
-+    virCgroupV1MemoryUnlimitedKB = mem_unlimited >> 10;
-+}
-+
-+static unsigned long long int
-+virCgroupV1GetMemoryUnlimitedKB(void)
-+{
-+    if (virOnce(&virCgroupV1MemoryOnce, virCgroupV1MemoryOnceInit) < 0)
-+        VIR_DEBUG("Init failed, will fall back to defaults.");
-+
-+    if (virCgroupV1MemoryUnlimitedKB)
-+        return virCgroupV1MemoryUnlimitedKB;
-+    else
-+        return VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+}
-+
-+
- static int
- virCgroupV1SetMemory(virCgroupPtr group,
-                      unsigned long long kb)
-@@ -1494,6 +1539,123 @@ virCgroupV1GetMemoryUsage(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetMemoryHardLimit(virCgroupPtr group,
-+                              unsigned long long kb)
-+{
-+    return virCgroupV1SetMemory(group, kb);
-+}
-+
-+
-+static int
-+virCgroupV1GetMemoryHardLimit(virCgroupPtr group,
-+                              unsigned long long *kb)
-+{
-+    long long unsigned int limit_in_bytes;
-+
-+    if (virCgroupGetValueU64(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.limit_in_bytes", &limit_in_bytes) < 0)
-+        return -1;
-+
-+    *kb = limit_in_bytes >> 10;
-+    if (*kb >= virCgroupV1GetMemoryUnlimitedKB())
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV1SetMemorySoftLimit(virCgroupPtr group,
-+                              unsigned long long kb)
-+{
-+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    if (kb > maxkb) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("Memory '%llu' must be less than %llu"),
-+                       kb, maxkb);
-+        return -1;
-+    }
-+
-+    if (kb == maxkb)
-+        return virCgroupSetValueI64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.soft_limit_in_bytes",
-+                                    -1);
-+    else
-+        return virCgroupSetValueU64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.soft_limit_in_bytes",
-+                                    kb << 10);
-+}
-+
-+
-+static int
-+virCgroupV1GetMemorySoftLimit(virCgroupPtr group,
-+                              unsigned long long *kb)
-+{
-+    long long unsigned int limit_in_bytes;
-+
-+    if (virCgroupGetValueU64(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.soft_limit_in_bytes", &limit_in_bytes) < 0)
-+        return -1;
-+
-+    *kb = limit_in_bytes >> 10;
-+    if (*kb >= virCgroupV1GetMemoryUnlimitedKB())
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV1SetMemSwapHardLimit(virCgroupPtr group,
-+                               unsigned long long kb)
-+{
-+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    if (kb > maxkb) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("Memory '%llu' must be less than %llu"),
-+                       kb, maxkb);
-+        return -1;
-+    }
-+
-+    if (kb == maxkb)
-+        return virCgroupSetValueI64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.memsw.limit_in_bytes",
-+                                    -1);
-+    else
-+        return virCgroupSetValueU64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.memsw.limit_in_bytes",
-+                                    kb << 10);
-+}
-+
-+
-+static int
-+virCgroupV1GetMemSwapHardLimit(virCgroupPtr group,
-+                               unsigned long long *kb)
-+{
-+    long long unsigned int limit_in_bytes;
-+
-+    if (virCgroupGetValueU64(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.memsw.limit_in_bytes", &limit_in_bytes) < 0)
-+        return -1;
-+
-+    *kb = limit_in_bytes >> 10;
-+    if (*kb >= virCgroupV1GetMemoryUnlimitedKB())
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1534,6 +1696,12 @@ virCgroupBackend virCgroupV1Backend = {
-     .setMemory = virCgroupV1SetMemory,
-     .getMemoryStat = virCgroupV1GetMemoryStat,
-     .getMemoryUsage = virCgroupV1GetMemoryUsage,
-+    .setMemoryHardLimit = virCgroupV1SetMemoryHardLimit,
-+    .getMemoryHardLimit = virCgroupV1GetMemoryHardLimit,
-+    .setMemorySoftLimit = virCgroupV1SetMemorySoftLimit,
-+    .getMemorySoftLimit = virCgroupV1GetMemorySoftLimit,
-+    .setMemSwapHardLimit = virCgroupV1SetMemSwapHardLimit,
-+    .getMemSwapHardLimit = virCgroupV1GetMemSwapHardLimit,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1AddTask.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1AddTask.patch
deleted file mode 100644
index ca3e8d8..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1AddTask.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From a756729403915485dbd3cbdf4f252806318c227c Mon Sep 17 00:00:00 2001
-Message-Id: <a756729403915485dbd3cbdf4f252806318c227c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:37 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1AddTask
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 064024e70afd6ad08993444b3839eb3ba67426f2)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <558f1a90ce9b0fc5a9688c5a44bf85dd523c37e5.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 56 ++++---------------------------------
- src/util/vircgroupbackend.h | 20 +++++++++++++
- src/util/vircgrouppriv.h    |  5 ++++
- src/util/vircgroupv1.c      | 31 ++++++++++++++++++++
- 4 files changed, 62 insertions(+), 50 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 33d34d6eda..a5076cb554 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -544,7 +544,7 @@ virCgroupSetValueU64(virCgroupPtr group,
- }
- 
- 
--static int
-+int
- virCgroupSetValueI64(virCgroupPtr group,
-                      int controller,
-                      const char *key,
-@@ -672,50 +672,6 @@ virCgroupNew(pid_t pid,
- }
- 
- 
--typedef enum {
--    /* Adds a whole process with all threads to specific cgroup except
--     * to systemd named controller. */
--    VIR_CGROUP_TASK_PROCESS = 1 << 0,
--
--    /* Same as VIR_CGROUP_TASK_PROCESS but it also adds the task to systemd
--     * named controller. */
--    VIR_CGROUP_TASK_SYSTEMD = 1 << 1,
--
--    /* Moves only specific thread into cgroup except to systemd
--     * named controller. */
--    VIR_CGROUP_TASK_THREAD = 1 << 2,
--} virCgroupTaskFlags;
--
--
--static int
--virCgroupAddTaskInternal(virCgroupPtr group,
--                         pid_t pid,
--                         unsigned int flags)
--{
--    int ret = -1;
--    size_t i;
--
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        /* Skip over controllers not mounted */
--        if (!group->controllers[i].mountPoint)
--            continue;
--
--        /* We must never add tasks in systemd's hierarchy
--         * unless we're intentionally trying to move a
--         * task into a systemd machine scope */
--        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD &&
--            !(flags & VIR_CGROUP_TASK_SYSTEMD))
--            continue;
--
--        if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)
--            goto cleanup;
--    }
--
--    ret = 0;
-- cleanup:
--    return ret;
--}
--
- /**
-  * virCgroupAddProcess:
-  *
-@@ -730,7 +686,7 @@ virCgroupAddTaskInternal(virCgroupPtr group,
- int
- virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- {
--    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_PROCESS);
-+    return group->backend->addTask(group, pid, VIR_CGROUP_TASK_PROCESS);
- }
- 
- /**
-@@ -747,9 +703,9 @@ virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- int
- virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid)
- {
--    return virCgroupAddTaskInternal(group, pid,
--                                    VIR_CGROUP_TASK_PROCESS |
--                                    VIR_CGROUP_TASK_SYSTEMD);
-+    return group->backend->addTask(group, pid,
-+                                   VIR_CGROUP_TASK_PROCESS |
-+                                   VIR_CGROUP_TASK_SYSTEMD);
- }
- 
- /**
-@@ -767,7 +723,7 @@ int
- virCgroupAddThread(virCgroupPtr group,
-                    pid_t pid)
- {
--    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_THREAD);
-+    return group->backend->addTask(group, pid, VIR_CGROUP_TASK_THREAD);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 1f28c51c49..bff1f8938e 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -35,6 +35,20 @@ typedef enum {
-                                        */
- } virCgroupBackendFlags;
- 
-+typedef enum {
-+    /* Adds a whole process with all threads to specific cgroup except
-+     * to systemd named controller. */
-+    VIR_CGROUP_TASK_PROCESS = 1 << 0,
-+
-+    /* Same as VIR_CGROUP_TASK_PROCESS but it also adds the task to systemd
-+     * named controller. */
-+    VIR_CGROUP_TASK_SYSTEMD = 1 << 1,
-+
-+    /* Moves only specific thread into cgroup except to systemd
-+     * named controller. */
-+    VIR_CGROUP_TASK_THREAD = 1 << 2,
-+} virCgroupBackendTaskFlags;
-+
- typedef enum {
-     VIR_CGROUP_BACKEND_TYPE_V1 = 0,
-     VIR_CGROUP_BACKEND_TYPE_LAST,
-@@ -103,6 +117,11 @@ typedef int
- typedef int
- (*virCgroupRemoveCB)(virCgroupPtr group);
- 
-+typedef int
-+(*virCgroupAddTaskCB)(virCgroupPtr group,
-+                      pid_t pid,
-+                      unsigned int flags);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -121,6 +140,7 @@ struct _virCgroupBackend {
-     virCgroupPathOfControllerCB pathOfController;
-     virCgroupMakeGroupCB makeGroup;
-     virCgroupRemoveCB remove;
-+    virCgroupAddTaskCB addTask;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index a760b9bcfd..01714370be 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -73,6 +73,11 @@ int virCgroupGetValueU64(virCgroupPtr group,
-                          const char *key,
-                          unsigned long long int *value);
- 
-+int virCgroupSetValueI64(virCgroupPtr group,
-+                         int controller,
-+                         const char *key,
-+                         long long int value);
-+
- int virCgroupPartitionEscape(char **path);
- 
- int virCgroupNewPartition(const char *path,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 4d4b51094a..fda2c43eef 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -706,6 +706,36 @@ virCgroupV1Remove(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV1AddTask(virCgroupPtr group,
-+                   pid_t pid,
-+                   unsigned int flags)
-+{
-+    int ret = -1;
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        /* Skip over controllers not mounted */
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+
-+        /* We must never add tasks in systemd's hierarchy
-+         * unless we're intentionally trying to move a
-+         * task into a systemd machine scope */
-+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD &&
-+            !(flags & VIR_CGROUP_TASK_SYSTEMD))
-+            continue;
-+
-+        if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)
-+            goto cleanup;
-+    }
-+
-+    ret = 0;
-+ cleanup:
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -723,6 +753,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .pathOfController = virCgroupV1PathOfController,
-     .makeGroup = virCgroupV1MakeGroup,
-     .remove = virCgroupV1Remove,
-+    .addTask = virCgroupV1AddTask,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1Available.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1Available.patch
deleted file mode 100644
index a8f932f..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1Available.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 0dcb8bdc63970be07228108f602a7425612bd1fe Mon Sep 17 00:00:00 2001
-Message-Id: <0dcb8bdc63970be07228108f602a7425612bd1fe@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:23 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1Available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 57d35b72c9049348b36382ce88bee32553e0fae5)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c54c63779affc0f0a30224fd8001aa53fff9df52.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 28 ++++++++--------------------
- src/util/vircgroupbackend.h |  7 +++++++
- src/util/vircgroupv1.c      | 35 +++++++++++++++++++++++++++++++++++
- 3 files changed, 50 insertions(+), 20 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index d55f411daa..47a3b9ed58 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -51,6 +51,7 @@
- 
- #include "virutil.h"
- #include "viralloc.h"
-+#include "vircgroupbackend.h"
- #include "virerror.h"
- #include "virlog.h"
- #include "virfile.h"
-@@ -64,8 +65,6 @@
- 
- VIR_LOG_INIT("util.cgroup");
- 
--#define CGROUP_MAX_VAL 512
--
- #define VIR_FROM_THIS VIR_FROM_CGROUP
- 
- #define CGROUP_NB_TOTAL_CPU_STAT_PARAM 3
-@@ -132,29 +131,18 @@ virCgroupGetDevicePermsString(int perms)
- bool
- virCgroupAvailable(void)
- {
--    bool ret = false;
--    FILE *mounts = NULL;
--    struct mntent entry;
--    char buf[CGROUP_MAX_VAL];
-+    size_t i;
-+    virCgroupBackendPtr *backends = virCgroupBackendGetAll();
- 
--    if (!virFileExists("/proc/cgroups"))
-+    if (!backends)
-         return false;
- 
--    if (!(mounts = fopen("/proc/mounts", "r")))
--        return false;
--
--    while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
--        /* We're looking for at least one 'cgroup' fs mount,
--         * which is *not* a named mount. */
--        if (STREQ(entry.mnt_type, "cgroup") &&
--            !strstr(entry.mnt_opts, "name=")) {
--            ret = true;
--            break;
--        }
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (backends[i] && backends[i]->available())
-+            return true;
-     }
- 
--    VIR_FORCE_FCLOSE(mounts);
--    return ret;
-+    return false;
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index db052485a8..88f51416b0 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -25,14 +25,21 @@
- 
- # include "vircgroup.h"
- 
-+# define CGROUP_MAX_VAL 512
- 
- typedef enum {
-     VIR_CGROUP_BACKEND_TYPE_V1 = 0,
-     VIR_CGROUP_BACKEND_TYPE_LAST,
- } virCgroupBackendType;
- 
-+typedef bool
-+(*virCgroupAvailableCB)(void);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
-+
-+    /* Mandatory callbacks that need to be implemented for every backend. */
-+    virCgroupAvailableCB available;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 4dda7865f1..73045b1109 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -20,6 +20,10 @@
-  */
- #include <config.h>
- 
-+#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
-+# include <mntent.h>
-+#endif
-+
- #include "internal.h"
- 
- #define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
-@@ -29,6 +33,7 @@
- #include "vircgroup.h"
- #include "vircgroupbackend.h"
- #include "vircgroupv1.h"
-+#include "virfile.h"
- #include "virlog.h"
- 
- VIR_LOG_INIT("util.cgroup");
-@@ -43,8 +48,38 @@ VIR_ENUM_IMPL(virCgroupV1Controller, VIR_CGROUP_CONTROLLER_LAST,
-               "name=systemd");
- 
- 
-+/* We're looking for at least one 'cgroup' fs mount,
-+ * which is *not* a named mount. */
-+static bool
-+virCgroupV1Available(void)
-+{
-+    bool ret = false;
-+    FILE *mounts = NULL;
-+    struct mntent entry;
-+    char buf[CGROUP_MAX_VAL];
-+
-+    if (!virFileExists("/proc/cgroups"))
-+        return false;
-+
-+    if (!(mounts = fopen("/proc/mounts", "r")))
-+        return false;
-+
-+    while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
-+        if (STREQ(entry.mnt_type, "cgroup") && !strstr(entry.mnt_opts, "name=")) {
-+            ret = true;
-+            break;
-+        }
-+    }
-+
-+    VIR_FORCE_FCLOSE(mounts);
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
-+
-+    .available = virCgroupV1Available,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1BindMount.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1BindMount.patch
deleted file mode 100644
index 9528463..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1BindMount.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-From 7ee971869f488f806a728eead8be82c287a35fc4 Mon Sep 17 00:00:00 2001
-Message-Id: <7ee971869f488f806a728eead8be82c287a35fc4@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:39 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1BindMount
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8dc1b6ce50a6c007c0d2149ac7106221c99beb6f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <71e4dbba49af93bcc36eefc92725e493a0447214.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 102 +-------------------------------
- src/util/vircgroupbackend.h |   6 ++
- src/util/vircgroupv1.c      | 113 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 120 insertions(+), 101 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index d4d02d8f5b..7789966472 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3179,35 +3179,6 @@ virCgroupKillPainfully(virCgroupPtr group)
- }
- 
- 
--static char *
--virCgroupIdentifyRoot(virCgroupPtr group)
--{
--    char *ret = NULL;
--    size_t i;
--
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        char *tmp;
--        if (!group->controllers[i].mountPoint)
--            continue;
--        if (!(tmp = strrchr(group->controllers[i].mountPoint, '/'))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Could not find directory separator in %s"),
--                           group->controllers[i].mountPoint);
--            return NULL;
--        }
--
--        if (VIR_STRNDUP(ret, group->controllers[i].mountPoint,
--                        tmp - group->controllers[i].mountPoint) < 0)
--            return NULL;
--        return ret;
--    }
--
--    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                   _("Could not find any mounted controllers"));
--    return NULL;
--}
--
--
- /**
-  * virCgroupGetCpuCfsQuota:
-  *
-@@ -3302,78 +3273,7 @@ int
- virCgroupBindMount(virCgroupPtr group, const char *oldroot,
-                    const char *mountopts)
- {
--    size_t i;
--    VIR_AUTOFREE(char *) opts = NULL;
--    VIR_AUTOFREE(char *) root = NULL;
--
--    if (!(root = virCgroupIdentifyRoot(group)))
--        return -1;
--
--    VIR_DEBUG("Mounting cgroups at '%s'", root);
--
--    if (virFileMakePath(root) < 0) {
--        virReportSystemError(errno,
--                             _("Unable to create directory %s"),
--                             root);
--        return -1;
--    }
--
--    if (virAsprintf(&opts,
--                    "mode=755,size=65536%s", mountopts) < 0)
--        return -1;
--
--    if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) {
--        virReportSystemError(errno,
--                             _("Failed to mount %s on %s type %s"),
--                             "tmpfs", root, "tmpfs");
--        return -1;
--    }
--
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
--            continue;
--
--        if (!virFileExists(group->controllers[i].mountPoint)) {
--            VIR_AUTOFREE(char *) src = NULL;
--            if (virAsprintf(&src, "%s%s",
--                            oldroot,
--                            group->controllers[i].mountPoint) < 0)
--                return -1;
--
--            VIR_DEBUG("Create mount point '%s'",
--                      group->controllers[i].mountPoint);
--            if (virFileMakePath(group->controllers[i].mountPoint) < 0) {
--                virReportSystemError(errno,
--                                     _("Unable to create directory %s"),
--                                     group->controllers[i].mountPoint);
--                return -1;
--            }
--
--            if (mount(src, group->controllers[i].mountPoint, "none", MS_BIND,
--                      NULL) < 0) {
--                virReportSystemError(errno,
--                                     _("Failed to bind cgroup '%s' on '%s'"),
--                                     src, group->controllers[i].mountPoint);
--                return -1;
--            }
--        }
--
--        if (group->controllers[i].linkPoint) {
--            VIR_DEBUG("Link mount point '%s' to '%s'",
--                      group->controllers[i].mountPoint,
--                      group->controllers[i].linkPoint);
--            if (symlink(group->controllers[i].mountPoint,
--                        group->controllers[i].linkPoint) < 0) {
--                virReportSystemError(errno,
--                                     _("Unable to symlink directory %s to %s"),
--                                     group->controllers[i].mountPoint,
--                                     group->controllers[i].linkPoint);
--                return -1;
--            }
--        }
--    }
--
--    return 0;
-+    return group->backend->bindMount(group, oldroot, mountopts);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 3e0f6d01f4..caeec3de60 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -126,6 +126,11 @@ typedef int
- (*virCgroupHasEmptyTasksCB)(virCgroupPtr cgroup,
-                             int controller);
- 
-+typedef int
-+(*virCgroupBindMountCB)(virCgroupPtr group,
-+                        const char *oldroot,
-+                        const char *mountopts);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -146,6 +151,7 @@ struct _virCgroupBackend {
-     virCgroupRemoveCB remove;
-     virCgroupAddTaskCB addTask;
-     virCgroupHasEmptyTasksCB hasEmptyTasks;
-+    virCgroupBindMountCB bindMount;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index b057cdfd9e..d63525dfb0 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -24,6 +24,9 @@
- # include <mntent.h>
- #endif
- #include <sys/stat.h>
-+#if defined HAVE_SYS_MOUNT_H
-+# include <sys/mount.h>
-+#endif
- 
- #include "internal.h"
- 
-@@ -755,6 +758,115 @@ virCgroupV1HasEmptyTasks(virCgroupPtr cgroup,
- }
- 
- 
-+static char *
-+virCgroupV1IdentifyRoot(virCgroupPtr group)
-+{
-+    char *ret = NULL;
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        char *tmp;
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+        if (!(tmp = strrchr(group->controllers[i].mountPoint, '/'))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Could not find directory separator in %s"),
-+                           group->controllers[i].mountPoint);
-+            return NULL;
-+        }
-+
-+        if (VIR_STRNDUP(ret, group->controllers[i].mountPoint,
-+                        tmp - group->controllers[i].mountPoint) < 0)
-+            return NULL;
-+        return ret;
-+    }
-+
-+    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                   _("Could not find any mounted v1 controllers"));
-+    return NULL;
-+}
-+
-+
-+static int
-+virCgroupV1BindMount(virCgroupPtr group,
-+                     const char *oldroot,
-+                     const char *mountopts)
-+{
-+    size_t i;
-+    VIR_AUTOFREE(char *) opts = NULL;
-+    VIR_AUTOFREE(char *) root = NULL;
-+
-+    if (!(root = virCgroupV1IdentifyRoot(group)))
-+        return -1;
-+
-+    VIR_DEBUG("Mounting cgroups at '%s'", root);
-+
-+    if (virFileMakePath(root) < 0) {
-+        virReportSystemError(errno,
-+                             _("Unable to create directory %s"),
-+                             root);
-+        return -1;
-+    }
-+
-+    if (virAsprintf(&opts,
-+                    "mode=755,size=65536%s", mountopts) < 0)
-+        return -1;
-+
-+    if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) {
-+        virReportSystemError(errno,
-+                             _("Failed to mount %s on %s type %s"),
-+                             "tmpfs", root, "tmpfs");
-+        return -1;
-+    }
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+
-+        if (!virFileExists(group->controllers[i].mountPoint)) {
-+            VIR_AUTOFREE(char *) src = NULL;
-+            if (virAsprintf(&src, "%s%s",
-+                            oldroot,
-+                            group->controllers[i].mountPoint) < 0)
-+                return -1;
-+
-+            VIR_DEBUG("Create mount point '%s'",
-+                      group->controllers[i].mountPoint);
-+            if (virFileMakePath(group->controllers[i].mountPoint) < 0) {
-+                virReportSystemError(errno,
-+                                     _("Unable to create directory %s"),
-+                                     group->controllers[i].mountPoint);
-+                return -1;
-+            }
-+
-+            if (mount(src, group->controllers[i].mountPoint, "none", MS_BIND,
-+                      NULL) < 0) {
-+                virReportSystemError(errno,
-+                                     _("Failed to bind cgroup '%s' on '%s'"),
-+                                     src, group->controllers[i].mountPoint);
-+                return -1;
-+            }
-+        }
-+
-+        if (group->controllers[i].linkPoint) {
-+            VIR_DEBUG("Link mount point '%s' to '%s'",
-+                      group->controllers[i].mountPoint,
-+                      group->controllers[i].linkPoint);
-+            if (symlink(group->controllers[i].mountPoint,
-+                        group->controllers[i].linkPoint) < 0) {
-+                virReportSystemError(errno,
-+                                     _("Unable to symlink directory %s to %s"),
-+                                     group->controllers[i].mountPoint,
-+                                     group->controllers[i].linkPoint);
-+                return -1;
-+            }
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -774,6 +886,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .remove = virCgroupV1Remove,
-     .addTask = virCgroupV1AddTask,
-     .hasEmptyTasks = virCgroupV1HasEmptyTasks,
-+    .bindMount = virCgroupV1BindMount,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyMounts.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyMounts.patch
deleted file mode 100644
index 08ce542..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyMounts.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From ac37b7c9693d27c9c20f87b3fd077bf55ac1d34f Mon Sep 17 00:00:00 2001
-Message-Id: <ac37b7c9693d27c9c20f87b3fd077bf55ac1d34f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:26 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1CopyMounts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 47941ea7f52be44f609a6b6acc8895644039e617)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b833625dd800eee0c3aac96f120ca27dae81ce89.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 23 +----------------------
- src/util/vircgroupbackend.h |  5 +++++
- src/util/vircgroupv1.c      | 22 ++++++++++++++++++++++
- 3 files changed, 28 insertions(+), 22 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 6825623478..9d644d37d1 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -235,27 +235,6 @@ virCgroupPartitionEscape(char **path)
- }
- 
- 
--static int
--virCgroupCopyMounts(virCgroupPtr group,
--                    virCgroupPtr parent)
--{
--    size_t i;
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!parent->controllers[i].mountPoint)
--            continue;
--
--        if (VIR_STRDUP(group->controllers[i].mountPoint,
--                       parent->controllers[i].mountPoint) < 0)
--            return -1;
--
--        if (VIR_STRDUP(group->controllers[i].linkPoint,
--                       parent->controllers[i].linkPoint) < 0)
--            return -1;
--    }
--    return 0;
--}
--
--
- static int
- virCgroupResolveMountLink(const char *mntDir,
-                           const char *typeStr,
-@@ -653,7 +632,7 @@ virCgroupDetect(virCgroupPtr group,
-     }
- 
-     if (parent) {
--        if (virCgroupCopyMounts(group, parent) < 0)
-+        if (group->backend->copyMounts(group, parent) < 0)
-             return -1;
-     } else {
-         if (virCgroupDetectMounts(group) < 0)
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index daf47bac09..81ee597fc8 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -41,12 +41,17 @@ typedef bool
-                                    const char *drivername,
-                                    const char *machinename);
- 
-+typedef int
-+(*virCgroupCopyMountsCB)(virCgroupPtr group,
-+                         virCgroupPtr parent);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-     /* Mandatory callbacks that need to be implemented for every backend. */
-     virCgroupAvailableCB available;
-     virCgroupValidateMachineGroupCB validateMachineGroup;
-+    virCgroupCopyMountsCB copyMounts;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index b78cdcab53..50b58ab413 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -160,11 +160,33 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1CopyMounts(virCgroupPtr group,
-+                      virCgroupPtr parent)
-+{
-+    size_t i;
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        if (!parent->controllers[i].mountPoint)
-+            continue;
-+
-+        if (VIR_STRDUP(group->controllers[i].mountPoint,
-+                       parent->controllers[i].mountPoint) < 0)
-+            return -1;
-+
-+        if (VIR_STRDUP(group->controllers[i].linkPoint,
-+                       parent->controllers[i].linkPoint) < 0)
-+            return -1;
-+    }
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-     .available = virCgroupV1Available,
-     .validateMachineGroup = virCgroupV1ValidateMachineGroup,
-+    .copyMounts = virCgroupV1CopyMounts,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyPlacement.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyPlacement.patch
deleted file mode 100644
index dacd6d8..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1CopyPlacement.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From b246f8418526ea154fe2f0223f6f34ea86b90ea4 Mon Sep 17 00:00:00 2001
-Message-Id: <b246f8418526ea154fe2f0223f6f34ea86b90ea4@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:28 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1CopyPlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 229a8b5d3504efdbe8cd25bb3a127ec74ab4bbd3)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <9a9b8e24c5574e7b61e19a46d9978bf0dc1b32d3.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 38 +------------------------------------
- src/util/vircgroupbackend.h |  6 ++++++
- src/util/vircgroupv1.c      | 37 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 44 insertions(+), 37 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 10c99a66fd..b63321ca33 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -269,42 +269,6 @@ virCgroupDetectMounts(virCgroupPtr group)
- }
- 
- 
--static int
--virCgroupCopyPlacement(virCgroupPtr group,
--                       const char *path,
--                       virCgroupPtr parent)
--{
--    size_t i;
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
--            continue;
--
--        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
--            continue;
--
--        if (path[0] == '/') {
--            if (VIR_STRDUP(group->controllers[i].placement, path) < 0)
--                return -1;
--        } else {
--            /*
--             * parent == "/" + path="" => "/"
--             * parent == "/libvirt.service" + path == "" => "/libvirt.service"
--             * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo"
--             */
--            if (virAsprintf(&group->controllers[i].placement,
--                            "%s%s%s",
--                            parent->controllers[i].placement,
--                            (STREQ(parent->controllers[i].placement, "/") ||
--                             STREQ(path, "") ? "" : "/"),
--                            path) < 0)
--                return -1;
--        }
--    }
--
--    return 0;
--}
--
--
- /*
-  * virCgroupDetectPlacement:
-  * @group: the group to process
-@@ -532,7 +496,7 @@ virCgroupDetect(virCgroupPtr group,
-      * based on the parent cgroup...
-      */
-     if ((parent || path[0] == '/') &&
--        virCgroupCopyPlacement(group, path, parent) < 0)
-+        group->backend->copyPlacement(group, path, parent) < 0)
-         return -1;
- 
-     /* ... but use /proc/cgroups to fill in the rest */
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index fadc7efdcf..85906e7191 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -45,6 +45,11 @@ typedef int
- (*virCgroupCopyMountsCB)(virCgroupPtr group,
-                          virCgroupPtr parent);
- 
-+typedef int
-+(*virCgroupCopyPlacementCB)(virCgroupPtr group,
-+                            const char *path,
-+                            virCgroupPtr parent);
-+
- typedef int
- (*virCgroupDetectMountsCB)(virCgroupPtr group,
-                            const char *mntType,
-@@ -64,6 +69,7 @@ struct _virCgroupBackend {
-     virCgroupAvailableCB available;
-     virCgroupValidateMachineGroupCB validateMachineGroup;
-     virCgroupCopyMountsCB copyMounts;
-+    virCgroupCopyPlacementCB copyPlacement;
-     virCgroupDetectMountsCB detectMounts;
-     virCgroupDetectPlacementCB detectPlacement;
- };
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index bd9f28f6e9..68bb1c6f5d 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -183,6 +183,42 @@ virCgroupV1CopyMounts(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1CopyPlacement(virCgroupPtr group,
-+                         const char *path,
-+                         virCgroupPtr parent)
-+{
-+    size_t i;
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+
-+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
-+            continue;
-+
-+        if (path[0] == '/') {
-+            if (VIR_STRDUP(group->controllers[i].placement, path) < 0)
-+                return -1;
-+        } else {
-+            /*
-+             * parent == "/" + path="" => "/"
-+             * parent == "/libvirt.service" + path == "" => "/libvirt.service"
-+             * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo"
-+             */
-+            if (virAsprintf(&group->controllers[i].placement,
-+                            "%s%s%s",
-+                            parent->controllers[i].placement,
-+                            (STREQ(parent->controllers[i].placement, "/") ||
-+                             STREQ(path, "") ? "" : "/"),
-+                            path) < 0)
-+                return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- virCgroupV1ResolveMountLink(const char *mntDir,
-                             const char *typeStr,
-@@ -343,6 +379,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .available = virCgroupV1Available,
-     .validateMachineGroup = virCgroupV1ValidateMachineGroup,
-     .copyMounts = virCgroupV1CopyMounts,
-+    .copyPlacement = virCgroupV1CopyPlacement,
-     .detectMounts = virCgroupV1DetectMounts,
-     .detectPlacement = virCgroupV1DetectPlacement,
- };
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1DetectControllers.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1DetectControllers.patch
deleted file mode 100644
index dbf60ef..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1DetectControllers.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From c5ff4dbe89d9a57da51bb92389ebd9e5af4dd8dc Mon Sep 17 00:00:00 2001
-Message-Id: <c5ff4dbe89d9a57da51bb92389ebd9e5af4dd8dc@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:31 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1DetectControllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d7f77dd6d5bcf91c3422a15842c2b7c2714510af)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a066563f5d5183b6e09ae73cbfb3defb478bb693.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 66 +------------------------------------
- src/util/vircgroupbackend.h |  5 +++
- src/util/vircgroupv1.c      | 65 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 71 insertions(+), 65 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 0e64ad67f4..2e74cbbff4 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -349,70 +349,6 @@ virCgroupDetectPlacement(virCgroupPtr group,
- }
- 
- 
--static int
--virCgroupDetectControllers(virCgroupPtr group,
--                           int controllers)
--{
--    size_t i;
--    size_t j;
--
--    if (controllers >= 0) {
--        VIR_DEBUG("Filtering controllers %d", controllers);
--        /* First mark requested but non-existing controllers to be ignored */
--        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--            if (((1 << i) & controllers)) {
--                /* Remove non-existent controllers  */
--                if (!group->controllers[i].mountPoint) {
--                    VIR_DEBUG("Requested controller '%s' not mounted, ignoring",
--                              virCgroupControllerTypeToString(i));
--                    controllers &= ~(1 << i);
--                }
--            }
--        }
--        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--            VIR_DEBUG("Controller '%s' wanted=%s, mount='%s'",
--                      virCgroupControllerTypeToString(i),
--                      (1 << i) & controllers ? "yes" : "no",
--                      NULLSTR(group->controllers[i].mountPoint));
--            if (!((1 << i) & controllers) &&
--                group->controllers[i].mountPoint) {
--                /* Check whether a request to disable a controller
--                 * clashes with co-mounting of controllers */
--                for (j = 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) {
--                    if (j == i)
--                        continue;
--                    if (!((1 << j) & controllers))
--                        continue;
--
--                    if (STREQ_NULLABLE(group->controllers[i].mountPoint,
--                                       group->controllers[j].mountPoint)) {
--                        virReportSystemError(EINVAL,
--                                             _("Controller '%s' is not wanted, but '%s' is co-mounted"),
--                                             virCgroupControllerTypeToString(i),
--                                             virCgroupControllerTypeToString(j));
--                        return -1;
--                    }
--                }
--                VIR_FREE(group->controllers[i].mountPoint);
--            }
--        }
--    } else {
--        VIR_DEBUG("Auto-detecting controllers");
--        controllers = 0;
--        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--            VIR_DEBUG("Controller '%s' present=%s",
--                      virCgroupControllerTypeToString(i),
--                      group->controllers[i].mountPoint ? "yes" : "no");
--            if (group->controllers[i].mountPoint == NULL)
--                continue;
--            controllers |= (1 << i);
--        }
--    }
--
--    return controllers;
--}
--
--
- static int
- virCgroupDetect(virCgroupPtr group,
-                 pid_t pid,
-@@ -451,7 +387,7 @@ virCgroupDetect(virCgroupPtr group,
-             return -1;
-     }
- 
--    rc = virCgroupDetectControllers(group, controllers);
-+    rc = group->backend->detectControllers(group, controllers);
-     if (rc < 0)
-         return -1;
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 9c0bd89793..011d1b00da 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -69,6 +69,10 @@ typedef int
- typedef char *
- (*virCgroupStealPlacementCB)(virCgroupPtr group);
- 
-+typedef int
-+(*virCgroupDetectControllersCB)(virCgroupPtr group,
-+                                int controllers);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -81,6 +85,7 @@ struct _virCgroupBackend {
-     virCgroupDetectPlacementCB detectPlacement;
-     virCgroupValidatePlacementCB validatePlacement;
-     virCgroupStealPlacementCB stealPlacement;
-+    virCgroupDetectControllersCB detectControllers;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 446546fd58..11a86c061a 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -414,6 +414,70 @@ virCgroupV1StealPlacement(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV1DetectControllers(virCgroupPtr group,
-+                             int controllers)
-+{
-+    size_t i;
-+    size_t j;
-+
-+    if (controllers >= 0) {
-+        VIR_DEBUG("Filtering controllers %d", controllers);
-+        /* First mark requested but non-existing controllers to be ignored */
-+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+            if (((1 << i) & controllers)) {
-+                /* Remove non-existent controllers  */
-+                if (!group->controllers[i].mountPoint) {
-+                    VIR_DEBUG("Requested controller '%s' not mounted, ignoring",
-+                              virCgroupV1ControllerTypeToString(i));
-+                    controllers &= ~(1 << i);
-+                }
-+            }
-+        }
-+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+            VIR_DEBUG("Controller '%s' wanted=%s, mount='%s'",
-+                      virCgroupV1ControllerTypeToString(i),
-+                      (1 << i) & controllers ? "yes" : "no",
-+                      NULLSTR(group->controllers[i].mountPoint));
-+            if (!((1 << i) & controllers) &&
-+                group->controllers[i].mountPoint) {
-+                /* Check whether a request to disable a controller
-+                 * clashes with co-mounting of controllers */
-+                for (j = 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) {
-+                    if (j == i)
-+                        continue;
-+                    if (!((1 << j) & controllers))
-+                        continue;
-+
-+                    if (STREQ_NULLABLE(group->controllers[i].mountPoint,
-+                                       group->controllers[j].mountPoint)) {
-+                        virReportSystemError(EINVAL,
-+                                             _("V1 controller '%s' is not wanted, but '%s' is co-mounted"),
-+                                             virCgroupV1ControllerTypeToString(i),
-+                                             virCgroupV1ControllerTypeToString(j));
-+                        return -1;
-+                    }
-+                }
-+                VIR_FREE(group->controllers[i].mountPoint);
-+            }
-+        }
-+    } else {
-+        VIR_DEBUG("Auto-detecting controllers");
-+        controllers = 0;
-+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+            VIR_DEBUG("Controller '%s' present=%s",
-+                      virCgroupV1ControllerTypeToString(i),
-+                      group->controllers[i].mountPoint ? "yes" : "no");
-+            if (group->controllers[i].mountPoint == NULL)
-+                continue;
-+            controllers |= (1 << i);
-+        }
-+    }
-+
-+    return controllers;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -425,6 +489,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .detectPlacement = virCgroupV1DetectPlacement,
-     .validatePlacement = virCgroupV1ValidatePlacement,
-     .stealPlacement = virCgroupV1StealPlacement,
-+    .detectControllers = virCgroupV1DetectControllers,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetAnyController.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetAnyController.patch
deleted file mode 100644
index 5e7acc3..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetAnyController.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 98be75680dd7026b7156b3f9a0bd220f00714387 Mon Sep 17 00:00:00 2001
-Message-Id: <98be75680dd7026b7156b3f9a0bd220f00714387@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:33 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetAnyController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d6564037e8161bbdd270a822f5a2aafd90c7df10)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <fc1d1ba80e734d7cdbdf6300e0199b48ede77bd1.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 16 ++++------------
- src/util/vircgroupbackend.h |  4 ++++
- src/util/vircgroupv1.c      | 22 ++++++++++++++++++++++
- 3 files changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 5bbe42b699..a6f529accd 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3173,19 +3173,11 @@ virCgroupPathOfAnyController(virCgroupPtr group,
-                              const char *name,
-                              char **keypath)
- {
--    size_t i;
-+    int controller;
- 
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        /* Reject any controller with a placement
--         * of '/' to avoid doing bad stuff to the root
--         * cgroup
--         */
--        if (group->controllers[i].mountPoint &&
--            group->controllers[i].placement &&
--            STRNEQ(group->controllers[i].placement, "/")) {
--            return virCgroupPathOfController(group, i, name, keypath);
--        }
--    }
-+    controller = group->backend->getAnyController(group);
-+    if (controller >= 0)
-+        return virCgroupPathOfController(group, controller, name, keypath);
- 
-     virReportSystemError(ENOSYS, "%s",
-                          _("No controllers are mounted"));
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 29b2fd119f..b4eaa89021 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -77,6 +77,9 @@ typedef bool
- (*virCgroupHasControllerCB)(virCgroupPtr cgroup,
-                             int controller);
- 
-+typedef int
-+(*virCgroupGetAnyControllerCB)(virCgroupPtr group);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -91,6 +94,7 @@ struct _virCgroupBackend {
-     virCgroupStealPlacementCB stealPlacement;
-     virCgroupDetectControllersCB detectControllers;
-     virCgroupHasControllerCB hasController;
-+    virCgroupGetAnyControllerCB getAnyController;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 0638f48d50..bae16b8294 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -486,6 +486,27 @@ virCgroupV1HasController(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetAnyController(virCgroupPtr group)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        /* Reject any controller with a placement
-+         * of '/' to avoid doing bad stuff to the root
-+         * cgroup
-+         */
-+        if (group->controllers[i].mountPoint &&
-+            group->controllers[i].placement &&
-+            STRNEQ(group->controllers[i].placement, "/")) {
-+            return i;
-+        }
-+    }
-+
-+    return -1;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -499,6 +520,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .stealPlacement = virCgroupV1StealPlacement,
-     .detectControllers = virCgroupV1DetectControllers,
-     .hasController = virCgroupV1HasController,
-+    .getAnyController = virCgroupV1GetAnyController,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoDeviceServiced.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoDeviceServiced.patch
deleted file mode 100644
index 7617d08..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoDeviceServiced.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From 0418e750369292b3bb7a855b998344042a87622c Mon Sep 17 00:00:00 2001
-Message-Id: <0418e750369292b3bb7a855b998344042a87622c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:43 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetBlkioIoDeviceServiced
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 44809a28ecfe6f79d18abb55685024128228c7ad)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <faf6e33b119a729cb9afc63f7446ccb5fcecfb04.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 83 ++--------------------------------
- src/util/vircgroupbackend.h |  9 ++++
- src/util/vircgrouppriv.h    |  2 +
- src/util/vircgroupv1.c      | 90 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 105 insertions(+), 79 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 8e46777920..fd39144ed2 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -409,7 +409,7 @@ virCgroupDetect(virCgroupPtr group,
- }
- 
- 
--static char *
-+char *
- virCgroupGetBlockDevString(const char *path)
- {
-     char *ret = NULL;
-@@ -1337,84 +1337,9 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
-                                   long long *requests_read,
-                                   long long *requests_write)
- {
--    VIR_AUTOFREE(char *) str1 = NULL;
--    VIR_AUTOFREE(char *) str2 = NULL;
--    VIR_AUTOFREE(char *) str3 = NULL;
--    char *p1 = NULL;
--    char *p2 = NULL;
--    size_t i;
--
--    const char *value_names[] = {
--        "Read ",
--        "Write "
--    };
--    long long *bytes_ptrs[] = {
--        bytes_read,
--        bytes_write
--    };
--    long long *requests_ptrs[] = {
--        requests_read,
--        requests_write
--    };
--
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_BLKIO,
--                             "blkio.throttle.io_service_bytes", &str1) < 0)
--        return -1;
--
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_BLKIO,
--                             "blkio.throttle.io_serviced", &str2) < 0)
--        return -1;
--
--    if (!(str3 = virCgroupGetBlockDevString(path)))
--        return -1;
--
--    if (!(p1 = strstr(str1, str3))) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Cannot find byte stats for block device '%s'"),
--                       str3);
--        return -1;
--    }
--
--    if (!(p2 = strstr(str2, str3))) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Cannot find request stats for block device '%s'"),
--                       str3);
--        return -1;
--    }
--
--    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
--        if (!(p1 = strstr(p1, value_names[i]))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Cannot find byte %sstats for block device '%s'"),
--                           value_names[i], str3);
--            return -1;
--        }
--
--        if (virStrToLong_ll(p1 + strlen(value_names[i]), &p1, 10, bytes_ptrs[i]) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Cannot parse %sstat '%s'"),
--                           value_names[i], p1 + strlen(value_names[i]));
--            return -1;
--        }
--
--        if (!(p2 = strstr(p2, value_names[i]))) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Cannot find request %sstats for block device '%s'"),
--                           value_names[i], str3);
--            return -1;
--        }
--
--        if (virStrToLong_ll(p2 + strlen(value_names[i]), &p2, 10, requests_ptrs[i]) < 0) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Cannot parse %sstat '%s'"),
--                           value_names[i], p2 + strlen(value_names[i]));
--            return -1;
--        }
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioIoDeviceServiced, -1,
-+                            path, bytes_read, bytes_write,
-+                            requests_read, requests_write);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 585a2eb353..e16d631a0f 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -152,6 +152,14 @@ typedef int
-                                  long long *requests_read,
-                                  long long *requests_write);
- 
-+typedef int
-+(*virCgroupGetBlkioIoDeviceServicedCB)(virCgroupPtr group,
-+                                       const char *path,
-+                                       long long *bytes_read,
-+                                       long long *bytes_write,
-+                                       long long *requests_read,
-+                                       long long *requests_write);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -179,6 +187,7 @@ struct _virCgroupBackend {
-     virCgroupSetBlkioWeightCB setBlkioWeight;
-     virCgroupGetBlkioWeightCB getBlkioWeight;
-     virCgroupGetBlkioIoServicedCB getBlkioIoServiced;
-+    virCgroupGetBlkioIoDeviceServicedCB getBlkioIoDeviceServiced;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 01714370be..525c288a9a 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -80,6 +80,8 @@ int virCgroupSetValueI64(virCgroupPtr group,
- 
- int virCgroupPartitionEscape(char **path);
- 
-+char *virCgroupGetBlockDevString(const char *path);
-+
- int virCgroupNewPartition(const char *path,
-                           bool create,
-                           int controllers,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 1afdad4afc..79c4812aef 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1049,6 +1049,95 @@ virCgroupV1GetBlkioIoServiced(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetBlkioIoDeviceServiced(virCgroupPtr group,
-+                                    const char *path,
-+                                    long long *bytes_read,
-+                                    long long *bytes_write,
-+                                    long long *requests_read,
-+                                    long long *requests_write)
-+{
-+    VIR_AUTOFREE(char *) str1 = NULL;
-+    VIR_AUTOFREE(char *) str2 = NULL;
-+    VIR_AUTOFREE(char *) str3 = NULL;
-+    char *p1 = NULL;
-+    char *p2 = NULL;
-+    size_t i;
-+
-+    const char *value_names[] = {
-+        "Read ",
-+        "Write "
-+    };
-+    long long *bytes_ptrs[] = {
-+        bytes_read,
-+        bytes_write
-+    };
-+    long long *requests_ptrs[] = {
-+        requests_read,
-+        requests_write
-+    };
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.io_service_bytes", &str1) < 0)
-+        return -1;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.io_serviced", &str2) < 0)
-+        return -1;
-+
-+    if (!(str3 = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (!(p1 = strstr(str1, str3))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Cannot find byte stats for block device '%s'"),
-+                       str3);
-+        return -1;
-+    }
-+
-+    if (!(p2 = strstr(str2, str3))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Cannot find request stats for block device '%s'"),
-+                       str3);
-+        return -1;
-+    }
-+
-+    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
-+        if (!(p1 = strstr(p1, value_names[i]))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Cannot find byte %sstats for block device '%s'"),
-+                           value_names[i], str3);
-+            return -1;
-+        }
-+
-+        if (virStrToLong_ll(p1 + strlen(value_names[i]), &p1, 10, bytes_ptrs[i]) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Cannot parse %sstat '%s'"),
-+                           value_names[i], p1 + strlen(value_names[i]));
-+            return -1;
-+        }
-+
-+        if (!(p2 = strstr(p2, value_names[i]))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Cannot find request %sstats for block device '%s'"),
-+                           value_names[i], str3);
-+            return -1;
-+        }
-+
-+        if (virStrToLong_ll(p2 + strlen(value_names[i]), &p2, 10, requests_ptrs[i]) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Cannot parse %sstat '%s'"),
-+                           value_names[i], p2 + strlen(value_names[i]));
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1074,6 +1163,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .setBlkioWeight = virCgroupV1SetBlkioWeight,
-     .getBlkioWeight = virCgroupV1GetBlkioWeight,
-     .getBlkioIoServiced = virCgroupV1GetBlkioIoServiced,
-+    .getBlkioIoDeviceServiced = virCgroupV1GetBlkioIoDeviceServiced,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoServiced.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoServiced.patch
deleted file mode 100644
index 660292e..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetBlkioIoServiced.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From 3cb8992be4013fb3ae978c62f6a433080e74130a Mon Sep 17 00:00:00 2001
-Message-Id: <3cb8992be4013fb3ae978c62f6a433080e74130a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:42 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetBlkioIoServiced
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 4baa08ace12d2db7e7023b2abe915360bc7dcddf)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <aa03ae2eef4e9a09d28562f7218c302ec095a912.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 87 ++-------------------------------
- src/util/vircgroupbackend.h |  8 ++++
- src/util/vircgroupv1.c      | 95 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 106 insertions(+), 84 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index d2ffa8aefe..8e46777920 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1311,90 +1311,9 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group,
-                             long long *requests_read,
-                             long long *requests_write)
- {
--    long long stats_val;
--    VIR_AUTOFREE(char *) str1 = NULL;
--    VIR_AUTOFREE(char *) str2 = NULL;
--    char *p1 = NULL;
--    char *p2 = NULL;
--    size_t i;
--
--    const char *value_names[] = {
--        "Read ",
--        "Write "
--    };
--    long long *bytes_ptrs[] = {
--        bytes_read,
--        bytes_write
--    };
--    long long *requests_ptrs[] = {
--        requests_read,
--        requests_write
--    };
--
--    *bytes_read = 0;
--    *bytes_write = 0;
--    *requests_read = 0;
--    *requests_write = 0;
--
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_BLKIO,
--                             "blkio.throttle.io_service_bytes", &str1) < 0)
--        return -1;
--
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_BLKIO,
--                             "blkio.throttle.io_serviced", &str2) < 0)
--        return -1;
--
--    /* sum up all entries of the same kind, from all devices */
--    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
--        p1 = str1;
--        p2 = str2;
--
--        while ((p1 = strstr(p1, value_names[i]))) {
--            p1 += strlen(value_names[i]);
--            if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) {
--                virReportError(VIR_ERR_INTERNAL_ERROR,
--                               _("Cannot parse byte %sstat '%s'"),
--                               value_names[i],
--                               p1);
--                return -1;
--            }
--
--            if (stats_val < 0 ||
--                (stats_val > 0 && *bytes_ptrs[i] > (LLONG_MAX - stats_val)))
--            {
--                virReportError(VIR_ERR_OVERFLOW,
--                               _("Sum of byte %sstat overflows"),
--                               value_names[i]);
--                return -1;
--            }
--            *bytes_ptrs[i] += stats_val;
--        }
--
--        while ((p2 = strstr(p2, value_names[i]))) {
--            p2 += strlen(value_names[i]);
--            if (virStrToLong_ll(p2, &p2, 10, &stats_val) < 0) {
--                virReportError(VIR_ERR_INTERNAL_ERROR,
--                               _("Cannot parse %srequest stat '%s'"),
--                               value_names[i],
--                               p2);
--                return -1;
--            }
--
--            if (stats_val < 0 ||
--                (stats_val > 0 && *requests_ptrs[i] > (LLONG_MAX - stats_val)))
--            {
--                virReportError(VIR_ERR_OVERFLOW,
--                               _("Sum of %srequest stat overflows"),
--                               value_names[i]);
--                return -1;
--            }
--            *requests_ptrs[i] += stats_val;
--        }
--    }
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getBlkioIoServiced, -1,
-+                            bytes_read, bytes_write,
-+                            requests_read, requests_write);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index ccce65f1e2..585a2eb353 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -145,6 +145,13 @@ typedef int
- (*virCgroupGetBlkioWeightCB)(virCgroupPtr group,
-                              unsigned int *weight);
- 
-+typedef int
-+(*virCgroupGetBlkioIoServicedCB)(virCgroupPtr group,
-+                                 long long *bytes_read,
-+                                 long long *bytes_write,
-+                                 long long *requests_read,
-+                                 long long *requests_write);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -171,6 +178,7 @@ struct _virCgroupBackend {
-     /* Optional cgroup controller specific callbacks. */
-     virCgroupSetBlkioWeightCB setBlkioWeight;
-     virCgroupGetBlkioWeightCB getBlkioWeight;
-+    virCgroupGetBlkioIoServicedCB getBlkioIoServiced;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index d67b3164ce..1afdad4afc 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -955,6 +955,100 @@ virCgroupV1GetBlkioWeight(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetBlkioIoServiced(virCgroupPtr group,
-+                              long long *bytes_read,
-+                              long long *bytes_write,
-+                              long long *requests_read,
-+                              long long *requests_write)
-+{
-+    long long stats_val;
-+    VIR_AUTOFREE(char *) str1 = NULL;
-+    VIR_AUTOFREE(char *) str2 = NULL;
-+    char *p1 = NULL;
-+    char *p2 = NULL;
-+    size_t i;
-+
-+    const char *value_names[] = {
-+        "Read ",
-+        "Write "
-+    };
-+    long long *bytes_ptrs[] = {
-+        bytes_read,
-+        bytes_write
-+    };
-+    long long *requests_ptrs[] = {
-+        requests_read,
-+        requests_write
-+    };
-+
-+    *bytes_read = 0;
-+    *bytes_write = 0;
-+    *requests_read = 0;
-+    *requests_write = 0;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.io_service_bytes", &str1) < 0)
-+        return -1;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "blkio.throttle.io_serviced", &str2) < 0)
-+        return -1;
-+
-+    /* sum up all entries of the same kind, from all devices */
-+    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
-+        p1 = str1;
-+        p2 = str2;
-+
-+        while ((p1 = strstr(p1, value_names[i]))) {
-+            p1 += strlen(value_names[i]);
-+            if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Cannot parse byte %sstat '%s'"),
-+                               value_names[i],
-+                               p1);
-+                return -1;
-+            }
-+
-+            if (stats_val < 0 ||
-+                (stats_val > 0 && *bytes_ptrs[i] > (LLONG_MAX - stats_val)))
-+            {
-+                virReportError(VIR_ERR_OVERFLOW,
-+                               _("Sum of byte %sstat overflows"),
-+                               value_names[i]);
-+                return -1;
-+            }
-+            *bytes_ptrs[i] += stats_val;
-+        }
-+
-+        while ((p2 = strstr(p2, value_names[i]))) {
-+            p2 += strlen(value_names[i]);
-+            if (virStrToLong_ll(p2, &p2, 10, &stats_val) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Cannot parse %srequest stat '%s'"),
-+                               value_names[i],
-+                               p2);
-+                return -1;
-+            }
-+
-+            if (stats_val < 0 ||
-+                (stats_val > 0 && *requests_ptrs[i] > (LLONG_MAX - stats_val)))
-+            {
-+                virReportError(VIR_ERR_OVERFLOW,
-+                               _("Sum of %srequest stat overflows"),
-+                               value_names[i]);
-+                return -1;
-+            }
-+            *requests_ptrs[i] += stats_val;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -979,6 +1073,7 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .setBlkioWeight = virCgroupV1SetBlkioWeight,
-     .getBlkioWeight = virCgroupV1GetBlkioWeight,
-+    .getBlkioIoServiced = virCgroupV1GetBlkioIoServiced,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacct-Usage.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacct-Usage.patch
deleted file mode 100644
index ac8db97..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacct-Usage.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 1d91616a1f70531a38695b1634e5538e1699b648 Mon Sep 17 00:00:00 2001
-Message-Id: <1d91616a1f70531a38695b1634e5538e1699b648@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:00 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetCpuacct*Usage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 83704663234b894251eb197638e81b652674103e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <fa6bba63dd9a7d3ad733b3107a613033e6fa6cd2.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  7 ++-----
- src/util/vircgroupbackend.h | 11 +++++++++++
- src/util/vircgroupv1.c      | 22 ++++++++++++++++++++++
- 3 files changed, 35 insertions(+), 5 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index fa9fa52019..4f791204d3 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2265,8 +2265,7 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota)
- int
- virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
- {
--    return virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
--                                "cpuacct.usage_percpu", usage);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpuacctPercpuUsage, -1, usage);
- }
- 
- 
-@@ -2589,9 +2588,7 @@ virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota)
- int
- virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage)
- {
--    return virCgroupGetValueU64(group,
--                                VIR_CGROUP_CONTROLLER_CPUACCT,
--                                "cpuacct.usage", usage);
-+    VIR_CGROUP_BACKEND_CALL(group, getCpuacctUsage, -1, usage);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index d3d5e7c222..39a75a69f4 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -303,6 +303,14 @@ typedef int
- typedef bool
- (*virCgroupSupportsCpuBWCB)(virCgroupPtr cgroup);
- 
-+typedef int
-+(*virCgroupGetCpuacctUsageCB)(virCgroupPtr group,
-+                              unsigned long long *usage);
-+
-+typedef int
-+(*virCgroupGetCpuacctPercpuUsageCB)(virCgroupPtr group,
-+                                    char **usage);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -365,6 +373,9 @@ struct _virCgroupBackend {
-     virCgroupSetCpuCfsQuotaCB setCpuCfsQuota;
-     virCgroupGetCpuCfsQuotaCB getCpuCfsQuota;
-     virCgroupSupportsCpuBWCB supportsCpuBW;
-+
-+    virCgroupGetCpuacctUsageCB getCpuacctUsage;
-+    virCgroupGetCpuacctPercpuUsageCB getCpuacctPercpuUsage;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index f2a8839f6e..9fb0c5cb96 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1864,6 +1864,25 @@ virCgroupV1SupportsCpuBW(virCgroupPtr cgroup)
- }
- 
- 
-+static int
-+virCgroupV1GetCpuacctUsage(virCgroupPtr group,
-+                           unsigned long long *usage)
-+{
-+    return virCgroupGetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPUACCT,
-+                                "cpuacct.usage", usage);
-+}
-+
-+
-+static int
-+virCgroupV1GetCpuacctPercpuUsage(virCgroupPtr group,
-+                                 char **usage)
-+{
-+    return virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                                "cpuacct.usage_percpu", usage);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1924,6 +1943,9 @@ virCgroupBackend virCgroupV1Backend = {
-     .setCpuCfsQuota = virCgroupV1SetCpuCfsQuota,
-     .getCpuCfsQuota = virCgroupV1GetCpuCfsQuota,
-     .supportsCpuBW = virCgroupV1SupportsCpuBW,
-+
-+    .getCpuacctUsage = virCgroupV1GetCpuacctUsage,
-+    .getCpuacctPercpuUsage = virCgroupV1GetCpuacctPercpuUsage,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacctStat.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacctStat.patch
deleted file mode 100644
index 7dbc0b4..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetCpuacctStat.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 97f3e1cef9707ac7b1e744aef51880d4538e286a Mon Sep 17 00:00:00 2001
-Message-Id: <97f3e1cef9707ac7b1e744aef51880d4538e286a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:01 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetCpuacctStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit e294615f9d849ee4923621db2224fce713018458)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <06921474355374c68d49725851f915e9bf44feeb.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 39 +-----------------------------
- src/util/vircgroupbackend.h |  6 +++++
- src/util/vircgroupv1.c      | 47 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 54 insertions(+), 38 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 4f791204d3..090fe140bb 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2596,44 +2596,7 @@ int
- virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
-                         unsigned long long *sys)
- {
--    VIR_AUTOFREE(char *) str = NULL;
--    char *p;
--    static double scale = -1.0;
--
--    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
--                             "cpuacct.stat", &str) < 0)
--        return -1;
--
--    if (!(p = STRSKIP(str, "user ")) ||
--        virStrToLong_ull(p, &p, 10, user) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Cannot parse user stat '%s'"),
--                       p);
--        return -1;
--    }
--    if (!(p = STRSKIP(p, "\nsystem ")) ||
--        virStrToLong_ull(p, NULL, 10, sys) < 0) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Cannot parse sys stat '%s'"),
--                       p);
--        return -1;
--    }
--    /* times reported are in system ticks (generally 100 Hz), but that
--     * rate can theoretically vary between machines.  Scale things
--     * into approximate nanoseconds.  */
--    if (scale < 0) {
--        long ticks_per_sec = sysconf(_SC_CLK_TCK);
--        if (ticks_per_sec == -1) {
--            virReportSystemError(errno, "%s",
--                                 _("Cannot determine system clock HZ"));
--            return -1;
--        }
--        scale = 1000000000.0 / ticks_per_sec;
--    }
--    *user *= scale;
--    *sys *= scale;
--
--    return 0;
-+    VIR_CGROUP_BACKEND_CALL(group, getCpuacctStat, -1, user, sys);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 39a75a69f4..3e3a73777d 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -311,6 +311,11 @@ typedef int
- (*virCgroupGetCpuacctPercpuUsageCB)(virCgroupPtr group,
-                                     char **usage);
- 
-+typedef int
-+(*virCgroupGetCpuacctStatCB)(virCgroupPtr group,
-+                             unsigned long long *user,
-+                             unsigned long long *sys);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -376,6 +381,7 @@ struct _virCgroupBackend {
- 
-     virCgroupGetCpuacctUsageCB getCpuacctUsage;
-     virCgroupGetCpuacctPercpuUsageCB getCpuacctPercpuUsage;
-+    virCgroupGetCpuacctStatCB getCpuacctStat;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 9fb0c5cb96..23a91adf60 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1883,6 +1883,52 @@ virCgroupV1GetCpuacctPercpuUsage(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetCpuacctStat(virCgroupPtr group,
-+                          unsigned long long *user,
-+                          unsigned long long *sys)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    char *p;
-+    static double scale = -1.0;
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                             "cpuacct.stat", &str) < 0)
-+        return -1;
-+
-+    if (!(p = STRSKIP(str, "user ")) ||
-+        virStrToLong_ull(p, &p, 10, user) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Cannot parse user stat '%s'"),
-+                       p);
-+        return -1;
-+    }
-+    if (!(p = STRSKIP(p, "\nsystem ")) ||
-+        virStrToLong_ull(p, NULL, 10, sys) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Cannot parse sys stat '%s'"),
-+                       p);
-+        return -1;
-+    }
-+    /* times reported are in system ticks (generally 100 Hz), but that
-+     * rate can theoretically vary between machines.  Scale things
-+     * into approximate nanoseconds.  */
-+    if (scale < 0) {
-+        long ticks_per_sec = sysconf(_SC_CLK_TCK);
-+        if (ticks_per_sec == -1) {
-+            virReportSystemError(errno, "%s",
-+                                 _("Cannot determine system clock HZ"));
-+            return -1;
-+        }
-+        scale = 1000000000.0 / ticks_per_sec;
-+    }
-+    *user *= scale;
-+    *sys *= scale;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1946,6 +1992,7 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .getCpuacctUsage = virCgroupV1GetCpuacctUsage,
-     .getCpuacctPercpuUsage = virCgroupV1GetCpuacctPercpuUsage,
-+    .getCpuacctStat = virCgroupV1GetCpuacctStat,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemSwapUsage.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemSwapUsage.patch
deleted file mode 100644
index bf8d146..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemSwapUsage.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 3e61b08bd5d925b262e3ca84d234670917604fda Mon Sep 17 00:00:00 2001
-Message-Id: <3e61b08bd5d925b262e3ca84d234670917604fda@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:53 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetMemSwapUsage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 87d9fc5b3bfbe217af1a5316af4392540f676657)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c660f81cdf6e8771917e54c44d362ebb4d2fbdb4.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  9 +--------
- src/util/vircgroupbackend.h |  5 +++++
- src/util/vircgroupv1.c      | 16 ++++++++++++++++
- 3 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 6708eef0da..088e97cb3f 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1697,14 +1697,7 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb)
- int
- virCgroupGetMemSwapUsage(virCgroupPtr group, unsigned long long *kb)
- {
--    long long unsigned int usage_in_bytes;
--    int ret;
--    ret = virCgroupGetValueU64(group,
--                               VIR_CGROUP_CONTROLLER_MEMORY,
--                               "memory.memsw.usage_in_bytes", &usage_in_bytes);
--    if (ret == 0)
--        *kb = usage_in_bytes >> 10;
--    return ret;
-+    VIR_CGROUP_BACKEND_CALL(group, getMemSwapUsage, -1, kb);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index cdbca4b907..27e6b18ea2 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -251,6 +251,10 @@ typedef int
- (*virCgroupGetMemSwapHardLimitCB)(virCgroupPtr group,
-                                   unsigned long long *kb);
- 
-+typedef int
-+(*virCgroupGetMemSwapUsageCB)(virCgroupPtr group,
-+                              unsigned long long *kb);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -299,6 +303,7 @@ struct _virCgroupBackend {
-     virCgroupGetMemorySoftLimitCB getMemorySoftLimit;
-     virCgroupSetMemSwapHardLimitCB setMemSwapHardLimit;
-     virCgroupGetMemSwapHardLimitCB getMemSwapHardLimit;
-+    virCgroupGetMemSwapUsageCB getMemSwapUsage;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 779288fb97..55b1d3ebd0 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1656,6 +1656,21 @@ virCgroupV1GetMemSwapHardLimit(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetMemSwapUsage(virCgroupPtr group,
-+                           unsigned long long *kb)
-+{
-+    long long unsigned int usage_in_bytes;
-+    int ret;
-+    ret = virCgroupGetValueU64(group,
-+                               VIR_CGROUP_CONTROLLER_MEMORY,
-+                               "memory.memsw.usage_in_bytes", &usage_in_bytes);
-+    if (ret == 0)
-+        *kb = usage_in_bytes >> 10;
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1702,6 +1717,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .getMemorySoftLimit = virCgroupV1GetMemorySoftLimit,
-     .setMemSwapHardLimit = virCgroupV1SetMemSwapHardLimit,
-     .getMemSwapHardLimit = virCgroupV1GetMemSwapHardLimit,
-+    .getMemSwapUsage = virCgroupV1GetMemSwapUsage,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryStat.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryStat.patch
deleted file mode 100644
index 4f408fc..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryStat.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 22e8736edafd1ac369adead17d924bd6b9536817 Mon Sep 17 00:00:00 2001
-Message-Id: <22e8736edafd1ac369adead17d924bd6b9536817@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:50 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetMemoryStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 64bfbd7ceb328d27becf98e0539d0ab4bcda8163)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <cafcbd973766d6e41a57c23e83b34912fe67e3f5.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 67 ++------------------------------
- src/util/vircgroupbackend.h | 10 +++++
- src/util/vircgroupv1.c      | 76 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 90 insertions(+), 63 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 4053c65939..786034d555 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1619,69 +1619,10 @@ virCgroupGetMemoryStat(virCgroupPtr group,
-                        unsigned long long *inactiveFile,
-                        unsigned long long *unevictable)
- {
--    int ret = -1;
--    char *stat = NULL;
--    char *line = NULL;
--    unsigned long long cacheVal = 0;
--    unsigned long long activeAnonVal = 0;
--    unsigned long long inactiveAnonVal = 0;
--    unsigned long long activeFileVal = 0;
--    unsigned long long inactiveFileVal = 0;
--    unsigned long long unevictableVal = 0;
--
--    if (virCgroupGetValueStr(group,
--                             VIR_CGROUP_CONTROLLER_MEMORY,
--                             "memory.stat",
--                             &stat) < 0) {
--        return -1;
--    }
--
--    line = stat;
--
--    while (line) {
--        char *newLine = strchr(line, '\n');
--        char *valueStr = strchr(line, ' ');
--        unsigned long long value;
--
--        if (newLine)
--            *newLine = '\0';
--
--        if (!valueStr) {
--            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                           _("Cannot parse 'memory.stat' cgroup file."));
--            goto cleanup;
--        }
--        *valueStr = '\0';
--
--        if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0)
--            goto cleanup;
--
--        if (STREQ(line, "cache"))
--            cacheVal = value >> 10;
--        else if (STREQ(line, "active_anon"))
--            activeAnonVal = value >> 10;
--        else if (STREQ(line, "inactive_anon"))
--            inactiveAnonVal = value >> 10;
--        else if (STREQ(line, "active_file"))
--            activeFileVal = value >> 10;
--        else if (STREQ(line, "inactive_file"))
--            inactiveFileVal = value >> 10;
--        else if (STREQ(line, "unevictable"))
--            unevictableVal = value >> 10;
--    }
--
--    *cache = cacheVal;
--    *activeAnon = activeAnonVal;
--    *inactiveAnon = inactiveAnonVal;
--    *activeFile = activeFileVal;
--    *inactiveFile = inactiveFileVal;
--    *unevictable = unevictableVal;
--
--    ret = 0;
--
-- cleanup:
--    VIR_FREE(stat);
--    return ret;
-+    VIR_CGROUP_BACKEND_CALL(group, getMemoryStat, -1, cache,
-+                            activeAnon, inactiveAnon,
-+                            activeFile, inactiveFile,
-+                            unevictable);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index e1f75c5c31..99754a6310 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -214,6 +214,15 @@ typedef int
- (*virCgroupSetMemoryCB)(virCgroupPtr group,
-                         unsigned long long kb);
- 
-+typedef int
-+(*virCgroupGetMemoryStatCB)(virCgroupPtr group,
-+                            unsigned long long *cache,
-+                            unsigned long long *activeAnon,
-+                            unsigned long long *inactiveAnon,
-+                            unsigned long long *activeFile,
-+                            unsigned long long *inactiveFile,
-+                            unsigned long long *unevictable);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -254,6 +263,7 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioDeviceWriteBpsCB getBlkioDeviceWriteBps;
- 
-     virCgroupSetMemoryCB setMemory;
-+    virCgroupGetMemoryStatCB getMemoryStat;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 17a4d67972..fcb2607e26 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1404,6 +1404,81 @@ virCgroupV1SetMemory(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetMemoryStat(virCgroupPtr group,
-+                         unsigned long long *cache,
-+                         unsigned long long *activeAnon,
-+                         unsigned long long *inactiveAnon,
-+                         unsigned long long *activeFile,
-+                         unsigned long long *inactiveFile,
-+                         unsigned long long *unevictable)
-+{
-+    int ret = -1;
-+    char *stat = NULL;
-+    char *line = NULL;
-+    unsigned long long cacheVal = 0;
-+    unsigned long long activeAnonVal = 0;
-+    unsigned long long inactiveAnonVal = 0;
-+    unsigned long long activeFileVal = 0;
-+    unsigned long long inactiveFileVal = 0;
-+    unsigned long long unevictableVal = 0;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.stat",
-+                             &stat) < 0) {
-+        return -1;
-+    }
-+
-+    line = stat;
-+
-+    while (line) {
-+        char *newLine = strchr(line, '\n');
-+        char *valueStr = strchr(line, ' ');
-+        unsigned long long value;
-+
-+        if (newLine)
-+            *newLine = '\0';
-+
-+        if (!valueStr) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("Cannot parse 'memory.stat' cgroup file."));
-+            goto cleanup;
-+        }
-+        *valueStr = '\0';
-+
-+        if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0)
-+            goto cleanup;
-+
-+        if (STREQ(line, "cache"))
-+            cacheVal = value >> 10;
-+        else if (STREQ(line, "active_anon"))
-+            activeAnonVal = value >> 10;
-+        else if (STREQ(line, "inactive_anon"))
-+            inactiveAnonVal = value >> 10;
-+        else if (STREQ(line, "active_file"))
-+            activeFileVal = value >> 10;
-+        else if (STREQ(line, "inactive_file"))
-+            inactiveFileVal = value >> 10;
-+        else if (STREQ(line, "unevictable"))
-+            unevictableVal = value >> 10;
-+    }
-+
-+    *cache = cacheVal;
-+    *activeAnon = activeAnonVal;
-+    *inactiveAnon = inactiveAnonVal;
-+    *activeFile = activeFileVal;
-+    *inactiveFile = inactiveFileVal;
-+    *unevictable = unevictableVal;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    VIR_FREE(stat);
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1442,6 +1517,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioDeviceWriteBps = virCgroupV1GetBlkioDeviceWriteBps,
- 
-     .setMemory = virCgroupV1SetMemory,
-+    .getMemoryStat = virCgroupV1GetMemoryStat,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryUsage.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryUsage.patch
deleted file mode 100644
index 8fc79e2..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1GetMemoryUsage.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From fadcb498572cd664d45d31039f2bd34e22cc02b3 Mon Sep 17 00:00:00 2001
-Message-Id: <fadcb498572cd664d45d31039f2bd34e22cc02b3@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:51 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1GetMemoryUsage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit e92f8bad6681439d50251e7ac13e5f9f1bef62d5)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <aa1a9f774f8757730539caad64376dc6f4be9e70.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  9 +--------
- src/util/vircgroupbackend.h |  5 +++++
- src/util/vircgroupv1.c      | 16 ++++++++++++++++
- 3 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 786034d555..ed7252243c 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1637,14 +1637,7 @@ virCgroupGetMemoryStat(virCgroupPtr group,
- int
- virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb)
- {
--    long long unsigned int usage_in_bytes;
--    int ret;
--    ret = virCgroupGetValueU64(group,
--                               VIR_CGROUP_CONTROLLER_MEMORY,
--                               "memory.usage_in_bytes", &usage_in_bytes);
--    if (ret == 0)
--        *kb = (unsigned long) usage_in_bytes >> 10;
--    return ret;
-+    VIR_CGROUP_BACKEND_CALL(group, getMemoryUsage, -1, kb);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 99754a6310..8bdfc5c835 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -223,6 +223,10 @@ typedef int
-                             unsigned long long *inactiveFile,
-                             unsigned long long *unevictable);
- 
-+typedef int
-+(*virCgroupGetMemoryUsageCB)(virCgroupPtr group,
-+                             unsigned long *kb);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -264,6 +268,7 @@ struct _virCgroupBackend {
- 
-     virCgroupSetMemoryCB setMemory;
-     virCgroupGetMemoryStatCB getMemoryStat;
-+    virCgroupGetMemoryUsageCB getMemoryUsage;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index fcb2607e26..4f1d79a758 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1479,6 +1479,21 @@ virCgroupV1GetMemoryStat(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1GetMemoryUsage(virCgroupPtr group,
-+                          unsigned long *kb)
-+{
-+    long long unsigned int usage_in_bytes;
-+    int ret;
-+    ret = virCgroupGetValueU64(group,
-+                               VIR_CGROUP_CONTROLLER_MEMORY,
-+                               "memory.usage_in_bytes", &usage_in_bytes);
-+    if (ret == 0)
-+        *kb = (unsigned long) usage_in_bytes >> 10;
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1518,6 +1533,7 @@ virCgroupBackend virCgroupV1Backend = {
- 
-     .setMemory = virCgroupV1SetMemory,
-     .getMemoryStat = virCgroupV1GetMemoryStat,
-+    .getMemoryUsage = virCgroupV1GetMemoryUsage,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1HasController.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1HasController.patch
deleted file mode 100644
index 7865a7d..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1HasController.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 784cb29187b72cd44c528b1435b27ca5f0a36f33 Mon Sep 17 00:00:00 2001
-Message-Id: <784cb29187b72cd44c528b1435b27ca5f0a36f33@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:32 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1HasController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 5e2df3d07f63128259a9677acdbbbcd983069110)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e823ddab991e14aa8cb5e9b9d139236eb460b594.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 3 ++-
- src/util/vircgroupbackend.h | 5 +++++
- src/util/vircgroupv1.c      | 9 +++++++++
- 3 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 2e74cbbff4..5bbe42b699 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1443,7 +1443,8 @@ virCgroupHasController(virCgroupPtr cgroup, int controller)
-         return false;
-     if (controller < 0 || controller >= VIR_CGROUP_CONTROLLER_LAST)
-         return false;
--    return cgroup->controllers[controller].mountPoint != NULL;
-+
-+    return cgroup->backend->hasController(cgroup, controller);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 011d1b00da..29b2fd119f 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -73,6 +73,10 @@ typedef int
- (*virCgroupDetectControllersCB)(virCgroupPtr group,
-                                 int controllers);
- 
-+typedef bool
-+(*virCgroupHasControllerCB)(virCgroupPtr cgroup,
-+                            int controller);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -86,6 +90,7 @@ struct _virCgroupBackend {
-     virCgroupValidatePlacementCB validatePlacement;
-     virCgroupStealPlacementCB stealPlacement;
-     virCgroupDetectControllersCB detectControllers;
-+    virCgroupHasControllerCB hasController;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 11a86c061a..0638f48d50 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -478,6 +478,14 @@ virCgroupV1DetectControllers(virCgroupPtr group,
- }
- 
- 
-+static bool
-+virCgroupV1HasController(virCgroupPtr group,
-+                         int controller)
-+{
-+    return group->controllers[controller].mountPoint != NULL;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -490,6 +498,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .validatePlacement = virCgroupV1ValidatePlacement,
-     .stealPlacement = virCgroupV1StealPlacement,
-     .detectControllers = virCgroupV1DetectControllers,
-+    .hasController = virCgroupV1HasController,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1HasEmptyTasks.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1HasEmptyTasks.patch
deleted file mode 100644
index b040247..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1HasEmptyTasks.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 272c540c20234508b31dcb9a7c3b548e2e328656 Mon Sep 17 00:00:00 2001
-Message-Id: <272c540c20234508b31dcb9a7c3b548e2e328656@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:38 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1HasEmptyTasks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit c4047141a0af36c5d428bfcc1f14d012f8352a11)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e81675457cc7dd357792080ff07d5e1159b88738.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 13 +------------
- src/util/vircgroupbackend.h |  5 +++++
- src/util/vircgroupv1.c      | 20 ++++++++++++++++++++
- 3 files changed, 26 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a5076cb554..d4d02d8f5b 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3465,18 +3465,7 @@ virCgroupSupportsCpuBW(virCgroupPtr cgroup)
- int
- virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller)
- {
--    int ret = -1;
--    VIR_AUTOFREE(char *) content = NULL;
--
--    if (!cgroup)
--        return -1;
--
--    ret = virCgroupGetValueStr(cgroup, controller, "tasks", &content);
--
--    if (ret == 0 && content[0] == '\0')
--        ret = 1;
--
--    return ret;
-+    return cgroup->backend->hasEmptyTasks(cgroup, controller);
- }
- 
- bool
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index bff1f8938e..3e0f6d01f4 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -122,6 +122,10 @@ typedef int
-                       pid_t pid,
-                       unsigned int flags);
- 
-+typedef int
-+(*virCgroupHasEmptyTasksCB)(virCgroupPtr cgroup,
-+                            int controller);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -141,6 +145,7 @@ struct _virCgroupBackend {
-     virCgroupMakeGroupCB makeGroup;
-     virCgroupRemoveCB remove;
-     virCgroupAddTaskCB addTask;
-+    virCgroupHasEmptyTasksCB hasEmptyTasks;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index fda2c43eef..b057cdfd9e 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -736,6 +736,25 @@ virCgroupV1AddTask(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1HasEmptyTasks(virCgroupPtr cgroup,
-+                         int controller)
-+{
-+    int ret = -1;
-+    VIR_AUTOFREE(char *) content = NULL;
-+
-+    if (!cgroup)
-+        return -1;
-+
-+    ret = virCgroupGetValueStr(cgroup, controller, "tasks", &content);
-+
-+    if (ret == 0 && content[0] == '\0')
-+        ret = 1;
-+
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -754,6 +773,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .makeGroup = virCgroupV1MakeGroup,
-     .remove = virCgroupV1Remove,
-     .addTask = virCgroupV1AddTask,
-+    .hasEmptyTasks = virCgroupV1HasEmptyTasks,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1MakeGroup.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1MakeGroup.patch
deleted file mode 100644
index 1ddd66d..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1MakeGroup.patch
+++ /dev/null
@@ -1,446 +0,0 @@
-From d72932998be48ff4eeb1b9d73d6f5d60560be031 Mon Sep 17 00:00:00 2001
-Message-Id: <d72932998be48ff4eeb1b9d73d6f5d60560be031@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:35 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1MakeGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 152c0f0bf52d4f727e09f388fef5c836c3c94db4)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b90114ff10174e747131ddc3dfeb4fe177d4bf21.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 141 ++----------------------------------
- src/util/vircgroupbackend.h |  15 ++++
- src/util/vircgrouppriv.h    |  20 +++++
- src/util/vircgroupv1.c      | 132 +++++++++++++++++++++++++++++++++
- 4 files changed, 174 insertions(+), 134 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 438d9b4e70..8f0ea4de9a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -80,14 +80,6 @@ VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST,
-               "freezer", "blkio", "net_cls", "perf_event",
-               "name=systemd");
- 
--typedef enum {
--    VIR_CGROUP_NONE = 0, /* create subdir under each cgroup if possible. */
--    VIR_CGROUP_MEM_HIERACHY = 1 << 0, /* call virCgroupSetMemoryUseHierarchy
--                                       * before creating subcgroups and
--                                       * attaching tasks
--                                       */
--} virCgroupFlags;
--
- 
- /**
-  * virCgroupGetDevicePermsString:
-@@ -446,7 +438,7 @@ virCgroupGetBlockDevString(const char *path)
- }
- 
- 
--static int
-+int
- virCgroupSetValueStr(virCgroupPtr group,
-                      int controller,
-                      const char *key,
-@@ -476,7 +468,7 @@ virCgroupSetValueStr(virCgroupPtr group,
- }
- 
- 
--static int
-+int
- virCgroupGetValueStr(virCgroupPtr group,
-                      int controller,
-                      const char *key,
-@@ -537,7 +529,7 @@ virCgroupGetValueForBlkDev(virCgroupPtr group,
- }
- 
- 
--static int
-+int
- virCgroupSetValueU64(virCgroupPtr group,
-                      int controller,
-                      const char *key,
-@@ -589,7 +581,7 @@ virCgroupGetValueI64(virCgroupPtr group,
- }
- 
- 
--static int
-+int
- virCgroupGetValueU64(virCgroupPtr group,
-                      int controller,
-                      const char *key,
-@@ -611,137 +603,18 @@ virCgroupGetValueU64(virCgroupPtr group,
- }
- 
- 
--static int
--virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group)
--{
--    size_t i;
--    const char *inherit_values[] = {
--        "cpuset.cpus",
--        "cpuset.mems",
--        "cpuset.memory_migrate",
--    };
--
--    VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path);
--    for (i = 0; i < ARRAY_CARDINALITY(inherit_values); i++) {
--        VIR_AUTOFREE(char *) value = NULL;
--
--        if (virCgroupGetValueStr(parent,
--                                 VIR_CGROUP_CONTROLLER_CPUSET,
--                                 inherit_values[i],
--                                 &value) < 0)
--            return -1;
--
--        VIR_DEBUG("Inherit %s = %s", inherit_values[i], value);
--
--        if (virCgroupSetValueStr(group,
--                                 VIR_CGROUP_CONTROLLER_CPUSET,
--                                 inherit_values[i],
--                                 value) < 0)
--            return -1;
--    }
--
--    return 0;
--}
--
--
--static int
--virCgroupSetMemoryUseHierarchy(virCgroupPtr group)
--{
--    unsigned long long value;
--    const char *filename = "memory.use_hierarchy";
--
--    if (virCgroupGetValueU64(group,
--                             VIR_CGROUP_CONTROLLER_MEMORY,
--                             filename, &value) < 0)
--        return -1;
--
--    /* Setting twice causes error, so if already enabled, skip setting */
--    if (value == 1)
--        return 0;
--
--    VIR_DEBUG("Setting up %s/%s", group->path, filename);
--    if (virCgroupSetValueU64(group,
--                             VIR_CGROUP_CONTROLLER_MEMORY,
--                             filename, 1) < 0)
--        return -1;
--
--    return 0;
--}
--
--
- static int
- virCgroupMakeGroup(virCgroupPtr parent,
-                    virCgroupPtr group,
-                    bool create,
-                    unsigned int flags)
- {
--    size_t i;
--
--    VIR_DEBUG("Make group %s", group->path);
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        VIR_AUTOFREE(char *) path = NULL;
--
--        /* We must never mkdir() in systemd's hierarchy */
--        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
--            VIR_DEBUG("Not creating systemd controller group");
--            continue;
--        }
--
--        /* Skip over controllers that aren't mounted */
--        if (!group->controllers[i].mountPoint) {
--            VIR_DEBUG("Skipping unmounted controller %s",
--                      virCgroupControllerTypeToString(i));
--            continue;
--        }
--
--        if (virCgroupPathOfController(group, i, "", &path) < 0)
--            goto error;
--
--        VIR_DEBUG("Make controller %s", path);
--        if (!virFileExists(path)) {
--            if (!create ||
--                mkdir(path, 0755) < 0) {
--                if (errno == EEXIST)
--                    continue;
--                /* With a kernel that doesn't support multi-level directory
--                 * for blkio controller, libvirt will fail and disable all
--                 * other controllers even though they are available. So
--                 * treat blkio as unmounted if mkdir fails. */
--                if (i == VIR_CGROUP_CONTROLLER_BLKIO) {
--                    VIR_DEBUG("Ignoring mkdir failure with blkio controller. Kernel probably too old");
--                    VIR_FREE(group->controllers[i].mountPoint);
--                    continue;
--                } else {
--                    virReportSystemError(errno,
--                                         _("Failed to create controller %s for group"),
--                                         virCgroupControllerTypeToString(i));
--                    goto error;
--                }
--            }
--            if (i == VIR_CGROUP_CONTROLLER_CPUSET &&
--                group->controllers[i].mountPoint != NULL &&
--                virCgroupCpuSetInherit(parent, group) < 0) {
--                goto error;
--            }
--            /*
--             * Note that virCgroupSetMemoryUseHierarchy should always be
--             * called prior to creating subcgroups and attaching tasks.
--             */
--            if ((flags & VIR_CGROUP_MEM_HIERACHY) &&
--                i == VIR_CGROUP_CONTROLLER_MEMORY &&
--                group->controllers[i].mountPoint != NULL &&
--                virCgroupSetMemoryUseHierarchy(group) < 0) {
--                goto error;
--            }
--        }
-+    if (group->backend->makeGroup(parent, group, create, flags) < 0) {
-+        virCgroupRemove(group);
-+        return -1;
-     }
- 
--    VIR_DEBUG("Done making controllers for group");
-     return 0;
--
-- error:
--    virCgroupRemove(group);
--    return -1;
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 916227ba6a..b2848c2076 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -27,6 +27,14 @@
- 
- # define CGROUP_MAX_VAL 512
- 
-+typedef enum {
-+    VIR_CGROUP_NONE = 0, /* create subdir under each cgroup if possible. */
-+    VIR_CGROUP_MEM_HIERACHY = 1 << 0, /* call virCgroupSetMemoryUseHierarchy
-+                                       * before creating subcgroups and
-+                                       * attaching tasks
-+                                       */
-+} virCgroupBackendFlags;
-+
- typedef enum {
-     VIR_CGROUP_BACKEND_TYPE_V1 = 0,
-     VIR_CGROUP_BACKEND_TYPE_LAST,
-@@ -86,6 +94,12 @@ typedef int
-                                const char *key,
-                                char **path);
- 
-+typedef int
-+(*virCgroupMakeGroupCB)(virCgroupPtr parent,
-+                        virCgroupPtr group,
-+                        bool create,
-+                        unsigned int flags);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -102,6 +116,7 @@ struct _virCgroupBackend {
-     virCgroupHasControllerCB hasController;
-     virCgroupGetAnyControllerCB getAnyController;
-     virCgroupPathOfControllerCB pathOfController;
-+    virCgroupMakeGroupCB makeGroup;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index e7f4a1f0fc..2e731458d5 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -53,6 +53,26 @@ struct _virCgroup {
-     virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
-+int virCgroupSetValueStr(virCgroupPtr group,
-+                         int controller,
-+                         const char *key,
-+                         const char *value);
-+
-+int virCgroupGetValueStr(virCgroupPtr group,
-+                         int controller,
-+                         const char *key,
-+                         char **value);
-+
-+int virCgroupSetValueU64(virCgroupPtr group,
-+                         int controller,
-+                         const char *key,
-+                         unsigned long long int value);
-+
-+int virCgroupGetValueU64(virCgroupPtr group,
-+                         int controller,
-+                         const char *key,
-+                         unsigned long long int *value);
-+
- int virCgroupPartitionEscape(char **path);
- 
- int virCgroupNewPartition(const char *path,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index a6302d71b1..653e848a83 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -537,6 +537,137 @@ virCgroupV1PathOfController(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1CpuSetInherit(virCgroupPtr parent,
-+                         virCgroupPtr group)
-+{
-+    size_t i;
-+    const char *inherit_values[] = {
-+        "cpuset.cpus",
-+        "cpuset.mems",
-+        "cpuset.memory_migrate",
-+    };
-+
-+    VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path);
-+    for (i = 0; i < ARRAY_CARDINALITY(inherit_values); i++) {
-+        VIR_AUTOFREE(char *) value = NULL;
-+
-+        if (virCgroupGetValueStr(parent,
-+                                 VIR_CGROUP_CONTROLLER_CPUSET,
-+                                 inherit_values[i],
-+                                 &value) < 0)
-+            return -1;
-+
-+        VIR_DEBUG("Inherit %s = %s", inherit_values[i], value);
-+
-+        if (virCgroupSetValueStr(group,
-+                                 VIR_CGROUP_CONTROLLER_CPUSET,
-+                                 inherit_values[i],
-+                                 value) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV1SetMemoryUseHierarchy(virCgroupPtr group)
-+{
-+    unsigned long long value;
-+    const char *filename = "memory.use_hierarchy";
-+
-+    if (virCgroupGetValueU64(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             filename, &value) < 0)
-+        return -1;
-+
-+    /* Setting twice causes error, so if already enabled, skip setting */
-+    if (value == 1)
-+        return 0;
-+
-+    VIR_DEBUG("Setting up %s/%s", group->path, filename);
-+    if (virCgroupSetValueU64(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             filename, 1) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV1MakeGroup(virCgroupPtr parent,
-+                     virCgroupPtr group,
-+                     bool create,
-+                     unsigned int flags)
-+{
-+    size_t i;
-+
-+    VIR_DEBUG("Make group %s", group->path);
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        VIR_AUTOFREE(char *) path = NULL;
-+
-+        /* We must never mkdir() in systemd's hierarchy */
-+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
-+            VIR_DEBUG("Not creating systemd controller group");
-+            continue;
-+        }
-+
-+        /* Skip over controllers that aren't mounted */
-+        if (!group->controllers[i].mountPoint) {
-+            VIR_DEBUG("Skipping unmounted controller %s",
-+                      virCgroupV1ControllerTypeToString(i));
-+            continue;
-+        }
-+
-+        if (virCgroupV1PathOfController(group, i, "", &path) < 0)
-+            return -1;
-+
-+        VIR_DEBUG("Make controller %s", path);
-+        if (!virFileExists(path)) {
-+            if (!create ||
-+                mkdir(path, 0755) < 0) {
-+                if (errno == EEXIST)
-+                    continue;
-+                /* With a kernel that doesn't support multi-level directory
-+                 * for blkio controller, libvirt will fail and disable all
-+                 * other controllers even though they are available. So
-+                 * treat blkio as unmounted if mkdir fails. */
-+                if (i == VIR_CGROUP_CONTROLLER_BLKIO) {
-+                    VIR_DEBUG("Ignoring mkdir failure with blkio controller. Kernel probably too old");
-+                    VIR_FREE(group->controllers[i].mountPoint);
-+                    continue;
-+                } else {
-+                    virReportSystemError(errno,
-+                                         _("Failed to create v1 controller %s for group"),
-+                                         virCgroupV1ControllerTypeToString(i));
-+                    return -1;
-+                }
-+            }
-+            if (i == VIR_CGROUP_CONTROLLER_CPUSET &&
-+                group->controllers[i].mountPoint != NULL &&
-+                virCgroupV1CpuSetInherit(parent, group) < 0) {
-+                return -1;
-+            }
-+            /*
-+             * Note that virCgroupV1SetMemoryUseHierarchy should always be
-+             * called prior to creating subcgroups and attaching tasks.
-+             */
-+            if ((flags & VIR_CGROUP_MEM_HIERACHY) &&
-+                i == VIR_CGROUP_CONTROLLER_MEMORY &&
-+                group->controllers[i].mountPoint != NULL &&
-+                virCgroupV1SetMemoryUseHierarchy(group) < 0) {
-+                return -1;
-+            }
-+        }
-+    }
-+
-+    VIR_DEBUG("Done making controllers for group");
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -552,6 +683,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .hasController = virCgroupV1HasController,
-     .getAnyController = virCgroupV1GetAnyController,
-     .pathOfController = virCgroupV1PathOfController,
-+    .makeGroup = virCgroupV1MakeGroup,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1PathOfController.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1PathOfController.patch
deleted file mode 100644
index d0dc80a..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1PathOfController.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 66611194a3195560a9aea899b9da724154a03609 Mon Sep 17 00:00:00 2001
-Message-Id: <66611194a3195560a9aea899b9da724154a03609@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:34 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1PathOfController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 57890b2ab49b27ca9dc8a3922fe61e586aca8f77)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <0867ff8a5f46a8909e621bfb730942cfac3b2cdb.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 22 +---------------------
- src/util/vircgroupbackend.h |  7 +++++++
- src/util/vircgroupv1.c      | 31 +++++++++++++++++++++++++++++++
- 3 files changed, 39 insertions(+), 21 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a6f529accd..438d9b4e70 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1460,27 +1460,7 @@ virCgroupPathOfController(virCgroupPtr group,
-         return -1;
-     }
- 
--    if (group->controllers[controller].mountPoint == NULL) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Controller '%s' is not mounted"),
--                       virCgroupControllerTypeToString(controller));
--        return -1;
--    }
--
--    if (group->controllers[controller].placement == NULL) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("Controller '%s' is not enabled for group"),
--                       virCgroupControllerTypeToString(controller));
--        return -1;
--    }
--
--    if (virAsprintf(path, "%s%s/%s",
--                    group->controllers[controller].mountPoint,
--                    group->controllers[controller].placement,
--                    key ? key : "") < 0)
--        return -1;
--
--    return 0;
-+    return group->backend->pathOfController(group, controller, key, path);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index b4eaa89021..916227ba6a 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -80,6 +80,12 @@ typedef bool
- typedef int
- (*virCgroupGetAnyControllerCB)(virCgroupPtr group);
- 
-+typedef int
-+(*virCgroupPathOfControllerCB)(virCgroupPtr group,
-+                               int controller,
-+                               const char *key,
-+                               char **path);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -95,6 +101,7 @@ struct _virCgroupBackend {
-     virCgroupDetectControllersCB detectControllers;
-     virCgroupHasControllerCB hasController;
-     virCgroupGetAnyControllerCB getAnyController;
-+    virCgroupPathOfControllerCB pathOfController;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index bae16b8294..a6302d71b1 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -507,6 +507,36 @@ virCgroupV1GetAnyController(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV1PathOfController(virCgroupPtr group,
-+                            int controller,
-+                            const char *key,
-+                            char **path)
-+{
-+    if (group->controllers[controller].mountPoint == NULL) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("v1 controller '%s' is not mounted"),
-+                       virCgroupV1ControllerTypeToString(controller));
-+        return -1;
-+    }
-+
-+    if (group->controllers[controller].placement == NULL) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("v1 controller '%s' is not enabled for group"),
-+                       virCgroupV1ControllerTypeToString(controller));
-+        return -1;
-+    }
-+
-+    if (virAsprintf(path, "%s%s/%s",
-+                    group->controllers[controller].mountPoint,
-+                    group->controllers[controller].placement,
-+                    key ? key : "") < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -521,6 +551,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .detectControllers = virCgroupV1DetectControllers,
-     .hasController = virCgroupV1HasController,
-     .getAnyController = virCgroupV1GetAnyController,
-+    .pathOfController = virCgroupV1PathOfController,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1Remove.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1Remove.patch
deleted file mode 100644
index 6dfd27d..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1Remove.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 251261233d1dcfe086230f6b079c8b3b6518d60f Mon Sep 17 00:00:00 2001
-Message-Id: <251261233d1dcfe086230f6b079c8b3b6518d60f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:36 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1Remove
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b148d080495a989db6960ad4ac7e83e576957dfe)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <bf11de0f39d11e0c9122461848a50024b4096553.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 35 ++-------------------------------
- src/util/vircgroupbackend.h |  4 ++++
- src/util/vircgrouppriv.h    |  2 ++
- src/util/vircgroupv1.c      | 39 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 47 insertions(+), 33 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 8f0ea4de9a..33d34d6eda 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2923,7 +2923,7 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
- }
- 
- 
--static int
-+int
- virCgroupRemoveRecursively(char *grppath)
- {
-     DIR *grpdir;
-@@ -2986,38 +2986,7 @@ virCgroupRemoveRecursively(char *grppath)
- int
- virCgroupRemove(virCgroupPtr group)
- {
--    int rc = 0;
--    size_t i;
--
--    VIR_DEBUG("Removing cgroup %s", group->path);
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        VIR_AUTOFREE(char *) grppath = NULL;
--
--        /* Skip over controllers not mounted */
--        if (!group->controllers[i].mountPoint)
--            continue;
--
--        /* We must never rmdir() in systemd's hierarchy */
--        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
--            continue;
--
--        /* Don't delete the root group, if we accidentally
--           ended up in it for some reason */
--        if (STREQ(group->controllers[i].placement, "/"))
--            continue;
--
--        if (virCgroupPathOfController(group,
--                                      i,
--                                      NULL,
--                                      &grppath) != 0)
--            continue;
--
--        VIR_DEBUG("Removing cgroup %s and all child cgroups", grppath);
--        rc = virCgroupRemoveRecursively(grppath);
--    }
--    VIR_DEBUG("Done removing cgroup %s", group->path);
--
--    return rc;
-+    return group->backend->remove(group);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index b2848c2076..1f28c51c49 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -100,6 +100,9 @@ typedef int
-                         bool create,
-                         unsigned int flags);
- 
-+typedef int
-+(*virCgroupRemoveCB)(virCgroupPtr group);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -117,6 +120,7 @@ struct _virCgroupBackend {
-     virCgroupGetAnyControllerCB getAnyController;
-     virCgroupPathOfControllerCB pathOfController;
-     virCgroupMakeGroupCB makeGroup;
-+    virCgroupRemoveCB remove;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 2e731458d5..a760b9bcfd 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -88,4 +88,6 @@ int virCgroupNewDomainPartition(virCgroupPtr partition,
-                                 virCgroupPtr *group)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
- 
-+int virCgroupRemoveRecursively(char *grppath);
-+
- #endif /* __VIR_CGROUP_PRIV_H__ */
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 653e848a83..4d4b51094a 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -668,6 +668,44 @@ virCgroupV1MakeGroup(virCgroupPtr parent,
- }
- 
- 
-+static int
-+virCgroupV1Remove(virCgroupPtr group)
-+{
-+    int rc = 0;
-+    size_t i;
-+
-+    VIR_DEBUG("Removing cgroup %s", group->path);
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        VIR_AUTOFREE(char *) grppath = NULL;
-+
-+        /* Skip over controllers not mounted */
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+
-+        /* We must never rmdir() in systemd's hierarchy */
-+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
-+            continue;
-+
-+        /* Don't delete the root group, if we accidentally
-+           ended up in it for some reason */
-+        if (STREQ(group->controllers[i].placement, "/"))
-+            continue;
-+
-+        if (virCgroupV1PathOfController(group,
-+                                        i,
-+                                        NULL,
-+                                        &grppath) != 0)
-+            continue;
-+
-+        VIR_DEBUG("Removing cgroup %s and all child cgroups", grppath);
-+        rc = virCgroupRemoveRecursively(grppath);
-+    }
-+    VIR_DEBUG("Done removing cgroup %s", group->path);
-+
-+    return rc;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -684,6 +722,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .getAnyController = virCgroupV1GetAnyController,
-     .pathOfController = virCgroupV1PathOfController,
-     .makeGroup = virCgroupV1MakeGroup,
-+    .remove = virCgroupV1Remove,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1SetMemory.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1SetMemory.patch
deleted file mode 100644
index 975964c..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1SetMemory.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 75e53d9323c069ece39b40a99675425967ac2d62 Mon Sep 17 00:00:00 2001
-Message-Id: <75e53d9323c069ece39b40a99675425967ac2d62@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:49 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1SetMemory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 53f43deb0dfa666cb8c614cabbf5add075ccc33f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d24181f343e9a9ca60165d1f936cc9ec9c0616ec.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 20 +-------------------
- src/util/vircgroupbackend.h |  6 ++++++
- src/util/vircgroupv1.c      | 28 ++++++++++++++++++++++++++++
- 3 files changed, 35 insertions(+), 19 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 684bce4997..4053c65939 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1593,25 +1593,7 @@ virCgroupGetMemoryUnlimitedKB(void)
- int
- virCgroupSetMemory(virCgroupPtr group, unsigned long long kb)
- {
--    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
--
--    if (kb > maxkb) {
--        virReportError(VIR_ERR_INVALID_ARG,
--                       _("Memory '%llu' must be less than %llu"),
--                       kb, maxkb);
--        return -1;
--    }
--
--    if (kb == maxkb)
--        return virCgroupSetValueI64(group,
--                                    VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.limit_in_bytes",
--                                    -1);
--    else
--        return virCgroupSetValueU64(group,
--                                    VIR_CGROUP_CONTROLLER_MEMORY,
--                                    "memory.limit_in_bytes",
--                                    kb << 10);
-+    VIR_CGROUP_BACKEND_CALL(group, setMemory, -1, kb);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 67e795a2b7..e1f75c5c31 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -210,6 +210,10 @@ typedef int
-                                      const char *path,
-                                      unsigned long long *wbps);
- 
-+typedef int
-+(*virCgroupSetMemoryCB)(virCgroupPtr group,
-+                        unsigned long long kb);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -248,6 +252,8 @@ struct _virCgroupBackend {
-     virCgroupGetBlkioDeviceReadBpsCB getBlkioDeviceReadBps;
-     virCgroupSetBlkioDeviceWriteBpsCB setBlkioDeviceWriteBps;
-     virCgroupGetBlkioDeviceWriteBpsCB getBlkioDeviceWriteBps;
-+
-+    virCgroupSetMemoryCB setMemory;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index c044414dfd..17a4d67972 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1378,6 +1378,32 @@ virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetMemory(virCgroupPtr group,
-+                     unsigned long long kb)
-+{
-+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    if (kb > maxkb) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("Memory '%llu' must be less than %llu"),
-+                       kb, maxkb);
-+        return -1;
-+    }
-+
-+    if (kb == maxkb)
-+        return virCgroupSetValueI64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.limit_in_bytes",
-+                                    -1);
-+    else
-+        return virCgroupSetValueU64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.limit_in_bytes",
-+                                    kb << 10);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1414,6 +1440,8 @@ virCgroupBackend virCgroupV1Backend = {
-     .getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadBps,
-     .setBlkioDeviceWriteBps = virCgroupV1SetBlkioDeviceWriteBps,
-     .getBlkioDeviceWriteBps = virCgroupV1GetBlkioDeviceWriteBps,
-+
-+    .setMemory = virCgroupV1SetMemory,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1SetOwner.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1SetOwner.patch
deleted file mode 100644
index 975b387..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1SetOwner.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 955ac573d3291bfb069664e2df9f4edb0ed09313 Mon Sep 17 00:00:00 2001
-Message-Id: <955ac573d3291bfb069664e2df9f4edb0ed09313@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:40 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1SetOwner
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit dad061101d34a8e4b76ec3c03253ed3e83b50b2a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <644b2434def24cbb7834a7950595c110d5438166.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 54 +------------------------------
- src/util/vircgroupbackend.h |  7 +++++
- src/util/vircgroupv1.c      | 63 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 71 insertions(+), 53 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 7789966472..e57aecb08a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -3282,59 +3282,7 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
-                       gid_t gid,
-                       int controllers)
- {
--    int ret = -1;
--    size_t i;
--    DIR *dh = NULL;
--    int direrr;
--
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        VIR_AUTOFREE(char *) base = NULL;
--        struct dirent *de;
--
--        if (!((1 << i) & controllers))
--            continue;
--
--        if (!cgroup->controllers[i].mountPoint)
--            continue;
--
--        if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint,
--                        cgroup->controllers[i].placement) < 0)
--            goto cleanup;
--
--        if (virDirOpen(&dh, base) < 0)
--            goto cleanup;
--
--        while ((direrr = virDirRead(dh, &de, base)) > 0) {
--            VIR_AUTOFREE(char *) entry = NULL;
--
--            if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0)
--                goto cleanup;
--
--            if (chown(entry, uid, gid) < 0) {
--                virReportSystemError(errno,
--                                     _("cannot chown '%s' to (%u, %u)"),
--                                     entry, uid, gid);
--                goto cleanup;
--            }
--        }
--        if (direrr < 0)
--            goto cleanup;
--
--        if (chown(base, uid, gid) < 0) {
--            virReportSystemError(errno,
--                                 _("cannot chown '%s' to (%u, %u)"),
--                                 base, uid, gid);
--            goto cleanup;
--        }
--
--        VIR_DIR_CLOSE(dh);
--    }
--
--    ret = 0;
--
-- cleanup:
--    VIR_DIR_CLOSE(dh);
--    return ret;
-+    return cgroup->backend->setOwner(cgroup, uid, gid, controllers);
- }
- 
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index caeec3de60..74af796c2f 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -131,6 +131,12 @@ typedef int
-                         const char *oldroot,
-                         const char *mountopts);
- 
-+typedef int
-+(*virCgroupSetOwnerCB)(virCgroupPtr cgroup,
-+                       uid_t uid,
-+                       gid_t gid,
-+                       int controllers);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -152,6 +158,7 @@ struct _virCgroupBackend {
-     virCgroupAddTaskCB addTask;
-     virCgroupHasEmptyTasksCB hasEmptyTasks;
-     virCgroupBindMountCB bindMount;
-+    virCgroupSetOwnerCB setOwner;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index d63525dfb0..c1e2583912 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -867,6 +867,68 @@ virCgroupV1BindMount(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1SetOwner(virCgroupPtr cgroup,
-+                    uid_t uid,
-+                    gid_t gid,
-+                    int controllers)
-+{
-+    int ret = -1;
-+    size_t i;
-+    DIR *dh = NULL;
-+    int direrr;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        VIR_AUTOFREE(char *) base = NULL;
-+        struct dirent *de;
-+
-+        if (!((1 << i) & controllers))
-+            continue;
-+
-+        if (!cgroup->controllers[i].mountPoint)
-+            continue;
-+
-+        if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint,
-+                        cgroup->controllers[i].placement) < 0)
-+            goto cleanup;
-+
-+        if (virDirOpen(&dh, base) < 0)
-+            goto cleanup;
-+
-+        while ((direrr = virDirRead(dh, &de, base)) > 0) {
-+            VIR_AUTOFREE(char *) entry = NULL;
-+
-+            if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0)
-+                goto cleanup;
-+
-+            if (chown(entry, uid, gid) < 0) {
-+                virReportSystemError(errno,
-+                                     _("cannot chown '%s' to (%u, %u)"),
-+                                     entry, uid, gid);
-+                goto cleanup;
-+            }
-+        }
-+        if (direrr < 0)
-+            goto cleanup;
-+
-+        if (chown(base, uid, gid) < 0) {
-+            virReportSystemError(errno,
-+                                 _("cannot chown '%s' to (%u, %u)"),
-+                                 base, uid, gid);
-+            goto cleanup;
-+        }
-+
-+        VIR_DIR_CLOSE(dh);
-+    }
-+
-+    ret = 0;
-+
-+ cleanup:
-+    VIR_DIR_CLOSE(dh);
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -887,6 +949,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .addTask = virCgroupV1AddTask,
-     .hasEmptyTasks = virCgroupV1HasEmptyTasks,
-     .bindMount = virCgroupV1BindMount,
-+    .setOwner = virCgroupV1SetOwner,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1StealPlacement.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1StealPlacement.patch
deleted file mode 100644
index 11e2ff4..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1StealPlacement.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 6f37c631f12c0e9b7e9fe8ade5b5a98392090cfb Mon Sep 17 00:00:00 2001
-Message-Id: <6f37c631f12c0e9b7e9fe8ade5b5a98392090cfb@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:30 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1StealPlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 12264c12c819259edeb3e5adb59281906b673ca7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5f083ec4400455a10608945377f943a071e36c43.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  3 +--
- src/util/vircgroupbackend.h |  4 ++++
- src/util/vircgroupv1.c      | 12 ++++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index b17a1dcbb7..0e64ad67f4 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1323,8 +1323,7 @@ virCgroupNewMachineSystemd(const char *name,
-                            &init) < 0)
-         return -1;
- 
--    path = init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement;
--    init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement = NULL;
-+    path = init->backend->stealPlacement(init);
-     virCgroupFree(&init);
- 
-     if (!path || STREQ(path, "/") || path[0] != '/') {
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 086cfb8090..9c0bd89793 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -66,6 +66,9 @@ typedef int
- (*virCgroupValidatePlacementCB)(virCgroupPtr group,
-                                 pid_t pid);
- 
-+typedef char *
-+(*virCgroupStealPlacementCB)(virCgroupPtr group);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -77,6 +80,7 @@ struct _virCgroupBackend {
-     virCgroupDetectMountsCB detectMounts;
-     virCgroupDetectPlacementCB detectPlacement;
-     virCgroupValidatePlacementCB validatePlacement;
-+    virCgroupStealPlacementCB stealPlacement;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 2c905a832a..446546fd58 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -403,6 +403,17 @@ virCgroupV1ValidatePlacement(virCgroupPtr group,
- }
- 
- 
-+static char *
-+virCgroupV1StealPlacement(virCgroupPtr group)
-+{
-+    char *ret = NULL;
-+
-+    VIR_STEAL_PTR(ret, group->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement);
-+
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -413,6 +424,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .detectMounts = virCgroupV1DetectMounts,
-     .detectPlacement = virCgroupV1DetectPlacement,
-     .validatePlacement = virCgroupV1ValidatePlacement,
-+    .stealPlacement = virCgroupV1StealPlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1SupportsCpuBW.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1SupportsCpuBW.patch
deleted file mode 100644
index 18f0dc8..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1SupportsCpuBW.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 36f035a5d6620f5f39f4aec45d4ec1ec0fa7ccbc Mon Sep 17 00:00:00 2001
-Message-Id: <36f035a5d6620f5f39f4aec45d4ec1ec0fa7ccbc@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:59 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1SupportsCpuBW
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d182fac0bb07ff06ca938b40030849f86dfa24f1)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <679862bf39de7fbd81ab5b1e65c61cf578abb944.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 13 +------------
- src/util/vircgroupbackend.h |  4 ++++
- src/util/vircgroupv1.c      | 19 +++++++++++++++++++
- 3 files changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a3e7954d03..fa9fa52019 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2685,18 +2685,7 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
- bool
- virCgroupSupportsCpuBW(virCgroupPtr cgroup)
- {
--    VIR_AUTOFREE(char *) path = NULL;
--
--    if (!cgroup)
--        return false;
--
--    if (virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU,
--                                  "cpu.cfs_period_us", &path) < 0) {
--        virResetLastError();
--        return false;
--    }
--
--    return virFileExists(path);
-+    VIR_CGROUP_BACKEND_CALL(cgroup, supportsCpuBW, false);
- }
- 
- int
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index f7c230db76..d3d5e7c222 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -300,6 +300,9 @@ typedef int
- (*virCgroupGetCpuCfsQuotaCB)(virCgroupPtr group,
-                              long long *cfs_quota);
- 
-+typedef bool
-+(*virCgroupSupportsCpuBWCB)(virCgroupPtr cgroup);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -361,6 +364,7 @@ struct _virCgroupBackend {
-     virCgroupGetCpuCfsPeriodCB getCpuCfsPeriod;
-     virCgroupSetCpuCfsQuotaCB setCpuCfsQuota;
-     virCgroupGetCpuCfsQuotaCB getCpuCfsQuota;
-+    virCgroupSupportsCpuBWCB supportsCpuBW;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 25f7376026..f2a8839f6e 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -1846,6 +1846,24 @@ virCgroupV1GetCpuCfsQuota(virCgroupPtr group,
- }
- 
- 
-+static bool
-+virCgroupV1SupportsCpuBW(virCgroupPtr cgroup)
-+{
-+    VIR_AUTOFREE(char *) path = NULL;
-+
-+    if (!cgroup)
-+        return false;
-+
-+    if (virCgroupV1PathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU,
-+                                    "cpu.cfs_period_us", &path) < 0) {
-+        virResetLastError();
-+        return false;
-+    }
-+
-+    return virFileExists(path);
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -1905,6 +1923,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .getCpuCfsPeriod = virCgroupV1GetCpuCfsPeriod,
-     .setCpuCfsQuota = virCgroupV1SetCpuCfsQuota,
-     .getCpuCfsQuota = virCgroupV1GetCpuCfsQuota,
-+    .supportsCpuBW = virCgroupV1SupportsCpuBW,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidateMachineGroup.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidateMachineGroup.patch
deleted file mode 100644
index a8bbadb..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidateMachineGroup.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From e950a43b63a79cf68e835d800688d759ba408178 Mon Sep 17 00:00:00 2001
-Message-Id: <e950a43b63a79cf68e835d800688d759ba408178@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:25 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1ValidateMachineGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 61629d5be3a4809fe05feb15adbc8f2c27916702)
-
-Conflicts:
-    src/util/vircgroupv1.c: missing commit c0abcca417
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a34a0141721e9e27c0b3337108c13d36caa6bb79.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 85 +------------------------------------
- src/util/vircgroupbackend.h |  7 +++
- src/util/vircgrouppriv.h    |  2 +
- src/util/vircgroupv1.c      | 85 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 96 insertions(+), 83 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 15d0cb65ac..6825623478 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -216,7 +216,7 @@ virCgroupPartitionNeedsEscaping(const char *path)
- }
- 
- 
--static int
-+int
- virCgroupPartitionEscape(char **path)
- {
-     int rc;
-@@ -235,87 +235,6 @@ virCgroupPartitionEscape(char **path)
- }
- 
- 
--static bool
--virCgroupValidateMachineGroup(virCgroupPtr group,
--                              const char *name,
--                              const char *drivername,
--                              const char *machinename)
--{
--    size_t i;
--    VIR_AUTOFREE(char *) partname = NULL;
--    VIR_AUTOFREE(char *) scopename_old = NULL;
--    VIR_AUTOFREE(char *) scopename_new = NULL;
--    VIR_AUTOFREE(char *) partmachinename = NULL;
--
--    if (virAsprintf(&partname, "%s.libvirt-%s",
--                    name, drivername) < 0)
--        return false;
--
--    if (virCgroupPartitionEscape(&partname) < 0)
--        return false;
--
--    if (virAsprintf(&partmachinename, "%s.libvirt-%s",
--                    machinename, drivername) < 0 ||
--        virCgroupPartitionEscape(&partmachinename) < 0)
--        return false;
--
--    if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true)))
--        return false;
--
--    if (!(scopename_new = virSystemdMakeScopeName(machinename,
--                                                  drivername, false)))
--        return false;
--
--    if (virCgroupPartitionEscape(&scopename_old) < 0)
--        return false;
--
--    if (virCgroupPartitionEscape(&scopename_new) < 0)
--        return false;
--
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        char *tmp;
--
--        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
--            continue;
--
--        if (!group->controllers[i].placement)
--            continue;
--
--        tmp = strrchr(group->controllers[i].placement, '/');
--        if (!tmp)
--            return false;
--
--        if (i == VIR_CGROUP_CONTROLLER_CPU ||
--            i == VIR_CGROUP_CONTROLLER_CPUACCT ||
--            i == VIR_CGROUP_CONTROLLER_CPUSET) {
--            if (STREQ(tmp, "/emulator"))
--                *tmp = '\0';
--            tmp = strrchr(group->controllers[i].placement, '/');
--            if (!tmp)
--                return false;
--        }
--
--        tmp++;
--
--        if (STRNEQ(tmp, name) &&
--            STRNEQ(tmp, machinename) &&
--            STRNEQ(tmp, partname) &&
--            STRNEQ(tmp, partmachinename) &&
--            STRNEQ(tmp, scopename_old) &&
--            STRNEQ(tmp, scopename_new)) {
--            VIR_DEBUG("Name '%s' for controller '%s' does not match "
--                      "'%s', '%s', '%s', '%s' or '%s'",
--                      tmp, virCgroupControllerTypeToString(i),
--                      name, machinename, partname,
--                      scopename_old, scopename_new);
--            return false;
--        }
--    }
--
--    return true;
--}
--
--
- static int
- virCgroupCopyMounts(virCgroupPtr group,
-                     virCgroupPtr parent)
-@@ -1508,7 +1427,7 @@ virCgroupNewDetectMachine(const char *name,
-         return -1;
-     }
- 
--    if (!virCgroupValidateMachineGroup(*group, name, drivername, machinename)) {
-+    if (!(*group)->backend->validateMachineGroup(*group, name, drivername, machinename)) {
-         VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'",
-                   name, drivername);
-         virCgroupFree(group);
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 88f51416b0..daf47bac09 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -35,11 +35,18 @@ typedef enum {
- typedef bool
- (*virCgroupAvailableCB)(void);
- 
-+typedef bool
-+(*virCgroupValidateMachineGroupCB)(virCgroupPtr group,
-+                                   const char *name,
-+                                   const char *drivername,
-+                                   const char *machinename);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-     /* Mandatory callbacks that need to be implemented for every backend. */
-     virCgroupAvailableCB available;
-+    virCgroupValidateMachineGroupCB validateMachineGroup;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 2caa966fee..e7f4a1f0fc 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -53,6 +53,8 @@ struct _virCgroup {
-     virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
-+int virCgroupPartitionEscape(char **path);
-+
- int virCgroupNewPartition(const char *path,
-                           bool create,
-                           int controllers,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 73045b1109..b78cdcab53 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -30,11 +30,14 @@
- #include "vircgrouppriv.h"
- #undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
- 
-+#include "viralloc.h"
- #include "vircgroup.h"
- #include "vircgroupbackend.h"
- #include "vircgroupv1.h"
- #include "virfile.h"
- #include "virlog.h"
-+#include "virstring.h"
-+#include "virsystemd.h"
- 
- VIR_LOG_INIT("util.cgroup");
- 
-@@ -76,10 +79,92 @@ virCgroupV1Available(void)
- }
- 
- 
-+static bool
-+virCgroupV1ValidateMachineGroup(virCgroupPtr group,
-+                                const char *name,
-+                                const char *drivername,
-+                                const char *machinename)
-+{
-+    size_t i;
-+    VIR_AUTOFREE(char *) partname = NULL;
-+    VIR_AUTOFREE(char *) scopename_old = NULL;
-+    VIR_AUTOFREE(char *) scopename_new = NULL;
-+    VIR_AUTOFREE(char *) partmachinename = NULL;
-+
-+    if (virAsprintf(&partname, "%s.libvirt-%s",
-+                    name, drivername) < 0)
-+        return false;
-+
-+    if (virCgroupPartitionEscape(&partname) < 0)
-+        return false;
-+
-+    if (virAsprintf(&partmachinename, "%s.libvirt-%s",
-+                    machinename, drivername) < 0 ||
-+        virCgroupPartitionEscape(&partmachinename) < 0)
-+        return false;
-+
-+    if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true)))
-+        return false;
-+
-+    if (!(scopename_new = virSystemdMakeScopeName(machinename,
-+                                                  drivername, false)))
-+        return false;
-+
-+    if (virCgroupPartitionEscape(&scopename_old) < 0)
-+        return false;
-+
-+    if (virCgroupPartitionEscape(&scopename_new) < 0)
-+        return false;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        char *tmp;
-+
-+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
-+            continue;
-+
-+        if (!group->controllers[i].placement)
-+            continue;
-+
-+        tmp = strrchr(group->controllers[i].placement, '/');
-+        if (!tmp)
-+            return false;
-+
-+        if (i == VIR_CGROUP_CONTROLLER_CPU ||
-+            i == VIR_CGROUP_CONTROLLER_CPUACCT ||
-+            i == VIR_CGROUP_CONTROLLER_CPUSET) {
-+            if (STREQ(tmp, "/emulator"))
-+                *tmp = '\0';
-+            tmp = strrchr(group->controllers[i].placement, '/');
-+            if (!tmp)
-+                return false;
-+        }
-+
-+        tmp++;
-+
-+        if (STRNEQ(tmp, name) &&
-+            STRNEQ(tmp, machinename) &&
-+            STRNEQ(tmp, partname) &&
-+            STRNEQ(tmp, partmachinename) &&
-+            STRNEQ(tmp, scopename_old) &&
-+            STRNEQ(tmp, scopename_new)) {
-+            VIR_DEBUG("Name '%s' for controller '%s' does not match "
-+                      "'%s', '%s', '%s', '%s' or '%s'",
-+                      tmp, virCgroupV1ControllerTypeToString(i),
-+                      name, machinename, partname,
-+                      scopename_old, scopename_new);
-+            return false;
-+        }
-+    }
-+
-+    return true;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-     .available = virCgroupV1Available,
-+    .validateMachineGroup = virCgroupV1ValidateMachineGroup,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidatePlacement.patch b/SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidatePlacement.patch
deleted file mode 100644
index ddd9afb..0000000
--- a/SOURCES/libvirt-vircgroup-extract-virCgroupV1ValidatePlacement.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From a4fad1d74b1af03d7bd89d4ef1bc1be4d7c9feca Mon Sep 17 00:00:00 2001
-Message-Id: <a4fad1d74b1af03d7bd89d4ef1bc1be4d7c9feca@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:29 +0200
-Subject: [PATCH] vircgroup: extract virCgroupV1ValidatePlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b549a66edf46ced7c2b922408f3c7cdad2539e0b)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <0fac794a48f75788ccfab8614ac8e7f051df2719.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 32 +-------------------------------
- src/util/vircgroupbackend.h |  5 +++++
- src/util/vircgroupv1.c      | 31 +++++++++++++++++++++++++++++++
- 3 files changed, 37 insertions(+), 31 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index b63321ca33..b17a1dcbb7 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -349,36 +349,6 @@ virCgroupDetectPlacement(virCgroupPtr group,
- }
- 
- 
--static int
--virCgroupValidatePlacement(virCgroupPtr group,
--                           pid_t pid)
--{
--    size_t i;
--
--    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
--            continue;
--
--        if (!group->controllers[i].placement) {
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Could not find placement for controller %s at %s"),
--                           virCgroupControllerTypeToString(i),
--                           group->controllers[i].placement);
--            return -1;
--        }
--
--        VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
--                  i,
--                  virCgroupControllerTypeToString(i),
--                  group->controllers[i].mountPoint,
--                  group->controllers[i].placement,
--                  (long long) pid);
--    }
--
--    return 0;
--}
--
--
- static int
- virCgroupDetectControllers(virCgroupPtr group,
-                            int controllers)
-@@ -504,7 +474,7 @@ virCgroupDetect(virCgroupPtr group,
-         return -1;
- 
-     /* Check that for every mounted controller, we found our placement */
--    if (virCgroupValidatePlacement(group, pid) < 0)
-+    if (group->backend->validatePlacement(group, pid) < 0)
-         return -1;
- 
-     return 0;
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 85906e7191..086cfb8090 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -62,6 +62,10 @@ typedef int
-                               const char *controllers,
-                               const char *selfpath);
- 
-+typedef int
-+(*virCgroupValidatePlacementCB)(virCgroupPtr group,
-+                                pid_t pid);
-+
- struct _virCgroupBackend {
-     virCgroupBackendType type;
- 
-@@ -72,6 +76,7 @@ struct _virCgroupBackend {
-     virCgroupCopyPlacementCB copyPlacement;
-     virCgroupDetectMountsCB detectMounts;
-     virCgroupDetectPlacementCB detectPlacement;
-+    virCgroupValidatePlacementCB validatePlacement;
- };
- typedef struct _virCgroupBackend virCgroupBackend;
- typedef virCgroupBackend *virCgroupBackendPtr;
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 68bb1c6f5d..2c905a832a 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -373,6 +373,36 @@ virCgroupV1DetectPlacement(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV1ValidatePlacement(virCgroupPtr group,
-+                             pid_t pid)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        if (!group->controllers[i].mountPoint)
-+            continue;
-+
-+        if (!group->controllers[i].placement) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Could not find placement for v1 controller %s at %s"),
-+                           virCgroupV1ControllerTypeToString(i),
-+                           group->controllers[i].placement);
-+            return -1;
-+        }
-+
-+        VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
-+                  i,
-+                  virCgroupV1ControllerTypeToString(i),
-+                  group->controllers[i].mountPoint,
-+                  group->controllers[i].placement,
-+                  (long long) pid);
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV1Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V1,
- 
-@@ -382,6 +412,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .copyPlacement = virCgroupV1CopyPlacement,
-     .detectMounts = virCgroupV1DetectMounts,
-     .detectPlacement = virCgroupV1DetectPlacement,
-+    .validatePlacement = virCgroupV1ValidatePlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-fix-MinGW-build.patch b/SOURCES/libvirt-vircgroup-fix-MinGW-build.patch
deleted file mode 100644
index 8f34771..0000000
--- a/SOURCES/libvirt-vircgroup-fix-MinGW-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 86426efffd910c22c9cfadc50516883b606c6946 Mon Sep 17 00:00:00 2001
-Message-Id: <86426efffd910c22c9cfadc50516883b606c6946@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:03 +0200
-Subject: [PATCH] vircgroup: fix MinGW build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Broken by commit <901d2b9c87>.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit baebd9f3d84b5cb86c7c6f35eb41cf9fb7e9b624)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <bb4185916d7e3937b58f9019feb5abf3ba6e4823.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 0ed83932ac..df38bb77e0 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -4335,6 +4335,21 @@ virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNUSED,
- }
- 
- 
-+int
-+virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_UNUSED,
-+                       unsigned long long *cache ATTRIBUTE_UNUSED,
-+                       unsigned long long *activeAnon ATTRIBUTE_UNUSED,
-+                       unsigned long long *inactiveAnon ATTRIBUTE_UNUSED,
-+                       unsigned long long *activeFile ATTRIBUTE_UNUSED,
-+                       unsigned long long *inactiveFile ATTRIBUTE_UNUSED,
-+                       unsigned long long *unevictable ATTRIBUTE_UNUSED)
-+{
-+    virReportSystemError(ENOSYS, "%s",
-+                         _("Control groups not supported on this platform"));
-+    return -1;
-+}
-+
-+
- int
- virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
-                         unsigned long *kb ATTRIBUTE_UNUSED)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-fix-bug-in-virCgroupEnableMissingControllers.patch b/SOURCES/libvirt-vircgroup-fix-bug-in-virCgroupEnableMissingControllers.patch
deleted file mode 100644
index 18175d4..0000000
--- a/SOURCES/libvirt-vircgroup-fix-bug-in-virCgroupEnableMissingControllers.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 5abd9049c8bdea6170dc455033e37811ba875db8 Mon Sep 17 00:00:00 2001
-Message-Id: <5abd9049c8bdea6170dc455033e37811ba875db8@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:13 +0200
-Subject: [PATCH] vircgroup: fix bug in virCgroupEnableMissingControllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If we are on host with systemd we need to build cgroup hierarchy
-ourselves for controllers that are not managed by systemd.
-
-As a starting parent we need to force root group because
-virCgroupMakeGroup() takes that parent in order to inherit values
-for cpuset controller.
-
-By default cpuset controller is managed by systemd so we will never
-hit the issue but for v2 cgroups we need to use parent cgroup every
-time.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 63b4ed0dd3e1555b4c9d82ef0ca0648493f75af2)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <ae150854a6a02300cd3329c538373b770320f504.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 6aa30a82be..2328957818 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1495,7 +1495,7 @@ virCgroupEnableMissingControllers(char *path,
-     int ret = -1;
- 
-     if (virCgroupNew(pidleader,
--                     "",
-+                     "/",
-                      NULL,
-                      controllers,
-                      &parent) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-fix-cgroups-v2-controllers-detection.patch b/SOURCES/libvirt-vircgroup-fix-cgroups-v2-controllers-detection.patch
deleted file mode 100644
index e7f4d03..0000000
--- a/SOURCES/libvirt-vircgroup-fix-cgroups-v2-controllers-detection.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From b220fdba77897f65f3e7e963868f22d7ace58724 Mon Sep 17 00:00:00 2001
-Message-Id: <b220fdba77897f65f3e7e963868f22d7ace58724@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Thu, 25 Jul 2019 13:37:01 +0200
-Subject: [PATCH] vircgroup: fix cgroups v2 controllers detection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When creating new group for cgroups v2 the we cannot check
-cgroups.controllers for that cgroup because the directory is created
-later.  In that case we should check cgroups.subtree_control of parent
-group to get list of controllers enabled for child cgroups.
-
-In order to achieve that we will prefer the parent group if it exists,
-the current group will be used only for root group.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Acked-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 7b77f3a11e9ae3e3cf0ccb71bd72d4a865b7c71e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <ff6427994e0904f5649b70206f8f73129d1b8452.1564054553.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  2 +-
- src/util/vircgroupbackend.h |  3 ++-
- src/util/vircgroupv1.c      |  3 ++-
- src/util/vircgroupv2.c      | 23 ++++++++++++++++-------
- 4 files changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 37f6def08d..2c067edc5c 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -412,7 +412,7 @@ virCgroupDetect(virCgroupPtr group,
- 
-     for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-         if (group->backends[i]) {
--            int rc = group->backends[i]->detectControllers(group, controllers);
-+            int rc = group->backends[i]->detectControllers(group, controllers, parent);
-             if (rc < 0)
-                 return -1;
-             controllersAvailable |= rc;
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index 2b5be21a76..b97f686368 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -99,7 +99,8 @@ typedef char *
- 
- typedef int
- (*virCgroupDetectControllersCB)(virCgroupPtr group,
--                                int controllers);
-+                                int controllers,
-+                                virCgroupPtr parent);
- 
- typedef bool
- (*virCgroupHasControllerCB)(virCgroupPtr cgroup,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index a7d6c92e4c..925e8ee1c1 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -419,7 +419,8 @@ virCgroupV1StealPlacement(virCgroupPtr group)
- 
- static int
- virCgroupV1DetectControllers(virCgroupPtr group,
--                             int controllers)
-+                             int controllers,
-+                             virCgroupPtr parent ATTRIBUTE_UNUSED)
- {
-     size_t i;
-     size_t j;
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index b4e90ed46d..7b3cd64cc5 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -241,7 +241,8 @@ virCgroupV2StealPlacement(virCgroupPtr group)
- 
- 
- static int
--virCgroupV2ParseControllersFile(virCgroupPtr group)
-+virCgroupV2ParseControllersFile(virCgroupPtr group,
-+                                virCgroupPtr parent)
- {
-     int rc;
-     VIR_AUTOFREE(char *) contStr = NULL;
-@@ -249,10 +250,17 @@ virCgroupV2ParseControllersFile(virCgroupPtr group)
-     char **contList = NULL;
-     char **tmp;
- 
--    if (virAsprintf(&contFile, "%s%s/cgroup.controllers",
--                    group->unified.mountPoint,
--                    NULLSTR_EMPTY(group->unified.placement)) < 0)
--        return -1;
-+    if (parent) {
-+        if (virAsprintf(&contFile, "%s%s/cgroup.subtree_control",
-+                        parent->unified.mountPoint,
-+                        NULLSTR_EMPTY(parent->unified.placement)) < 0)
-+            return -1;
-+    } else {
-+        if (virAsprintf(&contFile, "%s%s/cgroup.controllers",
-+                        group->unified.mountPoint,
-+                        NULLSTR_EMPTY(group->unified.placement)) < 0)
-+            return -1;
-+    }
- 
-     rc = virFileReadAll(contFile, 1024 * 1024, &contStr);
-     if (rc < 0) {
-@@ -285,11 +293,12 @@ virCgroupV2ParseControllersFile(virCgroupPtr group)
- 
- static int
- virCgroupV2DetectControllers(virCgroupPtr group,
--                             int controllers)
-+                             int controllers,
-+                             virCgroupPtr parent)
- {
-     size_t i;
- 
--    if (virCgroupV2ParseControllersFile(group) < 0)
-+    if (virCgroupV2ParseControllersFile(group, parent) < 0)
-         return -1;
- 
-     /* In cgroup v2 there is no cpuacct controller, the cpu.stat file always
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-include-system-headers-only-on-linux.patch b/SOURCES/libvirt-vircgroup-include-system-headers-only-on-linux.patch
deleted file mode 100644
index 436ee86..0000000
--- a/SOURCES/libvirt-vircgroup-include-system-headers-only-on-linux.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 05df743686ad42fa006877341b7719ff4a890a70 Mon Sep 17 00:00:00 2001
-Message-Id: <05df743686ad42fa006877341b7719ff4a890a70@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:09 +0200
-Subject: [PATCH] vircgroup: include system headers only on linux
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-All the system headers are used only if we are compiling on linux
-and they all are present otherwise we would have seen build errors
-because in our tests/vircgrouptest.c we use only __linux__ to check
-whether to skip the cgroup tests or not.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 6ef37ed3b8e7cc5fd83ff2b84bf08deea62d3bd0)
-
-Conflicts:
-    src/util/vircgroup.c - missing commits 9403b63102 5165ff0971
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <78f1905b381e5d9dce9daeabcf157e2fe65ddffe.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index f1ecb1dbeb..a376b9b89a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -23,28 +23,27 @@
-  */
- #include <config.h>
- 
--#include <stdio.h>
--#if defined HAVE_MNTENT_H && defined HAVE_SYS_MOUNT_H \
--    && defined HAVE_GETMNTENT_R
-+#ifdef __linux__
-+# include <stdio.h>
- # include <mntent.h>
- # include <sys/mount.h>
--#endif
--#include <fcntl.h>
--#include <string.h>
--#include <errno.h>
--#include <stdlib.h>
--#include <sys/stat.h>
-+# include <fcntl.h>
-+# include <string.h>
-+# include <errno.h>
-+# include <stdlib.h>
-+# include <sys/stat.h>
- 
--#ifdef MAJOR_IN_MKDEV
--# include <sys/mkdev.h>
--#elif MAJOR_IN_SYSMACROS
--# include <sys/sysmacros.h>
--#endif
-+# ifdef MAJOR_IN_MKDEV
-+#  include <sys/mkdev.h>
-+# elif MAJOR_IN_SYSMACROS
-+#  include <sys/sysmacros.h>
-+# endif
- 
--#include <sys/types.h>
--#include <signal.h>
--#include <dirent.h>
--#include <unistd.h>
-+# include <sys/types.h>
-+# include <signal.h>
-+# include <dirent.h>
-+# include <unistd.h>
-+#endif /* __linux__ */
- 
- #define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
- #include "vircgrouppriv.h"
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-cgroup-v1-backend-files.patch b/SOURCES/libvirt-vircgroup-introduce-cgroup-v1-backend-files.patch
deleted file mode 100644
index 8a6dd5d..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-cgroup-v1-backend-files.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From d1b618c627d848ed4549912d83be397f969935d2 Mon Sep 17 00:00:00 2001
-Message-Id: <d1b618c627d848ed4549912d83be397f969935d2@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:22 +0200
-Subject: [PATCH] vircgroup: introduce cgroup v1 backend files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 1f221d610dc510b82f17407a81a0acd56d9efc5b)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d49ee905c005a855d89ed463e81aa935b07f003e.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/Makefile.am             |  1 +
- src/libvirt_private.syms    |  3 ++
- src/util/Makefile.inc.am    |  2 ++
- src/util/vircgroupbackend.c |  2 ++
- src/util/vircgroupv1.c      | 55 +++++++++++++++++++++++++++++++++++++
- src/util/vircgroupv1.h      | 27 ++++++++++++++++++
- 6 files changed, 90 insertions(+)
- create mode 100644 src/util/vircgroupv1.c
- create mode 100644 src/util/vircgroupv1.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c4e797f5a2..0def0a3b19 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -679,6 +679,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \
- 		util/virbuffer.c \
- 		util/vircgroup.c \
- 		util/vircgroupbackend.c \
-+		util/vircgroupv1.c \
- 		util/vircommand.c \
- 		util/virconf.c \
- 		util/virdbus.c \
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 627eb5e587..b144955154 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1595,6 +1595,9 @@ virCgroupTerminateMachine;
- virCgroupBackendGetAll;
- virCgroupBackendRegister;
- 
-+# util/vircgroupv1.h
-+virCgroupV1Register;
-+
- # util/virclosecallbacks.h
- virCloseCallbacksGet;
- virCloseCallbacksGetConn;
-diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
-index a9185bd7b7..725ece98e9 100644
---- a/src/util/Makefile.inc.am
-+++ b/src/util/Makefile.inc.am
-@@ -25,6 +25,8 @@ UTIL_SOURCES = \
- 	util/vircgroup.h util/vircgrouppriv.h \
- 	util/vircgroupbackend.c \
- 	util/vircgroupbackend.h \
-+	util/vircgroupv1.c \
-+	util/vircgroupv1.h \
- 	util/virclosecallbacks.c \
- 	util/virclosecallbacks.h \
- 	util/vircommand.c \
-diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
-index e014bfc0e6..d854c9711d 100644
---- a/src/util/vircgroupbackend.c
-+++ b/src/util/vircgroupbackend.c
-@@ -20,6 +20,7 @@
- #include <config.h>
- 
- #include "vircgroupbackend.h"
-+#include "vircgroupv1.h"
- #include "virerror.h"
- #include "virthread.h"
- 
-@@ -49,6 +50,7 @@ virCgroupBackendRegister(virCgroupBackendPtr backend)
- static void
- virCgroupBackendOnceInit(void)
- {
-+    virCgroupV1Register();
- }
- 
- 
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-new file mode 100644
-index 0000000000..4dda7865f1
---- /dev/null
-+++ b/src/util/vircgroupv1.c
-@@ -0,0 +1,55 @@
-+/*
-+ * vircgroupv1.c: methods for cgroups v1 backend
-+ *
-+ * Copyright (C) 2010-2015,2018 Red Hat, Inc.
-+ * Copyright IBM Corp. 2008
-+ *
-+ * 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 "internal.h"
-+
-+#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
-+#include "vircgrouppriv.h"
-+#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
-+
-+#include "vircgroup.h"
-+#include "vircgroupbackend.h"
-+#include "vircgroupv1.h"
-+#include "virlog.h"
-+
-+VIR_LOG_INIT("util.cgroup");
-+
-+#define VIR_FROM_THIS VIR_FROM_CGROUP
-+
-+
-+VIR_ENUM_DECL(virCgroupV1Controller);
-+VIR_ENUM_IMPL(virCgroupV1Controller, VIR_CGROUP_CONTROLLER_LAST,
-+              "cpu", "cpuacct", "cpuset", "memory", "devices",
-+              "freezer", "blkio", "net_cls", "perf_event",
-+              "name=systemd");
-+
-+
-+virCgroupBackend virCgroupV1Backend = {
-+    .type = VIR_CGROUP_BACKEND_TYPE_V1,
-+};
-+
-+
-+void
-+virCgroupV1Register(void)
-+{
-+    virCgroupBackendRegister(&virCgroupV1Backend);
-+}
-diff --git a/src/util/vircgroupv1.h b/src/util/vircgroupv1.h
-new file mode 100644
-index 0000000000..517517c109
---- /dev/null
-+++ b/src/util/vircgroupv1.h
-@@ -0,0 +1,27 @@
-+/*
-+ * vircgroupv1.h: methods for cgroups v1 backend
-+ *
-+ * Copyright (C) 2018 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/>.
-+ */
-+
-+#ifndef __VIR_CGROUP_V1_H__
-+# define __VIR_CGROUP_V1_H__
-+
-+void
-+virCgroupV1Register(void);
-+
-+#endif /* __VIR_CGROUP_V1_H__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupAddThread.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupAddThread.patch
deleted file mode 100644
index 5203d96..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupAddThread.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 83b13b08025476233d7acc7d37297abda861be32 Mon Sep 17 00:00:00 2001
-Message-Id: <83b13b08025476233d7acc7d37297abda861be32@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:16 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupAddThread
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Once we introduce cgroup v2 support we need to handle processes and
-threads differently.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7b526ea57c8ca02e49f6a8cc71a6910f56803bde)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <ed2085fc086090e3865b08758e973e0eedd78a4d.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/qemu/qemu_process.c  |  2 +-
- src/util/vircgroup.c     | 32 ++++++++++++++++++++++++++++++++
- src/util/vircgroup.h     |  1 +
- 4 files changed, 35 insertions(+), 1 deletion(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 5dd24e2e66..f8c1a0df16 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1515,6 +1515,7 @@ virBufferVasprintf;
- # util/vircgroup.h
- virCgroupAddMachineProcess;
- virCgroupAddProcess;
-+virCgroupAddThread;
- virCgroupAllowAllDevices;
- virCgroupAllowDevice;
- virCgroupAllowDevicePath;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index c21586fa12..0cd61f02bb 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2538,7 +2538,7 @@ qemuProcessSetupPid(virDomainObjPtr vm,
-             goto cleanup;
- 
-         /* Move the thread to the sub dir */
--        if (virCgroupAddProcess(cgroup, pid) < 0)
-+        if (virCgroupAddThread(cgroup, pid) < 0)
-             goto cleanup;
- 
-     }
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 5aa8596b9c..f08fe3600e 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1164,6 +1164,10 @@ typedef enum {
-     /* Same as VIR_CGROUP_TASK_PROCESS but it also adds the task to systemd
-      * named controller. */
-     VIR_CGROUP_TASK_SYSTEMD = 1 << 1,
-+
-+    /* Moves only specific thread into cgroup except to systemd
-+     * named controller. */
-+    VIR_CGROUP_TASK_THREAD = 1 << 2,
- } virCgroupTaskFlags;
- 
- 
-@@ -1232,6 +1236,24 @@ virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid)
-                                     VIR_CGROUP_TASK_SYSTEMD);
- }
- 
-+/**
-+ * virCgroupAddThread:
-+ *
-+ * @group: The cgroup to add a thread to
-+ * @pid: The pid of the thread to add
-+ *
-+ * Will add the thread to all controllers, except the
-+ * systemd unit controller.
-+ *
-+ * Returns: 0 on success, -1 on error
-+ */
-+int
-+virCgroupAddThread(virCgroupPtr group,
-+                   pid_t pid)
-+{
-+    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_THREAD);
-+}
-+
- 
- static int
- virCgroupSetPartitionSuffix(const char *path, char **res)
-@@ -4233,6 +4255,16 @@ virCgroupAddMachineProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
- }
- 
- 
-+int
-+virCgroupAddThread(virCgroupPtr group ATTRIBUTE_UNUSED,
-+                   pid_t pid ATTRIBUTE_UNUSED)
-+{
-+    virReportSystemError(ENXIO, "%s",
-+                         _("Control groups not supported on this platform"));
-+    return -1;
-+}
-+
-+
- int
- virCgroupGetBlkioIoServiced(virCgroupPtr group ATTRIBUTE_UNUSED,
-                             long long *bytes_read ATTRIBUTE_UNUSED,
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index bbd4c2ed57..1f676f21c3 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -120,6 +120,7 @@ int virCgroupPathOfController(virCgroupPtr group,
- 
- int virCgroupAddProcess(virCgroupPtr group, pid_t pid);
- int virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid);
-+int virCgroupAddThread(virCgroupPtr group, pid_t pid);
- 
- int virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight);
- int virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupKillRecursiveCB.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupKillRecursiveCB.patch
deleted file mode 100644
index cd77f04..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupKillRecursiveCB.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From 8b35858852e5c170410d4462fdf2bb19659b8894 Mon Sep 17 00:00:00 2001
-Message-Id: <8b35858852e5c170410d4462fdf2bb19659b8894@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:09 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupKillRecursiveCB
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The rewrite to support cgroup v2 missed this function.  In cgroup v2
-we have different files to track tasks.
-
-We would fail to remove cgroup on non-systemd OSes if there is any
-extra process assigned to guest cgroup because we would not kill any
-process form the guest cgroup.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b532546823fde032fe827d41735a0d591c3bc0b8)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2414a178eb8aba977e7369bba0b37a18cdfec654.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        | 69 ++++++++++++++++++++-----------------
- src/util/vircgroupbackend.h |  7 ++++
- src/util/vircgrouppriv.h    |  8 +++++
- src/util/vircgroupv1.c      | 16 +++++++++
- src/util/vircgroupv2.c      | 16 +++++++++
- 5 files changed, 84 insertions(+), 32 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 069f1ae396..736b5043a8 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2431,33 +2431,15 @@ virCgroupRemove(virCgroupPtr group)
- }
- 
- 
--static int
--virCgroupPathOfAnyController(virCgroupPtr group,
--                             const char *name,
--                             char **keypath)
--{
--    size_t i;
--    int controller;
--
--    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
--        if (group->backends[i]) {
--            controller = group->backends[i]->getAnyController(group);
--            if (controller >= 0)
--                return virCgroupPathOfController(group, controller, name, keypath);
--        }
--    }
--
--    virReportSystemError(ENOSYS, "%s",
--                         _("No controllers are mounted"));
--    return -1;
--}
--
--
- /*
-  * Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error
-  */
- static int
--virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
-+virCgroupKillInternal(virCgroupPtr group,
-+                      int signum,
-+                      virHashTablePtr pids,
-+                      int controller,
-+                      const char *taskFile)
- {
-     int ret = -1;
-     bool killedAny = false;
-@@ -2467,7 +2449,7 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
-     VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
-               group, group->path, signum, pids);
- 
--    if (virCgroupPathOfAnyController(group, "tasks", &keypath) < 0)
-+    if (virCgroupPathOfController(group, controller, taskFile, &keypath) < 0)
-         return -1;
- 
-     /* PIDs may be forking as we kill them, so loop
-@@ -2553,10 +2535,12 @@ virCgroupPidCopy(const void *name)
- }
- 
- 
--static int
-+int
- virCgroupKillRecursiveInternal(virCgroupPtr group,
-                                int signum,
-                                virHashTablePtr pids,
-+                               int controller,
-+                               const char *taskFile,
-                                bool dormdir)
- {
-     int ret = -1;
-@@ -2570,11 +2554,13 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
-     VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
-               group, group->path, signum, pids);
- 
--    if (virCgroupPathOfAnyController(group, "", &keypath) < 0)
-+    if (virCgroupPathOfController(group, controller, "", &keypath) < 0)
-         return -1;
- 
--    if ((rc = virCgroupKillInternal(group, signum, pids)) < 0)
-+    if ((rc = virCgroupKillInternal(group, signum, pids,
-+                                    controller, taskFile)) < 0) {
-         goto cleanup;
-+    }
-     if (rc == 1)
-         killedAny = true;
- 
-@@ -2598,7 +2584,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
-             goto cleanup;
- 
-         if ((rc = virCgroupKillRecursiveInternal(subgroup, signum, pids,
--                                                 true)) < 0)
-+                                                 controller, taskFile, true)) < 0)
-             goto cleanup;
-         if (rc == 1)
-             killedAny = true;
-@@ -2624,8 +2610,10 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
- int
- virCgroupKillRecursive(virCgroupPtr group, int signum)
- {
--    int ret;
--    VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum);
-+    int ret = 0;
-+    int rc;
-+    size_t i;
-+    virCgroupBackendPtr *backends = virCgroupBackendGetAll();
-     virHashTablePtr pids = virHashCreateFull(100,
-                                              NULL,
-                                              virCgroupPidCode,
-@@ -2633,10 +2621,27 @@ virCgroupKillRecursive(virCgroupPtr group, int signum)
-                                              virCgroupPidCopy,
-                                              NULL);
- 
--    ret = virCgroupKillRecursiveInternal(group, signum, pids, false);
-+    VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum);
- 
-+    if (!backends) {
-+        ret = -1;
-+        goto cleanup;
-+    }
-+
-+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-+        if (backends[i]) {
-+            rc = backends[i]->killRecursive(group, signum, pids);
-+            if (rc < 0) {
-+                ret = -1;
-+                goto cleanup;
-+            }
-+            if (rc > 0)
-+                ret = rc;
-+        }
-+    }
-+
-+ cleanup:
-     virHashFree(pids);
--
-     return ret;
- }
- 
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index bc60b44643..a825dc4be7 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -24,6 +24,7 @@
- # include "internal.h"
- 
- # include "vircgroup.h"
-+# include "virhash.h"
- 
- # define CGROUP_MAX_VAL 512
- 
-@@ -128,6 +129,11 @@ typedef int
- (*virCgroupHasEmptyTasksCB)(virCgroupPtr cgroup,
-                             int controller);
- 
-+typedef int
-+(*virCgroupKillRecursiveCB)(virCgroupPtr group,
-+                            int signum,
-+                            virHashTablePtr pids);
-+
- typedef int
- (*virCgroupBindMountCB)(virCgroupPtr group,
-                         const char *oldroot,
-@@ -370,6 +376,7 @@ struct _virCgroupBackend {
-     virCgroupRemoveCB remove;
-     virCgroupAddTaskCB addTask;
-     virCgroupHasEmptyTasksCB hasEmptyTasks;
-+    virCgroupKillRecursiveCB killRecursive;
-     virCgroupBindMountCB bindMount;
-     virCgroupSetOwnerCB setOwner;
- 
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 8f24b0891e..6067f5cdc8 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -123,4 +123,12 @@ int virCgroupNewDomainPartition(virCgroupPtr partition,
- 
- int virCgroupRemoveRecursively(char *grppath);
- 
-+
-+int virCgroupKillRecursiveInternal(virCgroupPtr group,
-+                                   int signum,
-+                                   virHashTablePtr pids,
-+                                   int controller,
-+                                   const char *taskFile,
-+                                   bool dormdir);
-+
- #endif /* __VIR_CGROUP_PRIV_H__ */
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 3147084f21..7098dc5644 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -758,6 +758,21 @@ virCgroupV1HasEmptyTasks(virCgroupPtr cgroup,
- }
- 
- 
-+static int
-+virCgroupV1KillRecursive(virCgroupPtr group,
-+                         int signum,
-+                         virHashTablePtr pids)
-+{
-+    int controller = virCgroupV1GetAnyController(group);
-+
-+    if (controller < 0)
-+        return -1;
-+
-+    return virCgroupKillRecursiveInternal(group, signum, pids, controller,
-+                                          "tasks", false);
-+}
-+
-+
- static char *
- virCgroupV1IdentifyRoot(virCgroupPtr group)
- {
-@@ -2042,6 +2057,7 @@ virCgroupBackend virCgroupV1Backend = {
-     .remove = virCgroupV1Remove,
-     .addTask = virCgroupV1AddTask,
-     .hasEmptyTasks = virCgroupV1HasEmptyTasks,
-+    .killRecursive = virCgroupV1KillRecursive,
-     .bindMount = virCgroupV1BindMount,
-     .setOwner = virCgroupV1SetOwner,
- 
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index bff2f78d7e..5652fcfffb 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -463,6 +463,21 @@ virCgroupV2HasEmptyTasks(virCgroupPtr cgroup,
- }
- 
- 
-+static int
-+virCgroupV2KillRecursive(virCgroupPtr group,
-+                         int signum,
-+                         virHashTablePtr pids)
-+{
-+    int controller = virCgroupV2GetAnyController(group);
-+
-+    if (controller < 0)
-+        return -1;
-+
-+    return virCgroupKillRecursiveInternal(group, signum, pids, controller,
-+                                          "cgroup.threads", false);
-+}
-+
-+
- static int
- virCgroupV2BindMount(virCgroupPtr group,
-                      const char *oldroot,
-@@ -1559,6 +1574,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .remove = virCgroupV2Remove,
-     .addTask = virCgroupV2AddTask,
-     .hasEmptyTasks = virCgroupV2HasEmptyTasks,
-+    .killRecursive = virCgroupV2KillRecursive,
-     .bindMount = virCgroupV2BindMount,
-     .setOwner = virCgroupV2SetOwner,
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupTaskFlags.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupTaskFlags.patch
deleted file mode 100644
index 4677c8b..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupTaskFlags.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 482d6964af9e1f8a4d52253e6474ce11f4a1ca5f Mon Sep 17 00:00:00 2001
-Message-Id: <482d6964af9e1f8a4d52253e6474ce11f4a1ca5f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:15 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupTaskFlags
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use flags in virCgroupAddTaskInternal instead of boolean parameter.
-Following patch will add new flag to indicate thread instead of process.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 36c5989c54cf335b365f4e179a4d7ab7d174bd6e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a2cf781e5090f8f3ba2aec04aadb80c957001f7c.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index cf510fb019..5aa8596b9c 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1156,8 +1156,21 @@ virCgroupNew(pid_t pid,
- }
- 
- 
-+typedef enum {
-+    /* Adds a whole process with all threads to specific cgroup except
-+     * to systemd named controller. */
-+    VIR_CGROUP_TASK_PROCESS = 1 << 0,
-+
-+    /* Same as VIR_CGROUP_TASK_PROCESS but it also adds the task to systemd
-+     * named controller. */
-+    VIR_CGROUP_TASK_SYSTEMD = 1 << 1,
-+} virCgroupTaskFlags;
-+
-+
- static int
--virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
-+virCgroupAddTaskInternal(virCgroupPtr group,
-+                         pid_t pid,
-+                         unsigned int flags)
- {
-     int ret = -1;
-     size_t i;
-@@ -1170,7 +1183,8 @@ virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
-         /* We must never add tasks in systemd's hierarchy
-          * unless we're intentionally trying to move a
-          * task into a systemd machine scope */
--        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD && !withSystemd)
-+        if (i == VIR_CGROUP_CONTROLLER_SYSTEMD &&
-+            !(flags & VIR_CGROUP_TASK_SYSTEMD))
-             continue;
- 
-         if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)
-@@ -1196,7 +1210,7 @@ virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
- int
- virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- {
--    return virCgroupAddTaskInternal(group, pid, false);
-+    return virCgroupAddTaskInternal(group, pid, VIR_CGROUP_TASK_PROCESS);
- }
- 
- /**
-@@ -1213,7 +1227,9 @@ virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- int
- virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid)
- {
--    return virCgroupAddTaskInternal(group, pid, true);
-+    return virCgroupAddTaskInternal(group, pid,
-+                                    VIR_CGROUP_TASK_PROCESS |
-+                                    VIR_CGROUP_TASK_SYSTEMD);
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadBps.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadBps.patch
deleted file mode 100644
index 5b44c95..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadBps.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 7ca4f79d91300d6d6da1ac31d745852e35d4220f Mon Sep 17 00:00:00 2001
-Message-Id: <7ca4f79d91300d6d6da1ac31d745852e35d4220f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:37 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceReadBps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 353ce9453e836da1d42993e71c88011f8515e538)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5fedf92d6740e387df3e88e3abf6b711d79f3dbe.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 70 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 1d25c0ae1f..b303e9cb10 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -879,6 +879,74 @@ virCgroupV2GetBlkioDeviceWriteIops(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetBlkioDeviceReadBps(virCgroupPtr group,
-+                                 const char *path,
-+                                 unsigned long long rbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (rbps == 0) {
-+        if (virAsprintf(&str, "%srbps=max", blkstr) < 0)
-+            return -1;
-+    } else {
-+        if (virAsprintf(&str, "%srbps=%llu", blkstr, rbps) < 0)
-+            return -1;
-+    }
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "io.max",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV2GetBlkioDeviceReadBps(virCgroupPtr group,
-+                                 const char *path,
-+                                 unsigned long long *rbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    const char *name = "rbps=";
-+    char *tmp;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "io.max",
-+                                   path,
-+                                   &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!str) {
-+        *rbps = 0;
-+    } else {
-+        if (!(tmp = strstr(str, name))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to find '%s' limit for block device '%s'"),
-+                           name, path);
-+            return -1;
-+        }
-+        tmp += strlen(name);
-+
-+        if (STREQLEN(tmp, "max", 3)) {
-+            *rbps = 0;
-+        } else if (virStrToLong_ull(tmp, NULL, 10, rbps) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to parse '%s' as an integer"),
-+                           str);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -911,6 +979,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioDeviceReadIops = virCgroupV2GetBlkioDeviceReadIops,
-     .setBlkioDeviceWriteIops = virCgroupV2SetBlkioDeviceWriteIops,
-     .getBlkioDeviceWriteIops = virCgroupV2GetBlkioDeviceWriteIops,
-+    .setBlkioDeviceReadBps = virCgroupV2SetBlkioDeviceReadBps,
-+    .getBlkioDeviceReadBps = virCgroupV2GetBlkioDeviceReadBps,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadIops.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadIops.patch
deleted file mode 100644
index 500aa29..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadIops.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 87e723cfed87955b7d23e0d2ea7bac61b57daf21 Mon Sep 17 00:00:00 2001
-Message-Id: <87e723cfed87955b7d23e0d2ea7bac61b57daf21@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:35 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceReadIops
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 862f630825a74a2605fca52bb66d8f04edefa75b)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <4afdb39491c625603a7b9963648d20148477cc33.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 70 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 86b3fc127a..8cecc43f76 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -743,6 +743,74 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetBlkioDeviceReadIops(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned int riops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (riops == 0) {
-+        if (virAsprintf(&str, "%sriops=max", blkstr) < 0)
-+            return -1;
-+    } else {
-+        if (virAsprintf(&str, "%sriops=%u", blkstr, riops) < 0)
-+            return -1;
-+    }
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "io.max",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV2GetBlkioDeviceReadIops(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned int *riops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    const char *name = "riops=";
-+    char *tmp;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "io.max",
-+                                   path,
-+                                   &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!str) {
-+        *riops = 0;
-+    } else {
-+        if (!(tmp = strstr(str, name))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to find '%s' limit for block device '%s'"),
-+                           name, path);
-+            return -1;
-+        }
-+        tmp += strlen(name);
-+
-+        if (STREQLEN(tmp, "max", 3)) {
-+            *riops = 0;
-+        } else if (virStrToLong_ui(tmp, NULL, 10, riops) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to parse '%s' as an integer"),
-+                           str);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -771,6 +839,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioIoDeviceServiced = virCgroupV2GetBlkioIoDeviceServiced,
-     .setBlkioDeviceWeight = virCgroupV2SetBlkioDeviceWeight,
-     .getBlkioDeviceWeight = virCgroupV2GetBlkioDeviceWeight,
-+    .setBlkioDeviceReadIops = virCgroupV2SetBlkioDeviceReadIops,
-+    .getBlkioDeviceReadIops = virCgroupV2GetBlkioDeviceReadIops,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWeight.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWeight.patch
deleted file mode 100644
index a73e4a7..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWeight.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 39b7d11c4b75b3213054f7730887acca90f62969 Mon Sep 17 00:00:00 2001
-Message-Id: <39b7d11c4b75b3213054f7730887acca90f62969@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:34 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceWeight
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 568f746eafce1194dc10cc91a41c91bf08fadd53)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5dd74b70bcec7b3cd7186b53e76857dcf1d21c6f.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 51 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index fcf39406e1..86b3fc127a 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -694,6 +694,55 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group,
-+                                const char *path,
-+                                unsigned int weight)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "io.weight",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
-+                                const char *path,
-+                                unsigned int *weight)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "io.weight",
-+                                   path,
-+                                   &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!str) {
-+        *weight = 0;
-+    } else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -720,6 +769,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioWeight = virCgroupV2GetBlkioWeight,
-     .getBlkioIoServiced = virCgroupV2GetBlkioIoServiced,
-     .getBlkioIoDeviceServiced = virCgroupV2GetBlkioIoDeviceServiced,
-+    .setBlkioDeviceWeight = virCgroupV2SetBlkioDeviceWeight,
-+    .getBlkioDeviceWeight = virCgroupV2GetBlkioDeviceWeight,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteBps.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteBps.patch
deleted file mode 100644
index 0012244..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteBps.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From b5ce0e989440de2c3d4bfb8b325d85ca25ace4ca Mon Sep 17 00:00:00 2001
-Message-Id: <b5ce0e989440de2c3d4bfb8b325d85ca25ace4ca@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:38 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceWriteBps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 91756fb64a370e48a6bcdd1973126a8c7a36e4f7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3d70ebb985fa8132e45ba12bbb8e78ac80557a78.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 70 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index b303e9cb10..52d31925c2 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -947,6 +947,74 @@ virCgroupV2GetBlkioDeviceReadBps(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetBlkioDeviceWriteBps(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned long long wbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (wbps == 0) {
-+        if (virAsprintf(&str, "%swbps=max", blkstr) < 0)
-+            return -1;
-+    } else {
-+        if (virAsprintf(&str, "%swbps=%llu", blkstr, wbps) < 0)
-+            return -1;
-+    }
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "io.max",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV2GetBlkioDeviceWriteBps(virCgroupPtr group,
-+                                  const char *path,
-+                                  unsigned long long *wbps)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    const char *name = "wbps=";
-+    char *tmp;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "io.max",
-+                                   path,
-+                                   &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!str) {
-+        *wbps = 0;
-+    } else {
-+        if (!(tmp = strstr(str, name))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to find '%s' limit for block device '%s'"),
-+                           name, path);
-+            return -1;
-+        }
-+        tmp += strlen(name);
-+
-+        if (STREQLEN(tmp, "max", 3)) {
-+            *wbps = 0;
-+        } else if (virStrToLong_ull(tmp, NULL, 10, wbps) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to parse '%s' as an integer"),
-+                           str);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -981,6 +1049,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioDeviceWriteIops = virCgroupV2GetBlkioDeviceWriteIops,
-     .setBlkioDeviceReadBps = virCgroupV2SetBlkioDeviceReadBps,
-     .getBlkioDeviceReadBps = virCgroupV2GetBlkioDeviceReadBps,
-+    .setBlkioDeviceWriteBps = virCgroupV2SetBlkioDeviceWriteBps,
-+    .getBlkioDeviceWriteBps = virCgroupV2GetBlkioDeviceWriteBps,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteIops.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteIops.patch
deleted file mode 100644
index 2d15aac..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteIops.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From eca0f75e6f67ec9e445b90685143992b6929cef0 Mon Sep 17 00:00:00 2001
-Message-Id: <eca0f75e6f67ec9e445b90685143992b6929cef0@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:36 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)BlkioDeviceWriteIops
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 438587033bdaf714238a98703c9efc7b0dada51f)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <7937bd2aa5da315f8351e3f312f5aee71b682c30.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 70 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 8cecc43f76..1d25c0ae1f 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -811,6 +811,74 @@ virCgroupV2GetBlkioDeviceReadIops(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetBlkioDeviceWriteIops(virCgroupPtr group,
-+                                   const char *path,
-+                                   unsigned int wiops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    VIR_AUTOFREE(char *) blkstr = NULL;
-+
-+    if (!(blkstr = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (wiops == 0) {
-+        if (virAsprintf(&str, "%swiops=max", blkstr) < 0)
-+            return -1;
-+    } else {
-+        if (virAsprintf(&str, "%swiops=%u", blkstr, wiops) < 0)
-+            return -1;
-+    }
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "io.max",
-+                                str);
-+}
-+
-+
-+static int
-+virCgroupV2GetBlkioDeviceWriteIops(virCgroupPtr group,
-+                                   const char *path,
-+                                   unsigned int *wiops)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    const char *name = "wiops=";
-+    char *tmp;
-+
-+    if (virCgroupGetValueForBlkDev(group,
-+                                   VIR_CGROUP_CONTROLLER_BLKIO,
-+                                   "io.max",
-+                                   path,
-+                                   &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!str) {
-+        *wiops = 0;
-+    } else {
-+        if (!(tmp = strstr(str, name))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to find '%s' limit for block device '%s'"),
-+                           name, path);
-+            return -1;
-+        }
-+        tmp += strlen(name);
-+
-+        if (STREQLEN(tmp, "max", 3)) {
-+            *wiops = 0;
-+        } else if (virStrToLong_ui(tmp, NULL, 10, wiops) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to parse '%s' as an integer"),
-+                           str);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -841,6 +909,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioDeviceWeight = virCgroupV2GetBlkioDeviceWeight,
-     .setBlkioDeviceReadIops = virCgroupV2SetBlkioDeviceReadIops,
-     .getBlkioDeviceReadIops = virCgroupV2GetBlkioDeviceReadIops,
-+    .setBlkioDeviceWriteIops = virCgroupV2SetBlkioDeviceWriteIops,
-+    .getBlkioDeviceWriteIops = virCgroupV2GetBlkioDeviceWriteIops,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioWeight.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioWeight.patch
deleted file mode 100644
index 755c0a1..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioWeight.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From ba7babc00b91a08c7c62858b6c34f1f0c77af0ce Mon Sep 17 00:00:00 2001
-Message-Id: <ba7babc00b91a08c7c62858b6c34f1f0c77af0ce@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:31 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)BlkioWeight
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 11bb7f1561be311b71f3899332dfabe61c55a793)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <8e485d7c092d35f80e10da00af74fd30554b43bf.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 49 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 27519d80e3..f7863a5690 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -521,6 +521,52 @@ virCgroupV2SetOwner(virCgroupPtr cgroup,
- }
- 
- 
-+static int
-+virCgroupV2SetBlkioWeight(virCgroupPtr group,
-+                          unsigned int weight)
-+{
-+    VIR_AUTOFREE(char *) value = NULL;
-+
-+    if (virAsprintf(&value, "default %u", weight) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group,
-+                                VIR_CGROUP_CONTROLLER_BLKIO,
-+                                "io.weight",
-+                                value);
-+}
-+
-+
-+static int
-+virCgroupV2GetBlkioWeight(virCgroupPtr group,
-+                          unsigned int *weight)
-+{
-+    VIR_AUTOFREE(char *) value = NULL;
-+    char *tmp;
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.weight", &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (!(tmp = strstr(value, "default "))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Cannot find default io weight."));
-+        return -1;
-+    }
-+    tmp += strlen("default ");
-+
-+    if (virStrToLong_ui(tmp, NULL, 10, weight) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to parse '%s' as an integer"),
-+                       tmp);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -542,6 +588,9 @@ virCgroupBackend virCgroupV2Backend = {
-     .hasEmptyTasks = virCgroupV2HasEmptyTasks,
-     .bindMount = virCgroupV2BindMount,
-     .setOwner = virCgroupV2SetOwner,
-+
-+    .setBlkioWeight = virCgroupV2SetBlkioWeight,
-+    .getBlkioWeight = virCgroupV2GetBlkioWeight,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsPeriod.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsPeriod.patch
deleted file mode 100644
index bfece79..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsPeriod.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 05610561d752380d3f75780056fea927d723b53b Mon Sep 17 00:00:00 2001
-Message-Id: <05610561d752380d3f75780056fea927d723b53b@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:47 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)CpuCfsPeriod
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to set CPU cfs period using cgroup v2 'cpu.max' interface
-we need to load the current value of CPU cfs quota first because
-format of 'cpu.max' interface is '$quota $period' and in order to
-change 'period' we need to write 'quota' as well.  Writing only one
-number changes only 'quota'.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 832422457214421211304bfb0c92b00546dcec53)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <21d457977390fd50b26a2ea5f7f904946578accb.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 68 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 68 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index cb9dd3d8e8..876785e4e1 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1325,6 +1325,72 @@ virCgroupV2GetCpuShares(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetCpuCfsPeriod(virCgroupPtr group,
-+                           unsigned long long cfs_period)
-+{
-+    VIR_AUTOFREE(char *) value = NULL;
-+    VIR_AUTOFREE(char *) str = NULL;
-+    char *tmp;
-+
-+    /* The cfs_period should be greater or equal than 1ms, and less or equal
-+     * than 1s.
-+     */
-+    if (cfs_period < 1000 || cfs_period > 1000000) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("cfs_period '%llu' must be in range (1000, 1000000)"),
-+                       cfs_period);
-+        return -1;
-+    }
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-+                             "cpu.max", &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!(tmp = strchr(str, ' '))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Invalid 'cpu.max' data."));
-+        return -1;
-+    }
-+    *tmp = '\n';
-+
-+    if (virAsprintf(&value, "%s %llu", str, cfs_period) < 0)
-+        return -1;
-+
-+    return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.max", value);
-+}
-+
-+
-+static int
-+virCgroupV2GetCpuCfsPeriod(virCgroupPtr group,
-+                           unsigned long long *cfs_period)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    char *tmp;
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-+                             "cpu.max", &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!(tmp = strchr(str, ' '))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Invalid 'cpu.max' data."));
-+        return -1;
-+    }
-+
-+    if (virStrToLong_ull(tmp, NULL, 10, cfs_period) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' from cpu.max."), str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1375,6 +1441,8 @@ virCgroupBackend virCgroupV2Backend = {
- 
-     .setCpuShares = virCgroupV2SetCpuShares,
-     .getCpuShares = virCgroupV2GetCpuShares,
-+    .setCpuCfsPeriod = virCgroupV2SetCpuCfsPeriod,
-+    .getCpuCfsPeriod = virCgroupV2GetCpuCfsPeriod,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsQuota.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsQuota.patch
deleted file mode 100644
index 118afd2..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsQuota.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 518ed664601680039546889ea3ebb9a957f26e16 Mon Sep 17 00:00:00 2001
-Message-Id: <518ed664601680039546889ea3ebb9a957f26e16@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:48 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)CpuCfsQuota
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8e2c887ffa552b59a3dd80fa73ee60791c960565)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <7fe344c65f7394026a2d9feb45920cd177f5f71c.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 52 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 52 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 876785e4e1..a0a7e55493 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1391,6 +1391,56 @@ virCgroupV2GetCpuCfsPeriod(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetCpuCfsQuota(virCgroupPtr group,
-+                          long long cfs_quota)
-+{
-+    /* The cfs_quota should be greater or equal than 1ms */
-+    if (cfs_quota >= 0 &&
-+        (cfs_quota < 1000 ||
-+         cfs_quota > ULLONG_MAX / 1000)) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("cfs_quota '%lld' must be in range (1000, %llu)"),
-+                       cfs_quota, ULLONG_MAX / 1000);
-+        return -1;
-+    }
-+
-+    if (cfs_quota == ULLONG_MAX / 1000) {
-+        return virCgroupSetValueStr(group,
-+                                    VIR_CGROUP_CONTROLLER_CPU,
-+                                    "cpu.max", "max");
-+    }
-+
-+    return virCgroupSetValueI64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.max", cfs_quota);
-+}
-+
-+
-+static int
-+virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
-+                          long long *cfs_quota)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-+                             "cpu.max", &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (STREQLEN(str, "max", 3))
-+        *cfs_quota = ULLONG_MAX / 1000;
-+
-+    if (virStrToLong_ll(str, NULL, 10, cfs_quota) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' from cpu.max."), str);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1443,6 +1493,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getCpuShares = virCgroupV2GetCpuShares,
-     .setCpuCfsPeriod = virCgroupV2SetCpuCfsPeriod,
-     .getCpuCfsPeriod = virCgroupV2GetCpuCfsPeriod,
-+    .setCpuCfsQuota = virCgroupV2SetCpuCfsQuota,
-+    .getCpuCfsQuota = virCgroupV2GetCpuCfsQuota,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuShares.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuShares.patch
deleted file mode 100644
index 16317e9..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuShares.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From aa652c60bb88208f8a73b8d5ae87eab7cb24d23c Mon Sep 17 00:00:00 2001
-Message-Id: <aa652c60bb88208f8a73b8d5ae87eab7cb24d23c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:46 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)CpuShares
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b8ca5afc22b4d3af3c8637573f1c3d12887fbb0a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5b6c973caaa4b82333949366f034eccaec24277c.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 8d184bd963..cb9dd3d8e8 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1305,6 +1305,26 @@ virCgroupV2GetMemSwapUsage(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetCpuShares(virCgroupPtr group,
-+                        unsigned long long shares)
-+{
-+    return virCgroupSetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.weight", shares);
-+}
-+
-+
-+static int
-+virCgroupV2GetCpuShares(virCgroupPtr group,
-+                        unsigned long long *shares)
-+{
-+    return virCgroupGetValueU64(group,
-+                                VIR_CGROUP_CONTROLLER_CPU,
-+                                "cpu.weight", shares);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1352,6 +1372,9 @@ virCgroupBackend virCgroupV2Backend = {
-     .setMemSwapHardLimit = virCgroupV2SetMemSwapHardLimit,
-     .getMemSwapHardLimit = virCgroupV2GetMemSwapHardLimit,
-     .getMemSwapUsage = virCgroupV2GetMemSwapUsage,
-+
-+    .setCpuShares = virCgroupV2SetCpuShares,
-+    .getCpuShares = virCgroupV2GetCpuShares,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemSwapHardLimit.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemSwapHardLimit.patch
deleted file mode 100644
index cfdad31..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemSwapHardLimit.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 86212853c9f16bbed77c2310aed1795fdb04f59d Mon Sep 17 00:00:00 2001
-Message-Id: <86212853c9f16bbed77c2310aed1795fdb04f59d@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:44 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)MemSwapHardLimit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit df63fd1f8f17354c5f81c991ff1bb7d12f96d986)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <39af05bcaea91a81740ba6d0b766f773f0e8580b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 62 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 62 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index d8a1d7712f..fed6792e16 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1230,6 +1230,66 @@ virCgroupV2GetMemorySoftLimit(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetMemSwapHardLimit(virCgroupPtr group,
-+                               unsigned long long kb)
-+{
-+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    if (kb > maxkb) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("Memory '%llu' must be less than %llu"),
-+                       kb, maxkb);
-+        return -1;
-+    }
-+
-+    if (kb == maxkb) {
-+        return virCgroupSetValueStr(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.swap.max",
-+                                    "max");
-+    } else {
-+        return virCgroupSetValueU64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.swap.max",
-+                                    kb << 10);
-+    }
-+}
-+
-+
-+static int
-+virCgroupV2GetMemSwapHardLimit(virCgroupPtr group,
-+                               unsigned long long *kb)
-+{
-+    VIR_AUTOFREE(char *) value = NULL;
-+    unsigned long long max;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.swap.max", &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (STREQ(value, "max")) {
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+        return 0;
-+    }
-+
-+    if (virStrToLong_ull(value, NULL, 10, &max) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' as number."),
-+                       value);
-+        return -1;
-+    }
-+
-+    *kb = max >> 10;
-+    if (*kb >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED)
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1274,6 +1334,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getMemoryHardLimit = virCgroupV2GetMemoryHardLimit,
-     .setMemorySoftLimit = virCgroupV2SetMemorySoftLimit,
-     .getMemorySoftLimit = virCgroupV2GetMemorySoftLimit,
-+    .setMemSwapHardLimit = virCgroupV2SetMemSwapHardLimit,
-+    .getMemSwapHardLimit = virCgroupV2GetMemSwapHardLimit,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemoryHardLimit.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemoryHardLimit.patch
deleted file mode 100644
index ea250c2..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemoryHardLimit.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From d9dca0b3b1ad64bcde8d96b05538d4656ca93af3 Mon Sep 17 00:00:00 2001
-Message-Id: <d9dca0b3b1ad64bcde8d96b05538d4656ca93af3@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:42 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)MemoryHardLimit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 2aa5385c58d50270d7084f8d11a22ac993275dc0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <dc9320d118699dc39071dc1f15b1094112cf5a04.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 43 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 87d357b0a7..81a577d28f 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1130,6 +1130,47 @@ virCgroupV2GetMemoryUsage(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetMemoryHardLimit(virCgroupPtr group,
-+                              unsigned long long kb)
-+{
-+    return virCgroupV2SetMemory(group, kb);
-+}
-+
-+
-+static int
-+virCgroupV2GetMemoryHardLimit(virCgroupPtr group,
-+                              unsigned long long *kb)
-+{
-+    VIR_AUTOFREE(char *) value = NULL;
-+    unsigned long long max;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.max", &value) < 0) {
-+        return -1;
-+    }
-+
-+    if (STREQ(value, "max")) {
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+        return 0;
-+    }
-+
-+    if (virStrToLong_ull(value, NULL, 10, &max) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' as number."),
-+                       value);
-+        return -1;
-+    }
-+
-+    *kb = max >> 10;
-+    if (*kb >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED)
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1170,6 +1211,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .setMemory = virCgroupV2SetMemory,
-     .getMemoryStat = virCgroupV2GetMemoryStat,
-     .getMemoryUsage = virCgroupV2GetMemoryUsage,
-+    .setMemoryHardLimit = virCgroupV2SetMemoryHardLimit,
-+    .getMemoryHardLimit = virCgroupV2GetMemoryHardLimit,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemorySoftLimit.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemorySoftLimit.patch
deleted file mode 100644
index 294f6e6..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemorySoftLimit.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 6a1f3fdcf13ff1fdcbd1f63443a1e5d05b2ddd1c Mon Sep 17 00:00:00 2001
-Message-Id: <6a1f3fdcf13ff1fdcbd1f63443a1e5d05b2ddd1c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:43 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)MemorySoftLimit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 94db4bf86ea10e9853f62c4ea079a432482a58df)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a59c442f9098898c0196a5fb2a0d3527ce277153.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 61 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 81a577d28f..d8a1d7712f 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1171,6 +1171,65 @@ virCgroupV2GetMemoryHardLimit(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetMemorySoftLimit(virCgroupPtr group,
-+                              unsigned long long kb)
-+{
-+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    if (kb > maxkb) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("Memory '%llu' must be less than %llu"),
-+                       kb, maxkb);
-+        return -1;
-+    }
-+
-+    if (kb == maxkb) {
-+        return virCgroupSetValueStr(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.high",
-+                                    "max");
-+    } else {
-+        return virCgroupSetValueU64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.high",
-+                                    kb << 10);
-+    }
-+}
-+
-+
-+static int
-+virCgroupV2GetMemorySoftLimit(virCgroupPtr group,
-+                              unsigned long long *kb)
-+{
-+    VIR_AUTOFREE(char *) value = NULL;
-+    unsigned long long high;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.high", &value) < 0)
-+        return -1;
-+
-+    if (STREQ(value, "max")) {
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+        return 0;
-+    }
-+
-+    if (virStrToLong_ull(value, NULL, 10, &high) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' as number."),
-+                       value);
-+        return -1;
-+    }
-+
-+    *kb = high >> 10;
-+    if (*kb >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED)
-+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1213,6 +1272,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getMemoryUsage = virCgroupV2GetMemoryUsage,
-     .setMemoryHardLimit = virCgroupV2SetMemoryHardLimit,
-     .getMemoryHardLimit = virCgroupV2GetMemoryHardLimit,
-+    .setMemorySoftLimit = virCgroupV2SetMemorySoftLimit,
-+    .getMemorySoftLimit = virCgroupV2GetMemorySoftLimit,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2AddTask.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2AddTask.patch
deleted file mode 100644
index 8d2d50f..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2AddTask.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From cb154a1d153edf2c399493a4336aebdccdc628f5 Mon Sep 17 00:00:00 2001
-Message-Id: <cb154a1d153edf2c399493a4336aebdccdc628f5@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:27 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2AddTask
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In cgroups v2 we need to handle threads and processes differently.
-If you need to move a process you need to write its pid into
-cgrou.procs file and it will move the process with all its threads
-as well.  The whole process will be moved if you use tid of any thread.
-
-In order to move only threads at first we need to create threaded group
-and after that we can write the relevant thread tids into cgroup.threads
-file.  Threads can be moved only into cgroups that are children of
-cgroup of its process.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 48572f8825f2bbd7dabb5afb34efbf7afa2f7302)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d6fb582c80903fc7725e2dd15165bd167c916f04.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index b5fad47ca0..6ffb5ce786 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -432,6 +432,20 @@ virCgroupV2Remove(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV2AddTask(virCgroupPtr group,
-+                   pid_t pid,
-+                   unsigned int flags)
-+{
-+    int controller = virCgroupV2GetAnyController(group);
-+
-+    if (flags & VIR_CGROUP_TASK_THREAD)
-+        return virCgroupSetValueI64(group, controller, "cgroup.threads", pid);
-+    else
-+        return virCgroupSetValueI64(group, controller, "cgroup.procs", pid);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -449,6 +463,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .pathOfController = virCgroupV2PathOfController,
-     .makeGroup = virCgroupV2MakeGroup,
-     .remove = virCgroupV2Remove,
-+    .addTask = virCgroupV2AddTask,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2Available.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2Available.patch
deleted file mode 100644
index db453d3..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2Available.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 4551f704f56b289735ed17f3b9ee0f9663183d09 Mon Sep 17 00:00:00 2001
-Message-Id: <4551f704f56b289735ed17f3b9ee0f9663183d09@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:13 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2Available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We cannot detect only mount points to figure out whether cgroup v2
-is available because systemd uses cgroup v2 for process tracking and
-all controllers are mounted as cgroup v1 controllers.
-
-To make sure that this is no the situation we need to check
-'cgroup.controllers' file if it's not empty to make sure that cgroup
-v2 is not mounted only for process tracking.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 034ef217d73aa240340dd22590402bb9636648b5)
-
-Conflicts:
-    src/util/vircgroupv2.c: missing commit c0abcca417
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <46bcb2f86e4ca5f029f67be5385770d725ef5c42.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 51 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 23bf81dae2..4ab9f2b792 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -19,16 +19,23 @@
-  */
- #include <config.h>
- 
-+#ifdef __linux__
-+# include <mntent.h>
-+#endif /* __linux__ */
-+
- #include "internal.h"
- 
- #define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
- #include "vircgrouppriv.h"
- #undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
- 
-+#include "viralloc.h"
- #include "vircgroup.h"
- #include "vircgroupbackend.h"
- #include "vircgroupv2.h"
-+#include "virfile.h"
- #include "virlog.h"
-+#include "virstring.h"
- 
- VIR_LOG_INIT("util.cgroup");
- 
-@@ -41,8 +48,52 @@ VIR_ENUM_IMPL(virCgroupV2Controller, VIR_CGROUP_CONTROLLER_LAST,
- 
- #ifdef __linux__
- 
-+/* We're looking for one 'cgroup2' fs mount which has some
-+ * controllers enabled. */
-+static bool
-+virCgroupV2Available(void)
-+{
-+    bool ret = false;
-+    FILE *mounts = NULL;
-+    struct mntent entry;
-+    char buf[CGROUP_MAX_VAL];
-+
-+    if (!(mounts = fopen("/proc/mounts", "r")))
-+        return false;
-+
-+    while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
-+        VIR_AUTOFREE(char *) contFile = NULL;
-+        VIR_AUTOFREE(char *) contStr = NULL;
-+
-+        if (STRNEQ(entry.mnt_type, "cgroup2"))
-+            continue;
-+
-+        /* Systemd uses cgroup v2 for process tracking but no controller is
-+         * available. We should consider this configuration as cgroup v2 is
-+         * not available. */
-+        if (virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir) < 0)
-+            goto cleanup;
-+
-+        if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0)
-+            goto cleanup;
-+
-+        if (STREQ(contStr, ""))
-+            continue;
-+
-+        ret = true;
-+        break;
-+    }
-+
-+ cleanup:
-+    VIR_FORCE_FCLOSE(mounts);
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
-+
-+    .available = virCgroupV2Available,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2BindMount.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2BindMount.patch
deleted file mode 100644
index a9373eb..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2BindMount.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 583928aa5c4d1b28304aa6484ad20cd2036407ae Mon Sep 17 00:00:00 2001
-Message-Id: <583928aa5c4d1b28304aa6484ad20cd2036407ae@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:29 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2BindMount
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit cda8ed0646d82f95d4424cfadfb9233037b1d815)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c99f93d93fe7a944219b860a2a76b18303c27479.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 074e6ec110..90ce660908 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -21,6 +21,7 @@
- 
- #ifdef __linux__
- # include <mntent.h>
-+# include <sys/mount.h>
- #endif /* __linux__ */
- 
- #include "internal.h"
-@@ -462,6 +463,38 @@ virCgroupV2HasEmptyTasks(virCgroupPtr cgroup,
- }
- 
- 
-+static int
-+virCgroupV2BindMount(virCgroupPtr group,
-+                     const char *oldroot,
-+                     const char *mountopts)
-+{
-+    VIR_AUTOFREE(char *) opts = NULL;
-+    VIR_AUTOFREE(char *) src = NULL;
-+
-+    VIR_DEBUG("Mounting cgroups at '%s'", group->unified.mountPoint);
-+
-+    if (virFileMakePath(group->unified.mountPoint) < 0) {
-+        virReportSystemError(errno, _("Unable to create directory %s"),
-+                             group->unified.mountPoint);
-+        return -1;
-+    }
-+
-+    if (virAsprintf(&opts, "mode=755,size=65536%s", mountopts) < 0)
-+        return -1;
-+
-+    if (virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint) < 0)
-+        return -1;
-+
-+    if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) {
-+        virReportSystemError(errno, _("Failed to bind cgroup '%s' on '%s'"),
-+                             src, group->unified.mountPoint);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -481,6 +514,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .remove = virCgroupV2Remove,
-     .addTask = virCgroupV2AddTask,
-     .hasEmptyTasks = virCgroupV2HasEmptyTasks,
-+    .bindMount = virCgroupV2BindMount,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyMounts.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyMounts.patch
deleted file mode 100644
index 334d251..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyMounts.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5429c3dfd57da26b6d6fd6368bc88d695ea2e852 Mon Sep 17 00:00:00 2001
-Message-Id: <5429c3dfd57da26b6d6fd6368bc88d695ea2e852@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:15 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2CopyMounts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 38a3fb56471d77102f58f19a1e68d3fb372e5cb0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <67863a638cc2666f1f2f8e7151125c32952aa247.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 02dc4e4686..5d3c80b309 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -132,11 +132,20 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2CopyMounts(virCgroupPtr group,
-+                      virCgroupPtr parent)
-+{
-+    return VIR_STRDUP(group->unified.mountPoint, parent->unified.mountPoint);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-     .available = virCgroupV2Available,
-     .validateMachineGroup = virCgroupV2ValidateMachineGroup,
-+    .copyMounts = virCgroupV2CopyMounts,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyPlacement.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyPlacement.patch
deleted file mode 100644
index c2b9e4a..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2CopyPlacement.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 1cabfada0f1a83ae78b6a7dbb9128512369fd6f4 Mon Sep 17 00:00:00 2001
-Message-Id: <1cabfada0f1a83ae78b6a7dbb9128512369fd6f4@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:16 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2CopyPlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7a86201dd6e8cc7e418ea0891aeb44bacd08a10d)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <70993f08246ff3782d9b4a5bdf9187a0c1b57882.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 5d3c80b309..ed87b35db7 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -140,12 +140,39 @@ virCgroupV2CopyMounts(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2CopyPlacement(virCgroupPtr group,
-+                         const char *path,
-+                         virCgroupPtr parent)
-+{
-+    if (path[0] == '/') {
-+        if (VIR_STRDUP(group->unified.placement, path) < 0)
-+            return -1;
-+    } else {
-+        /*
-+         * parent == "/" + path="" => "/"
-+         * parent == "/libvirt.service" + path == "" => "/libvirt.service"
-+         * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo"
-+         */
-+        if (virAsprintf(&group->unified.placement, "%s%s%s",
-+                        parent->unified.placement,
-+                        (STREQ(parent->unified.placement, "/") ||
-+                         STREQ(path, "") ? "" : "/"),
-+                        path) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-     .available = virCgroupV2Available,
-     .validateMachineGroup = virCgroupV2ValidateMachineGroup,
-     .copyMounts = virCgroupV2CopyMounts,
-+    .copyPlacement = virCgroupV2CopyPlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectControllers.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectControllers.patch
deleted file mode 100644
index af1b97e..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectControllers.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 079999bce280ca42a47a1521bb3b7bd06f7985f2 Mon Sep 17 00:00:00 2001
-Message-Id: <079999bce280ca42a47a1521bb3b7bd06f7985f2@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:21 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2DetectControllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Cgroup v2 has only single mount point for all controllers.  The list
-of controllers is stored in cgroup.controllers file, name of controllers
-are separated by space.
-
-In cgroup v2 there is no cpuacct controller, the cpu.stat file always
-exists with usage stats.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit e1bb7fffe2571e6a337bd87a9c5ed487ee6ee046)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2186bc99cdcfc420b1aaf516fc808dfbf582a1d0.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 69 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 69 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 270a6fb305..c8f2573864 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -33,6 +33,7 @@
- #include "vircgroup.h"
- #include "vircgroupbackend.h"
- #include "vircgroupv2.h"
-+#include "virerror.h"
- #include "virfile.h"
- #include "virlog.h"
- #include "virstring.h"
-@@ -231,6 +232,73 @@ virCgroupV2StealPlacement(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV2ParseControllersFile(virCgroupPtr group)
-+{
-+    int rc;
-+    VIR_AUTOFREE(char *) contStr = NULL;
-+    VIR_AUTOFREE(char *) contFile = NULL;
-+    char **contList = NULL;
-+    char **tmp;
-+
-+    if (virAsprintf(&contFile, "%s/cgroup.controllers",
-+                    group->unified.mountPoint) < 0)
-+        return -1;
-+
-+    rc = virFileReadAll(contFile, 1024 * 1024, &contStr);
-+    if (rc < 0) {
-+        virReportSystemError(errno, _("Unable to read from '%s'"), contFile);
-+        return -1;
-+    }
-+
-+    virTrimSpaces(contStr, NULL);
-+
-+    contList = virStringSplit(contStr, " ", 20);
-+    if (!contList)
-+        return -1;
-+
-+    tmp = contList;
-+
-+    while (*tmp) {
-+        int type = virCgroupV2ControllerTypeFromString(*tmp);
-+
-+        if (type >= 0)
-+            group->unified.controllers |= 1 << type;
-+
-+        tmp++;
-+    }
-+
-+    virStringListFree(contList);
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV2DetectControllers(virCgroupPtr group,
-+                             int controllers)
-+{
-+    size_t i;
-+
-+    if (virCgroupV2ParseControllersFile(group) < 0)
-+        return -1;
-+
-+    /* In cgroup v2 there is no cpuacct controller, the cpu.stat file always
-+     * exists with usage stats. */
-+    group->unified.controllers |= 1 << VIR_CGROUP_CONTROLLER_CPUACCT;
-+
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++)
-+        VIR_DEBUG("Controller '%s' present=%s",
-+                  virCgroupV2ControllerTypeToString(i),
-+                  (group->unified.controllers & 1 << i) ? "yes" : "no");
-+
-+    if (controllers >= 0)
-+        return controllers & group->unified.controllers;
-+    else
-+        return group->unified.controllers;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -242,6 +310,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .detectPlacement = virCgroupV2DetectPlacement,
-     .validatePlacement = virCgroupV2ValidatePlacement,
-     .stealPlacement = virCgroupV2StealPlacement,
-+    .detectControllers = virCgroupV2DetectControllers,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectMounts.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectMounts.patch
deleted file mode 100644
index de683e7..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectMounts.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d27635600023556a1e1ea566f0860facdf8d69c9 Mon Sep 17 00:00:00 2001
-Message-Id: <d27635600023556a1e1ea566f0860facdf8d69c9@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:17 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2DetectMounts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 50f61a46fcd0f25f98bb89db74bea76bca5dc4a4)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <050f43f97c07f9dc1c17f477c043fbe3a6759396.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index ed87b35db7..19a9ba38f8 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -166,6 +166,21 @@ virCgroupV2CopyPlacement(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2DetectMounts(virCgroupPtr group,
-+                        const char *mntType,
-+                        const char *mntOpts ATTRIBUTE_UNUSED,
-+                        const char *mntDir)
-+{
-+    if (STRNEQ(mntType, "cgroup2"))
-+        return 0;
-+
-+    VIR_FREE(group->unified.mountPoint);
-+
-+    return VIR_STRDUP(group->unified.mountPoint, mntDir);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -173,6 +188,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .validateMachineGroup = virCgroupV2ValidateMachineGroup,
-     .copyMounts = virCgroupV2CopyMounts,
-     .copyPlacement = virCgroupV2CopyPlacement,
-+    .detectMounts = virCgroupV2DetectMounts,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectPlacement.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectPlacement.patch
deleted file mode 100644
index 3998c21..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2DetectPlacement.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From af9bf10ff9d8a6f0ae9b6d898138144bf7dcd161 Mon Sep 17 00:00:00 2001
-Message-Id: <af9bf10ff9d8a6f0ae9b6d898138144bf7dcd161@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:18 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2DetectPlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the placement was copied from parent or set to absolute path
-there is nothing to do, otherwise set the placement based on
-process placement from /proc/self/cgroup or /proc/{pid}/cgroup.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 1efcf202e777d32600e90f3176e0357053341533)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <7fcc9d25385c40df5531e5b7171338a624d0c4fb.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 19a9ba38f8..fb1aa2de0a 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -181,6 +181,31 @@ virCgroupV2DetectMounts(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2DetectPlacement(virCgroupPtr group,
-+                           const char *path,
-+                           const char *controllers ATTRIBUTE_UNUSED,
-+                           const char *selfpath)
-+{
-+    if (group->unified.placement)
-+        return 0;
-+
-+    /*
-+     * selfpath == "/" + path="" -> "/"
-+     * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service"
-+     * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo"
-+     */
-+    if (virAsprintf(&group->unified.placement,
-+                    "%s%s%s", selfpath,
-+                    (STREQ(selfpath, "/") ||
-+                     STREQ(path, "") ? "" : "/"),
-+                    path) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -189,6 +214,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .copyMounts = virCgroupV2CopyMounts,
-     .copyPlacement = virCgroupV2CopyPlacement,
-     .detectMounts = virCgroupV2DetectMounts,
-+    .detectPlacement = virCgroupV2DetectPlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetAnyController.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetAnyController.patch
deleted file mode 100644
index 601d42b..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetAnyController.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6fc9abce93fb193d748c45dbe47920b287c9aa07 Mon Sep 17 00:00:00 2001
-Message-Id: <6fc9abce93fb193d748c45dbe47920b287c9aa07@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:23 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetAnyController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 171c700cd8c5509dc868c00faed9a16feaa2339d)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2bc9d83fa5195d1650a8801c69b850ff86fd8386.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index babce95aeb..65cbad533b 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -307,6 +307,14 @@ virCgroupV2HasController(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetAnyController(virCgroupPtr group)
-+{
-+    /* The least significant bit is position 1. */
-+    return ffs(group->unified.controllers) - 1;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -320,6 +328,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .stealPlacement = virCgroupV2StealPlacement,
-     .detectControllers = virCgroupV2DetectControllers,
-     .hasController = virCgroupV2HasController,
-+    .getAnyController = virCgroupV2GetAnyController,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoDeviceServiced.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoDeviceServiced.patch
deleted file mode 100644
index 3b8bc9a..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoDeviceServiced.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From e549b6a2270598ad1e736837430573fafb6a7e64 Mon Sep 17 00:00:00 2001
-Message-Id: <e549b6a2270598ad1e736837430573fafb6a7e64@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:33 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetBlkioIoDeviceServiced
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 93fa369df5edbf693cee472a9a8c2caa313ae2a0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c5774ab538aab66d306032ebcc330f36d47d318a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 64 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 64 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 000fd4c747..fcf39406e1 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -631,6 +631,69 @@ virCgroupV2GetBlkioIoServiced(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetBlkioIoDeviceServiced(virCgroupPtr group,
-+                                    const char *path,
-+                                    long long *bytes_read,
-+                                    long long *bytes_write,
-+                                    long long *requests_read,
-+                                    long long *requests_write)
-+{
-+    VIR_AUTOFREE(char *) str1 = NULL;
-+    VIR_AUTOFREE(char *) str2 = NULL;
-+    char *p1;
-+    size_t i;
-+
-+    const char *value_names[] = {
-+        "rbytes=",
-+        "wbytes=",
-+        "rios=",
-+        "wios=",
-+    };
-+    long long *value_ptrs[] = {
-+        bytes_read,
-+        bytes_write,
-+        requests_read,
-+        requests_write
-+    };
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.stat", &str1) < 0) {
-+        return -1;
-+    }
-+
-+    if (!(str2 = virCgroupGetBlockDevString(path)))
-+        return -1;
-+
-+    if (!(p1 = strstr(str1, str2))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Cannot find byte stats for block device '%s'"),
-+                       str2);
-+        return -1;
-+    }
-+
-+    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
-+        if (!(p1 = strstr(p1, value_names[i]))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Cannot find byte '%s' stats for block device '%s'"),
-+                           value_names[i], str2);
-+            return -1;
-+        }
-+
-+        p1 += strlen(value_names[i]);
-+        if (virStrToLong_ll(p1, &p1, 10, value_ptrs[i]) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Cannot parse '%s' stat '%s'"),
-+                           value_names[i], p1);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -656,6 +719,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .setBlkioWeight = virCgroupV2SetBlkioWeight,
-     .getBlkioWeight = virCgroupV2GetBlkioWeight,
-     .getBlkioIoServiced = virCgroupV2GetBlkioIoServiced,
-+    .getBlkioIoDeviceServiced = virCgroupV2GetBlkioIoDeviceServiced,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoServiced.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoServiced.patch
deleted file mode 100644
index 81ec8b6..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoServiced.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From abf2cfc52b828aa892b446385875381f735ff947 Mon Sep 17 00:00:00 2001
-Message-Id: <abf2cfc52b828aa892b446385875381f735ff947@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:32 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetBlkioIoServiced
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 709260add941a247b3829cf940624333cb445bb7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <f178386744bb4d74f41acecb82807d451c255fc9.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 65 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index f7863a5690..000fd4c747 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -567,6 +567,70 @@ virCgroupV2GetBlkioWeight(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetBlkioIoServiced(virCgroupPtr group,
-+                              long long *bytes_read,
-+                              long long *bytes_write,
-+                              long long *requests_read,
-+                              long long *requests_write)
-+{
-+    long long stats_val;
-+    VIR_AUTOFREE(char *) str1 = NULL;
-+    char *p1;
-+    size_t i;
-+
-+    const char *value_names[] = {
-+        "rbytes=",
-+        "wbytes=",
-+        "rios=",
-+        "wios=",
-+    };
-+    long long *value_ptrs[] = {
-+        bytes_read,
-+        bytes_write,
-+        requests_read,
-+        requests_write
-+    };
-+
-+    *bytes_read = 0;
-+    *bytes_write = 0;
-+    *requests_read = 0;
-+    *requests_write = 0;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_BLKIO,
-+                             "io.stat", &str1) < 0) {
-+        return -1;
-+    }
-+
-+    /* sum up all entries of the same kind, from all devices */
-+    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
-+        p1 = str1;
-+
-+        while ((p1 = strstr(p1, value_names[i]))) {
-+            p1 += strlen(value_names[i]);
-+            if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Cannot parse byte '%s' stat '%s'"),
-+                               value_names[i], p1);
-+                return -1;
-+            }
-+
-+            if (stats_val < 0 ||
-+                (stats_val > 0 && *value_ptrs[i] > (LLONG_MAX - stats_val))) {
-+                virReportError(VIR_ERR_OVERFLOW,
-+                               _("Sum of byte '%s' stat overflows"),
-+                               value_names[i]);
-+                return -1;
-+            }
-+            *value_ptrs[i] += stats_val;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -591,6 +655,7 @@ virCgroupBackend virCgroupV2Backend = {
- 
-     .setBlkioWeight = virCgroupV2SetBlkioWeight,
-     .getBlkioWeight = virCgroupV2GetBlkioWeight,
-+    .getBlkioIoServiced = virCgroupV2GetBlkioIoServiced,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctStat.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctStat.patch
deleted file mode 100644
index 6370f22..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctStat.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From d54383e93c3d3a71008d4b3a48b4dafba2368609 Mon Sep 17 00:00:00 2001
-Message-Id: <d54383e93c3d3a71008d4b3a48b4dafba2368609@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:51 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetCpuacctStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 4d1d5c92bdefc38bc68bde5f9bd2dbd3c11bff2a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <62365d349154035cfab2115d66430dcf3c7bdd03.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 49 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index afa243b3c7..d6362e2b05 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1487,6 +1487,54 @@ virCgroupV2GetCpuacctUsage(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetCpuacctStat(virCgroupPtr group,
-+                          unsigned long long *user,
-+                          unsigned long long *sys)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    char *tmp;
-+    unsigned long long userVal = 0;
-+    unsigned long long sysVal = 0;
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                             "cpu.stat", &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!(tmp = strstr(str, "user_usec "))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("cannot parse cpu user stat '%s'"), str);
-+        return -1;
-+    }
-+    tmp += strlen("user_usec ");
-+
-+    if (virStrToLong_ull(tmp, &tmp, 10, &userVal) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' as number."), tmp);
-+        return -1;
-+    }
-+
-+    if (!(tmp = strstr(str, "system_usec "))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("cannot parse cpu sys stat '%s'"), str);
-+        return -1;
-+    }
-+    tmp += strlen("system_usec ");
-+
-+    if (virStrToLong_ull(tmp, &tmp, 10, &sysVal) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' as number."), tmp);
-+        return -1;
-+    }
-+
-+    *user = userVal * 1000;
-+    *sys = sysVal * 1000;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1544,6 +1592,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .supportsCpuBW = virCgroupV2SupportsCpuBW,
- 
-     .getCpuacctUsage = virCgroupV2GetCpuacctUsage,
-+    .getCpuacctStat = virCgroupV2GetCpuacctStat,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctUsage.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctUsage.patch
deleted file mode 100644
index 6f16073..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetCpuacctUsage.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From e0764ef7577519de460fc2c2d52127eafb077200 Mon Sep 17 00:00:00 2001
-Message-Id: <e0764ef7577519de460fc2c2d52127eafb077200@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:50 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetCpuacctUsage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 567fcbdca56ac409e856a0be8425b2218d02fe81)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <26dc66d290ee4d5a4ba67470552df9d2fa4ae86b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 55f79af204..afa243b3c7 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1456,6 +1456,37 @@ virCgroupV2SupportsCpuBW(virCgroupPtr cgroup)
- }
- 
- 
-+static int
-+virCgroupV2GetCpuacctUsage(virCgroupPtr group,
-+                           unsigned long long *usage)
-+{
-+    VIR_AUTOFREE(char *) str = NULL;
-+    char *tmp;
-+
-+    if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
-+                             "cpu.stat", &str) < 0) {
-+        return -1;
-+    }
-+
-+    if (!(tmp = strstr(str, "usage_usec "))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("cannot parse cpu usage stat '%s'"), str);
-+        return -1;
-+    }
-+    tmp += strlen("usage_usec ");
-+
-+    if (virStrToLong_ull(tmp, &tmp, 10, usage) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to parse value '%s' as number."), tmp);
-+        return -1;
-+    }
-+
-+    *usage *= 1000;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1511,6 +1542,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .setCpuCfsQuota = virCgroupV2SetCpuCfsQuota,
-     .getCpuCfsQuota = virCgroupV2GetCpuCfsQuota,
-     .supportsCpuBW = virCgroupV2SupportsCpuBW,
-+
-+    .getCpuacctUsage = virCgroupV2GetCpuacctUsage,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemSwapUsage.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemSwapUsage.patch
deleted file mode 100644
index 2e1b584..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemSwapUsage.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 64df2fa746eab23c73578c53b6d8501cbec2d04c Mon Sep 17 00:00:00 2001
-Message-Id: <64df2fa746eab23c73578c53b6d8501cbec2d04c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:45 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetMemSwapUsage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 3f728c720b782e853de4c43999a37aeceb3f95b8)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c7135a2e07a613fb4f285556bc703843bb2fd872.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index fed6792e16..8d184bd963 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1290,6 +1290,21 @@ virCgroupV2GetMemSwapHardLimit(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetMemSwapUsage(virCgroupPtr group,
-+                           unsigned long long *kb)
-+{
-+    unsigned long long usage_in_bytes;
-+    int ret;
-+    ret = virCgroupGetValueU64(group,
-+                               VIR_CGROUP_CONTROLLER_MEMORY,
-+                               "memory.swap.current", &usage_in_bytes);
-+    if (ret == 0)
-+        *kb = (unsigned long) usage_in_bytes >> 10;
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1336,6 +1351,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .getMemorySoftLimit = virCgroupV2GetMemorySoftLimit,
-     .setMemSwapHardLimit = virCgroupV2SetMemSwapHardLimit,
-     .getMemSwapHardLimit = virCgroupV2GetMemSwapHardLimit,
-+    .getMemSwapUsage = virCgroupV2GetMemSwapUsage,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryStat.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryStat.patch
deleted file mode 100644
index 1233bef..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryStat.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7b4215f8a38221fd90bf15a3ced42cce55adf105 Mon Sep 17 00:00:00 2001
-Message-Id: <7b4215f8a38221fd90bf15a3ced42cce55adf105@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:40 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetMemoryStat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d080c001660ed0f173066b3db63ecac4edb773fc)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <9ebb30d0c01bdb6e356928701cd56501fe43af5e.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 75 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 75 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 1b7215d98b..1c7854909f 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1042,6 +1042,80 @@ virCgroupV2SetMemory(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetMemoryStat(virCgroupPtr group,
-+                         unsigned long long *cache,
-+                         unsigned long long *activeAnon,
-+                         unsigned long long *inactiveAnon,
-+                         unsigned long long *activeFile,
-+                         unsigned long long *inactiveFile,
-+                         unsigned long long *unevictable)
-+{
-+    VIR_AUTOFREE(char *) stat = NULL;
-+    char *line = NULL;
-+    unsigned long long cacheVal = 0;
-+    unsigned long long activeAnonVal = 0;
-+    unsigned long long inactiveAnonVal = 0;
-+    unsigned long long activeFileVal = 0;
-+    unsigned long long inactiveFileVal = 0;
-+    unsigned long long unevictableVal = 0;
-+
-+    if (virCgroupGetValueStr(group,
-+                             VIR_CGROUP_CONTROLLER_MEMORY,
-+                             "memory.stat",
-+                             &stat) < 0) {
-+        return -1;
-+    }
-+
-+    line = stat;
-+
-+    while (line) {
-+        char *newLine = strchr(line, '\n');
-+        char *valueStr = strchr(line, ' ');
-+        unsigned long long value;
-+
-+        if (newLine)
-+            *newLine = '\0';
-+
-+        if (!valueStr) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                           _("Cannot parse 'memory.stat' cgroup file."));
-+            return -1;
-+        }
-+        *valueStr = '\0';
-+
-+        if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unable to parse '%s' as an integer"),
-+                           valueStr + 1);
-+            return -1;
-+        }
-+
-+        if (STREQ(line, "file"))
-+            cacheVal = value >> 10;
-+        else if (STREQ(line, "active_anon"))
-+            activeAnonVal = value >> 10;
-+        else if (STREQ(line, "inactive_anon"))
-+            inactiveAnonVal = value >> 10;
-+        else if (STREQ(line, "active_file"))
-+            activeFileVal = value >> 10;
-+        else if (STREQ(line, "inactive_file"))
-+            inactiveFileVal = value >> 10;
-+        else if (STREQ(line, "unevictable"))
-+            unevictableVal = value >> 10;
-+    }
-+
-+    *cache = cacheVal;
-+    *activeAnon = activeAnonVal;
-+    *inactiveAnon = inactiveAnonVal;
-+    *activeFile = activeFileVal;
-+    *inactiveFile = inactiveFileVal;
-+    *unevictable = unevictableVal;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1080,6 +1154,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioDeviceWriteBps = virCgroupV2GetBlkioDeviceWriteBps,
- 
-     .setMemory = virCgroupV2SetMemory,
-+    .getMemoryStat = virCgroupV2GetMemoryStat,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryUsage.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryUsage.patch
deleted file mode 100644
index 64e2f07..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetMemoryUsage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0f9d55fe0fbbdc66a5fdc2236c9433aab840a1b9 Mon Sep 17 00:00:00 2001
-Message-Id: <0f9d55fe0fbbdc66a5fdc2236c9433aab840a1b9@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:41 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2GetMemoryUsage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 495f60edcb123a714706f765027ea190f8d20da3)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <fe7485f1f5e5743721ff623ecddac0d27dbc3f1e.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 1c7854909f..87d357b0a7 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1116,6 +1116,20 @@ virCgroupV2GetMemoryStat(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2GetMemoryUsage(virCgroupPtr group,
-+                          unsigned long *kb)
-+{
-+    unsigned long long usage_in_bytes;
-+    int ret = virCgroupGetValueU64(group,
-+                                   VIR_CGROUP_CONTROLLER_MEMORY,
-+                                   "memory.current", &usage_in_bytes);
-+    if (ret == 0)
-+        *kb = (unsigned long) usage_in_bytes >> 10;
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1155,6 +1169,7 @@ virCgroupBackend virCgroupV2Backend = {
- 
-     .setMemory = virCgroupV2SetMemory,
-     .getMemoryStat = virCgroupV2GetMemoryStat,
-+    .getMemoryUsage = virCgroupV2GetMemoryUsage,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasController.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasController.patch
deleted file mode 100644
index 9221fa2..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasController.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e5f2fdbd6499d97073ad20fe1ea491accecff704 Mon Sep 17 00:00:00 2001
-Message-Id: <e5f2fdbd6499d97073ad20fe1ea491accecff704@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:22 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2HasController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit c8f08a5346919b3d963908eb0b61fc077dbdbccd)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <8dfef2b4c814027c13ab2d693144ec77844bff7a.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index c8f2573864..babce95aeb 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -299,6 +299,14 @@ virCgroupV2DetectControllers(virCgroupPtr group,
- }
- 
- 
-+static bool
-+virCgroupV2HasController(virCgroupPtr group,
-+                         int controller)
-+{
-+    return group->unified.controllers & (1 << controller);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -311,6 +319,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .validatePlacement = virCgroupV2ValidatePlacement,
-     .stealPlacement = virCgroupV2StealPlacement,
-     .detectControllers = virCgroupV2DetectControllers,
-+    .hasController = virCgroupV2HasController,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasEmptyTasks.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasEmptyTasks.patch
deleted file mode 100644
index 2c6a126..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2HasEmptyTasks.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 40a3ab5f35bb847ae210160b5bcb2b3ab8990e5a Mon Sep 17 00:00:00 2001
-Message-Id: <40a3ab5f35bb847ae210160b5bcb2b3ab8990e5a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:28 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2HasEmptyTasks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 38411bb831a8c5086145b9781168349bc64fbc25)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <36bb2bd62faa6528de46da822d026f67be9f6d16.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 6ffb5ce786..074e6ec110 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -446,6 +446,22 @@ virCgroupV2AddTask(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2HasEmptyTasks(virCgroupPtr cgroup,
-+                         int controller)
-+{
-+    int ret = -1;
-+    VIR_AUTOFREE(char *) content = NULL;
-+
-+    ret = virCgroupGetValueStr(cgroup, controller, "cgroup.procs", &content);
-+
-+    if (ret == 0 && content[0] == '\0')
-+        ret = 1;
-+
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -464,6 +480,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .makeGroup = virCgroupV2MakeGroup,
-     .remove = virCgroupV2Remove,
-     .addTask = virCgroupV2AddTask,
-+    .hasEmptyTasks = virCgroupV2HasEmptyTasks,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2MakeGroup.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2MakeGroup.patch
deleted file mode 100644
index aeb0055..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2MakeGroup.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 4a7aa0ff6839fd9ccefce19d63c48beed32ee7f1 Mon Sep 17 00:00:00 2001
-Message-Id: <4a7aa0ff6839fd9ccefce19d63c48beed32ee7f1@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:25 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2MakeGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When creating cgroup hierarchy we need to enable controllers in the
-parent cgroup in order to be usable.  That means writing "+{controller}"
-into cgroup.subtree_control file.  We can enable only controllers that
-are enabled for parent cgroup, that means we need to do that for the
-whole cgroup tree.
-
-Cgroups for threads needs to be handled differently in cgroup v2.  There
-are two types of controllers:
-
-    - domain controllers: these cannot be enabled for threads
-    - threaded controllers: these can be enabled for threads
-
-In addition there are multiple types of cgroups:
-
-    - domain: normal cgroup
-    - domain threaded: a domain cgroup that serves as root for threaded
-                       cgroups
-    - domain invalid: invalid cgroup, can be changed into threaded, this
-                      is the default state if you create subgroup inside
-                      domain threaded group or threaded group
-    - threaded: threaded cgroup which can have domain threaded or
-                threaded as parent group
-
-In order to create threaded cgroup it's sufficient to write "threaded"
-into cgroup.type file, it will automatically make parent cgroup
-"domain threaded" if it was only "domain".  In case the parent cgroup
-is already "domain threaded" or "threaded" it will modify only the type
-of current cgroup.  After that we can enable threaded controllers.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 89f52abd07d3f991ddd22990e5d61338ff350a99)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <165b3b0f0fd1e5a4b52e4b9e86e4137b3598f7ee.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c        |  2 +-
- src/util/vircgroupbackend.h |  1 +
- src/util/vircgroupv2.c      | 76 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 78 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 42930582db..a859628241 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -942,7 +942,7 @@ virCgroupNewThread(virCgroupPtr domain,
-     if (virCgroupNew(-1, name, domain, controllers, group) < 0)
-         return -1;
- 
--    if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) {
-+    if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_THREAD) < 0) {
-         virCgroupFree(group);
-         return -1;
-     }
-diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
-index b1f19233e4..86d1539e07 100644
---- a/src/util/vircgroupbackend.h
-+++ b/src/util/vircgroupbackend.h
-@@ -33,6 +33,7 @@ typedef enum {
-                                        * before creating subcgroups and
-                                        * attaching tasks
-                                        */
-+    VIR_CGROUP_THREAD = 1 << 1, /* cgroup v2 handles threads differently */
- } virCgroupBackendFlags;
- 
- typedef enum {
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 6695901766..cf8bd01317 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -338,6 +338,81 @@ virCgroupV2PathOfController(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2EnableController(virCgroupPtr parent,
-+                            int controller)
-+{
-+    VIR_AUTOFREE(char *) val = NULL;
-+
-+    if (virAsprintf(&val, "+%s",
-+                    virCgroupV2ControllerTypeToString(controller)) < 0) {
-+        return -1;
-+    }
-+
-+    if (virCgroupSetValueStr(parent, controller,
-+                             "cgroup.subtree_control", val) < 0) {
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-+                     virCgroupPtr group,
-+                     bool create,
-+                     unsigned int flags)
-+{
-+    VIR_AUTOFREE(char *) path = NULL;
-+    int controller;
-+
-+    VIR_DEBUG("Make group %s", group->path);
-+
-+    controller = virCgroupV2GetAnyController(group);
-+    if (virCgroupV2PathOfController(group, controller, "", &path) < 0)
-+        return -1;
-+
-+    VIR_DEBUG("Make controller %s", path);
-+
-+    if (!virFileExists(path) &&
-+        (!create || (mkdir(path, 0755) < 0 && errno != EEXIST))) {
-+        virReportSystemError(errno, _("Failed to create v2 cgroup '%s'"),
-+                             group->path);
-+        return -1;
-+    }
-+
-+    if (create) {
-+        if (flags & VIR_CGROUP_THREAD) {
-+            if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-+                                     "cgroup.type", "threaded") < 0) {
-+                return -1;
-+            }
-+
-+            if (virCgroupV2EnableController(parent,
-+                                            VIR_CGROUP_CONTROLLER_CPU) < 0) {
-+                return -1;
-+            }
-+        } else {
-+            size_t i;
-+            for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+                if (!virCgroupV2HasController(parent, i))
-+                    continue;
-+
-+                /* Controllers that are implicitly enabled if available. */
-+                if (i == VIR_CGROUP_CONTROLLER_CPUACCT)
-+                    continue;
-+
-+                if (virCgroupV2EnableController(parent, i) < 0)
-+                    return -1;
-+            }
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -353,6 +428,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .hasController = virCgroupV2HasController,
-     .getAnyController = virCgroupV2GetAnyController,
-     .pathOfController = virCgroupV2PathOfController,
-+    .makeGroup = virCgroupV2MakeGroup,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2PathOfController.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2PathOfController.patch
deleted file mode 100644
index 012f7ba..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2PathOfController.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 2a826bcdbe8e34af71634250ae814d5ff81d6ffc Mon Sep 17 00:00:00 2001
-Message-Id: <2a826bcdbe8e34af71634250ae814d5ff81d6ffc@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:24 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2PathOfController
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0542640a9c480993c7e8be6917b0f513277b4cea)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <91b63d07af48bdb0fdc9648f4e5e4808cc90ad0e.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 65cbad533b..6695901766 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -315,6 +315,29 @@ virCgroupV2GetAnyController(virCgroupPtr group)
- }
- 
- 
-+static int
-+virCgroupV2PathOfController(virCgroupPtr group,
-+                            int controller,
-+                            const char *key,
-+                            char **path)
-+{
-+    if (!virCgroupV2HasController(group, controller)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("v2 controller '%s' is not available"),
-+                       virCgroupV2ControllerTypeToString(controller));
-+        return -1;
-+    }
-+
-+    if (virAsprintf(path, "%s%s/%s",
-+                    group->unified.mountPoint,
-+                    group->unified.placement,
-+                    key ? key : "") < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -329,6 +352,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .detectControllers = virCgroupV2DetectControllers,
-     .hasController = virCgroupV2HasController,
-     .getAnyController = virCgroupV2GetAnyController,
-+    .pathOfController = virCgroupV2PathOfController,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2Remove.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2Remove.patch
deleted file mode 100644
index 0dc70a5..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2Remove.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4a95be40b1a56cc0eb6d6f56161d536f22380804 Mon Sep 17 00:00:00 2001
-Message-Id: <4a95be40b1a56cc0eb6d6f56161d536f22380804@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:26 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2Remove
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 4fe4847438c8ff042d6d39718b26023199e67c8a)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a7464dfade07325cf93291200356e33235020a2e.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index cf8bd01317..b5fad47ca0 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -413,6 +413,25 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
- }
- 
- 
-+static int
-+virCgroupV2Remove(virCgroupPtr group)
-+{
-+    VIR_AUTOFREE(char *) grppath = NULL;
-+    int controller;
-+
-+    /* Don't delete the root group, if we accidentally
-+       ended up in it for some reason */
-+    if (STREQ(group->unified.placement, "/"))
-+        return 0;
-+
-+    controller = virCgroupV2GetAnyController(group);
-+    if (virCgroupV2PathOfController(group, controller, "", &grppath) < 0)
-+        return 0;
-+
-+    return virCgroupRemoveRecursively(grppath);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -429,6 +448,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .getAnyController = virCgroupV2GetAnyController,
-     .pathOfController = virCgroupV2PathOfController,
-     .makeGroup = virCgroupV2MakeGroup,
-+    .remove = virCgroupV2Remove,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetMemory.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetMemory.patch
deleted file mode 100644
index 2dfb833..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetMemory.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9697d24cc223028555629af325af8607de350d06 Mon Sep 17 00:00:00 2001
-Message-Id: <9697d24cc223028555629af325af8607de350d06@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:39 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2SetMemory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 63bd23a6ad17331cdc31bc07fd8b21a96d4b2eb0)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <d2076f596f9e8b58571e19334f23e295f72a2ee5.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 52d31925c2..1b7215d98b 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1015,6 +1015,33 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetMemory(virCgroupPtr group,
-+                     unsigned long long kb)
-+{
-+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
-+
-+    if (kb > maxkb) {
-+        virReportError(VIR_ERR_INVALID_ARG,
-+                       _("Memory '%llu' must be less than %llu"),
-+                       kb, maxkb);
-+        return -1;
-+    }
-+
-+    if (kb == maxkb) {
-+        return virCgroupSetValueStr(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.max",
-+                                    "max");
-+    } else {
-+        return virCgroupSetValueU64(group,
-+                                    VIR_CGROUP_CONTROLLER_MEMORY,
-+                                    "memory.max",
-+                                    kb << 10);
-+    }
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1051,6 +1078,8 @@ virCgroupBackend virCgroupV2Backend = {
-     .getBlkioDeviceReadBps = virCgroupV2GetBlkioDeviceReadBps,
-     .setBlkioDeviceWriteBps = virCgroupV2SetBlkioDeviceWriteBps,
-     .getBlkioDeviceWriteBps = virCgroupV2GetBlkioDeviceWriteBps,
-+
-+    .setMemory = virCgroupV2SetMemory,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetOwner.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetOwner.patch
deleted file mode 100644
index 4df00cb..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SetOwner.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c7f704deec7b42ec02ae13a678474b3ca62fecbd Mon Sep 17 00:00:00 2001
-Message-Id: <c7f704deec7b42ec02ae13a678474b3ca62fecbd@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:30 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2SetOwner
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 525ac6885b508759f8618f136f04554c95138ae8)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <778612847c720bc6567b98708532175ada48ce44.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 90ce660908..27519d80e3 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -495,6 +495,32 @@ virCgroupV2BindMount(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2SetOwner(virCgroupPtr cgroup,
-+                    uid_t uid,
-+                    gid_t gid,
-+                    int controllers ATTRIBUTE_UNUSED)
-+{
-+    VIR_AUTOFREE(char *) base = NULL;
-+
-+    if (virAsprintf(&base, "%s%s", cgroup->unified.mountPoint,
-+                    cgroup->unified.placement) < 0) {
-+        return -1;
-+    }
-+
-+    if (virFileChownFiles(base, uid, gid) < 0)
-+        return -1;
-+
-+    if (chown(base, uid, gid) < 0) {
-+        virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"),
-+                             base, uid, gid);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -515,6 +541,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .addTask = virCgroupV2AddTask,
-     .hasEmptyTasks = virCgroupV2HasEmptyTasks,
-     .bindMount = virCgroupV2BindMount,
-+    .setOwner = virCgroupV2SetOwner,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2StealPlacement.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2StealPlacement.patch
deleted file mode 100644
index e120096..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2StealPlacement.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f335c220a4ac822b6b66c8bd4dca0c85aad187f7 Mon Sep 17 00:00:00 2001
-Message-Id: <f335c220a4ac822b6b66c8bd4dca0c85aad187f7@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:20 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2StealPlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit f7394dcf010fc4be50b822e290e701430d45325d)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5e3bd896f2aa16a3637b90d1c8bd3b0676c2acbd.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 815d8fca9b..270a6fb305 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -220,6 +220,17 @@ virCgroupV2ValidatePlacement(virCgroupPtr group,
- }
- 
- 
-+static char *
-+virCgroupV2StealPlacement(virCgroupPtr group)
-+{
-+    char *ret;
-+
-+    VIR_STEAL_PTR(ret, group->unified.placement);
-+
-+    return ret;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -230,6 +241,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .detectMounts = virCgroupV2DetectMounts,
-     .detectPlacement = virCgroupV2DetectPlacement,
-     .validatePlacement = virCgroupV2ValidatePlacement,
-+    .stealPlacement = virCgroupV2StealPlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SupportsCpuBW.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SupportsCpuBW.patch
deleted file mode 100644
index 4387129..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2SupportsCpuBW.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 59084112841259e4ff74bde8ad7ebf32280fdcca Mon Sep 17 00:00:00 2001
-Message-Id: <59084112841259e4ff74bde8ad7ebf32280fdcca@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:49 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2SupportsCpuBW
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 5a4d90ae6af6ea5dd1bb6ae5e3fec7307a5f1257)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <e0f39a4ebc452685be49eaea66266fef5921c989.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index a0a7e55493..55f79af204 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1441,6 +1441,21 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
- }
- 
- 
-+static bool
-+virCgroupV2SupportsCpuBW(virCgroupPtr cgroup)
-+{
-+    VIR_AUTOFREE(char *) path = NULL;
-+
-+    if (virCgroupV2PathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU,
-+                                    "cpu.max", &path) < 0) {
-+        virResetLastError();
-+        return false;
-+    }
-+
-+    return virFileExists(path);
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -1495,6 +1510,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .getCpuCfsPeriod = virCgroupV2GetCpuCfsPeriod,
-     .setCpuCfsQuota = virCgroupV2SetCpuCfsQuota,
-     .getCpuCfsQuota = virCgroupV2GetCpuCfsQuota,
-+    .supportsCpuBW = virCgroupV2SupportsCpuBW,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidateMachineGroup.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidateMachineGroup.patch
deleted file mode 100644
index 976237b..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidateMachineGroup.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 3928ca076fac13572f14c20f38bcf5fb205d7670 Mon Sep 17 00:00:00 2001
-Message-Id: <3928ca076fac13572f14c20f38bcf5fb205d7670@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:14 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2ValidateMachineGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When reconnecting to a domain we are validating the cgroup name.
-In case of cgroup v2 we need to validate only the new format for host
-without systemd '{machinename}.libvirt-{drivername}' or scope name
-generated by systemd.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 3a365ef697b8fedb929725c46753481a63ae3de7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <97d6369bcfc2943c708fd9bfc94f71ab10e00535.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 43 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 4ab9f2b792..02dc4e4686 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -36,6 +36,7 @@
- #include "virfile.h"
- #include "virlog.h"
- #include "virstring.h"
-+#include "virsystemd.h"
- 
- VIR_LOG_INIT("util.cgroup");
- 
-@@ -90,10 +91,52 @@ virCgroupV2Available(void)
- }
- 
- 
-+static bool
-+virCgroupV2ValidateMachineGroup(virCgroupPtr group,
-+                                const char *name ATTRIBUTE_UNUSED,
-+                                const char *drivername,
-+                                const char *machinename)
-+{
-+    VIR_AUTOFREE(char *) partmachinename = NULL;
-+    VIR_AUTOFREE(char *) scopename = NULL;
-+    char *tmp;
-+
-+    if (virAsprintf(&partmachinename, "%s.libvirt-%s", machinename,
-+                    drivername) < 0) {
-+        return false;
-+    }
-+
-+    if (virCgroupPartitionEscape(&partmachinename) < 0)
-+        return false;
-+
-+    if (!(scopename = virSystemdMakeScopeName(machinename, drivername,
-+                                              false))) {
-+        return false;
-+    }
-+
-+    if (virCgroupPartitionEscape(&scopename) < 0)
-+        return false;
-+
-+    if (!(tmp = strrchr(group->unified.placement, '/')))
-+        return false;
-+    tmp++;
-+
-+    if (STRNEQ(tmp, partmachinename) &&
-+        STRNEQ(tmp, scopename)) {
-+        VIR_DEBUG("Name '%s' for unified does not match '%s' or '%s'",
-+                  tmp, partmachinename, scopename);
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-     .available = virCgroupV2Available,
-+    .validateMachineGroup = virCgroupV2ValidateMachineGroup,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidatePlacement.patch b/SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidatePlacement.patch
deleted file mode 100644
index bfbf697..0000000
--- a/SOURCES/libvirt-vircgroup-introduce-virCgroupV2ValidatePlacement.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 64cc7545de4c32deda12cd1c6088b065c0a09592 Mon Sep 17 00:00:00 2001
-Message-Id: <64cc7545de4c32deda12cd1c6088b065c0a09592@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:19 +0200
-Subject: [PATCH] vircgroup: introduce virCgroupV2ValidatePlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 9aa8226d866f7a274179bfe900d441cbd2f5ae12)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <db5e4f6695d27deead1d53a7397101e086261039.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index fb1aa2de0a..815d8fca9b 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -206,6 +206,20 @@ virCgroupV2DetectPlacement(virCgroupPtr group,
- }
- 
- 
-+static int
-+virCgroupV2ValidatePlacement(virCgroupPtr group,
-+                             pid_t pid ATTRIBUTE_UNUSED)
-+{
-+    if (!group->unified.placement) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Could not find placement for v2 controller"));
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
- virCgroupBackend virCgroupV2Backend = {
-     .type = VIR_CGROUP_BACKEND_TYPE_V2,
- 
-@@ -215,6 +229,7 @@ virCgroupBackend virCgroupV2Backend = {
-     .copyPlacement = virCgroupV2CopyPlacement,
-     .detectMounts = virCgroupV2DetectMounts,
-     .detectPlacement = virCgroupV2DetectPlacement,
-+    .validatePlacement = virCgroupV2ValidatePlacement,
- };
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-machinename-will-never-be-NULL.patch b/SOURCES/libvirt-vircgroup-machinename-will-never-be-NULL.patch
deleted file mode 100644
index e1ae46f..0000000
--- a/SOURCES/libvirt-vircgroup-machinename-will-never-be-NULL.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 440629a5a95d167af717a70c8d992e104866229a Mon Sep 17 00:00:00 2001
-Message-Id: <440629a5a95d167af717a70c8d992e104866229a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:05:59 +0200
-Subject: [PATCH] vircgroup: machinename will never be NULL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit <eaf2c9f89107b9f60cf8db2c919f78b987ff7177> moved machineName
-generation before virCgroupNewDetectMachine() is called.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit f9d18f89f7df937b922816aeae0024d8bd6dc72e)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <2e0f6a4d02b3f97f5b9efa74a6553d5ce11d077a.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index a2c971fbf4..5adf9d3c11 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -266,27 +266,22 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
-     if (virCgroupPartitionEscape(&partname) < 0)
-         return false;
- 
--    if (machinename &&
--        (virAsprintf(&partmachinename, "%s.libvirt-%s",
--                     machinename, drivername) < 0 ||
--         virCgroupPartitionEscape(&partmachinename) < 0))
-+    if (virAsprintf(&partmachinename, "%s.libvirt-%s",
-+                    machinename, drivername) < 0 ||
-+        virCgroupPartitionEscape(&partmachinename) < 0)
-         return false;
- 
-     if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true)))
-         return false;
- 
--    /* We should keep trying even if this failed */
--    if (!machinename)
--        virResetLastError();
--    else if (!(scopename_new = virSystemdMakeScopeName(machinename,
--                                                       drivername, false)))
-+    if (!(scopename_new = virSystemdMakeScopeName(machinename,
-+                                                  drivername, false)))
-         return false;
- 
-     if (virCgroupPartitionEscape(&scopename_old) < 0)
-         return false;
- 
--    if (scopename_new &&
--        virCgroupPartitionEscape(&scopename_new) < 0)
-+    if (virCgroupPartitionEscape(&scopename_new) < 0)
-         return false;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-@@ -315,16 +310,16 @@ virCgroupValidateMachineGroup(virCgroupPtr group,
-         tmp++;
- 
-         if (STRNEQ(tmp, name) &&
--            STRNEQ_NULLABLE(tmp, machinename) &&
-+            STRNEQ(tmp, machinename) &&
-             STRNEQ(tmp, partname) &&
--            STRNEQ_NULLABLE(tmp, partmachinename) &&
-+            STRNEQ(tmp, partmachinename) &&
-             STRNEQ(tmp, scopename_old) &&
--            STRNEQ_NULLABLE(tmp, scopename_new)) {
-+            STRNEQ(tmp, scopename_new)) {
-             VIR_DEBUG("Name '%s' for controller '%s' does not match "
-                       "'%s', '%s', '%s', '%s' or '%s'",
-                       tmp, virCgroupControllerTypeToString(i),
--                      name, NULLSTR(machinename), partname,
--                      scopename_old, NULLSTR(scopename_new));
-+                      name, machinename, partname,
-+                      scopename_old, scopename_new);
-             return false;
-         }
-     }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-register-cgroup-v2-backend.patch b/SOURCES/libvirt-vircgroup-register-cgroup-v2-backend.patch
deleted file mode 100644
index 2b650a3..0000000
--- a/SOURCES/libvirt-vircgroup-register-cgroup-v2-backend.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6b4f272c7de58d13d89a7ebb981b43ac53c41198 Mon Sep 17 00:00:00 2001
-Message-Id: <6b4f272c7de58d13d89a7ebb981b43ac53c41198@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:52 +0200
-Subject: [PATCH] vircgroup: register cgroup v2 backend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-All mandatory callbacks are implemented for cgroup v2 backend so we
-can register it now.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit a77f5326919e0d79f01686762ecc8656e4e6adc9)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <9d7990e568c23aa43ccd85011e845c840db97a27.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupbackend.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
-index 79fe6cb73d..7ee39ac8ca 100644
---- a/src/util/vircgroupbackend.c
-+++ b/src/util/vircgroupbackend.c
-@@ -52,6 +52,7 @@ virCgroupBackendRegister(virCgroupBackendPtr backend)
- static void
- virCgroupBackendOnceInit(void)
- {
-+    virCgroupV2Register();
-     virCgroupV1Register();
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-remove-VIR_CGROUP_SUPPORTED.patch b/SOURCES/libvirt-vircgroup-remove-VIR_CGROUP_SUPPORTED.patch
deleted file mode 100644
index 2e27127..0000000
--- a/SOURCES/libvirt-vircgroup-remove-VIR_CGROUP_SUPPORTED.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 2a09df456c5cceabdd6d6eee167061a74d7de9ea Mon Sep 17 00:00:00 2001
-Message-Id: <2a09df456c5cceabdd6d6eee167061a74d7de9ea@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:08 +0200
-Subject: [PATCH] vircgroup: remove VIR_CGROUP_SUPPORTED
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-tests/vircgrouptest.c uses #ifdef __linux__ for a long time and no
-failure was reported so far so it's safe to assume that __linux__ is
-good enough to guard cgroup code.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0df626698865e5158192a9090dfe4f76c2e44fc5)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <aa849f9f6c3bd44f7167a6ce08f16c4a0b7da72b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 349c388e0a..f1ecb1dbeb 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -70,11 +70,6 @@ VIR_LOG_INIT("util.cgroup");
- #define CGROUP_NB_TOTAL_CPU_STAT_PARAM 3
- #define CGROUP_NB_PER_CPU_STAT_PARAM   1
- 
--#if defined(__linux__) && defined(HAVE_GETMNTENT_R) && \
--    defined(_DIRENT_HAVE_D_TYPE) && defined(_SC_CLK_TCK)
--# define VIR_CGROUP_SUPPORTED
--#endif
--
- VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST,
-               "cpu", "cpuacct", "cpuset", "memory", "devices",
-               "freezer", "blkio", "net_cls", "perf_event",
-@@ -119,7 +114,7 @@ virCgroupGetDevicePermsString(int perms)
- }
- 
- 
--#ifdef VIR_CGROUP_SUPPORTED
-+#ifdef __linux__
- bool
- virCgroupAvailable(void)
- {
-@@ -2643,7 +2638,7 @@ virCgroupControllerAvailable(int controller)
-     return ret;
- }
- 
--#else /* !VIR_CGROUP_SUPPORTED */
-+#else /* !__linux__ */
- 
- bool
- virCgroupAvailable(void)
-@@ -3404,7 +3399,7 @@ virCgroupControllerAvailable(int controller ATTRIBUTE_UNUSED)
- {
-     return false;
- }
--#endif /* !VIR_CGROUP_SUPPORTED */
-+#endif /* !__linux__ */
- 
- 
- int
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-rename-controllers-to-legacy.patch b/SOURCES/libvirt-vircgroup-rename-controllers-to-legacy.patch
deleted file mode 100644
index 3b79453..0000000
--- a/SOURCES/libvirt-vircgroup-rename-controllers-to-legacy.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-From da3574e1bcbc4779b516e8bf14f56abf2a19885d Mon Sep 17 00:00:00 2001
-Message-Id: <da3574e1bcbc4779b516e8bf14f56abf2a19885d@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:07 +0200
-Subject: [PATCH] vircgroup: rename controllers to legacy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With the introduction of cgroup v2 there are new names used with
-cgroups based on which version is used:
-
-    - legacy: cgroup v1
-    - unified: cgroup v2
-    - hybrid: cgroup v1 and cgroup v2
-
-Let's use 'legacy' instead of 'cgroupv1' or 'controllers' in our code.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 65ba48d26745450e5079f171052caa7309c99fdf)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b9853bf7cd21097e0248448362f6178e31ab6279.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroup.c     |   6 +-
- src/util/vircgrouppriv.h |   2 +-
- src/util/vircgroupv1.c   | 140 +++++++++++++++++++--------------------
- tests/vircgrouptest.c    |  14 ++--
- 4 files changed, 81 insertions(+), 81 deletions(-)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index b159bda1bb..349c388e0a 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1246,9 +1246,9 @@ virCgroupFree(virCgroupPtr *group)
-         return;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        VIR_FREE((*group)->controllers[i].mountPoint);
--        VIR_FREE((*group)->controllers[i].linkPoint);
--        VIR_FREE((*group)->controllers[i].placement);
-+        VIR_FREE((*group)->legacy[i].mountPoint);
-+        VIR_FREE((*group)->legacy[i].linkPoint);
-+        VIR_FREE((*group)->legacy[i].placement);
-     }
- 
-     VIR_FREE((*group)->path);
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index ee6aeedbb5..c50a25f195 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -50,7 +50,7 @@ struct _virCgroup {
- 
-     virCgroupBackendPtr backend;
- 
--    virCgroupV1Controller controllers[VIR_CGROUP_CONTROLLER_LAST];
-+    virCgroupV1Controller legacy[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
- int virCgroupSetValueStr(virCgroupPtr group,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 0ba8757348..482615f3c8 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -127,10 +127,10 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group,
-         if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
-             continue;
- 
--        if (!group->controllers[i].placement)
-+        if (!group->legacy[i].placement)
-             continue;
- 
--        tmp = strrchr(group->controllers[i].placement, '/');
-+        tmp = strrchr(group->legacy[i].placement, '/');
-         if (!tmp)
-             return false;
- 
-@@ -139,7 +139,7 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group,
-             i == VIR_CGROUP_CONTROLLER_CPUSET) {
-             if (STREQ(tmp, "/emulator"))
-                 *tmp = '\0';
--            tmp = strrchr(group->controllers[i].placement, '/');
-+            tmp = strrchr(group->legacy[i].placement, '/');
-             if (!tmp)
-                 return false;
-         }
-@@ -171,15 +171,15 @@ virCgroupV1CopyMounts(virCgroupPtr group,
- {
-     size_t i;
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!parent->controllers[i].mountPoint)
-+        if (!parent->legacy[i].mountPoint)
-             continue;
- 
--        if (VIR_STRDUP(group->controllers[i].mountPoint,
--                       parent->controllers[i].mountPoint) < 0)
-+        if (VIR_STRDUP(group->legacy[i].mountPoint,
-+                       parent->legacy[i].mountPoint) < 0)
-             return -1;
- 
--        if (VIR_STRDUP(group->controllers[i].linkPoint,
--                       parent->controllers[i].linkPoint) < 0)
-+        if (VIR_STRDUP(group->legacy[i].linkPoint,
-+                       parent->legacy[i].linkPoint) < 0)
-             return -1;
-     }
-     return 0;
-@@ -193,14 +193,14 @@ virCgroupV1CopyPlacement(virCgroupPtr group,
- {
-     size_t i;
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
-+        if (!group->legacy[i].mountPoint)
-             continue;
- 
-         if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)
-             continue;
- 
-         if (path[0] == '/') {
--            if (VIR_STRDUP(group->controllers[i].placement, path) < 0)
-+            if (VIR_STRDUP(group->legacy[i].placement, path) < 0)
-                 return -1;
-         } else {
-             /*
-@@ -208,10 +208,10 @@ virCgroupV1CopyPlacement(virCgroupPtr group,
-              * parent == "/libvirt.service" + path == "" => "/libvirt.service"
-              * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo"
-              */
--            if (virAsprintf(&group->controllers[i].placement,
-+            if (virAsprintf(&group->legacy[i].placement,
-                             "%s%s%s",
--                            parent->controllers[i].placement,
--                            (STREQ(parent->controllers[i].placement, "/") ||
-+                            parent->legacy[i].placement,
-+                            (STREQ(parent->legacy[i].placement, "/") ||
-                              STREQ(path, "") ? "" : "/"),
-                             path) < 0)
-                 return -1;
-@@ -320,7 +320,7 @@ virCgroupV1DetectMounts(virCgroupPtr group,
-              * once. We need to save the results of the last one,
-              * and we need to be careful to release the memory used
-              * by previous processing. */
--            virCgroupV1ControllerPtr controller = &group->controllers[i];
-+            virCgroupV1ControllerPtr controller = &group->legacy[i];
- 
-             VIR_FREE(controller->mountPoint);
-             VIR_FREE(controller->linkPoint);
-@@ -350,19 +350,19 @@ virCgroupV1DetectPlacement(virCgroupPtr group,
-         const char *typestr = virCgroupV1ControllerTypeToString(i);
- 
-         if (virCgroupV1MountOptsMatchController(controllers, typestr) &&
--            group->controllers[i].mountPoint != NULL &&
--            group->controllers[i].placement == NULL) {
-+            group->legacy[i].mountPoint != NULL &&
-+            group->legacy[i].placement == NULL) {
-             /*
-              * selfpath == "/" + path="" -> "/"
-              * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service"
-              * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo"
-              */
-             if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
--                if (VIR_STRDUP(group->controllers[i].placement,
-+                if (VIR_STRDUP(group->legacy[i].placement,
-                                selfpath) < 0)
-                     return -1;
-             } else {
--                if (virAsprintf(&group->controllers[i].placement,
-+                if (virAsprintf(&group->legacy[i].placement,
-                                 "%s%s%s", selfpath,
-                                 (STREQ(selfpath, "/") ||
-                                  STREQ(path, "") ? "" : "/"),
-@@ -383,22 +383,22 @@ virCgroupV1ValidatePlacement(virCgroupPtr group,
-     size_t i;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
-+        if (!group->legacy[i].mountPoint)
-             continue;
- 
--        if (!group->controllers[i].placement) {
-+        if (!group->legacy[i].placement) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Could not find placement for v1 controller %s at %s"),
-                            virCgroupV1ControllerTypeToString(i),
--                           group->controllers[i].placement);
-+                           group->legacy[i].placement);
-             return -1;
-         }
- 
-         VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
-                   i,
-                   virCgroupV1ControllerTypeToString(i),
--                  group->controllers[i].mountPoint,
--                  group->controllers[i].placement,
-+                  group->legacy[i].mountPoint,
-+                  group->legacy[i].placement,
-                   (long long) pid);
-     }
- 
-@@ -411,7 +411,7 @@ virCgroupV1StealPlacement(virCgroupPtr group)
- {
-     char *ret = NULL;
- 
--    VIR_STEAL_PTR(ret, group->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement);
-+    VIR_STEAL_PTR(ret, group->legacy[VIR_CGROUP_CONTROLLER_SYSTEMD].placement);
- 
-     return ret;
- }
-@@ -430,7 +430,7 @@ virCgroupV1DetectControllers(virCgroupPtr group,
-         for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-             if (((1 << i) & controllers)) {
-                 /* Remove non-existent controllers  */
--                if (!group->controllers[i].mountPoint) {
-+                if (!group->legacy[i].mountPoint) {
-                     VIR_DEBUG("Requested controller '%s' not mounted, ignoring",
-                               virCgroupV1ControllerTypeToString(i));
-                     controllers &= ~(1 << i);
-@@ -441,9 +441,9 @@ virCgroupV1DetectControllers(virCgroupPtr group,
-             VIR_DEBUG("Controller '%s' wanted=%s, mount='%s'",
-                       virCgroupV1ControllerTypeToString(i),
-                       (1 << i) & controllers ? "yes" : "no",
--                      NULLSTR(group->controllers[i].mountPoint));
-+                      NULLSTR(group->legacy[i].mountPoint));
-             if (!((1 << i) & controllers) &&
--                group->controllers[i].mountPoint) {
-+                group->legacy[i].mountPoint) {
-                 /* Check whether a request to disable a controller
-                  * clashes with co-mounting of controllers */
-                 for (j = 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) {
-@@ -452,8 +452,8 @@ virCgroupV1DetectControllers(virCgroupPtr group,
-                     if (!((1 << j) & controllers))
-                         continue;
- 
--                    if (STREQ_NULLABLE(group->controllers[i].mountPoint,
--                                       group->controllers[j].mountPoint)) {
-+                    if (STREQ_NULLABLE(group->legacy[i].mountPoint,
-+                                       group->legacy[j].mountPoint)) {
-                         virReportSystemError(EINVAL,
-                                              _("V1 controller '%s' is not wanted, but '%s' is co-mounted"),
-                                              virCgroupV1ControllerTypeToString(i),
-@@ -461,7 +461,7 @@ virCgroupV1DetectControllers(virCgroupPtr group,
-                         return -1;
-                     }
-                 }
--                VIR_FREE(group->controllers[i].mountPoint);
-+                VIR_FREE(group->legacy[i].mountPoint);
-             }
-         }
-     } else {
-@@ -470,8 +470,8 @@ virCgroupV1DetectControllers(virCgroupPtr group,
-         for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-             VIR_DEBUG("Controller '%s' present=%s",
-                       virCgroupV1ControllerTypeToString(i),
--                      group->controllers[i].mountPoint ? "yes" : "no");
--            if (group->controllers[i].mountPoint == NULL)
-+                      group->legacy[i].mountPoint ? "yes" : "no");
-+            if (group->legacy[i].mountPoint == NULL)
-                 continue;
-             controllers |= (1 << i);
-         }
-@@ -485,7 +485,7 @@ static bool
- virCgroupV1HasController(virCgroupPtr group,
-                          int controller)
- {
--    return group->controllers[controller].mountPoint != NULL;
-+    return group->legacy[controller].mountPoint != NULL;
- }
- 
- 
-@@ -499,9 +499,9 @@ virCgroupV1GetAnyController(virCgroupPtr group)
-          * of '/' to avoid doing bad stuff to the root
-          * cgroup
-          */
--        if (group->controllers[i].mountPoint &&
--            group->controllers[i].placement &&
--            STRNEQ(group->controllers[i].placement, "/")) {
-+        if (group->legacy[i].mountPoint &&
-+            group->legacy[i].placement &&
-+            STRNEQ(group->legacy[i].placement, "/")) {
-             return i;
-         }
-     }
-@@ -516,14 +516,14 @@ virCgroupV1PathOfController(virCgroupPtr group,
-                             const char *key,
-                             char **path)
- {
--    if (group->controllers[controller].mountPoint == NULL) {
-+    if (group->legacy[controller].mountPoint == NULL) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("v1 controller '%s' is not mounted"),
-                        virCgroupV1ControllerTypeToString(controller));
-         return -1;
-     }
- 
--    if (group->controllers[controller].placement == NULL) {
-+    if (group->legacy[controller].placement == NULL) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("v1 controller '%s' is not enabled for group"),
-                        virCgroupV1ControllerTypeToString(controller));
-@@ -531,8 +531,8 @@ virCgroupV1PathOfController(virCgroupPtr group,
-     }
- 
-     if (virAsprintf(path, "%s%s/%s",
--                    group->controllers[controller].mountPoint,
--                    group->controllers[controller].placement,
-+                    group->legacy[controller].mountPoint,
-+                    group->legacy[controller].placement,
-                     key ? key : "") < 0)
-         return -1;
- 
-@@ -618,7 +618,7 @@ virCgroupV1MakeGroup(virCgroupPtr parent,
-         }
- 
-         /* Skip over controllers that aren't mounted */
--        if (!group->controllers[i].mountPoint) {
-+        if (!group->legacy[i].mountPoint) {
-             VIR_DEBUG("Skipping unmounted controller %s",
-                       virCgroupV1ControllerTypeToString(i));
-             continue;
-@@ -639,7 +639,7 @@ virCgroupV1MakeGroup(virCgroupPtr parent,
-                  * treat blkio as unmounted if mkdir fails. */
-                 if (i == VIR_CGROUP_CONTROLLER_BLKIO) {
-                     VIR_DEBUG("Ignoring mkdir failure with blkio controller. Kernel probably too old");
--                    VIR_FREE(group->controllers[i].mountPoint);
-+                    VIR_FREE(group->legacy[i].mountPoint);
-                     continue;
-                 } else {
-                     virReportSystemError(errno,
-@@ -649,7 +649,7 @@ virCgroupV1MakeGroup(virCgroupPtr parent,
-                 }
-             }
-             if (i == VIR_CGROUP_CONTROLLER_CPUSET &&
--                group->controllers[i].mountPoint != NULL &&
-+                group->legacy[i].mountPoint != NULL &&
-                 virCgroupV1CpuSetInherit(parent, group) < 0) {
-                 return -1;
-             }
-@@ -659,7 +659,7 @@ virCgroupV1MakeGroup(virCgroupPtr parent,
-              */
-             if ((flags & VIR_CGROUP_MEM_HIERACHY) &&
-                 i == VIR_CGROUP_CONTROLLER_MEMORY &&
--                group->controllers[i].mountPoint != NULL &&
-+                group->legacy[i].mountPoint != NULL &&
-                 virCgroupV1SetMemoryUseHierarchy(group) < 0) {
-                 return -1;
-             }
-@@ -682,7 +682,7 @@ virCgroupV1Remove(virCgroupPtr group)
-         VIR_AUTOFREE(char *) grppath = NULL;
- 
-         /* Skip over controllers not mounted */
--        if (!group->controllers[i].mountPoint)
-+        if (!group->legacy[i].mountPoint)
-             continue;
- 
-         /* We must never rmdir() in systemd's hierarchy */
-@@ -691,7 +691,7 @@ virCgroupV1Remove(virCgroupPtr group)
- 
-         /* Don't delete the root group, if we accidentally
-            ended up in it for some reason */
--        if (STREQ(group->controllers[i].placement, "/"))
-+        if (STREQ(group->legacy[i].placement, "/"))
-             continue;
- 
-         if (virCgroupV1PathOfController(group,
-@@ -719,7 +719,7 @@ virCgroupV1AddTask(virCgroupPtr group,
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-         /* Skip over controllers not mounted */
--        if (!group->controllers[i].mountPoint)
-+        if (!group->legacy[i].mountPoint)
-             continue;
- 
-         /* We must never add tasks in systemd's hierarchy
-@@ -766,17 +766,17 @@ virCgroupV1IdentifyRoot(virCgroupPtr group)
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-         char *tmp;
--        if (!group->controllers[i].mountPoint)
-+        if (!group->legacy[i].mountPoint)
-             continue;
--        if (!(tmp = strrchr(group->controllers[i].mountPoint, '/'))) {
-+        if (!(tmp = strrchr(group->legacy[i].mountPoint, '/'))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Could not find directory separator in %s"),
--                           group->controllers[i].mountPoint);
-+                           group->legacy[i].mountPoint);
-             return NULL;
-         }
- 
--        if (VIR_STRNDUP(ret, group->controllers[i].mountPoint,
--                        tmp - group->controllers[i].mountPoint) < 0)
-+        if (VIR_STRNDUP(ret, group->legacy[i].mountPoint,
-+                        tmp - group->legacy[i].mountPoint) < 0)
-             return NULL;
-         return ret;
-     }
-@@ -820,44 +820,44 @@ virCgroupV1BindMount(virCgroupPtr group,
-     }
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
--        if (!group->controllers[i].mountPoint)
-+        if (!group->legacy[i].mountPoint)
-             continue;
- 
--        if (!virFileExists(group->controllers[i].mountPoint)) {
-+        if (!virFileExists(group->legacy[i].mountPoint)) {
-             VIR_AUTOFREE(char *) src = NULL;
-             if (virAsprintf(&src, "%s%s",
-                             oldroot,
--                            group->controllers[i].mountPoint) < 0)
-+                            group->legacy[i].mountPoint) < 0)
-                 return -1;
- 
-             VIR_DEBUG("Create mount point '%s'",
--                      group->controllers[i].mountPoint);
--            if (virFileMakePath(group->controllers[i].mountPoint) < 0) {
-+                      group->legacy[i].mountPoint);
-+            if (virFileMakePath(group->legacy[i].mountPoint) < 0) {
-                 virReportSystemError(errno,
-                                      _("Unable to create directory %s"),
--                                     group->controllers[i].mountPoint);
-+                                     group->legacy[i].mountPoint);
-                 return -1;
-             }
- 
--            if (mount(src, group->controllers[i].mountPoint, "none", MS_BIND,
-+            if (mount(src, group->legacy[i].mountPoint, "none", MS_BIND,
-                       NULL) < 0) {
-                 virReportSystemError(errno,
-                                      _("Failed to bind cgroup '%s' on '%s'"),
--                                     src, group->controllers[i].mountPoint);
-+                                     src, group->legacy[i].mountPoint);
-                 return -1;
-             }
-         }
- 
--        if (group->controllers[i].linkPoint) {
-+        if (group->legacy[i].linkPoint) {
-             VIR_DEBUG("Link mount point '%s' to '%s'",
--                      group->controllers[i].mountPoint,
--                      group->controllers[i].linkPoint);
--            if (symlink(group->controllers[i].mountPoint,
--                        group->controllers[i].linkPoint) < 0) {
-+                      group->legacy[i].mountPoint,
-+                      group->legacy[i].linkPoint);
-+            if (symlink(group->legacy[i].mountPoint,
-+                        group->legacy[i].linkPoint) < 0) {
-                 virReportSystemError(errno,
-                                      _("Unable to symlink directory %s to %s"),
--                                     group->controllers[i].mountPoint,
--                                     group->controllers[i].linkPoint);
-+                                     group->legacy[i].mountPoint,
-+                                     group->legacy[i].linkPoint);
-                 return -1;
-             }
-         }
-@@ -885,11 +885,11 @@ virCgroupV1SetOwner(virCgroupPtr cgroup,
-         if (!((1 << i) & controllers))
-             continue;
- 
--        if (!cgroup->controllers[i].mountPoint)
-+        if (!cgroup->legacy[i].mountPoint)
-             continue;
- 
--        if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint,
--                        cgroup->controllers[i].placement) < 0)
-+        if (virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint,
-+                        cgroup->legacy[i].placement) < 0)
-             goto cleanup;
- 
-         if (virDirOpen(&dh, base) < 0)
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 588a6e824d..c4bf987ca1 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -56,25 +56,25 @@ static int validateCgroup(virCgroupPtr cgroup,
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-         if (STRNEQ_NULLABLE(expectMountPoint[i],
--                            cgroup->controllers[i].mountPoint)) {
-+                            cgroup->legacy[i].mountPoint)) {
-             fprintf(stderr, "Wrong mount '%s', expected '%s' for '%s'\n",
--                    cgroup->controllers[i].mountPoint,
-+                    cgroup->legacy[i].mountPoint,
-                     expectMountPoint[i],
-                     virCgroupControllerTypeToString(i));
-             return -1;
-         }
-         if (STRNEQ_NULLABLE(expectLinkPoint[i],
--                            cgroup->controllers[i].linkPoint)) {
-+                            cgroup->legacy[i].linkPoint)) {
-             fprintf(stderr, "Wrong link '%s', expected '%s' for '%s'\n",
--                    cgroup->controllers[i].linkPoint,
-+                    cgroup->legacy[i].linkPoint,
-                     expectLinkPoint[i],
-                     virCgroupControllerTypeToString(i));
-             return -1;
-         }
-         if (STRNEQ_NULLABLE(expectPlacement[i],
--                            cgroup->controllers[i].placement)) {
-+                            cgroup->legacy[i].placement)) {
-             fprintf(stderr, "Wrong placement '%s', expected '%s' for '%s'\n",
--                    cgroup->controllers[i].placement,
-+                    cgroup->legacy[i].placement,
-                     expectPlacement[i],
-                     virCgroupControllerTypeToString(i));
-             return -1;
-@@ -174,7 +174,7 @@ testCgroupDetectMounts(const void *args)
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-         virBufferAsprintf(&buf, "%-12s %s\n",
-                           virCgroupControllerTypeToString(i),
--                          NULLSTR(group->controllers[i].mountPoint));
-+                          NULLSTR(group->legacy[i].mountPoint));
-     }
-     if (virBufferCheckError(&buf) < 0)
-         goto cleanup;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-rename-virCgroupAdd.-Task-to-virCgroupAdd.-Process.patch b/SOURCES/libvirt-vircgroup-rename-virCgroupAdd.-Task-to-virCgroupAdd.-Process.patch
deleted file mode 100644
index b682d5d..0000000
--- a/SOURCES/libvirt-vircgroup-rename-virCgroupAdd.-Task-to-virCgroupAdd.-Process.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From d91f1d09bcd6297034d7a9b87c40036aafc2b20c Mon Sep 17 00:00:00 2001
-Message-Id: <d91f1d09bcd6297034d7a9b87c40036aafc2b20c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:14 +0200
-Subject: [PATCH] vircgroup: rename virCgroupAdd.*Task to virCgroupAdd.*Process
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In cgroup v2 we need to handle processes and threads differently,
-following patch will introduce virCgroupAddThread.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0772c34685848dabf73574feeb2dd35b2edd9e18)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <75bd43c8342b621a7c01e1431a29bc505e7c155f.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt-lxc.c        |  2 +-
- src/libvirt_private.syms |  4 ++--
- src/lxc/lxc_controller.c |  4 ++--
- src/qemu/qemu_process.c  |  4 ++--
- src/qemu/qemu_tpm.c      |  2 +-
- src/util/vircgroup.c     | 32 ++++++++++++++++----------------
- src/util/vircgroup.h     |  4 ++--
- 7 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
-index c9f2146487..9bf0174b95 100644
---- a/src/libvirt-lxc.c
-+++ b/src/libvirt-lxc.c
-@@ -306,7 +306,7 @@ int virDomainLxcEnterCGroup(virDomainPtr domain,
-     if (virCgroupNewDetect(domain->id, -1, &cgroup) < 0)
-         goto error;
- 
--    if (virCgroupAddTask(cgroup, getpid()) < 0)
-+    if (virCgroupAddProcess(cgroup, getpid()) < 0)
-         goto error;
- 
-     virCgroupFree(&cgroup);
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 2ec9d8f4bf..5dd24e2e66 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1513,8 +1513,8 @@ virBufferVasprintf;
- 
- 
- # util/vircgroup.h
--virCgroupAddMachineTask;
--virCgroupAddTask;
-+virCgroupAddMachineProcess;
-+virCgroupAddProcess;
- virCgroupAllowAllDevices;
- virCgroupAllowDevice;
- virCgroupAllowDevicePath;
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 4e84391bf5..4ead2dc9f0 100644
---- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -875,12 +875,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl)
-                                             ctrl->nicindexes)))
-         goto cleanup;
- 
--    if (virCgroupAddMachineTask(ctrl->cgroup, getpid()) < 0)
-+    if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0)
-         goto cleanup;
- 
-     /* Add all qemu-nbd tasks to the cgroup */
-     for (i = 0; i < ctrl->nnbdpids; i++) {
--        if (virCgroupAddMachineTask(ctrl->cgroup, ctrl->nbdpids[i]) < 0)
-+        if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->nbdpids[i]) < 0)
-             goto cleanup;
-     }
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index db14d322f5..c21586fa12 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -2538,7 +2538,7 @@ qemuProcessSetupPid(virDomainObjPtr vm,
-             goto cleanup;
- 
-         /* Move the thread to the sub dir */
--        if (virCgroupAddTask(cgroup, pid) < 0)
-+        if (virCgroupAddProcess(cgroup, pid) < 0)
-             goto cleanup;
- 
-     }
-@@ -2776,7 +2776,7 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm)
-     }
- 
-     if (priv->cgroup &&
--        virCgroupAddMachineTask(priv->cgroup, cpid) < 0)
-+        virCgroupAddMachineProcess(priv->cgroup, cpid) < 0)
-         goto cleanup;
- 
-     if (qemuSecurityDomainSetPathLabel(driver, vm, socketPath, true) < 0)
-diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
-index 278b262c48..c64114feac 100644
---- a/src/qemu/qemu_tpm.c
-+++ b/src/qemu/qemu_tpm.c
-@@ -905,7 +905,7 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
-                            _("Could not get process id of swtpm"));
-             goto cleanup;
-         }
--        if (virCgroupAddTask(cgroup, pid) < 0)
-+        if (virCgroupAddProcess(cgroup, pid) < 0)
-             goto cleanup;
-         break;
-     case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 2328957818..cf510fb019 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -1183,35 +1183,35 @@ virCgroupAddTaskInternal(virCgroupPtr group, pid_t pid, bool withSystemd)
- }
- 
- /**
-- * virCgroupAddTask:
-+ * virCgroupAddProcess:
-  *
-- * @group: The cgroup to add a task to
-- * @pid: The pid of the task to add
-+ * @group: The cgroup to add a process to
-+ * @pid: The pid of the process to add
-  *
-- * Will add the task to all controllers, except the
-+ * Will add the process to all controllers, except the
-  * systemd unit controller.
-  *
-  * Returns: 0 on success, -1 on error
-  */
- int
--virCgroupAddTask(virCgroupPtr group, pid_t pid)
-+virCgroupAddProcess(virCgroupPtr group, pid_t pid)
- {
-     return virCgroupAddTaskInternal(group, pid, false);
- }
- 
- /**
-- * virCgroupAddMachineTask:
-+ * virCgroupAddMachineProcess:
-  *
-- * @group: The cgroup to add a task to
-- * @pid: The pid of the task to add
-+ * @group: The cgroup to add a process to
-+ * @pid: The pid of the process to add
-  *
-- * Will add the task to all controllers, including the
-+ * Will add the process to all controllers, including the
-  * systemd unit controller.
-  *
-  * Returns: 0 on success, -1 on error
-  */
- int
--virCgroupAddMachineTask(virCgroupPtr group, pid_t pid)
-+virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid)
- {
-     return virCgroupAddTaskInternal(group, pid, true);
- }
-@@ -1592,7 +1592,7 @@ virCgroupNewMachineSystemd(const char *name,
-         goto error;
-     }
- 
--    if (virCgroupAddTask(*group, pidleader) < 0)
-+    if (virCgroupAddProcess(*group, pidleader) < 0)
-         goto error;
- 
-     return 0;
-@@ -1648,7 +1648,7 @@ virCgroupNewMachineManual(const char *name,
-                                     group) < 0)
-         goto cleanup;
- 
--    if (virCgroupAddTask(*group, pidleader) < 0) {
-+    if (virCgroupAddProcess(*group, pidleader) < 0) {
-         virErrorPtr saved = virSaveLastError();
-         virCgroupRemove(*group);
-         virCgroupFree(group);
-@@ -4198,8 +4198,8 @@ virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED,
- 
- 
- int
--virCgroupAddTask(virCgroupPtr group ATTRIBUTE_UNUSED,
--                 pid_t pid ATTRIBUTE_UNUSED)
-+virCgroupAddProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
-+                    pid_t pid ATTRIBUTE_UNUSED)
- {
-     virReportSystemError(ENXIO, "%s",
-                          _("Control groups not supported on this platform"));
-@@ -4208,8 +4208,8 @@ virCgroupAddTask(virCgroupPtr group ATTRIBUTE_UNUSED,
- 
- 
- int
--virCgroupAddMachineTask(virCgroupPtr group ATTRIBUTE_UNUSED,
--                        pid_t pid ATTRIBUTE_UNUSED)
-+virCgroupAddMachineProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
-+                           pid_t pid ATTRIBUTE_UNUSED)
- {
-     virReportSystemError(ENXIO, "%s",
-                          _("Control groups not supported on this platform"));
-diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index ee3b7c7222..bbd4c2ed57 100644
---- a/src/util/vircgroup.h
-+++ b/src/util/vircgroup.h
-@@ -118,8 +118,8 @@ int virCgroupPathOfController(virCgroupPtr group,
-                               const char *key,
-                               char **path);
- 
--int virCgroupAddTask(virCgroupPtr group, pid_t pid);
--int virCgroupAddMachineTask(virCgroupPtr group, pid_t pid);
-+int virCgroupAddProcess(virCgroupPtr group, pid_t pid);
-+int virCgroupAddMachineProcess(virCgroupPtr group, pid_t pid);
- 
- int virCgroupSetBlkioWeight(virCgroupPtr group, unsigned int weight);
- int virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroup-rename-virCgroupController-into-virCgroupV1Controller.patch b/SOURCES/libvirt-vircgroup-rename-virCgroupController-into-virCgroupV1Controller.patch
deleted file mode 100644
index a6ed638..0000000
--- a/SOURCES/libvirt-vircgroup-rename-virCgroupController-into-virCgroupV1Controller.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 648fecd5f67da4d118632251365e5dd93d987d3c Mon Sep 17 00:00:00 2001
-Message-Id: <648fecd5f67da4d118632251365e5dd93d987d3c@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:06 +0200
-Subject: [PATCH] vircgroup: rename virCgroupController into
- virCgroupV1Controller
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit bebf732cfae2c1786cb92e7ba3217c551543e3a9)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <4f23fb7e55cf80372867783a87c95cac02653a94.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgrouppriv.h | 8 ++++----
- src/util/vircgroupv1.c   | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index 38c911e8ed..ee6aeedbb5 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -32,7 +32,7 @@
- # include "vircgroup.h"
- # include "vircgroupbackend.h"
- 
--struct _virCgroupController {
-+struct _virCgroupV1Controller {
-     int type;
-     char *mountPoint;
-     /* If mountPoint holds several controllers co-mounted,
-@@ -42,15 +42,15 @@ struct _virCgroupController {
-     char *linkPoint;
-     char *placement;
- };
--typedef struct _virCgroupController virCgroupController;
--typedef virCgroupController *virCgroupControllerPtr;
-+typedef struct _virCgroupV1Controller virCgroupV1Controller;
-+typedef virCgroupV1Controller *virCgroupV1ControllerPtr;
- 
- struct _virCgroup {
-     char *path;
- 
-     virCgroupBackendPtr backend;
- 
--    virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
-+    virCgroupV1Controller controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
- int virCgroupSetValueStr(virCgroupPtr group,
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 54e7d6ea9a..0ba8757348 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -225,7 +225,7 @@ virCgroupV1CopyPlacement(virCgroupPtr group,
- static int
- virCgroupV1ResolveMountLink(const char *mntDir,
-                             const char *typeStr,
--                            virCgroupControllerPtr controller)
-+                            virCgroupV1ControllerPtr controller)
- {
-     VIR_AUTOFREE(char *) linkSrc = NULL;
-     VIR_AUTOFREE(char *) tmp = NULL;
-@@ -320,7 +320,7 @@ virCgroupV1DetectMounts(virCgroupPtr group,
-              * once. We need to save the results of the last one,
-              * and we need to be careful to release the memory used
-              * by previous processing. */
--            virCgroupControllerPtr controller = &group->controllers[i];
-+            virCgroupV1ControllerPtr controller = &group->controllers[i];
- 
-             VIR_FREE(controller->mountPoint);
-             VIR_FREE(controller->linkPoint);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupmock-add-support-to-test-cgroup-v2.patch b/SOURCES/libvirt-vircgroupmock-add-support-to-test-cgroup-v2.patch
deleted file mode 100644
index 55ae3fc..0000000
--- a/SOURCES/libvirt-vircgroupmock-add-support-to-test-cgroup-v2.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-From 5b4d8244ee6361111903a956843b03739f006b4a Mon Sep 17 00:00:00 2001
-Message-Id: <5b4d8244ee6361111903a956843b03739f006b4a@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:55 +0200
-Subject: [PATCH] vircgroupmock: add support to test cgroup v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We need to create the cgroup v2 sysfs the same way as we do for
-cgroup v1.
-
-This introduces new VIR_CGROUP_MOCK_MODE env variable which will
-configure which cgroup mode each test requires.  There are three
-different modes:
-
-    - legacy: only cgroup v1 is available and it's the default mode
-    - hybrid: both cgroup v1 and cgroup v2 are available and have some
-        controllers
-    - unified: only cgroup v2 is available
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 61ff6021d842a3baf2f6cbc3f37dd272f6c86563)
-
-Conflicts:
-    src/util/vircgroupv2.c: missing commit c0abcca417
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <26937fa61f83f373ff46d4a7d6cc8cb2dfd3c66d.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupmock.c | 162 ++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 147 insertions(+), 15 deletions(-)
-
-diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
-index fcc00a7a7b..2041b1e970 100644
---- a/tests/vircgroupmock.c
-+++ b/tests/vircgroupmock.c
-@@ -36,6 +36,7 @@
- 
- # include <stdarg.h>
- # include "testutilslxc.h"
-+# include "viralloc.h"
- # include "virstring.h"
- # include "virfile.h"
- 
-@@ -107,7 +108,8 @@ static int make_file(const char *path,
-     return ret;
- }
- 
--static int make_controller(const char *path, mode_t mode)
-+
-+static int make_controller_v1(const char *path, mode_t mode)
- {
-     int ret = -1;
-     const char *controller;
-@@ -233,11 +235,86 @@ static int make_controller(const char *path, mode_t mode)
-         goto cleanup;
-     }
- 
-+# undef MAKE_FILE
-+
-     ret = 0;
-  cleanup:
-     return ret;
- }
- 
-+
-+static int make_controller_v2(const char *path, mode_t mode)
-+{
-+    if (!STRPREFIX(path, fakesysfscgroupdir)) {
-+        errno = EINVAL;
-+        return -1;
-+    }
-+
-+    if (real_mkdir(path, mode) < 0 && errno != EEXIST)
-+        return -1;
-+
-+# define MAKE_FILE(name, value) \
-+    do { \
-+        if (make_file(path, name, value) < 0) \
-+            return -1; \
-+    } while (0)
-+
-+    MAKE_FILE("cgroup.controllers", "cpu io memory\n");
-+    MAKE_FILE("cgroup.subtree_control", "");
-+    MAKE_FILE("cgroup.type", "domain\n");
-+    MAKE_FILE("cpu.max", "max 100000\n");
-+    MAKE_FILE("cpu.stat",
-+              "usage_usec 0\n"
-+              "user_usec 0\n"
-+              "system_usec 0\n"
-+              "nr_periods 0\n"
-+              "nr_throttled 0\n"
-+              "throttled_usec 0\n");
-+    MAKE_FILE("cpu.weight", "100\n");
-+    MAKE_FILE("memory.current", "1455321088\n");
-+    MAKE_FILE("memory.high", "max\n");
-+    MAKE_FILE("memory.max", "max\n");
-+    MAKE_FILE("memory.stat",
-+              "anon 0\n"
-+              "file 0\n"
-+              "kernel_stack 0\n"
-+              "slab 0\n"
-+              "sock 0\n"
-+              "shmem 0\n"
-+              "file_mapped 0\n"
-+              "file_dirty 0\n"
-+              "file_writeback 0\n"
-+              "inactive_anon 0\n"
-+              "active_anon 0\n"
-+              "inactive_file 0\n"
-+              "active_file 0\n"
-+              "unevictable 0\n"
-+              "slab_reclaimable 0\n"
-+              "slab_unreclaimable 0\n"
-+              "pgfault 0\n"
-+              "pgmajfault 0\n"
-+              "pgrefill 0\n"
-+              "pgscan 0\n"
-+              "pgsteal 0\n"
-+              "pgactivate 0\n"
-+              "pgdeactivate 0\n"
-+              "pglazyfree 0\n"
-+              "pglazyfreed 0\n"
-+              "workingset_refault 0\n"
-+              "workingset_activate 0\n"
-+              "workingset_nodereclaim 0\n");
-+    MAKE_FILE("memory.swap.current", "0\n");
-+    MAKE_FILE("memory.swap.max", "max\n");
-+    MAKE_FILE("io.stat", "8:0 rbytes=26828800 wbytes=77062144 rios=2256 wios=7849 dbytes=0 dios=0\n");
-+    MAKE_FILE("io.max", "");
-+    MAKE_FILE("io.weight", "default 100\n");
-+
-+# undef MAKE_FILE
-+
-+    return 0;
-+}
-+
-+
- static void init_syms(void)
- {
-     if (real_fopen)
-@@ -251,16 +328,64 @@ static void init_syms(void)
-     VIR_MOCK_REAL_INIT(open);
- }
- 
-+
-+static int make_controller(const char *path, mode_t mode)
-+{
-+    const char *mock;
-+    bool unified = false;
-+    bool hybrid = false;
-+
-+    mock = getenv("VIR_CGROUP_MOCK_MODE");
-+    if (mock) {
-+        if (STREQ(mock, "unified")) {
-+            unified = true;
-+        } else if (STREQ(mock, "hybrid")) {
-+            hybrid = true;
-+        } else {
-+            fprintf(stderr, "invalid mode '%s'\n", mock);
-+            abort();
-+        }
-+    }
-+
-+    if (unified || (hybrid && strstr(path, "unified"))) {
-+        return make_controller_v2(path, mode);
-+    } else {
-+        return make_controller_v1(path, mode);
-+    }
-+}
-+
-+
- static void init_sysfs(void)
- {
--    if (fakerootdir && fakesysfscgroupdir)
--        return;
-+    const char *mock;
-+    char *newfakerootdir;
-+    bool unified = false;
-+    bool hybrid = false;
- 
--    if (!(fakerootdir = getenv("LIBVIRT_FAKE_ROOT_DIR"))) {
-+    if (!(newfakerootdir = getenv("LIBVIRT_FAKE_ROOT_DIR"))) {
-         fprintf(stderr, "Missing LIBVIRT_FAKE_ROOT_DIR env variable\n");
-         abort();
-     }
- 
-+    if (fakerootdir && STREQ(fakerootdir, newfakerootdir))
-+        return;
-+
-+    fakerootdir = newfakerootdir;
-+
-+    mock = getenv("VIR_CGROUP_MOCK_MODE");
-+    if (mock) {
-+        if (STREQ(mock, "unified")) {
-+            unified = true;
-+        } else if (STREQ(mock, "hybrid")) {
-+            hybrid = true;
-+        } else {
-+            fprintf(stderr, "invalid mode '%s'\n", mock);
-+            abort();
-+        }
-+    }
-+
-+    VIR_FREE(fakesysfscgroupdir);
-+
-     if (virAsprintfQuiet(&fakesysfscgroupdir, "%s%s",
-                          fakerootdir, SYSFS_CGROUP_PREFIX) < 0)
-         abort();
-@@ -283,18 +408,25 @@ static void init_sysfs(void)
-         free(path); \
-     } while (0)
- 
--    MAKE_CONTROLLER("cpu");
--    MAKE_CONTROLLER("cpuacct");
--    MAKE_CONTROLLER("cpu,cpuacct");
--    MAKE_CONTROLLER("cpu,cpuacct/system");
--    MAKE_CONTROLLER("cpuset");
--    MAKE_CONTROLLER("blkio");
--    MAKE_CONTROLLER("memory");
--    MAKE_CONTROLLER("freezer");
-+    if (unified) {
-+        MAKE_CONTROLLER("");
-+    } else if (hybrid) {
-+        MAKE_CONTROLLER("unified");
-+        MAKE_CONTROLLER("cpuset");
-+        MAKE_CONTROLLER("freezer");
-+    } else {
-+        MAKE_CONTROLLER("cpu");
-+        MAKE_CONTROLLER("cpuacct");
-+        MAKE_CONTROLLER("cpu,cpuacct");
-+        MAKE_CONTROLLER("cpuset");
-+        MAKE_CONTROLLER("blkio");
-+        MAKE_CONTROLLER("memory");
-+        MAKE_CONTROLLER("freezer");
- 
--    if (make_file(fakesysfscgroupdir,
--                  SYSFS_CPU_PRESENT_MOCKED, "8-23,48-159\n") < 0)
--        abort();
-+        if (make_file(fakesysfscgroupdir,
-+                      SYSFS_CPU_PRESENT_MOCKED, "8-23,48-159\n") < 0)
-+            abort();
-+    }
- }
- 
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupmock-change-cgroup-prefix.patch b/SOURCES/libvirt-vircgroupmock-change-cgroup-prefix.patch
deleted file mode 100644
index 82784b1..0000000
--- a/SOURCES/libvirt-vircgroupmock-change-cgroup-prefix.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From bbb7b7a4cb906bdeaf46ab664ce67a0a27b9ef5d Mon Sep 17 00:00:00 2001
-Message-Id: <bbb7b7a4cb906bdeaf46ab664ce67a0a27b9ef5d@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:54 +0200
-Subject: [PATCH] vircgroupmock: change cgroup prefix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove the trailing '/' from prefix.  This change is required in order
-to introduce tests for unified cgroups.  They are usually mounted in
-'/sys/fs/cgroup'.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 9bd1979e37ca703f8e29c2dfca83a9cd04af2982)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <cdff08c2966b44ad1c3c7d166fc39c20f4bd0ba2.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupmock.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
-index 3afe2fe192..fcc00a7a7b 100644
---- a/tests/vircgroupmock.c
-+++ b/tests/vircgroupmock.c
-@@ -58,7 +58,7 @@ const char *fakedevicedir0 = FAKEDEVDIR0;
- const char *fakedevicedir1 = FAKEDEVDIR1;
- 
- 
--# define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup/"
-+# define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup"
- # define SYSFS_CPU_PRESENT "/sys/devices/system/cpu/present"
- # define SYSFS_CPU_PRESENT_MOCKED "devices_system_cpu_present"
- 
-@@ -356,7 +356,7 @@ int access(const char *path, int mode)
-     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
-         char *newpath;
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
-@@ -388,7 +388,7 @@ int __lxstat(int ver, const char *path, struct stat *sb)
-     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
-         char *newpath;
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
-@@ -419,7 +419,7 @@ int lstat(const char *path, struct stat *sb)
-     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
-         char *newpath;
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
-@@ -450,7 +450,7 @@ int __xstat(int ver, const char *path, struct stat *sb)
-     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
-         char *newpath;
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
-@@ -489,7 +489,7 @@ int stat(const char *path, struct stat *sb)
-         }
-     } else if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
-@@ -521,7 +521,7 @@ int mkdir(const char *path, mode_t mode)
-     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
-         char *newpath;
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
-@@ -554,7 +554,7 @@ int open(const char *path, int flags, ...)
- 
-     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
-         init_sysfs();
--        if (asprintf(&newpath, "%s/%s",
-+        if (asprintf(&newpath, "%s%s",
-                      fakesysfscgroupdir,
-                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
-             errno = ENOMEM;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupmock-cleanup-unused-cgroup-files.patch b/SOURCES/libvirt-vircgroupmock-cleanup-unused-cgroup-files.patch
deleted file mode 100644
index 8a2d326..0000000
--- a/SOURCES/libvirt-vircgroupmock-cleanup-unused-cgroup-files.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 0542ea82913e75374a5efb0c7dde147036d32d20 Mon Sep 17 00:00:00 2001
-Message-Id: <0542ea82913e75374a5efb0c7dde147036d32d20@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:17 +0200
-Subject: [PATCH] vircgroupmock: cleanup unused cgroup files
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit f9085cf702f5fe5bf786045b9cc95365ab4e628b)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <efa74d1882ab59aca1379f2a95a568eb0cb02134.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupmock.c | 73 -------------------------------------------
- 1 file changed, 73 deletions(-)
-
-diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
-index bae8304f6c..cd5422dcba 100644
---- a/tests/vircgroupmock.c
-+++ b/tests/vircgroupmock.c
-@@ -214,13 +214,7 @@ static int make_controller(const char *path, mode_t mode)
-     if (STRPREFIX(controller, "cpu,cpuacct")) {
-         MAKE_FILE("cpu.cfs_period_us", "100000\n");
-         MAKE_FILE("cpu.cfs_quota_us", "-1\n");
--        MAKE_FILE("cpu.rt_period_us", "1000000\n");
--        MAKE_FILE("cpu.rt_runtime_us", "950000\n");
-         MAKE_FILE("cpu.shares", "1024\n");
--        MAKE_FILE("cpu.stat",
--                  "nr_periods 0\n"
--                  "nr_throttled 0\n"
--                  "throttled_time 0\n");
-         MAKE_FILE("cpuacct.stat",
-                   "user 216687025\n"
-                   "system 43421396\n");
-@@ -235,46 +229,19 @@ static int make_controller(const char *path, mode_t mode)
-                   "709566900 0 0 0 0 0 0 0 444777342 0 0 0 0 0 0 0 "
-                   "5683512916 0 0 0 0 0 0 0 635751356 0 0 0 0 0 0 0\n");
-     } else if (STRPREFIX(controller, "cpuset")) {
--        MAKE_FILE("cpuset.cpu_exclusive", "1\n");
-         if (STREQ(controller, "cpuset"))
-             MAKE_FILE("cpuset.cpus", "0-1");
-         else
-             MAKE_FILE("cpuset.cpus", ""); /* Values don't inherit */
--        MAKE_FILE("cpuset.mem_exclusive", "1\n");
--        MAKE_FILE("cpuset.mem_hardwall", "0\n");
-         MAKE_FILE("cpuset.memory_migrate", "0\n");
--        MAKE_FILE("cpuset.memory_pressure", "0\n");
--        MAKE_FILE("cpuset.memory_pressure_enabled", "0\n");
--        MAKE_FILE("cpuset.memory_spread_page", "0\n");
--        MAKE_FILE("cpuset.memory_spread_slab", "0\n");
-         if (STREQ(controller, "cpuset"))
-             MAKE_FILE("cpuset.mems", "0");
-         else
-             MAKE_FILE("cpuset.mems", ""); /* Values don't inherit */
--        MAKE_FILE("cpuset.sched_load_balance", "1\n");
--        MAKE_FILE("cpuset.sched_relax_domain_level", "-1\n");
-     } else if (STRPREFIX(controller, "memory")) {
--        MAKE_FILE("memory.failcnt", "0\n");
--        MAKE_FILE("memory.force_empty", ""); /* Write only */
--        MAKE_FILE("memory.kmem.tcp.failcnt", "0\n");
--        MAKE_FILE("memory.kmem.tcp.limit_in_bytes", "9223372036854775807\n");
--        MAKE_FILE("memory.kmem.tcp.max_usage_in_bytes", "0\n");
--        MAKE_FILE("memory.kmem.tcp.usage_in_bytes", "16384\n");
-         MAKE_FILE("memory.limit_in_bytes", "9223372036854775807\n");
--        MAKE_FILE("memory.max_usage_in_bytes", "0\n");
--        MAKE_FILE("memory.memsw.failcnt", ""); /* Not supported */
-         MAKE_FILE("memory.memsw.limit_in_bytes", ""); /* Not supported */
--        MAKE_FILE("memory.memsw.max_usage_in_bytes", ""); /* Not supported */
-         MAKE_FILE("memory.memsw.usage_in_bytes", ""); /* Not supported */
--        MAKE_FILE("memory.move_charge_at_immigrate", "0\n");
--        MAKE_FILE("memory.numa_stat",
--                  "total=367664 N0=367664\n"
--                  "file=314764 N0=314764\n"
--                  "anon=51999 N0=51999\n"
--                  "unevictable=901 N0=901\n");
--        MAKE_FILE("memory.oom_control",
--                  "oom_kill_disable 0\n"
--                  "under_oom 0\n");
-         MAKE_FILE("memory.soft_limit_in_bytes", "9223372036854775807\n");
-         MAKE_FILE("memory.stat",
-                   "cache 1336619008\n"
-@@ -306,50 +273,11 @@ static int make_controller(const char *path, mode_t mode)
-                   "recent_rotated_file 2547948\n"
-                   "recent_scanned_anon 113796164\n"
-                   "recent_scanned_file 8199863\n");
--        MAKE_FILE("memory.swappiness", "60\n");
-         MAKE_FILE("memory.usage_in_bytes", "1455321088\n");
-         MAKE_FILE("memory.use_hierarchy", "0\n");
-     } else if (STRPREFIX(controller, "freezer")) {
-         MAKE_FILE("freezer.state", "THAWED");
-     } else if (STRPREFIX(controller, "blkio")) {
--        MAKE_FILE("blkio.io_merged",
--                  "8:0 Read 1100949\n"
--                  "8:0 Write 2248076\n"
--                  "8:0 Sync 63063\n"
--                  "8:0 Async 3285962\n"
--                  "8:0 Total 3349025\n");
--        MAKE_FILE("blkio.io_queued",
--                  "8:0 Read 0\n"
--                  "8:0 Write 0\n"
--                  "8:0 Sync 0\n"
--                  "8:0 Async 0\n"
--                  "8:0 Total 0\n");
--        MAKE_FILE("blkio.io_service_bytes",
--                  "8:0 Read 59542078464\n"
--                  "8:0 Write 397369182208\n"
--                  "8:0 Sync 234080922624\n"
--                  "8:0 Async 222830338048\n"
--                  "8:0 Total 456911260672\n");
--        MAKE_FILE("blkio.io_serviced",
--                  "8:0 Read 3402504\n"
--                  "8:0 Write 14966516\n"
--                  "8:0 Sync 12064031\n"
--                  "8:0 Async 6304989\n"
--                  "8:0 Total 18369020\n");
--        MAKE_FILE("blkio.io_service_time",
--                  "8:0 Read 10747537542349\n"
--                  "8:0 Write 9200028590575\n"
--                  "8:0 Sync 6449319855381\n"
--                  "8:0 Async 13498246277543\n"
--                  "8:0 Total 19947566132924\n");
--        MAKE_FILE("blkio.io_wait_time",
--                  "8:0 Read 14687514824889\n"
--                  "8:0 Write 357748452187691\n"
--                  "8:0 Sync 55296974349413\n"
--                  "8:0 Async 317138992663167\n"
--                  "8:0 Total 372435967012580\n");
--        MAKE_FILE("blkio.reset_stats", ""); /* Write only */
--        MAKE_FILE("blkio.sectors", "8:0 892404806\n");
-         MAKE_FILE("blkio.throttle.io_service_bytes",
-                   "8:0 Read 59542107136\n"
-                   "8:0 Write 411440480256\n"
-@@ -376,7 +304,6 @@ static int make_controller(const char *path, mode_t mode)
-         MAKE_FILE("blkio.throttle.read_iops_device", "");
-         MAKE_FILE("blkio.throttle.write_bps_device", "");
-         MAKE_FILE("blkio.throttle.write_iops_device", "");
--        MAKE_FILE("blkio.time", "8:0 61019089\n");
-         MAKE_FILE("blkio.weight", "1000\n");
-         MAKE_FILE("blkio.weight_device", "");
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupmock-rewrite-cgroup-fopen-mocking.patch b/SOURCES/libvirt-vircgroupmock-rewrite-cgroup-fopen-mocking.patch
deleted file mode 100644
index 2abb06c..0000000
--- a/SOURCES/libvirt-vircgroupmock-rewrite-cgroup-fopen-mocking.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From d323cd99b256b368c37f0a36eef8b3b2d6213346 Mon Sep 17 00:00:00 2001
-Message-Id: <d323cd99b256b368c37f0a36eef8b3b2d6213346@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:18 +0200
-Subject: [PATCH] vircgroupmock: rewrite cgroup fopen mocking
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Move all the cgroup data into separate files out of vircgroupmock.c
-and rework the fopen function to load data from files.  This will
-make it easier to add more test cases.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 5cf1b25708328ad4006572801d0829548418cfe7)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <efee26b41a026de90498f4abd724f1c7d85d6731.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupdata/all-in-one.cgroups     |   7 ++
- tests/vircgroupdata/all-in-one.mounts      |   2 +-
- tests/vircgroupdata/all-in-one.parsed      |  12 +-
- tests/vircgroupdata/all-in-one.self.cgroup |   1 +
- tests/vircgroupdata/logind.cgroups         |  10 ++
- tests/vircgroupdata/logind.mounts          |   2 +
- tests/vircgroupdata/logind.self.cgroup     |   1 +
- tests/vircgroupdata/systemd.cgroups        |   8 ++
- tests/vircgroupdata/systemd.mounts         |  11 ++
- tests/vircgroupdata/systemd.self.cgroup    |   6 +
- tests/vircgroupmock.c                      | 136 +++------------------
- tests/vircgrouptest.c                      |  10 +-
- 12 files changed, 79 insertions(+), 127 deletions(-)
- create mode 100644 tests/vircgroupdata/all-in-one.cgroups
- create mode 100644 tests/vircgroupdata/all-in-one.self.cgroup
- create mode 100644 tests/vircgroupdata/logind.cgroups
- create mode 100644 tests/vircgroupdata/logind.mounts
- create mode 100644 tests/vircgroupdata/logind.self.cgroup
- create mode 100644 tests/vircgroupdata/systemd.cgroups
- create mode 100644 tests/vircgroupdata/systemd.mounts
- create mode 100644 tests/vircgroupdata/systemd.self.cgroup
-
-diff --git a/tests/vircgroupdata/all-in-one.cgroups b/tests/vircgroupdata/all-in-one.cgroups
-new file mode 100644
-index 0000000000..7208e5a0b6
---- /dev/null
-+++ b/tests/vircgroupdata/all-in-one.cgroups
-@@ -0,0 +1,7 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset   6   1  1
-+cpu      6   1  1
-+cpuacct  6   1  1
-+memory   6   1  1
-+devices  6   1  1
-+blkio    6   1  1
-diff --git a/tests/vircgroupdata/all-in-one.mounts b/tests/vircgroupdata/all-in-one.mounts
-index 14093b961c..76c579ff69 100644
---- a/tests/vircgroupdata/all-in-one.mounts
-+++ b/tests/vircgroupdata/all-in-one.mounts
-@@ -4,4 +4,4 @@ proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
- udev /dev devtmpfs rw,relatime,size=16458560k,nr_inodes=4114640,mode=755 0 0
- devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
- nfsd /proc/fs/nfsd nfsd rw,relatime 0 0
--cgroup /sys/fs/cgroup cgroup rw,relatime,blkio,devices,memory,cpuacct,cpu,cpuset 0 0
-+cgroup /not/really/sys/fs/cgroup cgroup rw,relatime,blkio,devices,memory,cpuacct,cpu,cpuset 0 0
-diff --git a/tests/vircgroupdata/all-in-one.parsed b/tests/vircgroupdata/all-in-one.parsed
-index 2701778fea..d703d08fb9 100644
---- a/tests/vircgroupdata/all-in-one.parsed
-+++ b/tests/vircgroupdata/all-in-one.parsed
-@@ -1,10 +1,10 @@
--cpu          /sys/fs/cgroup
--cpuacct      /sys/fs/cgroup
--cpuset       /sys/fs/cgroup
--memory       /sys/fs/cgroup
--devices      /sys/fs/cgroup
-+cpu          /not/really/sys/fs/cgroup
-+cpuacct      /not/really/sys/fs/cgroup
-+cpuset       /not/really/sys/fs/cgroup
-+memory       /not/really/sys/fs/cgroup
-+devices      /not/really/sys/fs/cgroup
- freezer      <null>
--blkio        /sys/fs/cgroup
-+blkio        /not/really/sys/fs/cgroup
- net_cls      <null>
- perf_event   <null>
- name=systemd <null>
-diff --git a/tests/vircgroupdata/all-in-one.self.cgroup b/tests/vircgroupdata/all-in-one.self.cgroup
-new file mode 100644
-index 0000000000..cf237502e9
---- /dev/null
-+++ b/tests/vircgroupdata/all-in-one.self.cgroup
-@@ -0,0 +1 @@
-+6:blkio,devices,memory,cpuacct,cpu,cpuset:/
-diff --git a/tests/vircgroupdata/logind.cgroups b/tests/vircgroupdata/logind.cgroups
-new file mode 100644
-index 0000000000..9d46f130e0
---- /dev/null
-+++ b/tests/vircgroupdata/logind.cgroups
-@@ -0,0 +1,10 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset    0  1  1
-+cpu       0  1  1
-+cpuacct   0  1  1
-+memory    0  1  0
-+devices   0  1  1
-+freezer   0  1  1
-+net_cls   0  1  1
-+blkio     0  1  1
-+perf_event  0  1  1
-diff --git a/tests/vircgroupdata/logind.mounts b/tests/vircgroupdata/logind.mounts
-new file mode 100644
-index 0000000000..3ab908aee9
---- /dev/null
-+++ b/tests/vircgroupdata/logind.mounts
-@@ -0,0 +1,2 @@
-+none /not/really/sys/fs/cgroup tmpfs rw,rootcontext=system_u:object_r:sysfs_t:s0,seclabel,relatime,size=4k,mode=755 0 0
-+systemd /not/really/sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,name=systemd 0 0
-diff --git a/tests/vircgroupdata/logind.self.cgroup b/tests/vircgroupdata/logind.self.cgroup
-new file mode 100644
-index 0000000000..31e0cfe8eb
---- /dev/null
-+++ b/tests/vircgroupdata/logind.self.cgroup
-@@ -0,0 +1 @@
-+0:name=systemd:/
-diff --git a/tests/vircgroupdata/systemd.cgroups b/tests/vircgroupdata/systemd.cgroups
-new file mode 100644
-index 0000000000..d32dfab222
---- /dev/null
-+++ b/tests/vircgroupdata/systemd.cgroups
-@@ -0,0 +1,8 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset  2       4       1
-+cpu     3       48      1
-+cpuacct 3       48      1
-+memory  4       4       1
-+devices 5       4       1
-+freezer 6       4       1
-+blkio   8       4       1
-diff --git a/tests/vircgroupdata/systemd.mounts b/tests/vircgroupdata/systemd.mounts
-new file mode 100644
-index 0000000000..75572c86f7
---- /dev/null
-+++ b/tests/vircgroupdata/systemd.mounts
-@@ -0,0 +1,11 @@
-+rootfs / rootfs rw 0 0
-+tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0
-+tmpfs /not/really/sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,mode=755 0 0
-+cgroup /not/really/sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0
-+cgroup /not/really/sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+cgroup /not/really/sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0
-+cgroup /not/really/sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-+cgroup /not/really/sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
-+cgroup /not/really/sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
-+/dev/sda1 /boot ext4 rw,seclabel,relatime,data=ordered 0 0
-+tmpfs /tmp tmpfs rw,seclabel,relatime,size=1024000k 0 0
-diff --git a/tests/vircgroupdata/systemd.self.cgroup b/tests/vircgroupdata/systemd.self.cgroup
-new file mode 100644
-index 0000000000..2b95af79d2
---- /dev/null
-+++ b/tests/vircgroupdata/systemd.self.cgroup
-@@ -0,0 +1,6 @@
-+115:memory:/
-+8:blkio:/
-+6:freezer:/
-+3:cpuacct,cpu:/system
-+2:cpuset:/
-+1:name=systemd:/user/berrange/123
-diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
-index cd5422dcba..3afe2fe192 100644
---- a/tests/vircgroupmock.c
-+++ b/tests/vircgroupmock.c
-@@ -81,85 +81,6 @@ const char *fakedevicedir1 = FAKEDEVDIR1;
-  * of files beneath it
-  */
- 
--/*
-- * Intentionally missing the 'devices' mount.
-- * Co-mounting cpu & cpuacct controllers
-- * An anonymous controller for systemd
-- */
--const char *procmounts =
--    "rootfs / rootfs rw 0 0\n"
--    "tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0\n"
--    "tmpfs /not/really/sys/fs/cgroup tmpfs rw,seclabel,nosuid,nodev,noexec,mode=755 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0\n"
--    "/dev/sda1 /boot ext4 rw,seclabel,relatime,data=ordered 0 0\n"
--    "tmpfs /tmp tmpfs rw,seclabel,relatime,size=1024000k 0 0\n";
--
--const char *procselfcgroups =
--    "115:memory:/\n"
--    "8:blkio:/\n"
--    "6:freezer:/\n"
--    "3:cpuacct,cpu:/system\n"
--    "2:cpuset:/\n"
--    "1:name=systemd:/user/berrange/123\n";
--
--const char *proccgroups =
--    "#subsys_name    hierarchy       num_cgroups     enabled\n"
--    "cpuset  2       4       1\n"
--    "cpu     3       48      1\n"
--    "cpuacct 3       48      1\n"
--    "memory  4       4       1\n"
--    "devices 5       4       1\n"
--    "freezer 6       4       1\n"
--    "blkio   8       4       1\n";
--
--
--const char *procmountsallinone =
--    "rootfs / rootfs rw 0 0\n"
--    "sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0\n"
--    "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0\n"
--    "udev /dev devtmpfs rw,relatime,size=16458560k,nr_inodes=4114640,mode=755 0 0\n"
--    "devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0\n"
--    "nfsd /proc/fs/nfsd nfsd rw,relatime 0 0\n"
--    "cgroup /not/really/sys/fs/cgroup cgroup rw,relatime,blkio,devices,memory,cpuacct,cpu,cpuset 0 0\n";
--
--const char *procselfcgroupsallinone =
--    "6:blkio,devices,memory,cpuacct,cpu,cpuset:/";
--
--const char *proccgroupsallinone =
--    "#subsys_name    hierarchy       num_cgroups     enabled\n"
--    "cpuset   6   1  1\n"
--    "cpu      6   1  1\n"
--    "cpuacct  6   1  1\n"
--    "memory   6   1  1\n"
--    "devices  6   1  1\n"
--    "blkio    6   1  1\n";
--
--const char *procmountslogind =
--    "none /not/really/sys/fs/cgroup tmpfs rw,rootcontext=system_u:object_r:sysfs_t:s0,seclabel,relatime,size=4k,mode=755 0 0\n"
--    "systemd /not/really/sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,name=systemd 0 0\n";
--
--const char *procselfcgroupslogind =
--    "1:name=systemd:/\n";
--
--const char *proccgroupslogind =
--    "#subsys_name    hierarchy       num_cgroups     enabled\n"
--    "cpuset    0  1  1\n"
--    "cpu       0  1  1\n"
--    "cpuacct   0  1  1\n"
--    "memory    0  1  0\n"
--    "devices   0  1  1\n"
--    "freezer   0  1  1\n"
--    "net_cls   0  1  1\n"
--    "blkio     0  1  1\n"
--    "perf_event  0  1  1\n";
--
--
--
- static int make_file(const char *path,
-                      const char *name,
-                      const char *value)
-@@ -379,29 +300,16 @@ static void init_sysfs(void)
- 
- FILE *fopen(const char *path, const char *mode)
- {
--    const char *mock;
--    bool allinone = false, logind = false;
--    init_syms();
-+    char *filepath = NULL;
-+    const char *type = NULL;
-+    FILE *rc = NULL;
-+    const char *filename = getenv("VIR_CGROUP_MOCK_FILENAME");
- 
--    mock = getenv("VIR_CGROUP_MOCK_MODE");
--    if (mock) {
--        if (STREQ(mock, "allinone"))
--            allinone = true;
--        else if (STREQ(mock, "logind"))
--            logind = true;
--    }
-+    init_syms();
- 
-     if (STREQ(path, "/proc/mounts")) {
-         if (STREQ(mode, "r")) {
--            if (allinone)
--                return fmemopen((void *)procmountsallinone,
--                                strlen(procmountsallinone) + 1, mode);
--            else if (logind)
--                return fmemopen((void *)procmountslogind,
--                                strlen(procmountslogind) + 1, mode);
--            else
--                return fmemopen((void *)procmounts,
--                                strlen(procmounts) + 1, mode);
-+            type = "mounts";
-         } else {
-             errno = EACCES;
-             return NULL;
-@@ -409,15 +317,7 @@ FILE *fopen(const char *path, const char *mode)
-     }
-     if (STREQ(path, "/proc/cgroups")) {
-         if (STREQ(mode, "r")) {
--            if (allinone)
--                return fmemopen((void *)proccgroupsallinone,
--                                strlen(proccgroupsallinone) + 1, mode);
--            else if (logind)
--                return fmemopen((void *)proccgroupslogind,
--                                strlen(proccgroupslogind) + 1, mode);
--            else
--                return fmemopen((void *)proccgroups,
--                                strlen(proccgroups) + 1, mode);
-+            type = "cgroups";
-         } else {
-             errno = EACCES;
-             return NULL;
-@@ -425,21 +325,25 @@ FILE *fopen(const char *path, const char *mode)
-     }
-     if (STREQ(path, "/proc/self/cgroup")) {
-         if (STREQ(mode, "r")) {
--            if (allinone)
--                return fmemopen((void *)procselfcgroupsallinone,
--                                strlen(procselfcgroupsallinone) + 1, mode);
--            else if (logind)
--                return fmemopen((void *)procselfcgroupslogind,
--                                strlen(procselfcgroupslogind) + 1, mode);
--            else
--                return fmemopen((void *)procselfcgroups,
--                                strlen(procselfcgroups) + 1, mode);
-+            type = "self.cgroup";
-         } else {
-             errno = EACCES;
-             return NULL;
-         }
-     }
- 
-+    if (type) {
-+        if (!filename)
-+            abort();
-+        if (virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s",
-+                             abs_srcdir, filename, type) < 0) {
-+            abort();
-+        }
-+        rc = real_fopen(filepath, mode);
-+        free(filepath);
-+        return rc;
-+    }
-+
-     return real_fopen(path, mode);
- }
- 
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index be50f3e73c..7968903cad 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -890,6 +890,7 @@ mymain(void)
-     DETECT_MOUNTS("no-cgroups");
-     DETECT_MOUNTS("kubevirt");
- 
-+    setenv("VIR_CGROUP_MOCK_FILENAME", "systemd", 1);
-     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
-         ret = -1;
- 
-@@ -925,20 +926,21 @@ mymain(void)
- 
-     if (virTestRun("virCgroupGetPercpuStats works", testCgroupGetPercpuStats, NULL) < 0)
-         ret = -1;
-+    unsetenv("VIR_CGROUP_MOCK_FILENAME");
- 
--    setenv("VIR_CGROUP_MOCK_MODE", "allinone", 1);
-+    setenv("VIR_CGROUP_MOCK_FILENAME", "all-in-one", 1);
-     if (virTestRun("New cgroup for self (allinone)", testCgroupNewForSelfAllInOne, NULL) < 0)
-         ret = -1;
-     if (virTestRun("Cgroup available", testCgroupAvailable, (void*)0x1) < 0)
-         ret = -1;
--    unsetenv("VIR_CGROUP_MOCK_MODE");
-+    unsetenv("VIR_CGROUP_MOCK_FILENAME");
- 
--    setenv("VIR_CGROUP_MOCK_MODE", "logind", 1);
-+    setenv("VIR_CGROUP_MOCK_FILENAME", "logind", 1);
-     if (virTestRun("New cgroup for self (logind)", testCgroupNewForSelfLogind, NULL) < 0)
-         ret = -1;
-     if (virTestRun("Cgroup available", testCgroupAvailable, (void*)0x0) < 0)
-         ret = -1;
--    unsetenv("VIR_CGROUP_MOCK_MODE");
-+    unsetenv("VIR_CGROUP_MOCK_FILENAME");
- 
-     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
-         virFileDeleteTree(fakerootdir);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-add-cgroup-v2-tests.patch b/SOURCES/libvirt-vircgrouptest-add-cgroup-v2-tests.patch
deleted file mode 100644
index 4d676e4..0000000
--- a/SOURCES/libvirt-vircgrouptest-add-cgroup-v2-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 8b85c2ad4afbad2998163ac61b376320b4f392b8 Mon Sep 17 00:00:00 2001
-Message-Id: <8b85c2ad4afbad2998163ac61b376320b4f392b8@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:01 +0200
-Subject: [PATCH] vircgrouptest: add cgroup v2 tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit edf59855cf9b78fc4dc95f4b2833d87188decc71)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5354c6c494c94b274e3b366188597ccd0828aefa.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgrouptest.c | 36 ++++++++++++++++++++++++++++++++----
- 1 file changed, 32 insertions(+), 4 deletions(-)
-
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 87f8fa7e67..3b844f0fbf 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -570,14 +570,35 @@ static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED)
- static int testCgroupNewForSelfLogind(const void *args ATTRIBUTE_UNUSED)
- {
-     virCgroupPtr cgroup = NULL;
--    int ret = -1;
- 
--    if (virCgroupNewSelf(&cgroup) == 0) {
--        fprintf(stderr, "Expected cgroup creation to fail.\n");
-+    if (virCgroupNewSelf(&cgroup) >= 0) {
-+        fprintf(stderr, "Expected to fail, only systemd cgroup available.\n");
-+        virCgroupFree(&cgroup);
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int testCgroupNewForSelfUnified(const void *args ATTRIBUTE_UNUSED)
-+{
-+    virCgroupPtr cgroup = NULL;
-+    int ret = -1;
-+    const char *empty[VIR_CGROUP_CONTROLLER_LAST] = { 0 };
-+    unsigned int controllers =
-+        (1 << VIR_CGROUP_CONTROLLER_CPU) |
-+        (1 << VIR_CGROUP_CONTROLLER_CPUACCT) |
-+        (1 << VIR_CGROUP_CONTROLLER_MEMORY) |
-+        (1 << VIR_CGROUP_CONTROLLER_BLKIO);
-+
-+    if (virCgroupNewSelf(&cgroup) < 0) {
-+        fprintf(stderr, "Cannot create cgroup for self\n");
-         goto cleanup;
-     }
- 
--    ret = 0;
-+    ret = validateCgroup(cgroup, "", empty, empty, empty,
-+                         "/not/really/sys/fs/cgroup", "/", controllers);
-  cleanup:
-     virCgroupFree(&cgroup);
-     return ret;
-@@ -994,7 +1015,14 @@ mymain(void)
-         ret = -1;
-     cleanupFakeFS(fakerootdir);
- 
-+    /* cgroup unified */
- 
-+    fakerootdir = initFakeFS("unified", "unified");
-+    if (virTestRun("New cgroup for self (unified)", testCgroupNewForSelfUnified, NULL) < 0)
-+        ret = -1;
-+    if (virTestRun("Cgroup available (unified)", testCgroupAvailable, (void*)0x1) < 0)
-+        ret = -1;
-+    cleanupFakeFS(fakerootdir);
- 
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-cgroup-v2.patch b/SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-cgroup-v2.patch
deleted file mode 100644
index 38cbd13..0000000
--- a/SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-cgroup-v2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ab8447f6e6a5ab8e3d278be61bc9ccc93c435d3b Mon Sep 17 00:00:00 2001
-Message-Id: <ab8447f6e6a5ab8e3d278be61bc9ccc93c435d3b@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:58 +0200
-Subject: [PATCH] vircgrouptest: add detect mounts test for cgroup v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8f43c7a698b7a360d508eccc82ffc08e930cc3f8)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <10b25253a0f4705093b96cfe56a0c64bb2114785.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupdata/unified.cgroups     | 13 +++++++++++++
- tests/vircgroupdata/unified.mounts      | 20 ++++++++++++++++++++
- tests/vircgroupdata/unified.parsed      | 11 +++++++++++
- tests/vircgroupdata/unified.self.cgroup |  1 +
- tests/vircgrouptest.c                   |  3 +++
- 5 files changed, 48 insertions(+)
- create mode 100644 tests/vircgroupdata/unified.cgroups
- create mode 100644 tests/vircgroupdata/unified.mounts
- create mode 100644 tests/vircgroupdata/unified.parsed
- create mode 100644 tests/vircgroupdata/unified.self.cgroup
-
-diff --git a/tests/vircgroupdata/unified.cgroups b/tests/vircgroupdata/unified.cgroups
-new file mode 100644
-index 0000000000..e0d8a3561c
---- /dev/null
-+++ b/tests/vircgroupdata/unified.cgroups
-@@ -0,0 +1,13 @@
-+#subsys_name	hierarchy	num_cgroups	enabled
-+cpuset      0       1       1
-+cpu         0       1       1
-+cpuacct     0       1       1
-+blkio       0       1       1
-+memory      0       1       1
-+devices     0       1       1
-+freezer     0       1       1
-+net_cls     0       1       1
-+perf_event  0       1       1
-+net_prio    0       1       1
-+hugetlb     0       1       1
-+pids        0       1       1
-diff --git a/tests/vircgroupdata/unified.mounts b/tests/vircgroupdata/unified.mounts
-new file mode 100644
-index 0000000000..b4ab94a2c3
---- /dev/null
-+++ b/tests/vircgroupdata/unified.mounts
-@@ -0,0 +1,20 @@
-+sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0
-+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-+devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=1009844k,nr_inodes=252461,mode=755 0 0
-+securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0
-+tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0
-+devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
-+tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0
-+cgroup2 /not/really/sys/fs/cgroup cgroup2 rw,seclabel,nosuid,nodev,noexec,relatime,nsdelegate 0 0
-+pstore /sys/fs/pstore pstore rw,seclabel,nosuid,nodev,noexec,relatime 0 0
-+bpf /sys/fs/bpf bpf rw,nosuid,nodev,noexec,relatime,mode=700 0 0
-+configfs /sys/kernel/config configfs rw,relatime 0 0
-+/dev/vda2 / ext4 rw,seclabel,relatime 0 0
-+selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0
-+debugfs /sys/kernel/debug debugfs rw,seclabel,relatime 0 0
-+hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime,pagesize=2M 0 0
-+systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=40,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=14586 0 0
-+mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0
-+tmpfs /tmp tmpfs rw,seclabel,nosuid,nodev 0 0
-+sunrpc /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0
-+tmpfs /run/user/0 tmpfs rw,seclabel,nosuid,nodev,relatime,size=204000k,mode=700 0 0
-diff --git a/tests/vircgroupdata/unified.parsed b/tests/vircgroupdata/unified.parsed
-new file mode 100644
-index 0000000000..3de0fc643d
---- /dev/null
-+++ b/tests/vircgroupdata/unified.parsed
-@@ -0,0 +1,11 @@
-+cpu          <null>
-+cpuacct      <null>
-+cpuset       <null>
-+memory       <null>
-+devices      <null>
-+freezer      <null>
-+blkio        <null>
-+net_cls      <null>
-+perf_event   <null>
-+name=systemd <null>
-+unified      /not/really/sys/fs/cgroup
-diff --git a/tests/vircgroupdata/unified.self.cgroup b/tests/vircgroupdata/unified.self.cgroup
-new file mode 100644
-index 0000000000..1e027b2a3c
---- /dev/null
-+++ b/tests/vircgroupdata/unified.self.cgroup
-@@ -0,0 +1 @@
-+0::/
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index b66682e6c8..1ce1371ddc 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -900,6 +900,9 @@ mymain(void)
-     DETECT_MOUNTS("all-in-one");
-     DETECT_MOUNTS_FAIL("no-cgroups");
-     DETECT_MOUNTS("kubevirt");
-+    fakerootdir = initFakeFS("unified", NULL);
-+    DETECT_MOUNTS("unified");
-+    cleanupFakeFS(fakerootdir);
- 
-     fakerootdir = initFakeFS(NULL, "systemd");
-     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-hybrid-cgroups.patch b/SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-hybrid-cgroups.patch
deleted file mode 100644
index 298390f..0000000
--- a/SOURCES/libvirt-vircgrouptest-add-detect-mounts-test-for-hybrid-cgroups.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 804df2c86f609fee35603273329f773e6eead7a8 Mon Sep 17 00:00:00 2001
-Message-Id: <804df2c86f609fee35603273329f773e6eead7a8@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:59 +0200
-Subject: [PATCH] vircgrouptest: add detect mounts test for hybrid cgroups
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 1981c79c4b068b918c3f34093ed2e634811b4147)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <8692433b683cef60139ee0b11052fd7f0de9ea41.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupdata/hybrid.cgroups     | 12 ++++++++++++
- tests/vircgroupdata/hybrid.mounts      | 23 +++++++++++++++++++++++
- tests/vircgroupdata/hybrid.parsed      | 11 +++++++++++
- tests/vircgroupdata/hybrid.self.cgroup |  9 +++++++++
- tests/vircgrouptest.c                  |  3 +++
- 5 files changed, 58 insertions(+)
- create mode 100644 tests/vircgroupdata/hybrid.cgroups
- create mode 100644 tests/vircgroupdata/hybrid.mounts
- create mode 100644 tests/vircgroupdata/hybrid.parsed
- create mode 100644 tests/vircgroupdata/hybrid.self.cgroup
-
-diff --git a/tests/vircgroupdata/hybrid.cgroups b/tests/vircgroupdata/hybrid.cgroups
-new file mode 100644
-index 0000000000..7f3bc7b8cb
---- /dev/null
-+++ b/tests/vircgroupdata/hybrid.cgroups
-@@ -0,0 +1,12 @@
-+#subsys_name	hierarchy	num_cgroups	enabled
-+cpuset      2       1       1
-+cpu         0       1       1
-+cpuacct     0       1       1
-+blkio       0       1       1
-+memory      0       1       1
-+devices     3       1       1
-+freezer     5       1       1
-+net_cls     4       1       1
-+perf_event  6       1       1
-+hugetlb     7       1       1
-+pids        8       1       1
-diff --git a/tests/vircgroupdata/hybrid.mounts b/tests/vircgroupdata/hybrid.mounts
-new file mode 100644
-index 0000000000..d6f5f82115
---- /dev/null
-+++ b/tests/vircgroupdata/hybrid.mounts
-@@ -0,0 +1,23 @@
-+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-+sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-+devtmpfs /dev devtmpfs rw,nosuid,size=10240k,nr_inodes=502705,mode=755 0 0
-+devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
-+tmpfs /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0
-+tmpfs /run tmpfs rw,nosuid,nodev,noexec,mode=755 0 0
-+mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
-+securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0
-+debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
-+configfs /sys/kernel/config configfs rw,nosuid,nodev,noexec,relatime 0 0
-+fusectl /sys/fs/fuse/connections fusectl rw,nosuid,nodev,noexec,relatime 0 0
-+selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0
-+pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0
-+cgroup_root /not/really/sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
-+openrc /not/really/sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
-+none /not/really/sys/fs/cgroup/unified cgroup2 rw,nosuid,nodev,noexec,relatime,nsdelegate 0 0
-+cpuset /not/really/sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+devices /not/really/sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0
-+net_cls /not/really/sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0
-+freezer /not/really/sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-+perf_event /not/really/sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0
-+hugetlb /not/really/sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
-+pids /not/really/sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0
-diff --git a/tests/vircgroupdata/hybrid.parsed b/tests/vircgroupdata/hybrid.parsed
-new file mode 100644
-index 0000000000..7600de5f45
---- /dev/null
-+++ b/tests/vircgroupdata/hybrid.parsed
-@@ -0,0 +1,11 @@
-+cpu          <null>
-+cpuacct      <null>
-+cpuset       /not/really/sys/fs/cgroup/cpuset
-+memory       <null>
-+devices      /not/really/sys/fs/cgroup/devices
-+freezer      /not/really/sys/fs/cgroup/freezer
-+blkio        <null>
-+net_cls      /not/really/sys/fs/cgroup/net_cls
-+perf_event   /not/really/sys/fs/cgroup/perf_event
-+name=systemd <null>
-+unified      /not/really/sys/fs/cgroup/unified
-diff --git a/tests/vircgroupdata/hybrid.self.cgroup b/tests/vircgroupdata/hybrid.self.cgroup
-new file mode 100644
-index 0000000000..2a08905c91
---- /dev/null
-+++ b/tests/vircgroupdata/hybrid.self.cgroup
-@@ -0,0 +1,9 @@
-+8:pids:/
-+7:hugetlb:/
-+6:perf_event:/
-+5:freezer:/
-+4:net_cls:/
-+3:devices:/
-+2:cpuset:/
-+1:name=openrc:/
-+0::/
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 1ce1371ddc..aeb2840823 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -903,6 +903,9 @@ mymain(void)
-     fakerootdir = initFakeFS("unified", NULL);
-     DETECT_MOUNTS("unified");
-     cleanupFakeFS(fakerootdir);
-+    fakerootdir = initFakeFS("hybrid", NULL);
-+    DETECT_MOUNTS("hybrid");
-+    cleanupFakeFS(fakerootdir);
- 
-     fakerootdir = initFakeFS(NULL, "systemd");
-     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-add-hybrid-tests.patch b/SOURCES/libvirt-vircgrouptest-add-hybrid-tests.patch
deleted file mode 100644
index b01a628..0000000
--- a/SOURCES/libvirt-vircgrouptest-add-hybrid-tests.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0628a57a5b4a28d644970a2ad82cfadc14a3cd9f Mon Sep 17 00:00:00 2001
-Message-Id: <0628a57a5b4a28d644970a2ad82cfadc14a3cd9f@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:02 +0200
-Subject: [PATCH] vircgrouptest: add hybrid tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit a26de856f98119bf651ed9928c64b6f96f78f185)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <434692bd0df2a6f28c93e3cc071187144820d836.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgrouptest.c | 48 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
-
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 3b844f0fbf..7fde50b463 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -605,6 +605,45 @@ static int testCgroupNewForSelfUnified(const void *args ATTRIBUTE_UNUSED)
- }
- 
- 
-+static int testCgroupNewForSelfHybrid(const void *args ATTRIBUTE_UNUSED)
-+{
-+    virCgroupPtr cgroup = NULL;
-+    int ret = -1;
-+    const char *empty[VIR_CGROUP_CONTROLLER_LAST] = { 0 };
-+    const char *mounts[VIR_CGROUP_CONTROLLER_LAST] = {
-+        [VIR_CGROUP_CONTROLLER_CPUSET] = "/not/really/sys/fs/cgroup/cpuset",
-+        [VIR_CGROUP_CONTROLLER_DEVICES] = "/not/really/sys/fs/cgroup/devices",
-+        [VIR_CGROUP_CONTROLLER_FREEZER] = "/not/really/sys/fs/cgroup/freezer",
-+        [VIR_CGROUP_CONTROLLER_NET_CLS] = "/not/really/sys/fs/cgroup/net_cls",
-+        [VIR_CGROUP_CONTROLLER_PERF_EVENT] = "/not/really/sys/fs/cgroup/perf_event",
-+    };
-+    const char *placement[VIR_CGROUP_CONTROLLER_LAST] = {
-+        [VIR_CGROUP_CONTROLLER_CPUSET] = "/",
-+        [VIR_CGROUP_CONTROLLER_DEVICES] = "/",
-+        [VIR_CGROUP_CONTROLLER_FREEZER] = "/",
-+        [VIR_CGROUP_CONTROLLER_NET_CLS] = "/",
-+        [VIR_CGROUP_CONTROLLER_PERF_EVENT] = "/",
-+    };
-+    unsigned int controllers =
-+        (1 << VIR_CGROUP_CONTROLLER_CPU) |
-+        (1 << VIR_CGROUP_CONTROLLER_CPUACCT) |
-+        (1 << VIR_CGROUP_CONTROLLER_MEMORY) |
-+        (1 << VIR_CGROUP_CONTROLLER_BLKIO);
-+
-+    if (virCgroupNewSelf(&cgroup) < 0) {
-+        fprintf(stderr, "Cannot create cgroup for self\n");
-+        goto cleanup;
-+    }
-+
-+    ret = validateCgroup(cgroup, "", mounts, empty, placement,
-+                         "/not/really/sys/fs/cgroup/unified", "/", controllers);
-+
-+ cleanup:
-+    virCgroupFree(&cgroup);
-+    return ret;
-+}
-+
-+
- static int testCgroupAvailable(const void *args)
- {
-     bool got = virCgroupAvailable();
-@@ -1024,6 +1063,15 @@ mymain(void)
-         ret = -1;
-     cleanupFakeFS(fakerootdir);
- 
-+    /* cgroup hybrid */
-+
-+    fakerootdir = initFakeFS("hybrid", "hybrid");
-+    if (virTestRun("New cgroup for self (hybrid)", testCgroupNewForSelfHybrid, NULL) < 0)
-+        ret = -1;
-+    if (virTestRun("Cgroup available (hybrid)", testCgroupAvailable, (void*)0x1) < 0)
-+        ret = -1;
-+    cleanupFakeFS(fakerootdir);
-+
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-call-virCgroupDetectMounts-directly.patch b/SOURCES/libvirt-vircgrouptest-call-virCgroupDetectMounts-directly.patch
deleted file mode 100644
index 77285a2..0000000
--- a/SOURCES/libvirt-vircgrouptest-call-virCgroupDetectMounts-directly.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 094b38a5c13a27f2f48897bd8cf811741a754db7 Mon Sep 17 00:00:00 2001
-Message-Id: <094b38a5c13a27f2f48897bd8cf811741a754db7@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:19 +0200
-Subject: [PATCH] vircgrouptest: call virCgroupDetectMounts directly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Because we can set which files to return for cgroup tests there
-is no need to have special function tailored to run tests.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 4988f4b347d3c56af4bdb9852d1461f08f6cfced)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <5b3185e7dd49ac4d9a56532e6d77ad1aa098db95.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  2 +-
- src/util/vircgroup.c     | 21 +++++----------------
- src/util/vircgrouppriv.h |  4 +---
- tests/vircgrouptest.c    | 16 ++++++++--------
- 4 files changed, 15 insertions(+), 28 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index f8c1a0df16..b66beb7f91 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1528,7 +1528,7 @@ virCgroupDelThread;
- virCgroupDenyAllDevices;
- virCgroupDenyDevice;
- virCgroupDenyDevicePath;
--virCgroupDetectMountsFromFile;
-+virCgroupDetectMounts;
- virCgroupFree;
- virCgroupGetBlkioDeviceReadBps;
- virCgroupGetBlkioDeviceReadIops;
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index f08fe3600e..53f5faafd2 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -430,9 +430,7 @@ virCgroupMountOptsMatchController(const char *mntOpts,
-  * mounted and where
-  */
- int
--virCgroupDetectMountsFromFile(virCgroupPtr group,
--                              const char *path,
--                              bool checkLinks)
-+virCgroupDetectMounts(virCgroupPtr group)
- {
-     size_t i;
-     FILE *mounts = NULL;
-@@ -440,9 +438,9 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-     char buf[CGROUP_MAX_VAL];
-     int ret = -1;
- 
--    mounts = fopen(path, "r");
-+    mounts = fopen("/proc/mounts", "r");
-     if (mounts == NULL) {
--        virReportSystemError(errno, _("Unable to open %s"), path);
-+        virReportSystemError(errno, "%s", _("Unable to open /proc/mounts"));
-         return -1;
-     }
- 
-@@ -470,8 +468,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
- 
-                 /* If it is a co-mount it has a filename like "cpu,cpuacct"
-                  * and we must identify the symlink path */
--                if (checkLinks &&
--                    virCgroupResolveMountLink(entry.mnt_dir, typestr,
-+                if (virCgroupResolveMountLink(entry.mnt_dir, typestr,
-                                               controller) < 0) {
-                     goto cleanup;
-                 }
-@@ -485,12 +482,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-     return ret;
- }
- 
--static int
--virCgroupDetectMounts(virCgroupPtr group)
--{
--    return virCgroupDetectMountsFromFile(group, "/proc/mounts", true);
--}
--
- 
- static int
- virCgroupCopyPlacement(virCgroupPtr group,
-@@ -4090,9 +4081,7 @@ virCgroupAvailable(void)
- 
- 
- int
--virCgroupDetectMountsFromFile(virCgroupPtr group ATTRIBUTE_UNUSED,
--                              const char *path ATTRIBUTE_UNUSED,
--                              bool checkLinks ATTRIBUTE_UNUSED)
-+virCgroupDetectMounts(virCgroupPtr group ATTRIBUTE_UNUSED)
- {
-     virReportSystemError(ENXIO, "%s",
-                          _("Control groups not supported on this platform"));
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index a0034f3889..f78fe8bb9c 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -50,9 +50,7 @@ struct _virCgroup {
-     virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
--int virCgroupDetectMountsFromFile(virCgroupPtr group,
--                                  const char *path,
--                                  bool checkLinks);
-+int virCgroupDetectMounts(virCgroupPtr group);
- 
- int virCgroupNewPartition(const char *path,
-                           bool create,
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 7968903cad..6a38091a86 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -164,21 +164,21 @@ testCgroupDetectMounts(const void *args)
- {
-     int result = -1;
-     const char *file = args;
--    char *mounts = NULL;
-     char *parsed = NULL;
-     const char *actual;
-     virCgroupPtr group = NULL;
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     size_t i;
- 
--    if (virAsprintf(&mounts, "%s/vircgroupdata/%s.mounts",
--                    abs_srcdir, file) < 0 ||
--        virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed",
--                    abs_srcdir, file) < 0 ||
--        VIR_ALLOC(group) < 0)
-+    setenv("VIR_CGROUP_MOCK_FILENAME", file, 1);
-+
-+    if (virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", abs_srcdir, file) < 0)
-         goto cleanup;
- 
--    if (virCgroupDetectMountsFromFile(group, mounts, false) < 0)
-+    if (VIR_ALLOC(group) < 0)
-+        goto cleanup;
-+
-+    if (virCgroupDetectMounts(group) < 0)
-         goto cleanup;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-@@ -196,7 +196,7 @@ testCgroupDetectMounts(const void *args)
-     result = 0;
- 
-  cleanup:
--    VIR_FREE(mounts);
-+    unsetenv("VIR_CGROUP_MOCK_FILENAME");
-     VIR_FREE(parsed);
-     virCgroupFree(&group);
-     virBufferFreeAndReset(&buf);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-call-virCgroupNewSelf-instead-virCgroupDetectMounts.patch b/SOURCES/libvirt-vircgrouptest-call-virCgroupNewSelf-instead-virCgroupDetectMounts.patch
deleted file mode 100644
index 1984f62..0000000
--- a/SOURCES/libvirt-vircgrouptest-call-virCgroupNewSelf-instead-virCgroupDetectMounts.patch
+++ /dev/null
@@ -1,544 +0,0 @@
-From e3b6a0736a5b8e23041006ac004cccf1e48ae528 Mon Sep 17 00:00:00 2001
-Message-Id: <e3b6a0736a5b8e23041006ac004cccf1e48ae528@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:06:20 +0200
-Subject: [PATCH] vircgrouptest: call virCgroupNewSelf instead
- virCgroupDetectMounts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This will be required once cgroup v2 is introduced.  The cgroup
-detection is not simple and we will have multiple backends so we
-should not just jump into the middle of the detection code.
-
-In order to use virCgroupNewSelf we need to create all the remaining
-data files:
-
-    - {name}.cgroups represents /proc/cgroups, it is a list of cgroup
-      controllers compiled into kernel
-
-    - {name}.self.cgroup represents /proc/self/cgroup, it describes
-      cgroups to which the process belongs
-
-For "no-cgroups" we need to modify the expected behavior because
-virCgroupNewSelf() will fail if there are no controllers available.
-
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8b62008d2bc5442f7755e579ea754ffd5e3f9691)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3d1ddcca1a1e323e607445c5d1089698122efdd8.1561993099.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms                      |  1 -
- src/util/vircgroup.c                          | 11 +------
- src/util/vircgrouppriv.h                      |  2 --
- tests/vircgroupdata/cgroups1.cgroups          | 11 +++++++
- tests/vircgroupdata/cgroups1.self.cgroup      | 11 +++++++
- tests/vircgroupdata/cgroups2.cgroups          | 10 +++++++
- tests/vircgroupdata/cgroups2.self.cgroup      | 10 +++++++
- tests/vircgroupdata/cgroups3.cgroups          | 12 ++++++++
- tests/vircgroupdata/cgroups3.self.cgroup      | 12 ++++++++
- tests/vircgroupdata/fedora-18.cgroups         | 10 +++++++
- tests/vircgroupdata/fedora-18.self.cgroup     |  9 ++++++
- tests/vircgroupdata/fedora-21.cgroups         | 12 ++++++++
- tests/vircgroupdata/fedora-21.self.cgroup     | 10 +++++++
- tests/vircgroupdata/kubevirt.cgroups          | 10 +++++++
- tests/vircgroupdata/kubevirt.self.cgroup      | 10 +++++++
- tests/vircgroupdata/no-cgroups.cgroups        |  8 +++++
- tests/vircgroupdata/no-cgroups.parsed         | 10 -------
- tests/vircgroupdata/no-cgroups.self.cgroup    |  0
- tests/vircgroupdata/ovirt-node-6.6.cgroups    |  9 ++++++
- .../vircgroupdata/ovirt-node-6.6.self.cgroup  |  8 +++++
- tests/vircgroupdata/ovirt-node-7.1.cgroups    | 11 +++++++
- .../vircgroupdata/ovirt-node-7.1.self.cgroup  | 10 +++++++
- tests/vircgroupdata/rhel-7.1.cgroups          | 11 +++++++
- tests/vircgroupdata/rhel-7.1.self.cgroup      | 10 +++++++
- tests/vircgrouptest.c                         | 30 ++++++++++++++-----
- 25 files changed, 217 insertions(+), 31 deletions(-)
- create mode 100644 tests/vircgroupdata/cgroups1.cgroups
- create mode 100644 tests/vircgroupdata/cgroups1.self.cgroup
- create mode 100644 tests/vircgroupdata/cgroups2.cgroups
- create mode 100644 tests/vircgroupdata/cgroups2.self.cgroup
- create mode 100644 tests/vircgroupdata/cgroups3.cgroups
- create mode 100644 tests/vircgroupdata/cgroups3.self.cgroup
- create mode 100644 tests/vircgroupdata/fedora-18.cgroups
- create mode 100644 tests/vircgroupdata/fedora-18.self.cgroup
- create mode 100644 tests/vircgroupdata/fedora-21.cgroups
- create mode 100644 tests/vircgroupdata/fedora-21.self.cgroup
- create mode 100644 tests/vircgroupdata/kubevirt.cgroups
- create mode 100644 tests/vircgroupdata/kubevirt.self.cgroup
- create mode 100644 tests/vircgroupdata/no-cgroups.cgroups
- delete mode 100644 tests/vircgroupdata/no-cgroups.parsed
- create mode 100644 tests/vircgroupdata/no-cgroups.self.cgroup
- create mode 100644 tests/vircgroupdata/ovirt-node-6.6.cgroups
- create mode 100644 tests/vircgroupdata/ovirt-node-6.6.self.cgroup
- create mode 100644 tests/vircgroupdata/ovirt-node-7.1.cgroups
- create mode 100644 tests/vircgroupdata/ovirt-node-7.1.self.cgroup
- create mode 100644 tests/vircgroupdata/rhel-7.1.cgroups
- create mode 100644 tests/vircgroupdata/rhel-7.1.self.cgroup
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index b66beb7f91..8c4be84fd5 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1528,7 +1528,6 @@ virCgroupDelThread;
- virCgroupDenyAllDevices;
- virCgroupDenyDevice;
- virCgroupDenyDevicePath;
--virCgroupDetectMounts;
- virCgroupFree;
- virCgroupGetBlkioDeviceReadBps;
- virCgroupGetBlkioDeviceReadIops;
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 53f5faafd2..d55f411daa 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -429,7 +429,7 @@ virCgroupMountOptsMatchController(const char *mntOpts,
-  * Process /proc/mounts figuring out what controllers are
-  * mounted and where
-  */
--int
-+static int
- virCgroupDetectMounts(virCgroupPtr group)
- {
-     size_t i;
-@@ -4080,15 +4080,6 @@ virCgroupAvailable(void)
- }
- 
- 
--int
--virCgroupDetectMounts(virCgroupPtr group ATTRIBUTE_UNUSED)
--{
--    virReportSystemError(ENXIO, "%s",
--                         _("Control groups not supported on this platform"));
--    return -1;
--}
--
--
- int
- virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
-                       bool create ATTRIBUTE_UNUSED,
-diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
-index f78fe8bb9c..046c96c52c 100644
---- a/src/util/vircgrouppriv.h
-+++ b/src/util/vircgrouppriv.h
-@@ -50,8 +50,6 @@ struct _virCgroup {
-     virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
- };
- 
--int virCgroupDetectMounts(virCgroupPtr group);
--
- int virCgroupNewPartition(const char *path,
-                           bool create,
-                           int controllers,
-diff --git a/tests/vircgroupdata/cgroups1.cgroups b/tests/vircgroupdata/cgroups1.cgroups
-new file mode 100644
-index 0000000000..a03c290a98
---- /dev/null
-+++ b/tests/vircgroupdata/cgroups1.cgroups
-@@ -0,0 +1,11 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     3       1       1
-+blkio       8       1       1
-+memory      4       1       1
-+devices     5       1       1
-+freezer     6       1       1
-+net_cls     7       1       1
-+net_prio    9       1       1
-+hugetlb     10      1       1
-diff --git a/tests/vircgroupdata/cgroups1.self.cgroup b/tests/vircgroupdata/cgroups1.self.cgroup
-new file mode 100644
-index 0000000000..181f0c22f8
---- /dev/null
-+++ b/tests/vircgroupdata/cgroups1.self.cgroup
-@@ -0,0 +1,11 @@
-+10:hugetlb:/
-+9:net_prio:/
-+8:blkio:/
-+7:net_cls:/
-+6:freezer:/
-+5:devices:/
-+4:memory:/
-+3:cpuacct:/
-+2:cpu:/
-+1:cpuset:/
-+0:name=openrc:/
-diff --git a/tests/vircgroupdata/cgroups2.cgroups b/tests/vircgroupdata/cgroups2.cgroups
-new file mode 100644
-index 0000000000..f0a7699559
---- /dev/null
-+++ b/tests/vircgroupdata/cgroups2.cgroups
-@@ -0,0 +1,10 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     3       1       1
-+blkio       7       1       1
-+memory      4       1       1
-+devices     5       1       1
-+freezer     6       1       1
-+perf_event  8       1       1
-+hugetlb     9       1       1
-diff --git a/tests/vircgroupdata/cgroups2.self.cgroup b/tests/vircgroupdata/cgroups2.self.cgroup
-new file mode 100644
-index 0000000000..3d0e793e5a
---- /dev/null
-+++ b/tests/vircgroupdata/cgroups2.self.cgroup
-@@ -0,0 +1,10 @@
-+9:hugetlb:/
-+8:perf_event:/
-+7:blkio:/
-+6:freezer:/
-+5:devices:/
-+4:memory:/
-+3:cpuacct:/
-+2:cpu:/
-+1:cpuset:/
-+0:name=openrc:/
-diff --git a/tests/vircgroupdata/cgroups3.cgroups b/tests/vircgroupdata/cgroups3.cgroups
-new file mode 100644
-index 0000000000..294d95dedf
---- /dev/null
-+++ b/tests/vircgroupdata/cgroups3.cgroups
-@@ -0,0 +1,12 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     3       1       1
-+blkio       8       1       1
-+memory      4       1       1
-+devices     5       1       1
-+freezer     6       1       1
-+net_cls     7       1       1
-+perf_event  9       1       1
-+net_prio    10      1       1
-+hugetlb     11      1       1
-diff --git a/tests/vircgroupdata/cgroups3.self.cgroup b/tests/vircgroupdata/cgroups3.self.cgroup
-new file mode 100644
-index 0000000000..bf346abdf9
---- /dev/null
-+++ b/tests/vircgroupdata/cgroups3.self.cgroup
-@@ -0,0 +1,12 @@
-+11:hugetlb:/
-+10:net_prio:/
-+9:perf_event:/
-+8:blkio:/
-+7:net_cls:/
-+6:freezer:/
-+5:devices:/
-+4:memory:/
-+3:cpuacct:/
-+2:cpu:/
-+1:cpuset:/
-+0:name=openrc:/
-diff --git a/tests/vircgroupdata/fedora-18.cgroups b/tests/vircgroupdata/fedora-18.cgroups
-new file mode 100644
-index 0000000000..8eb41087f3
---- /dev/null
-+++ b/tests/vircgroupdata/fedora-18.cgroups
-@@ -0,0 +1,10 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     2       1       1
-+blkio       7       1       1
-+memory      3       1       1
-+devices     4       1       1
-+freezer     5       1       1
-+net_cls     6       1       1
-+perf_event  8       1       1
-diff --git a/tests/vircgroupdata/fedora-18.self.cgroup b/tests/vircgroupdata/fedora-18.self.cgroup
-new file mode 100644
-index 0000000000..da9ad8ad4d
---- /dev/null
-+++ b/tests/vircgroupdata/fedora-18.self.cgroup
-@@ -0,0 +1,9 @@
-+8:perf_event:/
-+7:blkio:/
-+6:net_cls:/
-+5:freezer:/
-+4:devices:/
-+3:memory:/
-+2:cpu,cpuacct:/
-+1:cpuset:/
-+0:name=systemd:/
-diff --git a/tests/vircgroupdata/fedora-21.cgroups b/tests/vircgroupdata/fedora-21.cgroups
-new file mode 100644
-index 0000000000..3e1401ee98
---- /dev/null
-+++ b/tests/vircgroupdata/fedora-21.cgroups
-@@ -0,0 +1,12 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     2       1       1
-+blkio       7       1       1
-+memory      3       1       1
-+devices     4       1       1
-+freezer     5       1       1
-+net_cls     6       1       1
-+perf_event  8       1       1
-+net_prio    6       1       1
-+hugetlb     9       1       1
-diff --git a/tests/vircgroupdata/fedora-21.self.cgroup b/tests/vircgroupdata/fedora-21.self.cgroup
-new file mode 100644
-index 0000000000..4c666bd59e
---- /dev/null
-+++ b/tests/vircgroupdata/fedora-21.self.cgroup
-@@ -0,0 +1,10 @@
-+9:hugetlb:/
-+8:perf_event:/
-+7:blkio:/
-+6:net_cls,net_prio:/
-+5:freezer:/
-+4:devices:/
-+3:memory:/
-+2:cpu,cpuacct:/
-+1:cpuset:/
-+0:name=systemd:/
-diff --git a/tests/vircgroupdata/kubevirt.cgroups b/tests/vircgroupdata/kubevirt.cgroups
-new file mode 100644
-index 0000000000..f0a7699559
---- /dev/null
-+++ b/tests/vircgroupdata/kubevirt.cgroups
-@@ -0,0 +1,10 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     3       1       1
-+blkio       7       1       1
-+memory      4       1       1
-+devices     5       1       1
-+freezer     6       1       1
-+perf_event  8       1       1
-+hugetlb     9       1       1
-diff --git a/tests/vircgroupdata/kubevirt.self.cgroup b/tests/vircgroupdata/kubevirt.self.cgroup
-new file mode 100644
-index 0000000000..3d0e793e5a
---- /dev/null
-+++ b/tests/vircgroupdata/kubevirt.self.cgroup
-@@ -0,0 +1,10 @@
-+9:hugetlb:/
-+8:perf_event:/
-+7:blkio:/
-+6:freezer:/
-+5:devices:/
-+4:memory:/
-+3:cpuacct:/
-+2:cpu:/
-+1:cpuset:/
-+0:name=openrc:/
-diff --git a/tests/vircgroupdata/no-cgroups.cgroups b/tests/vircgroupdata/no-cgroups.cgroups
-new file mode 100644
-index 0000000000..3ed1d4e45e
---- /dev/null
-+++ b/tests/vircgroupdata/no-cgroups.cgroups
-@@ -0,0 +1,8 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      0       1       1
-+cpu         0       1       1
-+cpuacct     0       1       1
-+memory      0       1       1
-+devices     0       1       1
-+freezer     0       1       1
-+blkio       0       1       1
-diff --git a/tests/vircgroupdata/no-cgroups.parsed b/tests/vircgroupdata/no-cgroups.parsed
-deleted file mode 100644
-index bf4eea085f..0000000000
---- a/tests/vircgroupdata/no-cgroups.parsed
-+++ /dev/null
-@@ -1,10 +0,0 @@
--cpu          <null>
--cpuacct      <null>
--cpuset       <null>
--memory       <null>
--devices      <null>
--freezer      <null>
--blkio        <null>
--net_cls      <null>
--perf_event   <null>
--name=systemd <null>
-diff --git a/tests/vircgroupdata/no-cgroups.self.cgroup b/tests/vircgroupdata/no-cgroups.self.cgroup
-new file mode 100644
-index 0000000000..e69de29bb2
-diff --git a/tests/vircgroupdata/ovirt-node-6.6.cgroups b/tests/vircgroupdata/ovirt-node-6.6.cgroups
-new file mode 100644
-index 0000000000..aaabf11a44
---- /dev/null
-+++ b/tests/vircgroupdata/ovirt-node-6.6.cgroups
-@@ -0,0 +1,9 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      0       1       1
-+cpu         1       1       1
-+cpuacct     2       1       1
-+blkio       7       1       1
-+memory      3       1       1
-+devices     4       1       1
-+freezer     5       1       1
-+net_cls     6       1       1
-diff --git a/tests/vircgroupdata/ovirt-node-6.6.self.cgroup b/tests/vircgroupdata/ovirt-node-6.6.self.cgroup
-new file mode 100644
-index 0000000000..dadc8155fa
---- /dev/null
-+++ b/tests/vircgroupdata/ovirt-node-6.6.self.cgroup
-@@ -0,0 +1,8 @@
-+7:blkio:/
-+6:net_cls:/
-+5:freezer:/
-+4:devices:/
-+3:memory:/
-+2:cpuacct:/
-+1:cpu:/
-+0:cpuset:/
-diff --git a/tests/vircgroupdata/ovirt-node-7.1.cgroups b/tests/vircgroupdata/ovirt-node-7.1.cgroups
-new file mode 100644
-index 0000000000..687297ad4a
---- /dev/null
-+++ b/tests/vircgroupdata/ovirt-node-7.1.cgroups
-@@ -0,0 +1,11 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     2       1       1
-+blkio       7       1       1
-+memory      3       1       1
-+devices     4       1       1
-+freezer     5       1       1
-+net_cls     6       1       1
-+perf_event  8       1       1
-+hugetlb     9       1       1
-diff --git a/tests/vircgroupdata/ovirt-node-7.1.self.cgroup b/tests/vircgroupdata/ovirt-node-7.1.self.cgroup
-new file mode 100644
-index 0000000000..f07e8e20f5
---- /dev/null
-+++ b/tests/vircgroupdata/ovirt-node-7.1.self.cgroup
-@@ -0,0 +1,10 @@
-+9:hugetlb:/
-+8:perf_event:/
-+7:blkio:/
-+6:net_cls:/
-+5:freezer:/
-+4:devices:/
-+3:memory:/
-+2:cpu,cpuacct:/
-+1:cpuset:/
-+0:name=systemd:/
-diff --git a/tests/vircgroupdata/rhel-7.1.cgroups b/tests/vircgroupdata/rhel-7.1.cgroups
-new file mode 100644
-index 0000000000..687297ad4a
---- /dev/null
-+++ b/tests/vircgroupdata/rhel-7.1.cgroups
-@@ -0,0 +1,11 @@
-+#subsys_name    hierarchy       num_cgroups     enabled
-+cpuset      1       1       1
-+cpu         2       1       1
-+cpuacct     2       1       1
-+blkio       7       1       1
-+memory      3       1       1
-+devices     4       1       1
-+freezer     5       1       1
-+net_cls     6       1       1
-+perf_event  8       1       1
-+hugetlb     9       1       1
-diff --git a/tests/vircgroupdata/rhel-7.1.self.cgroup b/tests/vircgroupdata/rhel-7.1.self.cgroup
-new file mode 100644
-index 0000000000..f07e8e20f5
---- /dev/null
-+++ b/tests/vircgroupdata/rhel-7.1.self.cgroup
-@@ -0,0 +1,10 @@
-+9:hugetlb:/
-+8:perf_event:/
-+7:blkio:/
-+6:net_cls:/
-+5:freezer:/
-+4:devices:/
-+3:memory:/
-+2:cpu,cpuacct:/
-+1:cpuset:/
-+0:name=systemd:/
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 6a38091a86..5031a2973d 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -159,26 +159,37 @@ const char *linksLogind[VIR_CGROUP_CONTROLLER_LAST] = {
- };
- 
- 
-+struct _detectMountsData {
-+    const char *file;
-+    bool fail;
-+};
-+
-+
- static int
- testCgroupDetectMounts(const void *args)
- {
-     int result = -1;
--    const char *file = args;
-+    const struct _detectMountsData *data = args;
-     char *parsed = NULL;
-     const char *actual;
-     virCgroupPtr group = NULL;
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     size_t i;
- 
--    setenv("VIR_CGROUP_MOCK_FILENAME", file, 1);
-+    setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1);
- 
--    if (virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", abs_srcdir, file) < 0)
-+    if (virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed",
-+                    abs_srcdir, data->file) < 0) {
-         goto cleanup;
-+    }
- 
--    if (VIR_ALLOC(group) < 0)
-+    if (virCgroupNewSelf(&group) < 0) {
-+        if (data->fail)
-+            result = 0;
-         goto cleanup;
-+    }
- 
--    if (virCgroupDetectMounts(group) < 0)
-+    if (data->fail)
-         goto cleanup;
- 
-     for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-@@ -870,13 +881,16 @@ mymain(void)
- 
-     setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1);
- 
--# define DETECT_MOUNTS(file) \
-+# define DETECT_MOUNTS_FULL(file, fail) \
-     do { \
-+        struct _detectMountsData data = { file, fail }; \
-         if (virTestRun("Detect cgroup mounts for " file, \
-                        testCgroupDetectMounts, \
--                       file) < 0) \
-+                       &data) < 0) \
-             ret = -1; \
-     } while (0)
-+# define DETECT_MOUNTS(file) DETECT_MOUNTS_FULL(file, false);
-+# define DETECT_MOUNTS_FAIL(file) DETECT_MOUNTS_FULL(file, true);
- 
-     DETECT_MOUNTS("ovirt-node-6.6");
-     DETECT_MOUNTS("ovirt-node-7.1");
-@@ -887,7 +901,7 @@ mymain(void)
-     DETECT_MOUNTS("cgroups2");
-     DETECT_MOUNTS("cgroups3");
-     DETECT_MOUNTS("all-in-one");
--    DETECT_MOUNTS("no-cgroups");
-+    DETECT_MOUNTS_FAIL("no-cgroups");
-     DETECT_MOUNTS("kubevirt");
- 
-     setenv("VIR_CGROUP_MOCK_FILENAME", "systemd", 1);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-introduce-initFakeFS-and-cleanupFakeFS-helpers.patch b/SOURCES/libvirt-vircgrouptest-introduce-initFakeFS-and-cleanupFakeFS-helpers.patch
deleted file mode 100644
index 521994b..0000000
--- a/SOURCES/libvirt-vircgrouptest-introduce-initFakeFS-and-cleanupFakeFS-helpers.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From d1c2f060ea724b4f430f9e3198676e18bf0656af Mon Sep 17 00:00:00 2001
-Message-Id: <d1c2f060ea724b4f430f9e3198676e18bf0656af@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:56 +0200
-Subject: [PATCH] vircgrouptest: introduce initFakeFS and cleanupFakeFS helpers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We need to configure multiple env variables for each set of tests so
-create helper functions to do that.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 9b9c6528a2f867a3be79022b4f282116d2efd3cd)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b9c0307500ba7b4e95ed097a457590a54dcd0ddb.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgrouptest.c | 48 ++++++++++++++++++++++++++++++++-----------
- 1 file changed, 36 insertions(+), 12 deletions(-)
-
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index c4bf987ca1..1837383e61 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -831,10 +831,10 @@ static int testCgroupGetBlkioIoDeviceServiced(const void *args ATTRIBUTE_UNUSED)
- 
- # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX"
- 
--static int
--mymain(void)
-+static char *
-+initFakeFS(const char *mode,
-+           const char *filename)
- {
--    int ret = 0;
-     char *fakerootdir;
- 
-     if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) {
-@@ -849,6 +849,33 @@ mymain(void)
- 
-     setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1);
- 
-+    if (mode)
-+        setenv("VIR_CGROUP_MOCK_MODE", mode, 1);
-+
-+    if (filename)
-+        setenv("VIR_CGROUP_MOCK_FILENAME", filename, 1);
-+
-+    return fakerootdir;
-+}
-+
-+static void
-+cleanupFakeFS(char *fakerootdir)
-+{
-+    if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
-+        virFileDeleteTree(fakerootdir);
-+
-+    VIR_FREE(fakerootdir);
-+    unsetenv("LIBVIRT_FAKE_ROOT_DIR");
-+    unsetenv("VIR_CGROUP_MOCK_MODE");
-+    unsetenv("VIR_CGROUP_MOCK_FILENAME");
-+}
-+
-+static int
-+mymain(void)
-+{
-+    int ret = 0;
-+    char *fakerootdir;
-+
- # define DETECT_MOUNTS_FULL(file, fail) \
-     do { \
-         struct _detectMountsData data = { file, fail }; \
-@@ -872,7 +899,7 @@ mymain(void)
-     DETECT_MOUNTS_FAIL("no-cgroups");
-     DETECT_MOUNTS("kubevirt");
- 
--    setenv("VIR_CGROUP_MOCK_FILENAME", "systemd", 1);
-+    fakerootdir = initFakeFS(NULL, "systemd");
-     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
-         ret = -1;
- 
-@@ -908,26 +935,23 @@ mymain(void)
- 
-     if (virTestRun("virCgroupGetPercpuStats works", testCgroupGetPercpuStats, NULL) < 0)
-         ret = -1;
--    unsetenv("VIR_CGROUP_MOCK_FILENAME");
-+    cleanupFakeFS(fakerootdir);
- 
--    setenv("VIR_CGROUP_MOCK_FILENAME", "all-in-one", 1);
-+    fakerootdir = initFakeFS(NULL, "all-in-one");
-     if (virTestRun("New cgroup for self (allinone)", testCgroupNewForSelfAllInOne, NULL) < 0)
-         ret = -1;
-     if (virTestRun("Cgroup available", testCgroupAvailable, (void*)0x1) < 0)
-         ret = -1;
--    unsetenv("VIR_CGROUP_MOCK_FILENAME");
-+    cleanupFakeFS(fakerootdir);
- 
--    setenv("VIR_CGROUP_MOCK_FILENAME", "logind", 1);
-+    fakerootdir = initFakeFS(NULL, "logind");
-     if (virTestRun("New cgroup for self (logind)", testCgroupNewForSelfLogind, NULL) < 0)
-         ret = -1;
-     if (virTestRun("Cgroup available", testCgroupAvailable, (void*)0x0) < 0)
-         ret = -1;
--    unsetenv("VIR_CGROUP_MOCK_FILENAME");
-+    cleanupFakeFS(fakerootdir);
- 
--    if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
--        virFileDeleteTree(fakerootdir);
- 
--    VIR_FREE(fakerootdir);
- 
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-prepare-testCgroupDetectMounts-for-cgroup-v2.patch b/SOURCES/libvirt-vircgrouptest-prepare-testCgroupDetectMounts-for-cgroup-v2.patch
deleted file mode 100644
index 41df5c6..0000000
--- a/SOURCES/libvirt-vircgrouptest-prepare-testCgroupDetectMounts-for-cgroup-v2.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 541ede1193bfb32f73d76918d755c0f3d403e5ce Mon Sep 17 00:00:00 2001
-Message-Id: <541ede1193bfb32f73d76918d755c0f3d403e5ce@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:57 +0200
-Subject: [PATCH] vircgrouptest: prepare testCgroupDetectMounts for cgroup v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 9f8d170dab8dc30d4563cb038e5aef393b0d1128)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <f9905a25dc85ad266308c81afeeab379ca20a8ba.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupdata/all-in-one.parsed     | 1 +
- tests/vircgroupdata/cgroups1.parsed       | 1 +
- tests/vircgroupdata/cgroups2.parsed       | 1 +
- tests/vircgroupdata/cgroups3.parsed       | 1 +
- tests/vircgroupdata/fedora-18.parsed      | 1 +
- tests/vircgroupdata/fedora-21.parsed      | 1 +
- tests/vircgroupdata/kubevirt.parsed       | 1 +
- tests/vircgroupdata/ovirt-node-6.6.parsed | 1 +
- tests/vircgroupdata/ovirt-node-7.1.parsed | 1 +
- tests/vircgroupdata/rhel-7.1.parsed       | 1 +
- tests/vircgrouptest.c                     | 2 ++
- 11 files changed, 12 insertions(+)
-
-diff --git a/tests/vircgroupdata/all-in-one.parsed b/tests/vircgroupdata/all-in-one.parsed
-index d703d08fb9..97c96e8ecd 100644
---- a/tests/vircgroupdata/all-in-one.parsed
-+++ b/tests/vircgroupdata/all-in-one.parsed
-@@ -8,3 +8,4 @@ blkio        /not/really/sys/fs/cgroup
- net_cls      <null>
- perf_event   <null>
- name=systemd <null>
-+unified      <null>
-diff --git a/tests/vircgroupdata/cgroups1.parsed b/tests/vircgroupdata/cgroups1.parsed
-index b6916f17a1..16431aa006 100644
---- a/tests/vircgroupdata/cgroups1.parsed
-+++ b/tests/vircgroupdata/cgroups1.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      /sys/fs/cgroup/net_cls
- perf_event   <null>
- name=systemd <null>
-+unified      <null>
-diff --git a/tests/vircgroupdata/cgroups2.parsed b/tests/vircgroupdata/cgroups2.parsed
-index 5eb2bc7bb2..d1bb0dcb7c 100644
---- a/tests/vircgroupdata/cgroups2.parsed
-+++ b/tests/vircgroupdata/cgroups2.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      <null>
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd <null>
-+unified      <null>
-diff --git a/tests/vircgroupdata/cgroups3.parsed b/tests/vircgroupdata/cgroups3.parsed
-index 2b1f3825c1..44e475c9d2 100644
---- a/tests/vircgroupdata/cgroups3.parsed
-+++ b/tests/vircgroupdata/cgroups3.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      /sys/fs/cgroup/net_cls
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd <null>
-+unified      <null>
-diff --git a/tests/vircgroupdata/fedora-18.parsed b/tests/vircgroupdata/fedora-18.parsed
-index 8d5ba75c7e..662a38a9e8 100644
---- a/tests/vircgroupdata/fedora-18.parsed
-+++ b/tests/vircgroupdata/fedora-18.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      /sys/fs/cgroup/net_cls
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd /sys/fs/cgroup/systemd
-+unified      <null>
-diff --git a/tests/vircgroupdata/fedora-21.parsed b/tests/vircgroupdata/fedora-21.parsed
-index 3377af0382..4e447fd7bd 100644
---- a/tests/vircgroupdata/fedora-21.parsed
-+++ b/tests/vircgroupdata/fedora-21.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      /sys/fs/cgroup/net_cls,net_prio
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd /sys/fs/cgroup/systemd
-+unified      <null>
-diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
-index 6948707238..bf977f8363 100644
---- a/tests/vircgroupdata/kubevirt.parsed
-+++ b/tests/vircgroupdata/kubevirt.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      <null>
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd <null>
-+unified      <null>
-diff --git a/tests/vircgroupdata/ovirt-node-6.6.parsed b/tests/vircgroupdata/ovirt-node-6.6.parsed
-index 01bf466be6..9d10813d8c 100644
---- a/tests/vircgroupdata/ovirt-node-6.6.parsed
-+++ b/tests/vircgroupdata/ovirt-node-6.6.parsed
-@@ -8,3 +8,4 @@ blkio        /cgroup/blkio
- net_cls      /cgroup/net_cls
- perf_event   <null>
- name=systemd <null>
-+unified      <null>
-diff --git a/tests/vircgroupdata/ovirt-node-7.1.parsed b/tests/vircgroupdata/ovirt-node-7.1.parsed
-index 8d5ba75c7e..662a38a9e8 100644
---- a/tests/vircgroupdata/ovirt-node-7.1.parsed
-+++ b/tests/vircgroupdata/ovirt-node-7.1.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      /sys/fs/cgroup/net_cls
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd /sys/fs/cgroup/systemd
-+unified      <null>
-diff --git a/tests/vircgroupdata/rhel-7.1.parsed b/tests/vircgroupdata/rhel-7.1.parsed
-index 8d5ba75c7e..662a38a9e8 100644
---- a/tests/vircgroupdata/rhel-7.1.parsed
-+++ b/tests/vircgroupdata/rhel-7.1.parsed
-@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
- net_cls      /sys/fs/cgroup/net_cls
- perf_event   /sys/fs/cgroup/perf_event
- name=systemd /sys/fs/cgroup/systemd
-+unified      <null>
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index 1837383e61..b66682e6c8 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -176,6 +176,8 @@ testCgroupDetectMounts(const void *args)
-                           virCgroupControllerTypeToString(i),
-                           NULLSTR(group->legacy[i].mountPoint));
-     }
-+    virBufferAsprintf(&buf, "%-12s %s\n",
-+                      "unified", NULLSTR(group->unified.mountPoint));
-     if (virBufferCheckError(&buf) < 0)
-         goto cleanup;
- 
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgrouptest-prepare-validateCgroup-for-cgroupv2.patch b/SOURCES/libvirt-vircgrouptest-prepare-validateCgroup-for-cgroupv2.patch
deleted file mode 100644
index fe04791..0000000
--- a/SOURCES/libvirt-vircgrouptest-prepare-validateCgroup-for-cgroupv2.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From f186ff31027a18b0568cf8c31da4fbffb7e3ead7 Mon Sep 17 00:00:00 2001
-Message-Id: <f186ff31027a18b0568cf8c31da4fbffb7e3ead7@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:00 +0200
-Subject: [PATCH] vircgrouptest: prepare validateCgroup for cgroupv2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 2a3df5fac52abb0d414d221a5da3bb957675a094)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <b5ae08efdc04ae116b8af6041a751672e090506b.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgrouptest.c | 53 +++++++++++++++++++++++++++++++++++--------
- 1 file changed, 44 insertions(+), 9 deletions(-)
-
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index aeb2840823..87f8fa7e67 100644
---- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -44,7 +44,10 @@ static int validateCgroup(virCgroupPtr cgroup,
-                           const char *expectPath,
-                           const char **expectMountPoint,
-                           const char **expectLinkPoint,
--                          const char **expectPlacement)
-+                          const char **expectPlacement,
-+                          const char *expectUnifiedMountPoint,
-+                          const char *expectUnifiedPlacement,
-+                          unsigned int expectUnifiedControllers)
- {
-     size_t i;
- 
-@@ -81,6 +84,38 @@ static int validateCgroup(virCgroupPtr cgroup,
-         }
-     }
- 
-+    if (STRNEQ_NULLABLE(expectUnifiedMountPoint,
-+                        cgroup->unified.mountPoint)) {
-+        fprintf(stderr, "Wrong mount '%s', expected '%s' for 'unified'\n",
-+                cgroup->unified.mountPoint,
-+                expectUnifiedMountPoint);
-+        return -1;
-+    }
-+    if (STRNEQ_NULLABLE(expectUnifiedPlacement,
-+                        cgroup->unified.placement)) {
-+        fprintf(stderr, "Wrong placement '%s', expected '%s' for 'unified'\n",
-+                cgroup->unified.placement,
-+                expectUnifiedPlacement);
-+        return -1;
-+    }
-+    if (expectUnifiedControllers != cgroup->unified.controllers) {
-+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+            int type = 1 << i;
-+            if ((expectUnifiedControllers & type) != (cgroup->unified.controllers & type)) {
-+                const char *typeStr = virCgroupControllerTypeToString(i);
-+                if (expectUnifiedControllers & type) {
-+                    fprintf(stderr, "expected controller '%s' for 'unified', "
-+                            "but it's missing\n", typeStr);
-+                } else {
-+                    fprintf(stderr, "existing controller '%s' for 'unified', "
-+                            "but it's not expected\n", typeStr);
-+                }
-+            }
-+
-+        }
-+        return -1;
-+    }
-+
-     return 0;
- }
- 
-@@ -216,7 +251,7 @@ static int testCgroupNewForSelf(const void *args ATTRIBUTE_UNUSED)
-         goto cleanup;
-     }
- 
--    ret = validateCgroup(cgroup, "", mountsFull, links, placement);
-+    ret = validateCgroup(cgroup, "", mountsFull, links, placement, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&cgroup);
-@@ -295,14 +330,14 @@ static int testCgroupNewForPartition(const void *args ATTRIBUTE_UNUSED)
-         fprintf(stderr, "Cannot create /virtualmachines cgroup: %d\n", -rv);
-         goto cleanup;
-     }
--    ret = validateCgroup(cgroup, "/virtualmachines.partition", mountsSmall, links, placementSmall);
-+    ret = validateCgroup(cgroup, "/virtualmachines.partition", mountsSmall, links, placementSmall, NULL, NULL, 0);
-     virCgroupFree(&cgroup);
- 
-     if ((rv = virCgroupNewPartition("/virtualmachines", true, -1, &cgroup)) != 0) {
-         fprintf(stderr, "Cannot create /virtualmachines cgroup: %d\n", -rv);
-         goto cleanup;
-     }
--    ret = validateCgroup(cgroup, "/virtualmachines.partition", mountsFull, links, placementFull);
-+    ret = validateCgroup(cgroup, "/virtualmachines.partition", mountsFull, links, placementFull, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&cgroup);
-@@ -352,7 +387,7 @@ static int testCgroupNewForPartitionNested(const void *args ATTRIBUTE_UNUSED)
-     }
- 
-     ret = validateCgroup(cgroup, "/deployment.partition/production.partition",
--                         mountsFull, links, placementFull);
-+                         mountsFull, links, placementFull, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&cgroup);
-@@ -408,7 +443,7 @@ static int testCgroupNewForPartitionNestedDeep(const void *args ATTRIBUTE_UNUSED
-     }
- 
-     ret = validateCgroup(cgroup, "/user/berrange.user/production.partition",
--                         mountsFull, links, placementFull);
-+                         mountsFull, links, placementFull, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&cgroup);
-@@ -444,7 +479,7 @@ static int testCgroupNewForPartitionDomain(const void *args ATTRIBUTE_UNUSED)
-         goto cleanup;
-     }
- 
--    ret = validateCgroup(domaincgroup, "/production.partition/foo.libvirt-lxc", mountsFull, links, placement);
-+    ret = validateCgroup(domaincgroup, "/production.partition/foo.libvirt-lxc", mountsFull, links, placement, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&partitioncgroup);
-@@ -495,7 +530,7 @@ static int testCgroupNewForPartitionDomainEscaped(const void *args ATTRIBUTE_UNU
-      * since our fake /proc/cgroups pretends this controller
-      * isn't compiled into the kernel
-      */
--    ret = validateCgroup(domaincgroup, "/_cgroup.evil/net_cls.evil/__evil.evil/_cpu.foo.libvirt-lxc", mountsFull, links, placement);
-+    ret = validateCgroup(domaincgroup, "/_cgroup.evil/net_cls.evil/__evil.evil/_cpu.foo.libvirt-lxc", mountsFull, links, placement, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&partitioncgroup3);
-@@ -524,7 +559,7 @@ static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED)
-         goto cleanup;
-     }
- 
--    ret = validateCgroup(cgroup, "", mountsAllInOne, linksAllInOne, placement);
-+    ret = validateCgroup(cgroup, "", mountsAllInOne, linksAllInOne, placement, NULL, NULL, 0);
- 
-  cleanup:
-     virCgroupFree(&cgroup);
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupv1-fix-build-on-non-linux-OSes.patch b/SOURCES/libvirt-vircgroupv1-fix-build-on-non-linux-OSes.patch
deleted file mode 100644
index b25993f..0000000
--- a/SOURCES/libvirt-vircgroupv1-fix-build-on-non-linux-OSes.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 2b27d54de68a4581a9b46fe5c399b45c0014fcbd Mon Sep 17 00:00:00 2001
-Message-Id: <2b27d54de68a4581a9b46fe5c399b45c0014fcbd@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:07:10 +0200
-Subject: [PATCH] vircgroupv1: fix build on non-linux OSes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Cgroups are linux specific and we need to make sure that the code is
-compiled only on linux.  On different OSes it fails the compilation:
-
-../../src/util/vircgroupv1.c:65:19: error: variable has incomplete type 'struct mntent'
-    struct mntent entry;
-                  ^
-../../src/util/vircgroupv1.c:65:12: note: forward declaration of 'struct mntent'
-    struct mntent entry;
-           ^
-../../src/util/vircgroupv1.c:74:12: error: implicit declaration of function 'getmntent_r' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
-    while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {
-           ^
-../../src/util/vircgroupv1.c:814:39: error: use of undeclared identifier 'MS_NOSUID'
-    if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) {
-                                      ^
-../../src/util/vircgroupv1.c:814:49: error: use of undeclared identifier 'MS_NODEV'
-    if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) {
-                                                ^
-../../src/util/vircgroupv1.c:814:58: error: use of undeclared identifier 'MS_NOEXEC'
-    if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) {
-                                                         ^
-../../src/util/vircgroupv1.c:841:65: error: use of undeclared identifier 'MS_BIND'
-            if (mount(src, group->legacy[i].mountPoint, "none", MS_BIND,
-                                                                ^
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0615c8436ac868889454bee2781b6c9993518597)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <a1b4d0cfa90a65f5c431a388e6f51be2ab9a7cdd.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv1.c | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 482615f3c8..97d108d3ac 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -20,13 +20,11 @@
-  */
- #include <config.h>
- 
--#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
-+#ifdef __linux__
- # include <mntent.h>
--#endif
--#include <sys/stat.h>
--#if defined HAVE_SYS_MOUNT_H
-+# include <sys/stat.h>
- # include <sys/mount.h>
--#endif
-+#endif /* __linux__ */
- 
- #include "internal.h"
- 
-@@ -56,6 +54,8 @@ VIR_ENUM_IMPL(virCgroupV1Controller, VIR_CGROUP_CONTROLLER_LAST,
-               "name=systemd");
- 
- 
-+#ifdef __linux__
-+
- /* We're looking for at least one 'cgroup' fs mount,
-  * which is *not* a named mount. */
- static bool
-@@ -2100,3 +2100,13 @@ virCgroupV1Register(void)
- {
-     virCgroupBackendRegister(&virCgroupV1Backend);
- }
-+
-+#else /* !__linux__ */
-+
-+void
-+virCgroupV1Register(void)
-+{
-+    VIR_INFO("Control groups not supported on this platform");
-+}
-+
-+#endif /* !__linux__ */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupv2-fix-abort-in-VIR_AUTOFREE.patch b/SOURCES/libvirt-vircgroupv2-fix-abort-in-VIR_AUTOFREE.patch
deleted file mode 100644
index 105f2f3..0000000
--- a/SOURCES/libvirt-vircgroupv2-fix-abort-in-VIR_AUTOFREE.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c627fa58c17960e5eed999049bf966b5ea952c3b Mon Sep 17 00:00:00 2001
-Message-Id: <c627fa58c17960e5eed999049bf966b5ea952c3b@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Fri, 30 Aug 2019 16:35:33 +0200
-Subject: [PATCH] vircgroupv2: fix abort in VIR_AUTOFREE
-
-Introduced by commit <c854e0bd33c7a5afb04a36465bf04f861b2efef5> that
-tried to fix an issue where we would fail to parse values from files.
-
-We cannot change the original pointer that is going to be used by
-VIR_AUTOFREE.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1747440
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Acked-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 9a99b01f8d3b2be491f9f8412c6f894d30d7e2fe)
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <c9be614c3648b2901481f257ba1af3fcd8fe7e76.1567175708.git.phrdina@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/vircgroupv2.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index e31a2d1121..e7b9093754 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -848,6 +848,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
-     VIR_AUTOFREE(char *) path = NULL;
-     VIR_AUTOFREE(char *) str = NULL;
-     VIR_AUTOFREE(char *) value = NULL;
-+    char *tmp;
- 
-     if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO,
-                                     "io.weight", &path) < 0) {
-@@ -868,7 +869,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
- 
-     if (!str) {
-         *weight = 0;
--    } else if (virStrToLong_ui(str, &str, 10, weight) < 0) {
-+    } else if (virStrToLong_ui(str, &tmp, 10, weight) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
-@@ -1575,6 +1576,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
-                           long long *cfs_quota)
- {
-     VIR_AUTOFREE(char *) str = NULL;
-+    char *tmp;
- 
-     if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU,
-                              "cpu.max", &str) < 0) {
-@@ -1586,7 +1588,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
-         return 0;
-     }
- 
--    if (virStrToLong_ll(str, &str, 10, cfs_quota) < 0) {
-+    if (virStrToLong_ll(str, &tmp, 10, cfs_quota) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Failed to parse value '%s' from cpu.max."), str);
-         return -1;
--- 
-2.23.0
-
diff --git a/SOURCES/libvirt-vircgroupv2-fix-parsing-multiple-values-in-single-file.patch b/SOURCES/libvirt-vircgroupv2-fix-parsing-multiple-values-in-single-file.patch
deleted file mode 100644
index c76eb62..0000000
--- a/SOURCES/libvirt-vircgroupv2-fix-parsing-multiple-values-in-single-file.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From ae178683071d3948d1d1da6205726a3e24923b45 Mon Sep 17 00:00:00 2001
-Message-Id: <ae178683071d3948d1d1da6205726a3e24923b45@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Wed, 21 Aug 2019 09:42:34 +0200
-Subject: [PATCH] vircgroupv2: fix parsing multiple values in single file
-
-Our virStrToLong* helpers converts string to integers where it wraps
-strtol standard function.  After the conversion happens and there are
-some remaining invalid characters our helpers will fail if the second
-argument is NULL.
-
-We need to pass pointer to string in cases where there are multiple
-values in a single file.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1741825
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit c854e0bd33c7a5afb04a36465bf04f861b2efef5)
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <49fe97f452eb4247040b1f322d348a3eea931efe.1566373284.git.phrdina@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/vircgroupv2.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 9ae47e775e..e129686a52 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -672,7 +672,7 @@ virCgroupV2GetBlkioWeight(virCgroupPtr group,
-         tmp = value;
-     }
- 
--    if (virStrToLong_ui(tmp, NULL, 10, weight) < 0) {
-+    if (virStrToLong_ui(tmp, &tmp, 10, weight) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        tmp);
-@@ -868,7 +868,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroupPtr group,
- 
-     if (!str) {
-         *weight = 0;
--    } else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
-+    } else if (virStrToLong_ui(str, &str, 10, weight) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Unable to parse '%s' as an integer"),
-                        str);
-@@ -938,7 +938,7 @@ virCgroupV2GetBlkioDeviceReadIops(virCgroupPtr group,
- 
-         if (STREQLEN(tmp, "max", 3)) {
-             *riops = 0;
--        } else if (virStrToLong_ui(tmp, NULL, 10, riops) < 0) {
-+        } else if (virStrToLong_ui(tmp, &tmp, 10, riops) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Unable to parse '%s' as an integer"),
-                            str);
-@@ -1009,7 +1009,7 @@ virCgroupV2GetBlkioDeviceWriteIops(virCgroupPtr group,
- 
-         if (STREQLEN(tmp, "max", 3)) {
-             *wiops = 0;
--        } else if (virStrToLong_ui(tmp, NULL, 10, wiops) < 0) {
-+        } else if (virStrToLong_ui(tmp, &tmp, 10, wiops) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Unable to parse '%s' as an integer"),
-                            str);
-@@ -1080,7 +1080,7 @@ virCgroupV2GetBlkioDeviceReadBps(virCgroupPtr group,
- 
-         if (STREQLEN(tmp, "max", 3)) {
-             *rbps = 0;
--        } else if (virStrToLong_ull(tmp, NULL, 10, rbps) < 0) {
-+        } else if (virStrToLong_ull(tmp, &tmp, 10, rbps) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Unable to parse '%s' as an integer"),
-                            str);
-@@ -1151,7 +1151,7 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroupPtr group,
- 
-         if (STREQLEN(tmp, "max", 3)) {
-             *wbps = 0;
--        } else if (virStrToLong_ull(tmp, NULL, 10, wbps) < 0) {
-+        } else if (virStrToLong_ull(tmp, &tmp, 10, wbps) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Unable to parse '%s' as an integer"),
-                            str);
-@@ -1534,7 +1534,7 @@ virCgroupV2GetCpuCfsPeriod(virCgroupPtr group,
-         return -1;
-     }
- 
--    if (virStrToLong_ull(tmp, NULL, 10, cfs_period) < 0) {
-+    if (virStrToLong_ull(tmp, &tmp, 10, cfs_period) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Failed to parse value '%s' from cpu.max."), str);
-         return -1;
-@@ -1584,7 +1584,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
-     if (STREQLEN(str, "max", 3))
-         *cfs_quota = ULLONG_MAX / 1000;
- 
--    if (virStrToLong_ll(str, NULL, 10, cfs_quota) < 0) {
-+    if (virStrToLong_ll(str, &str, 10, cfs_quota) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Failed to parse value '%s' from cpu.max."), str);
-         return -1;
--- 
-2.23.0
-
diff --git a/SOURCES/libvirt-vircgroupv2-fix-setting-cpu.max-period.patch b/SOURCES/libvirt-vircgroupv2-fix-setting-cpu.max-period.patch
deleted file mode 100644
index c07b46e..0000000
--- a/SOURCES/libvirt-vircgroupv2-fix-setting-cpu.max-period.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 164b5885c6916d39a71a4778da9782c9dc6cadf0 Mon Sep 17 00:00:00 2001
-Message-Id: <164b5885c6916d39a71a4778da9782c9dc6cadf0@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Fri, 6 Sep 2019 09:29:41 +0200
-Subject: [PATCH] vircgroupv2: fix setting cpu.max period
-
-When we set cpu.max period we need to parse the cpu.max file first as
-it contains both quota and period values separated by space.  When only
-a single number is written to that file it will set quota.  However,
-in order to change period we need to write both values.
-
-The code was prepared for that but mistakenly used new line to end the
-string with the first value.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749227
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 0bd4ad193d8ba7f0104f4739f19f2731e7cf9f56)
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3a1021b39f7b5add388e98eae4caa63975b60fc3.1567754949.git.phrdina@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/util/vircgroupv2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index e7b9093754..13a51e67a4 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1507,7 +1507,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group,
-                        _("Invalid 'cpu.max' data."));
-         return -1;
-     }
--    *tmp = '\n';
-+    *tmp = '\0';
- 
-     if (virAsprintf(&value, "%s %llu", str, cfs_period) < 0)
-         return -1;
--- 
-2.23.0
-
diff --git a/SOURCES/libvirt-vircgroupv2-fix-virCgroupV2GetCpuCfsQuota-for-max-value.patch b/SOURCES/libvirt-vircgroupv2-fix-virCgroupV2GetCpuCfsQuota-for-max-value.patch
deleted file mode 100644
index 06680d6..0000000
--- a/SOURCES/libvirt-vircgroupv2-fix-virCgroupV2GetCpuCfsQuota-for-max-value.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From dd46b194155d91d44d8c10f5bca48a5b4d296f63 Mon Sep 17 00:00:00 2001
-Message-Id: <dd46b194155d91d44d8c10f5bca48a5b4d296f63@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Wed, 21 Aug 2019 09:42:35 +0200
-Subject: [PATCH] vircgroupv2: fix virCgroupV2GetCpuCfsQuota for "max" value
-
-If the first value in cpu.max is "max" return from function.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1741837
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 23689cddd4542041cdfa3416705993d373033961)
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <287fbea9b44a5f7263505dc5fbd72d1bf2692bc6.1566373284.git.phrdina@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/vircgroupv2.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index e129686a52..e31a2d1121 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -1581,8 +1581,10 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
-         return -1;
-     }
- 
--    if (STREQLEN(str, "max", 3))
-+    if (STREQLEN(str, "max", 3)) {
-         *cfs_quota = ULLONG_MAX / 1000;
-+        return 0;
-+    }
- 
-     if (virStrToLong_ll(str, &str, 10, cfs_quota) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--- 
-2.23.0
-
diff --git a/SOURCES/libvirt-vircgroupv2-fix-virCgroupV2ValidateMachineGroup.patch b/SOURCES/libvirt-vircgroupv2-fix-virCgroupV2ValidateMachineGroup.patch
deleted file mode 100644
index 0b7339d..0000000
--- a/SOURCES/libvirt-vircgroupv2-fix-virCgroupV2ValidateMachineGroup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9193cc6a2395f2f26bcae2d990f78b2860b08ae9 Mon Sep 17 00:00:00 2001
-Message-Id: <9193cc6a2395f2f26bcae2d990f78b2860b08ae9@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:10 +0200
-Subject: [PATCH] vircgroupv2: fix virCgroupV2ValidateMachineGroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When libvirt is reconnecting to running domain that uses cgroup v2
-the QEMU process reports cgroup for the emulator directory because the
-main thread is in that cgroup.  We need to remove the "/emulator" part
-in order to match with the root cgroup directory name for that domain.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 634bd528cb194439f0bea0815f579d0b0c1b1a92)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <963bff76d79df2da95b1881fc9b7329be7b59d52.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 5652fcfffb..8658454d8b 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -121,6 +121,13 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group,
- 
-     if (!(tmp = strrchr(group->unified.placement, '/')))
-         return false;
-+
-+    if (STREQ(tmp, "/emulator")) {
-+        *tmp = '\0';
-+
-+        if (!(tmp = strrchr(group->unified.placement, '/')))
-+            return false;
-+    }
-     tmp++;
- 
-     if (STRNEQ(tmp, partmachinename) &&
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircgroupv2-store-enabled-controllers.patch b/SOURCES/libvirt-vircgroupv2-store-enabled-controllers.patch
deleted file mode 100644
index 86a974a..0000000
--- a/SOURCES/libvirt-vircgroupv2-store-enabled-controllers.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6d526969ab72e7c35b988a7154d8343001a05208 Mon Sep 17 00:00:00 2001
-Message-Id: <6d526969ab72e7c35b988a7154d8343001a05208@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Thu, 25 Jul 2019 13:37:02 +0200
-Subject: [PATCH] vircgroupv2: store enabled controllers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In cgroups v2 when a new group is created by default no controller is
-enabled so the detection code will not detect any controllers.
-
-When enabling the controllers we should also store them for the group.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Acked-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 56fdf3f025207a550726767e3f0ec1f290603ba4)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <3cef886d4257a746e5a7182246d5457664d8bcec.1564054553.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv2.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
-index 7b3cd64cc5..9ae47e775e 100644
---- a/src/util/vircgroupv2.c
-+++ b/src/util/vircgroupv2.c
-@@ -364,7 +364,8 @@ virCgroupV2PathOfController(virCgroupPtr group,
-  *          0 on success
-  */
- static int
--virCgroupV2EnableController(virCgroupPtr parent,
-+virCgroupV2EnableController(virCgroupPtr group,
-+                            virCgroupPtr parent,
-                             int controller,
-                             bool report)
- {
-@@ -390,6 +391,8 @@ virCgroupV2EnableController(virCgroupPtr parent,
-         return -2;
-     }
- 
-+    group->unified.controllers |= 1 << controller;
-+
-     return 0;
- }
- 
-@@ -431,14 +434,14 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-             }
- 
-             if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPU) &&
--                virCgroupV2EnableController(parent,
-+                virCgroupV2EnableController(group, parent,
-                                             VIR_CGROUP_CONTROLLER_CPU,
-                                             true) < 0) {
-                 return -1;
-             }
- 
-             if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPUSET) &&
--                virCgroupV2EnableController(parent,
-+                virCgroupV2EnableController(group, parent,
-                                             VIR_CGROUP_CONTROLLER_CPUSET,
-                                             true) < 0) {
-                 return -1;
-@@ -455,7 +458,7 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
-                 if (i == VIR_CGROUP_CONTROLLER_CPUACCT)
-                     continue;
- 
--                rc = virCgroupV2EnableController(parent, i, false);
-+                rc = virCgroupV2EnableController(group, parent, i, false);
-                 if (rc < 0) {
-                     if (rc == -2) {
-                         virResetLastError();
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircommand-Separate-mass-FD-closing-into-a-function.patch b/SOURCES/libvirt-vircommand-Separate-mass-FD-closing-into-a-function.patch
deleted file mode 100644
index eea098c..0000000
--- a/SOURCES/libvirt-vircommand-Separate-mass-FD-closing-into-a-function.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 0f27acb41229aa29d539f1975c36c78f75fdf11c Mon Sep 17 00:00:00 2001
-Message-Id: <0f27acb41229aa29d539f1975c36c78f75fdf11c@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 30 Jul 2019 15:30:53 +0200
-Subject: [PATCH] vircommand: Separate mass FD closing into a function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I will optimize this code a bit in the next commit. But for that
-it is better if the code lives in a separate function.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c1a9bfbbba48fea44fdfbe532e084c5323c9c9b3)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1721434
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Message-Id: <6de04910a1dc7c2e5554983b504b1a9932411a60.1564493409.git.mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircommand.c | 52 ++++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 18 deletions(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index d328431373..8ae9a952a3 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -491,6 +491,37 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups)
-     return ret;
- }
- 
-+static int
-+virCommandMassClose(virCommandPtr cmd,
-+                    int childin,
-+                    int childout,
-+                    int childerr)
-+{
-+    int openmax = sysconf(_SC_OPEN_MAX);
-+    int fd;
-+    int tmpfd;
-+
-+    if (openmax < 0) {
-+        virReportSystemError(errno,  "%s",
-+                             _("sysconf(_SC_OPEN_MAX) failed"));
-+        return -1;
-+    }
-+
-+    for (fd = 3; fd < openmax; fd++) {
-+        if (fd == childin || fd == childout || fd == childerr)
-+            continue;
-+        if (!virCommandFDIsSet(cmd, fd)) {
-+            tmpfd = fd;
-+            VIR_MASS_CLOSE(tmpfd);
-+        } else if (virSetInherit(fd, true) < 0) {
-+            virReportSystemError(errno, _("failed to preserve fd %d"), fd);
-+            return -1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
- /*
-  * virExec:
-  * @cmd virCommandPtr containing all information about the program to
-@@ -500,13 +531,12 @@ static int
- virExec(virCommandPtr cmd)
- {
-     pid_t pid;
--    int null = -1, fd, openmax;
-+    int null = -1;
-     int pipeout[2] = {-1, -1};
-     int pipeerr[2] = {-1, -1};
-     int childin = cmd->infd;
-     int childout = -1;
-     int childerr = -1;
--    int tmpfd;
-     VIR_AUTOFREE(char *) binarystr = NULL;
-     const char *binary = NULL;
-     int ret;
-@@ -612,23 +642,9 @@ virExec(virCommandPtr cmd)
-     if (cmd->mask)
-         umask(cmd->mask);
-     ret = EXIT_CANCELED;
--    openmax = sysconf(_SC_OPEN_MAX);
--    if (openmax < 0) {
--        virReportSystemError(errno,  "%s",
--                             _("sysconf(_SC_OPEN_MAX) failed"));
-+
-+    if (virCommandMassClose(cmd, childin, childout, childerr) < 0)
-         goto fork_error;
--    }
--    for (fd = 3; fd < openmax; fd++) {
--        if (fd == childin || fd == childout || fd == childerr)
--            continue;
--        if (!virCommandFDIsSet(cmd, fd)) {
--            tmpfd = fd;
--            VIR_MASS_CLOSE(tmpfd);
--        } else if (virSetInherit(fd, true) < 0) {
--            virReportSystemError(errno, _("failed to preserve fd %d"), fd);
--            goto fork_error;
--        }
--    }
- 
-     if (prepareStdFd(childin, STDIN_FILENO) < 0) {
-         virReportSystemError(errno,
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-vircpuhost-Add-support-for-reading-MSRs.patch b/SOURCES/libvirt-vircpuhost-Add-support-for-reading-MSRs.patch
deleted file mode 100644
index 1f5ccce..0000000
--- a/SOURCES/libvirt-vircpuhost-Add-support-for-reading-MSRs.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 6094ea6111dd57274b6037e76f662a06b8e5c9d1 Mon Sep 17 00:00:00 2001
-Message-Id: <6094ea6111dd57274b6037e76f662a06b8e5c9d1@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:43 +0200
-Subject: [PATCH] vircpuhost: Add support for reading MSRs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The new virHostCPUGetMSR internal API will try to read the MSR from
-/dev/cpu/0/msr and if it is not possible (the device does not exist or
-libvirt is running unprivileged), it will fallback to asking KVM for the
-MSR using KVM_GET_MSRS ioctl.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit df4b46737f43a1a67f9b5de2840213a1bd2b3cce)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Conflicts:
-	src/util/virhostcpu.h
-            - different header file guard symbol
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0d4c18704c435cccc2b18ebd55f4f914caf05d13.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virhostcpu.c    | 80 ++++++++++++++++++++++++++++++++++++++++
- src/util/virhostcpu.h    |  3 ++
- 3 files changed, 84 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 347667b17c..9ebc5384fb 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1974,6 +1974,7 @@ virHostCPUGetInfo;
- virHostCPUGetKVMMaxVCPUs;
- virHostCPUGetMap;
- virHostCPUGetMicrocodeVersion;
-+virHostCPUGetMSR;
- virHostCPUGetOnline;
- virHostCPUGetOnlineBitmap;
- virHostCPUGetPresentBitmap;
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index effe04ca3a..d0c47faa18 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -64,6 +64,7 @@
- VIR_LOG_INIT("util.hostcpu");
- 
- #define KVM_DEVICE "/dev/kvm"
-+#define MSR_DEVICE "/dev/cpu/0/msr"
- 
- 
- #if defined(__FreeBSD__) || defined(__APPLE__)
-@@ -1266,3 +1267,82 @@ virHostCPUGetMicrocodeVersion(void)
- }
- 
- #endif /* __linux__ */
-+
-+
-+#if HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS)
-+static int
-+virHostCPUGetMSRFromKVM(unsigned long index,
-+                        uint64_t *result)
-+{
-+    VIR_AUTOCLOSE fd = -1;
-+    struct {
-+        struct kvm_msrs header;
-+        struct kvm_msr_entry entry;
-+    } msr = {
-+        .header = { .nmsrs = 1 },
-+        .entry = { .index = index },
-+    };
-+
-+    if ((fd = open(KVM_DEVICE, O_RDONLY)) < 0) {
-+        virReportSystemError(errno, _("Unable to open %s"), KVM_DEVICE);
-+        return -1;
-+    }
-+
-+    if (ioctl(fd, KVM_GET_MSRS, &msr) < 0) {
-+        VIR_DEBUG("Cannot get MSR 0x%lx from KVM", index);
-+        return 1;
-+    }
-+
-+    *result = msr.entry.data;
-+    return 0;
-+}
-+
-+#else
-+
-+static int
-+virHostCPUGetMSRFromKVM(unsigned long index ATTRIBUTE_UNUSED,
-+                        uint64_t *result ATTRIBUTE_UNUSED)
-+{
-+    virReportSystemError(ENOSYS, "%s",
-+                         _("Reading MSRs via KVM is not supported on this platform"));
-+    return -1;
-+}
-+#endif /* HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) */
-+
-+
-+/*
-+ * Returns 0 on success,
-+ *         1 when the MSR is not supported by the host CPU,
-+*         -1 on error.
-+ */
-+int
-+virHostCPUGetMSR(unsigned long index,
-+                 uint64_t *msr)
-+{
-+    VIR_AUTOCLOSE fd = -1;
-+    char ebuf[1024];
-+
-+    *msr = 0;
-+
-+    if ((fd = open(MSR_DEVICE, O_RDONLY)) < 0) {
-+        VIR_DEBUG("Unable to open %s: %s",
-+                  MSR_DEVICE, virStrerror(errno, ebuf, sizeof(ebuf)));
-+    } else {
-+        int rc = pread(fd, msr, sizeof(*msr), index);
-+
-+        if (rc == sizeof(*msr))
-+            return 0;
-+
-+        if (rc < 0 && errno == EIO) {
-+            VIR_DEBUG("CPU does not support MSR 0x%lx", index);
-+            return 1;
-+        }
-+
-+        VIR_DEBUG("Cannot read MSR 0x%lx from %s: %s",
-+                  index, MSR_DEVICE, virStrerror(errno, ebuf, sizeof(ebuf)));
-+    }
-+
-+    VIR_DEBUG("Falling back to KVM ioctl");
-+
-+    return virHostCPUGetMSRFromKVM(index, msr);
-+}
-diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
-index f9f3359288..e705623d4f 100644
---- a/src/util/virhostcpu.h
-+++ b/src/util/virhostcpu.h
-@@ -68,4 +68,7 @@ int virHostCPUGetOnline(unsigned int cpu, bool *online);
- 
- unsigned int virHostCPUGetMicrocodeVersion(void);
- 
-+int virHostCPUGetMSR(unsigned long index,
-+                     uint64_t *msr);
-+
- #endif /* __VIR_HOSTCPU_H__*/
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virdbus-Grab-a-ref-as-long-as-the-while-loop-is-executed.patch b/SOURCES/libvirt-virdbus-Grab-a-ref-as-long-as-the-while-loop-is-executed.patch
deleted file mode 100644
index 499c3d4..0000000
--- a/SOURCES/libvirt-virdbus-Grab-a-ref-as-long-as-the-while-loop-is-executed.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2b04ec4cfae111f315514395030ab1106b6370da Mon Sep 17 00:00:00 2001
-Message-Id: <2b04ec4cfae111f315514395030ab1106b6370da@dist-git>
-From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
-Date: Fri, 16 Aug 2019 16:01:55 +0200
-Subject: [PATCH] virdbus: Grab a ref as long as the while loop is executed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Grab a ref for info->bus (a DBus connection) as long as the while loop
-is running. With the grabbed reference it is ensured that info->bus
-isn't freed as long as the while loop is executed. This is necessary
-as it's allowed to drop the last ref for the bus connection in a
-handler.
-
-There was already a bug of this kind in libdbus itself:
-https://bugs.freedesktop.org/show_bug.cgi?id=15635.
-
-Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 6707ffd11c1d8940ca7dfa7aaef707a60ef6756e)
-
-RHEL-8.1.0: https://bugzilla.redhat.com/show_bug.cgi?id=1741900
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Message-Id: <9656cea8218d901d5e44a157362cd0f009ff1a7d.1565964111.git.jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virdbus.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/util/virdbus.c b/src/util/virdbus.c
-index ba8b684f17..d0e2c76e48 100644
---- a/src/util/virdbus.c
-+++ b/src/util/virdbus.c
-@@ -198,8 +198,10 @@ static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
- 
-     (void)dbus_watch_handle(watch, dbus_flags);
- 
-+    dbus_connection_ref(info->bus);
-     while (dbus_connection_dispatch(info->bus) == DBUS_DISPATCH_DATA_REMAINS)
-         /* keep dispatching while data remains */;
-+    dbus_connection_unref(info->bus);
- }
- 
- 
--- 
-2.22.1
-
diff --git a/SOURCES/libvirt-virdevmapper-Don-t-cache-device-mapper-major.patch b/SOURCES/libvirt-virdevmapper-Don-t-cache-device-mapper-major.patch
new file mode 100644
index 0000000..c02e3ab
--- /dev/null
+++ b/SOURCES/libvirt-virdevmapper-Don-t-cache-device-mapper-major.patch
@@ -0,0 +1,99 @@
+From bc406e0919e72b1f108ded76a380212b179c8572 Mon Sep 17 00:00:00 2001
+Message-Id: <bc406e0919e72b1f108ded76a380212b179c8572@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Aug 2020 17:16:05 +0200
+Subject: [PATCH] virdevmapper: Don't cache device-mapper major
+
+The device mapper major is needed in virIsDevMapperDevice() which
+determines whether given device is managed by device-mapper. This
+number is obtained by parsing /proc/devices and then stored in a
+global variable so that the file doesn't have to be parsed again.
+However, as it turns out this logic is flawed - the major number
+is not static and can change as it can be specified as a
+parameter when loading the dm-mod module.
+
+Unfortunately, I was not able to come up with a good solution and
+thus the /proc/devices file is being parsed every time we need
+the device mapper major.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit 82bb167f0d15b733b23931205be3488b83cb9ec6)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <64b6d6124918bc8cfe220464752eac93cd6d6734.1598364552.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virdevmapper.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index a471504176..b43dbefa9a 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -46,11 +46,9 @@
+ 
+ G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
+ 
+-static unsigned int virDMMajor;
+-
+ 
+ static int
+-virDevMapperOnceInit(void)
++virDevMapperGetMajor(unsigned int *major)
+ {
+     g_autofree char *buf = NULL;
+     VIR_AUTOSTRINGLIST lines = NULL;
+@@ -69,7 +67,7 @@ virDevMapperOnceInit(void)
+ 
+         if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
+             STREQ(dev, DM_NAME)) {
+-            virDMMajor = maj;
++            *major = maj;
+             break;
+         }
+     }
+@@ -85,9 +83,6 @@ virDevMapperOnceInit(void)
+ }
+ 
+ 
+-VIR_ONCE_GLOBAL_INIT(virDevMapper);
+-
+-
+ static void *
+ virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
+ {
+@@ -305,9 +300,6 @@ virDevMapperGetTargets(const char *path,
+      * consist of devices or yet another targets. If that's the
+      * case, we have to stop recursion somewhere. */
+ 
+-    if (virDevMapperInitialize() < 0)
+-        return -1;
+-
+     if ((controlFD = virDMOpen()) < 0)
+         return -1;
+ 
+@@ -319,13 +311,14 @@ bool
+ virIsDevMapperDevice(const char *dev_name)
+ {
+     struct stat buf;
++    unsigned int major;
+ 
+-    if (virDevMapperInitialize() < 0)
++    if (virDevMapperGetMajor(&major) < 0)
+         return false;
+ 
+     if (!stat(dev_name, &buf) &&
+         S_ISBLK(buf.st_mode) &&
+-        major(buf.st_rdev) == virDMMajor)
++        major(buf.st_rdev) == major)
+         return true;
+ 
+     return false;
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virdevmapper-Don-t-use-libdevmapper-to-obtain-dependencies.patch b/SOURCES/libvirt-virdevmapper-Don-t-use-libdevmapper-to-obtain-dependencies.patch
new file mode 100644
index 0000000..27647cd
--- /dev/null
+++ b/SOURCES/libvirt-virdevmapper-Don-t-use-libdevmapper-to-obtain-dependencies.patch
@@ -0,0 +1,467 @@
+From 7ba9a0bbdf30984c13e7719e0646fffc7539f853 Mon Sep 17 00:00:00 2001
+Message-Id: <7ba9a0bbdf30984c13e7719e0646fffc7539f853@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 27 Jul 2020 12:36:52 +0200
+Subject: [PATCH] virdevmapper: Don't use libdevmapper to obtain dependencies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CVE-2020-14339
+
+When building domain's private /dev in a namespace, libdevmapper
+is consulted for getting full dependency tree of domain's disks.
+The reason is that for a multipath devices all dependent devices
+must be created in the namespace and allowed in CGroups.
+
+However, this approach is very fragile as building of namespace
+happens in the forked off child process, after mass close of FDs
+and just before dropping privileges and execing QEMU. And it so
+happens that when calling libdevmapper APIs, one of them opens
+/dev/mapper/control and saves the FD into a global variable. The
+FD is kept open until the lib is unlinked or dm_lib_release() is
+called explicitly. We are doing neither.
+
+However, the virDevMapperGetTargets() function is called also
+from libvirtd (when setting up CGroups) and thus has to be thread
+safe. Unfortunately, libdevmapper APIs are not thread safe (nor
+async signal safe) and thus we can't use them. Reimplement what
+libdevmapper would do using plain C (ioctl()-s, /proc/devices
+parsing, /dev/mapper dirwalking, and so on).
+
+Fixes: a30078cb832646177defd256e77c632905f1e6d0
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1858260
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Conflicts:
+- po/POTFILES.in - In c6a0d3ff8b4ead3b1f38a40668df65f152cc2f32
+  (po: change the format of POTFILES.in) we've changed the format
+  of the file and haven't backported it, yet.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <bf0ad2c93723aab2579368496aab4289701a94d8.1595846084.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ po/POTFILES.in          |   1 +
+ src/util/virdevmapper.c | 300 +++++++++++++++++++++++++++++-----------
+ 2 files changed, 217 insertions(+), 84 deletions(-)
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 29984042f4..49348292eb 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -238,6 +238,7 @@
+ @SRCDIR@/src/util/vircrypto.c
+ @SRCDIR@/src/util/virdbus.c
+ @SRCDIR@/src/util/virdnsmasq.c
++@SRCDIR@/src/util/virdevmapper.c
+ @SRCDIR@/src/util/virerror.c
+ @SRCDIR@/src/util/virerror.h
+ @SRCDIR@/src/util/virevent.c
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index 44c4731fb4..a471504176 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -20,38 +20,67 @@
+ 
+ #include <config.h>
+ 
++#include "virdevmapper.h"
++#include "internal.h"
++
+ #ifdef __linux__
+ # include <sys/sysmacros.h>
+-#endif
++# include <linux/dm-ioctl.h>
++# include <sys/ioctl.h>
++# include <sys/types.h>
++# include <sys/stat.h>
++# include <fcntl.h>
+ 
+-#ifdef WITH_DEVMAPPER
+-# include <libdevmapper.h>
+-#endif
++# include "virthread.h"
++# include "viralloc.h"
++# include "virstring.h"
++# include "virfile.h"
++
++# define VIR_FROM_THIS VIR_FROM_STORAGE
++
++# define PROC_DEVICES "/proc/devices"
++# define DM_NAME "device-mapper"
++# define DEV_DM_DIR "/dev/" DM_DIR
++# define CONTROL_PATH DEV_DM_DIR "/" DM_CONTROL_NODE
++# define BUF_SIZE (16 * 1024)
++
++G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
++
++static unsigned int virDMMajor;
+ 
+-#include "virdevmapper.h"
+-#include "internal.h"
+-#include "virthread.h"
+-#include "viralloc.h"
+-#include "virstring.h"
+-
+-#ifdef WITH_DEVMAPPER
+-static void
+-virDevMapperDummyLogger(int level G_GNUC_UNUSED,
+-                        const char *file G_GNUC_UNUSED,
+-                        int line G_GNUC_UNUSED,
+-                        int dm_errno G_GNUC_UNUSED,
+-                        const char *fmt G_GNUC_UNUSED,
+-                        ...)
+-{
+-    return;
+-}
+ 
+ static int
+ virDevMapperOnceInit(void)
+ {
+-    /* Ideally, we would not need this. But libdevmapper prints
+-     * error messages to stderr by default. Sad but true. */
+-    dm_log_with_errno_init(virDevMapperDummyLogger);
++    g_autofree char *buf = NULL;
++    VIR_AUTOSTRINGLIST lines = NULL;
++    size_t i;
++
++    if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
++        return -1;
++
++    lines = virStringSplit(buf, "\n", 0);
++    if (!lines)
++        return -1;
++
++    for (i = 0; lines[i]; i++) {
++        g_autofree char *dev = NULL;
++        unsigned int maj;
++
++        if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
++            STREQ(dev, DM_NAME)) {
++            virDMMajor = maj;
++            break;
++        }
++    }
++
++    if (!lines[i]) {
++        virReportError(VIR_ERR_INTERNAL_ERROR,
++                       _("Unable to find major for %s"),
++                       DM_NAME);
++        return -1;
++    }
++
+     return 0;
+ }
+ 
+@@ -59,94 +88,190 @@ virDevMapperOnceInit(void)
+ VIR_ONCE_GLOBAL_INIT(virDevMapper);
+ 
+ 
++static void *
++virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
++{
++    size_t bufsize = BUF_SIZE;
++
++ reread:
++    *buf = g_new0(char, bufsize);
++
++    dm->version[0] = DM_VERSION_MAJOR;
++    dm->version[1] = 0;
++    dm->version[2] = 0;
++    dm->data_size = bufsize;
++    dm->data_start = sizeof(struct dm_ioctl);
++
++    memcpy(*buf, dm, sizeof(struct dm_ioctl));
++
++    if (ioctl(controlFD, cmd, *buf) < 0) {
++        VIR_FREE(*buf);
++        return NULL;
++    }
++
++    memcpy(dm, *buf, sizeof(struct dm_ioctl));
++
++    if (dm->flags & DM_BUFFER_FULL_FLAG) {
++        bufsize += BUF_SIZE;
++        VIR_FREE(*buf);
++        goto reread;
++    }
++
++    return *buf + dm->data_start;
++}
++
++
+ static int
+-virDevMapperGetTargetsImpl(const char *path,
++virDMOpen(void)
++{
++    VIR_AUTOCLOSE controlFD = -1;
++    struct dm_ioctl dm;
++    g_autofree char *tmp = NULL;
++    int ret;
++
++    memset(&dm, 0, sizeof(dm));
++
++    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
++        return -1;
++
++    if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
++        virReportSystemError(errno, "%s",
++                             _("Unable to get device-mapper version"));
++        return -1;
++    }
++
++    if (dm.version[0] != DM_VERSION_MAJOR) {
++        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
++                       _("Unsupported device-mapper version. Expected %d got %d"),
++                       DM_VERSION_MAJOR, dm.version[0]);
++        return -1;
++    }
++
++    ret = controlFD;
++    controlFD = -1;
++    return ret;
++}
++
++
++static char *
++virDMSanitizepath(const char *path)
++{
++    g_autofree char *dmDirPath = NULL;
++    struct dirent *ent = NULL;
++    struct stat sb[2];
++    DIR *dh = NULL;
++    const char *p;
++    char *ret = NULL;
++    int rc;
++
++    /* If a path is NOT provided then assume it's DM name */
++    p = strrchr(path, '/');
++
++    if (!p)
++        return g_strdup(path);
++    else
++        p++;
++
++    /* It's a path. Check if the last component is DM name */
++    if (stat(path, &sb[0]) < 0) {
++        virReportError(errno,
++                       _("Unable to stat %p"),
++                       path);
++        return NULL;
++    }
++
++    dmDirPath = g_strdup_printf(DEV_DM_DIR "/%s", p);
++
++    if (stat(dmDirPath, &sb[1]) == 0 &&
++        sb[0].st_rdev == sb[1].st_rdev) {
++        return g_strdup(p);
++    }
++
++    /* The last component of @path wasn't DM name. Let's check if
++     * there's a device under /dev/mapper/ with the same rdev. */
++    if (virDirOpen(&dh, DEV_DM_DIR) < 0)
++        return NULL;
++
++    while ((rc = virDirRead(dh, &ent, DEV_DM_DIR)) > 0) {
++        g_autofree char *tmp = g_strdup_printf(DEV_DM_DIR "/%s", ent->d_name);
++
++        if (stat(tmp, &sb[1]) == 0 &&
++            sb[0].st_rdev == sb[0].st_rdev) {
++            ret = g_steal_pointer(&tmp);
++            break;
++        }
++    }
++
++    virDirClose(&dh);
++    return ret;
++}
++
++
++static int
++virDevMapperGetTargetsImpl(int controlFD,
++                           const char *path,
+                            char ***devPaths_ret,
+                            unsigned int ttl)
+ {
+-    struct dm_task *dmt = NULL;
+-    struct dm_deps *deps;
+-    struct dm_info info;
++    g_autofree char *sanitizedPath = NULL;
++    g_autofree char *buf = NULL;
++    struct dm_ioctl dm;
++    struct dm_target_deps *deps = NULL;
+     VIR_AUTOSTRINGLIST devPaths = NULL;
+     size_t i;
+-    int ret = -1;
+ 
++    memset(&dm, 0, sizeof(dm));
+     *devPaths_ret = NULL;
+ 
+-    if (virDevMapperInitialize() < 0)
+-        return ret;
+-
+     if (ttl == 0) {
+         errno = ELOOP;
+-        return ret;
++        return -1;
+     }
+ 
+     if (!virIsDevMapperDevice(path))
+         return 0;
+ 
+-    if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) {
+-        if (errno == ENOENT || errno == ENODEV) {
+-            /* It's okay. Kernel is probably built without
+-             * devmapper support. */
+-            ret = 0;
+-        }
+-        return ret;
+-    }
+-
+-    if (!dm_task_set_name(dmt, path)) {
+-        if (errno == ENOENT) {
+-            /* It's okay, @path is not managed by devmapper =>
+-             * not a devmapper device. */
+-            ret = 0;
+-        }
+-        goto cleanup;
+-    }
+-
+-    dm_task_no_open_count(dmt);
++    if (!(sanitizedPath = virDMSanitizepath(path)))
++        return 0;
+ 
+-    if (!dm_task_run(dmt)) {
+-        if (errno == ENXIO) {
+-            /* If @path = "/dev/mapper/control" ENXIO is returned. */
+-            ret = 0;
+-        }
+-        goto cleanup;
++    if (virStrncpy(dm.name, sanitizedPath, -1, DM_TABLE_DEPS) < 0) {
++        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
++                       _("Resolved device mapper name too long"));
++        return -1;
+     }
+ 
+-    if (!dm_task_get_info(dmt, &info))
+-        goto cleanup;
++    deps = virDMIoctl(controlFD, DM_TABLE_DEPS, &dm, &buf);
++    if (!deps) {
++        if (errno == ENXIO)
++            return 0;
+ 
+-    if (!info.exists) {
+-        ret = 0;
+-        goto cleanup;
++        virReportSystemError(errno,
++                             _("Unable to query dependencies for %s"),
++                             path);
++        return -1;
+     }
+ 
+-    if (!(deps = dm_task_get_deps(dmt)))
+-        goto cleanup;
+-
+     if (VIR_ALLOC_N_QUIET(devPaths, deps->count + 1) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < deps->count; i++) {
+         devPaths[i] = g_strdup_printf("/dev/block/%u:%u",
+-                                      major(deps->device[i]),
+-                                      minor(deps->device[i]));
++                                      major(deps->dev[i]),
++                                      minor(deps->dev[i]));
+     }
+ 
+     for (i = 0; i < deps->count; i++) {
+         VIR_AUTOSTRINGLIST tmpPaths = NULL;
+ 
+-        if (virDevMapperGetTargetsImpl(devPaths[i], &tmpPaths, ttl - 1) < 0)
+-            goto cleanup;
++        if (virDevMapperGetTargetsImpl(controlFD, devPaths[i], &tmpPaths, ttl - 1) < 0)
++            return -1;
+ 
+         if (virStringListMerge(&devPaths, &tmpPaths) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     *devPaths_ret = g_steal_pointer(&devPaths);
+-    ret = 0;
+- cleanup:
+-    dm_task_destroy(dmt);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+@@ -165,9 +290,6 @@ virDevMapperGetTargetsImpl(const char *path,
+  * If @path consists of yet another devmapper targets these are
+  * consulted recursively.
+  *
+- * If we don't have permissions to talk to kernel, -1 is returned
+- * and errno is set to EBADF.
+- *
+  * Returns 0 on success,
+  *        -1 otherwise (with errno set, no libvirt error is
+  *        reported)
+@@ -176,13 +298,20 @@ int
+ virDevMapperGetTargets(const char *path,
+                        char ***devPaths)
+ {
++    VIR_AUTOCLOSE controlFD = -1;
+     const unsigned int ttl = 32;
+ 
+     /* Arbitrary limit on recursion level. A devmapper target can
+      * consist of devices or yet another targets. If that's the
+      * case, we have to stop recursion somewhere. */
+ 
+-    return virDevMapperGetTargetsImpl(path, devPaths, ttl);
++    if (virDevMapperInitialize() < 0)
++        return -1;
++
++    if ((controlFD = virDMOpen()) < 0)
++        return -1;
++
++    return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
+ }
+ 
+ 
+@@ -191,15 +320,18 @@ virIsDevMapperDevice(const char *dev_name)
+ {
+     struct stat buf;
+ 
++    if (virDevMapperInitialize() < 0)
++        return false;
++
+     if (!stat(dev_name, &buf) &&
+         S_ISBLK(buf.st_mode) &&
+-        dm_is_dm_major(major(buf.st_rdev)))
+-            return true;
++        major(buf.st_rdev) == virDMMajor)
++        return true;
+ 
+     return false;
+ }
+ 
+-#else /* ! WITH_DEVMAPPER */
++#else /* !defined(__linux__)  */
+ 
+ int
+ virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
+@@ -215,4 +347,4 @@ virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
+ {
+     return false;
+ }
+-#endif /* ! WITH_DEVMAPPER */
++#endif /* ! defined(__linux__) */
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virdevmapper-Handle-kernel-without-device-mapper-support.patch b/SOURCES/libvirt-virdevmapper-Handle-kernel-without-device-mapper-support.patch
new file mode 100644
index 0000000..c55aa74
--- /dev/null
+++ b/SOURCES/libvirt-virdevmapper-Handle-kernel-without-device-mapper-support.patch
@@ -0,0 +1,87 @@
+From a9c950dcbac1f708bcd01111d4ec9b550db37fe3 Mon Sep 17 00:00:00 2001
+Message-Id: <a9c950dcbac1f708bcd01111d4ec9b550db37fe3@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Aug 2020 17:16:06 +0200
+Subject: [PATCH] virdevmapper: Handle kernel without device-mapper support
+
+In one of my latest patch (v6.6.0~30) I was trying to remove
+libdevmapper use in favor of our own implementation. However, the
+code did not take into account that device mapper can be not
+compiled into the kernel (e.g. be a separate module that's not
+loaded) in which case /proc/devices won't have the device-mapper
+major number and thus virDevMapperGetTargets() and/or
+virIsDevMapperDevice() fails.
+
+However, such failure is safe to ignore, because if device mapper
+is missing then there can't be any multipath devices and thus we
+don't need to allow the deps in CGroups, nor create them in the
+domain private namespace, etc.
+
+Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e
+Reported-by: Andrea Bolognani <abologna@redhat.com>
+Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit feb8564a3cc63bc8f68284063d53ec0d2d81a1cc)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <71fcd93071dffdf4942ccce8671af7fcbcec397f.1598364552.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virdevmapper.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index b43dbefa9a..a81e2edee4 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -54,6 +54,9 @@ virDevMapperGetMajor(unsigned int *major)
+     VIR_AUTOSTRINGLIST lines = NULL;
+     size_t i;
+ 
++    if (!virFileExists(CONTROL_PATH))
++        return -2;
++
+     if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
+         return -1;
+ 
+@@ -126,8 +129,13 @@ virDMOpen(void)
+ 
+     memset(&dm, 0, sizeof(dm));
+ 
+-    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
++    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
++        if (errno == ENOENT)
++            return -2;
++
++        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
+         return -1;
++    }
+ 
+     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
+         virReportSystemError(errno, "%s",
+@@ -300,8 +308,16 @@ virDevMapperGetTargets(const char *path,
+      * consist of devices or yet another targets. If that's the
+      * case, we have to stop recursion somewhere. */
+ 
+-    if ((controlFD = virDMOpen()) < 0)
++    if ((controlFD = virDMOpen()) < 0) {
++        if (controlFD == -2) {
++            /* The CONTROL_PATH doesn't exist. Probably the
++             * module isn't loaded, yet. Don't error out, just
++             * exit. */
++            return 0;
++        }
++
+         return -1;
++    }
+ 
+     return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
+ }
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-control.patch b/SOURCES/libvirt-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-control.patch
new file mode 100644
index 0000000..d7ab070
--- /dev/null
+++ b/SOURCES/libvirt-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-control.patch
@@ -0,0 +1,88 @@
+From b38ab86a0a2cf3453d37a5fe96b2e022d8a1d48a Mon Sep 17 00:00:00 2001
+Message-Id: <b38ab86a0a2cf3453d37a5fe96b2e022d8a1d48a@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 25 Aug 2020 17:16:07 +0200
+Subject: [PATCH] virdevmapper: Ignore all errors when opening
+ /dev/mapper/control
+
+So far, only ENOENT is ignored (to deal with kernels without
+devmapper). However, as reported on the list, under certain
+scenarios a different error can occur. For instance, when libvirt
+is running inside a container which doesn't have permissions to
+talk to the devmapper. If this is the case, then open() returns
+-1 and sets errno=EPERM.
+
+Assuming that multipath devices are fairly narrow use case and
+using them in a restricted container is even more narrow the best
+fix seems to be to ignore all open errors BUT produce a warning
+on failure. To avoid flooding logs with warnings on kernels
+without devmapper the level is reduced to a plain debug message.
+
+Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 53d9af1e7924757e3b5f661131dd707d7110d094)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <e1b69d69e7d242829995208c6d59ed0477208920.1598364552.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virdevmapper.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index a81e2edee4..ee2fab5ae3 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -35,9 +35,12 @@
+ # include "viralloc.h"
+ # include "virstring.h"
+ # include "virfile.h"
++# include "virlog.h"
+ 
+ # define VIR_FROM_THIS VIR_FROM_STORAGE
+ 
++VIR_LOG_INIT("util.virdevmapper");
++
+ # define PROC_DEVICES "/proc/devices"
+ # define DM_NAME "device-mapper"
+ # define DEV_DM_DIR "/dev/" DM_DIR
+@@ -130,11 +133,15 @@ virDMOpen(void)
+     memset(&dm, 0, sizeof(dm));
+ 
+     if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
+-        if (errno == ENOENT)
+-            return -2;
+-
+-        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
+-        return -1;
++        /* We can't talk to devmapper. Produce a warning and let
++         * the caller decide what to do next. */
++        if (errno == ENOENT) {
++            VIR_DEBUG("device mapper not available");
++        } else {
++            VIR_WARN("unable to open %s: %s",
++                     CONTROL_PATH, g_strerror(errno));
++        }
++        return -2;
+     }
+ 
+     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
+@@ -310,9 +317,9 @@ virDevMapperGetTargets(const char *path,
+ 
+     if ((controlFD = virDMOpen()) < 0) {
+         if (controlFD == -2) {
+-            /* The CONTROL_PATH doesn't exist. Probably the
+-             * module isn't loaded, yet. Don't error out, just
+-             * exit. */
++            /* The CONTROL_PATH doesn't exist or is unusable.
++             * Probably the module isn't loaded, yet. Don't error
++             * out, just exit. */
+             return 0;
+         }
+ 
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virdevmapper.c-Join-two-WITH_DEVMAPPER-sections-together.patch b/SOURCES/libvirt-virdevmapper.c-Join-two-WITH_DEVMAPPER-sections-together.patch
new file mode 100644
index 0000000..c3b6b78
--- /dev/null
+++ b/SOURCES/libvirt-virdevmapper.c-Join-two-WITH_DEVMAPPER-sections-together.patch
@@ -0,0 +1,69 @@
+From 4e021109613173e72df17eca6bff970ebb86b47f Mon Sep 17 00:00:00 2001
+Message-Id: <4e021109613173e72df17eca6bff970ebb86b47f@dist-git>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 27 Jul 2020 12:36:50 +0200
+Subject: [PATCH] virdevmapper.c: Join two WITH_DEVMAPPER sections together
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are two distinct WITH_DEVMAPPER sections in the file, for
+different functions each. Rearrange the code to make some of
+future commits smaller.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit ae5752aabc09f435675504246e30a0b9c4795d79)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1860421
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Message-Id: <2b5410a10bb23e8a9526c663052afbb6f37b0a0c.1595846084.git.mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ src/util/virdevmapper.c | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index 40a82285f9..118dc82e94 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -195,19 +195,7 @@ virDevMapperGetTargets(const char *path,
+     return virDevMapperGetTargetsImpl(path, devPaths, ttl);
+ }
+ 
+-#else /* ! WITH_DEVMAPPER */
+-
+-int
+-virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
+-                       char ***devPaths G_GNUC_UNUSED)
+-{
+-    errno = ENOSYS;
+-    return -1;
+-}
+-#endif /* ! WITH_DEVMAPPER */
+ 
+-
+-#if WITH_DEVMAPPER
+ bool
+ virIsDevMapperDevice(const char *dev_name)
+ {
+@@ -223,6 +211,15 @@ virIsDevMapperDevice(const char *dev_name)
+ 
+ #else /* ! WITH_DEVMAPPER */
+ 
++int
++virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
++                       char ***devPaths G_GNUC_UNUSED)
++{
++    errno = ENOSYS;
++    return -1;
++}
++
++
+ bool
+ virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
+ {
+-- 
+2.28.0
+
diff --git a/SOURCES/libvirt-virfile-Detect-ceph-as-shared-FS.patch b/SOURCES/libvirt-virfile-Detect-ceph-as-shared-FS.patch
deleted file mode 100644
index 0576034..0000000
--- a/SOURCES/libvirt-virfile-Detect-ceph-as-shared-FS.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 6dd1c06ab2d05193d8cfee720f16d6b1d84b2cdf Mon Sep 17 00:00:00 2001
-Message-Id: <6dd1c06ab2d05193d8cfee720f16d6b1d84b2cdf@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 4 Jun 2019 13:27:35 +0200
-Subject: [PATCH] virfile: Detect ceph as shared FS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1665553
-
-Ceph can be mounted just like any other filesystem and in fact is
-a shared and cluster filesystem. The filesystem magic constant
-was taken from kernel sources as it is not in magic.h yet.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 6dd2a2ae6386b1d51edcc9a434f56d7f9dc2cb35)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1698133
-Message-Id: <55c1009db101780867229bdeea3f739db2efafeb.1559647301.git.pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virfile.c            | 9 ++++++++-
- src/util/virfile.h            | 1 +
- src/util/virstoragefile.c     | 3 ++-
- tests/virfiledata/mounts3.txt | 2 ++
- tests/virfilemock.c           | 5 +++++
- tests/virfiletest.c           | 2 ++
- 6 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 716b55d770..471d309062 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3537,6 +3537,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
- # ifndef FUSE_SUPER_MAGIC
- #  define FUSE_SUPER_MAGIC 0x65735546
- # endif
-+# ifndef CEPH_SUPER_MAGIC
-+#  define CEPH_SUPER_MAGIC 0x00C36400
-+# endif
- 
- # define PROC_MOUNTS "/proc/mounts"
- 
-@@ -3682,6 +3685,9 @@ virFileIsSharedFSType(const char *path,
-     if ((fstypes & VIR_FILE_SHFS_CIFS) &&
-         (f_type == CIFS_SUPER_MAGIC))
-         return 1;
-+    if ((fstypes & VIR_FILE_SHFS_CEPH) &&
-+        (f_type == CEPH_SUPER_MAGIC))
-+        return 1;
- 
-     return 0;
- }
-@@ -3845,7 +3851,8 @@ int virFileIsSharedFS(const char *path)
-                                  VIR_FILE_SHFS_OCFS |
-                                  VIR_FILE_SHFS_AFS |
-                                  VIR_FILE_SHFS_SMB |
--                                 VIR_FILE_SHFS_CIFS);
-+                                 VIR_FILE_SHFS_CIFS |
-+                                 VIR_FILE_SHFS_CEPH);
- }
- 
- 
-diff --git a/src/util/virfile.h b/src/util/virfile.h
-index 6f1e802fde..1d16e96b59 100644
---- a/src/util/virfile.h
-+++ b/src/util/virfile.h
-@@ -205,6 +205,7 @@ enum {
-     VIR_FILE_SHFS_AFS = (1 << 3),
-     VIR_FILE_SHFS_SMB = (1 << 4),
-     VIR_FILE_SHFS_CIFS = (1 << 5),
-+    VIR_FILE_SHFS_CEPH = (1 << 6),
- };
- 
- int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1);
-diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index 58f67278da..0b15219c3e 100644
---- a/src/util/virstoragefile.c
-+++ b/src/util/virstoragefile.c
-@@ -1366,7 +1366,8 @@ int virStorageFileIsClusterFS(const char *path)
-      */
-     return virFileIsSharedFSType(path,
-                                  VIR_FILE_SHFS_GFS2 |
--                                 VIR_FILE_SHFS_OCFS);
-+                                 VIR_FILE_SHFS_OCFS |
-+                                 VIR_FILE_SHFS_CEPH);
- }
- 
- #ifdef LVS
-diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
-index 134c6e8f81..68eded048c 100644
---- a/tests/virfiledata/mounts3.txt
-+++ b/tests/virfiledata/mounts3.txt
-@@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,
- dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
- host:/gv0 /gluster fuse.glusterfs rw 0 0
- root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
-+192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
-+192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
-diff --git a/tests/virfilemock.c b/tests/virfilemock.c
-index ae5c8d025a..eb5182df66 100644
---- a/tests/virfilemock.c
-+++ b/tests/virfilemock.c
-@@ -88,6 +88,9 @@ setmntent(const char *filename, const char *type)
- #ifndef FUSE_SUPER_MAGIC
- # define FUSE_SUPER_MAGIC 0x65735546
- #endif
-+#ifndef CEPH_SUPER_MAGIC
-+# define CEPH_SUPER_MAGIC 0x00c36400
-+#endif
- 
- 
- static int
-@@ -134,6 +137,8 @@ statfs_mock(const char *mtab,
-             ftype = CIFS_SUPER_MAGIC;
-         } else if (STRPREFIX(mb.mnt_type, "fuse")) {
-             ftype = FUSE_SUPER_MAGIC;
-+        } else if (STRPREFIX(mb.mnt_type, "ceph")) {
-+            ftype = CEPH_SUPER_MAGIC;
-         } else {
-             /* Everything else is EXT4. We don't care really for other paths. */
-             ftype = EXT4_SUPER_MAGIC;
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index a246d601ba..972c07fdc5 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -458,6 +458,8 @@ mymain(void)
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true);
- 
-     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virfile-Rework-virFileIsSharedFixFUSE.patch b/SOURCES/libvirt-virfile-Rework-virFileIsSharedFixFUSE.patch
deleted file mode 100644
index d049ec7..0000000
--- a/SOURCES/libvirt-virfile-Rework-virFileIsSharedFixFUSE.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 3d3a4186cbffd454c5f48af7ed7bd3e8934bbb2f Mon Sep 17 00:00:00 2001
-Message-Id: <3d3a4186cbffd454c5f48af7ed7bd3e8934bbb2f@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 10 Oct 2018 17:25:56 +0200
-Subject: [PATCH] virfile: Rework virFileIsSharedFixFUSE
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1632711
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1635705
-
-There are couple of things wrong with the current implementation.
-The first one is that in the first loop the code tries to build a
-list of fuse.glusterfs mount points. Well, since the strings are
-allocated in a temporary buffer and are not duplicated this
-results in wrong decision made later in the code.
-
-The second problem is that the code does not take into account
-subtree mounts. For instance, if there's a fuse.gluster mounted
-at /some/path and another FS mounted at /some/path/subdir the
-code would not recognize this subdir mount.
-
-Reported-by: Han Han <hhan@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 1dbf6222dd5e1fedcbe335fc0852ef66e7a92901)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virfile.c            | 61 ++++++++++++++---------------------
- tests/virfiledata/mounts3.txt |  2 ++
- tests/virfiletest.c           |  2 ++
- 3 files changed, 29 insertions(+), 36 deletions(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 05ecf7bf21..e1dee7633a 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3544,18 +3544,14 @@ static int
- virFileIsSharedFixFUSE(const char *path,
-                        long long *f_type)
- {
--    char *dirpath = NULL;
--    const char **mounts = NULL;
--    size_t nmounts = 0;
--    char *p;
-     FILE *f = NULL;
-     struct mntent mb;
-     char mntbuf[1024];
-+    char *mntDir = NULL;
-+    char *mntType = NULL;
-+    size_t maxMatching = 0;
-     int ret = -1;
- 
--    if (VIR_STRDUP(dirpath, path) < 0)
--        return -1;
--
-     if (!(f = setmntent(PROC_MOUNTS, "r"))) {
-         virReportSystemError(errno,
-                              _("Unable to open %s"),
-@@ -3564,43 +3560,36 @@ virFileIsSharedFixFUSE(const char *path,
-     }
- 
-     while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) {
--        if (STRNEQ("fuse.glusterfs", mb.mnt_type))
-+        const char *p;
-+        size_t len = strlen(mb.mnt_dir);
-+
-+        if (!(p = STRSKIP(path, mb.mnt_dir)))
-             continue;
- 
--        if (VIR_APPEND_ELEMENT_COPY(mounts, nmounts, mb.mnt_dir) < 0)
--            goto cleanup;
-+        if (*(p - 1) != '/' && *p != '/' && *p != '\0')
-+            continue;
-+
-+        if (len > maxMatching) {
-+            maxMatching = len;
-+            VIR_FREE(mntType);
-+            VIR_FREE(mntDir);
-+            if (VIR_STRDUP(mntDir, mb.mnt_dir) < 0 ||
-+                VIR_STRDUP(mntType, mb.mnt_type) < 0)
-+                goto cleanup;
-+        }
-     }
- 
--    /* Add NULL sentinel so that this is a virStringList */
--    if (VIR_REALLOC_N(mounts, nmounts + 1) < 0)
--        goto cleanup;
--    mounts[nmounts] = NULL;
--
--    do {
--        if ((p = strrchr(dirpath, '/')) == NULL) {
--            virReportSystemError(EINVAL,
--                                 _("Invalid relative path '%s'"), path);
--            goto cleanup;
--        }
--
--        if (p == dirpath)
--            *(p+1) = '\0';
--        else
--            *p = '\0';
--
--        if (virStringListHasString(mounts, dirpath)) {
--            VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. "
--                      "Fixing shared FS type", dirpath, path);
--            *f_type = GFS2_MAGIC;
--            break;
--        }
--    } while (p != dirpath);
-+    if (STREQ_NULLABLE(mntType, "fuse.glusterfs")) {
-+        VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. "
-+                  "Fixing shared FS type", mntDir, path);
-+        *f_type = GFS2_MAGIC;
-+    }
- 
-     ret = 0;
-  cleanup:
-+    VIR_FREE(mntType);
-+    VIR_FREE(mntDir);
-     endmntent(f);
--    VIR_FREE(mounts);
--    VIR_FREE(dirpath);
-     return ret;
- }
- 
-diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
-index 226f67dc00..134c6e8f81 100644
---- a/tests/virfiledata/mounts3.txt
-+++ b/tests/virfiledata/mounts3.txt
-@@ -31,3 +31,5 @@ hugetlbfs /hugepages2M hugetlbfs rw,relatime,mode=1777,pagesize=2M 0 0
- none /run/user/1000 tmpfs rw,relatime,mode=700,uid=1000 0 0
- host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp6,timeo=600,retrans=2,sec=sys,clientaddr=::,local_lock=none,addr=:: 0 0
- dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
-+host:/gv0 /gluster fuse.glusterfs rw 0 0
-+root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index 80ea34bfa4..be4dbf8910 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -455,6 +455,8 @@ mymain(void)
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts2.txt", "/run/user/501/gvfs/some/file", false);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/file", true);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/blah", false);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false);
- 
-     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- }
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virfile-Take-symlink-into-account-in-virFileIsSharedFixFUSE.patch b/SOURCES/libvirt-virfile-Take-symlink-into-account-in-virFileIsSharedFixFUSE.patch
deleted file mode 100644
index 73f2784..0000000
--- a/SOURCES/libvirt-virfile-Take-symlink-into-account-in-virFileIsSharedFixFUSE.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 666d4aacfd91d8c0447a1e4f8d44d50a3fe40198 Mon Sep 17 00:00:00 2001
-Message-Id: <666d4aacfd91d8c0447a1e4f8d44d50a3fe40198@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 23 Oct 2018 11:40:58 +0100
-Subject: [PATCH] virfile: Take symlink into account in virFileIsSharedFixFUSE
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1640465
-RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1641798
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-
-Weirdly enough, there can be symlinks in the path we are trying
-to fix. If it is the case our clever algorithm that finds matches
-against mount table won't work. Canonicalize path at the
-beginning then.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit c0790e3a09f57da0bd25c7eac4a35ed6e7e9e858)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- cfg.mk              |  2 +-
- src/util/virfile.c  | 15 +++++++++++++--
- tests/virfilemock.c | 33 ++++++++++++++++++++++++++++++++-
- tests/virfiletest.c |  1 +
- 4 files changed, 47 insertions(+), 4 deletions(-)
-
-diff --git a/cfg.mk b/cfg.mk
-index 6bebd0ad9f..e3e94bf6f0 100644
---- a/cfg.mk
-+++ b/cfg.mk
-@@ -1216,7 +1216,7 @@ exclude_file_name_regexp--sc_prohibit_select = \
- 	^cfg\.mk$$
- 
- exclude_file_name_regexp--sc_prohibit_canonicalize_file_name = \
--  ^cfg\.mk$$
-+  ^(cfg\.mk|tests/virfilemock\.c)$$
- 
- exclude_file_name_regexp--sc_prohibit_raw_allocation = \
-   ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index e1dee7633a..716b55d770 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3549,9 +3549,19 @@ virFileIsSharedFixFUSE(const char *path,
-     char mntbuf[1024];
-     char *mntDir = NULL;
-     char *mntType = NULL;
-+    char *canonPath = NULL;
-     size_t maxMatching = 0;
-     int ret = -1;
- 
-+    if (!(canonPath = virFileCanonicalizePath(path))) {
-+        virReportSystemError(errno,
-+                             _("unable to canonicalize %s"),
-+                             path);
-+        return -1;
-+    }
-+
-+    VIR_DEBUG("Path canonicalization: %s->%s", path, canonPath);
-+
-     if (!(f = setmntent(PROC_MOUNTS, "r"))) {
-         virReportSystemError(errno,
-                              _("Unable to open %s"),
-@@ -3563,7 +3573,7 @@ virFileIsSharedFixFUSE(const char *path,
-         const char *p;
-         size_t len = strlen(mb.mnt_dir);
- 
--        if (!(p = STRSKIP(path, mb.mnt_dir)))
-+        if (!(p = STRSKIP(canonPath, mb.mnt_dir)))
-             continue;
- 
-         if (*(p - 1) != '/' && *p != '/' && *p != '\0')
-@@ -3581,12 +3591,13 @@ virFileIsSharedFixFUSE(const char *path,
- 
-     if (STREQ_NULLABLE(mntType, "fuse.glusterfs")) {
-         VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. "
--                  "Fixing shared FS type", mntDir, path);
-+                  "Fixing shared FS type", mntDir, canonPath);
-         *f_type = GFS2_MAGIC;
-     }
- 
-     ret = 0;
-  cleanup:
-+    VIR_FREE(canonPath);
-     VIR_FREE(mntType);
-     VIR_FREE(mntDir);
-     endmntent(f);
-diff --git a/tests/virfilemock.c b/tests/virfilemock.c
-index 822c757380..ae5c8d025a 100644
---- a/tests/virfilemock.c
-+++ b/tests/virfilemock.c
-@@ -28,11 +28,14 @@
- #endif
- 
- #include "virmock.h"
-+#include "virstring.h"
-+#include "viralloc.h"
- 
- #define VIR_FROM_THIS VIR_FROM_NONE
- 
- static FILE *(*real_setmntent)(const char *filename, const char *type);
- static int (*real_statfs)(const char *path, struct statfs *buf);
-+static char *(*real_canonicalize_file_name)(const char *path);
- 
- 
- static void
-@@ -43,6 +46,7 @@ init_syms(void)
- 
-     VIR_MOCK_REAL_INIT(setmntent);
-     VIR_MOCK_REAL_INIT(statfs);
-+    VIR_MOCK_REAL_INIT(canonicalize_file_name);
- }
- 
- 
-@@ -94,6 +98,7 @@ statfs_mock(const char *mtab,
-     FILE *f;
-     struct mntent mb;
-     char mntbuf[1024];
-+    char *canonPath = NULL;
-     int ret = -1;
- 
-     if (!(f = real_setmntent(mtab, "r"))) {
-@@ -101,10 +106,16 @@ statfs_mock(const char *mtab,
-         return -1;
-     }
- 
-+    /* We don't need to do this in callers because real statfs(2)
-+     * does that for us. However, in mocked implementation we
-+     * need to do this. */
-+    if (!(canonPath = canonicalize_file_name(path)))
-+        return -1;
-+
-     while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) {
-         int ftype;
- 
--        if (STRNEQ(mb.mnt_dir, path))
-+        if (STRNEQ(mb.mnt_dir, canonPath))
-             continue;
- 
-         if (STREQ(mb.mnt_type, "nfs") ||
-@@ -136,6 +147,7 @@ statfs_mock(const char *mtab,
-     }
- 
-     endmntent(f);
-+    VIR_FREE(canonPath);
-     return ret;
- }
- 
-@@ -152,3 +164,22 @@ statfs(const char *path, struct statfs *buf)
- 
-     return real_statfs(path, buf);
- }
-+
-+
-+char *
-+canonicalize_file_name(const char *path)
-+{
-+    if (getenv("LIBVIRT_MTAB")) {
-+        const char *p;
-+        char *ret;
-+
-+        if ((p = STRSKIP(path, "/some/symlink")))
-+            ignore_value(virAsprintfQuiet(&ret, "/gluster%s", p));
-+        else
-+            ignore_value(VIR_STRDUP_QUIET(ret, path));
-+
-+        return ret;
-+    }
-+
-+    return real_canonicalize_file_name(path);
-+}
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index be4dbf8910..a246d601ba 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -457,6 +457,7 @@ mymain(void)
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/blah", false);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true);
- 
-     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- }
--- 
-2.19.2
-
diff --git a/SOURCES/libvirt-virfile-added-GPFS-as-shared-fs.patch b/SOURCES/libvirt-virfile-added-GPFS-as-shared-fs.patch
deleted file mode 100644
index b807638..0000000
--- a/SOURCES/libvirt-virfile-added-GPFS-as-shared-fs.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From fca427057cfad652bd787096b9af94d273c69185 Mon Sep 17 00:00:00 2001
-Message-Id: <fca427057cfad652bd787096b9af94d273c69185@dist-git>
-From: Diego Michelotto <diego.michelotto@cnaf.infn.it>
-Date: Tue, 4 Jun 2019 13:27:36 +0200
-Subject: [PATCH] virfile: added GPFS as shared fs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Added GPFS as shared file system recognized during live migration
-security checks.
-
-GPFS is 'IBM General Parallel File System' also called
-'IBM Spectrum Scale'
-
-BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1679528
-
-Signed-off-by: Diego Michelotto <diego.michelotto@cnaf.infn.it>
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit d163b940a73a0d6b8277a4bccef2b60936933cf0)
-https: //bugzilla.redhat.com/show_bug.cgi?id=1698133
-Message-Id: <5d98c30627de2ed2fd02a77ecadaac0585c5fb15.1559647301.git.pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virfile.c            | 9 ++++++++-
- src/util/virfile.h            | 1 +
- tests/virfiledata/mounts3.txt | 1 +
- tests/virfilemock.c           | 5 +++++
- tests/virfiletest.c           | 1 +
- 5 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 471d309062..e0564295dd 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3540,6 +3540,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
- # ifndef CEPH_SUPER_MAGIC
- #  define CEPH_SUPER_MAGIC 0x00C36400
- # endif
-+# ifndef GPFS_SUPER_MAGIC
-+#  define GPFS_SUPER_MAGIC 0x47504653
-+# endif
- 
- # define PROC_MOUNTS "/proc/mounts"
- 
-@@ -3688,6 +3691,9 @@ virFileIsSharedFSType(const char *path,
-     if ((fstypes & VIR_FILE_SHFS_CEPH) &&
-         (f_type == CEPH_SUPER_MAGIC))
-         return 1;
-+    if ((fstypes & VIR_FILE_SHFS_GPFS) &&
-+        (f_type == GPFS_SUPER_MAGIC))
-+        return 1;
- 
-     return 0;
- }
-@@ -3852,7 +3858,8 @@ int virFileIsSharedFS(const char *path)
-                                  VIR_FILE_SHFS_AFS |
-                                  VIR_FILE_SHFS_SMB |
-                                  VIR_FILE_SHFS_CIFS |
--                                 VIR_FILE_SHFS_CEPH);
-+                                 VIR_FILE_SHFS_CEPH |
-+                                 VIR_FILE_SHFS_GPFS);
- }
- 
- 
-diff --git a/src/util/virfile.h b/src/util/virfile.h
-index 1d16e96b59..51c221e069 100644
---- a/src/util/virfile.h
-+++ b/src/util/virfile.h
-@@ -206,6 +206,7 @@ enum {
-     VIR_FILE_SHFS_SMB = (1 << 4),
-     VIR_FILE_SHFS_CIFS = (1 << 5),
-     VIR_FILE_SHFS_CEPH = (1 << 6),
-+    VIR_FILE_SHFS_GPFS = (1 << 7),
- };
- 
- int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1);
-diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
-index 68eded048c..4377e5d471 100644
---- a/tests/virfiledata/mounts3.txt
-+++ b/tests/virfiledata/mounts3.txt
-@@ -35,3 +35,4 @@ host:/gv0 /gluster fuse.glusterfs rw 0 0
- root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
- 192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
- 192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
-+gpfs_data /gpfs/data gpfs rw,relatime 0 0
-diff --git a/tests/virfilemock.c b/tests/virfilemock.c
-index eb5182df66..02f26433d4 100644
---- a/tests/virfilemock.c
-+++ b/tests/virfilemock.c
-@@ -91,6 +91,9 @@ setmntent(const char *filename, const char *type)
- #ifndef CEPH_SUPER_MAGIC
- # define CEPH_SUPER_MAGIC 0x00c36400
- #endif
-+#ifndef GPFS_SUPER_MAGIC
-+# define GPFS_SUPER_MAGIC 0x47504653
-+#endif
- 
- 
- static int
-@@ -139,6 +142,8 @@ statfs_mock(const char *mtab,
-             ftype = FUSE_SUPER_MAGIC;
-         } else if (STRPREFIX(mb.mnt_type, "ceph")) {
-             ftype = CEPH_SUPER_MAGIC;
-+        } else if (STRPREFIX(mb.mnt_type, "gpfs")) {
-+            ftype = GPFS_SUPER_MAGIC;
-         } else {
-             /* Everything else is EXT4. We don't care really for other paths. */
-             ftype = EXT4_SUPER_MAGIC;
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index 972c07fdc5..5f17676c75 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -460,6 +460,7 @@ mymain(void)
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true);
-     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gpfs/data", true);
- 
-     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- }
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virfile-fix-cast-align-error.patch b/SOURCES/libvirt-virfile-fix-cast-align-error.patch
deleted file mode 100644
index 6c06a32..0000000
--- a/SOURCES/libvirt-virfile-fix-cast-align-error.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 63c2edaa16b04d99c9c3d6465cc4aaede3c81588 Mon Sep 17 00:00:00 2001
-Message-Id: <63c2edaa16b04d99c9c3d6465cc4aaede3c81588@dist-git>
-From: Marc Hartmayer <mhartmay@linux.ibm.com>
-Date: Wed, 10 Oct 2018 17:25:52 +0200
-Subject: [PATCH] virfile: fix cast-align error
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1632711
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1635705
-
-On s390x the struct member f_type of statsfs is hard coded to 'unsigned
-int'. Change virFileIsSharedFixFUSE() to take a 'long long int' and use
-a temporary to avoid pointer-casting.
-
-This fixes the following error:
-../../src/util/virfile.c:3578:38: error: cast increases required alignment of target type [-Werror=cast-align]
-         virFileIsSharedFixFUSE(path, (long *) &sb.f_type);
-
-Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
-(cherry picked from commit 2b03534eeb2f3f41865538cd4c3e5d326260ad27)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/util/virfile.c | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index c87e26bf5b..46466ed136 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -3542,7 +3542,7 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
- 
- static int
- virFileIsSharedFixFUSE(const char *path,
--                       long *f_type)
-+                       long long *f_type)
- {
-     char *dirpath = NULL;
-     const char **mounts = NULL;
-@@ -3612,6 +3612,7 @@ virFileIsSharedFSType(const char *path,
-     char *dirpath, *p;
-     struct statfs sb;
-     int statfs_ret;
-+    long long f_type = 0;
- 
-     if (VIR_STRDUP(dirpath, path) < 0)
-         return -1;
-@@ -3651,32 +3652,34 @@ virFileIsSharedFSType(const char *path,
-         return -1;
-     }
- 
--    if (sb.f_type == FUSE_SUPER_MAGIC) {
-+    f_type = sb.f_type;
-+
-+    if (f_type == FUSE_SUPER_MAGIC) {
-         VIR_DEBUG("Found FUSE mount for path=%s. Trying to fix it", path);
--        virFileIsSharedFixFUSE(path, (long *) &sb.f_type);
-+        virFileIsSharedFixFUSE(path, &f_type);
-     }
- 
-     VIR_DEBUG("Check if path %s with FS magic %lld is shared",
--              path, (long long int)sb.f_type);
-+              path, f_type);
- 
-     if ((fstypes & VIR_FILE_SHFS_NFS) &&
--        (sb.f_type == NFS_SUPER_MAGIC))
-+        (f_type == NFS_SUPER_MAGIC))
-         return 1;
- 
-     if ((fstypes & VIR_FILE_SHFS_GFS2) &&
--        (sb.f_type == GFS2_MAGIC))
-+        (f_type == GFS2_MAGIC))
-         return 1;
-     if ((fstypes & VIR_FILE_SHFS_OCFS) &&
--        (sb.f_type == OCFS2_SUPER_MAGIC))
-+        (f_type == OCFS2_SUPER_MAGIC))
-         return 1;
-     if ((fstypes & VIR_FILE_SHFS_AFS) &&
--        (sb.f_type == AFS_FS_MAGIC))
-+        (f_type == AFS_FS_MAGIC))
-         return 1;
-     if ((fstypes & VIR_FILE_SHFS_SMB) &&
--        (sb.f_type == SMB_SUPER_MAGIC))
-+        (f_type == SMB_SUPER_MAGIC))
-         return 1;
-     if ((fstypes & VIR_FILE_SHFS_CIFS) &&
--        (sb.f_type == CIFS_SUPER_MAGIC))
-+        (f_type == CIFS_SUPER_MAGIC))
-         return 1;
- 
-     return 0;
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virfiletest-Fix-test-name-prefix-for-virFileInData-test.patch b/SOURCES/libvirt-virfiletest-Fix-test-name-prefix-for-virFileInData-test.patch
deleted file mode 100644
index af7d072..0000000
--- a/SOURCES/libvirt-virfiletest-Fix-test-name-prefix-for-virFileInData-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c8f85424443d570863cdbfe93df75f9060d761ce Mon Sep 17 00:00:00 2001
-Message-Id: <c8f85424443d570863cdbfe93df75f9060d761ce@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 10 Oct 2018 17:25:53 +0200
-Subject: [PATCH] virfiletest: Fix test name prefix for virFileInData test
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1632711
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1635705
-
-Because of lacking virTestCounterReset() call, the old test cases
-name was preserved.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 6814ac678e07ea3f2f8351eb75c82af9ad9d727f)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/virfiletest.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index a15495e9e8..790911cacb 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -389,6 +389,7 @@ mymain(void)
-     } while (0)
- 
-     if (holesSupported()) {
-+        virTestCounterReset("testFileInData ");
-         DO_TEST_IN_DATA(true, 4, 4, 4);
-         DO_TEST_IN_DATA(false, 4, 4, 4);
-         DO_TEST_IN_DATA(true, 8, 8, 8);
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virfiletst-Test-virFileIsSharedFS.patch b/SOURCES/libvirt-virfiletst-Test-virFileIsSharedFS.patch
deleted file mode 100644
index dd81c85..0000000
--- a/SOURCES/libvirt-virfiletst-Test-virFileIsSharedFS.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-From 137a29247f0989440ffbd42f7f56da154eb6003a Mon Sep 17 00:00:00 2001
-Message-Id: <137a29247f0989440ffbd42f7f56da154eb6003a@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 10 Oct 2018 17:25:54 +0200
-Subject: [PATCH] virfiletst: Test virFileIsSharedFS
-
-RHEL-7.7: https://bugzilla.redhat.com/show_bug.cgi?id=1632711
-RHEL-8.0: https://bugzilla.redhat.com/show_bug.cgi?id=1634782
-RHEL-7.6.z: https://bugzilla.redhat.com/show_bug.cgi?id=1635705
-
-Introduce some basic test cases for virFileIsSharedFS(). More
-will be added later. In order to achieve desired result, mocks
-for setmntent() and statfs() need to be invented because the
-first thing that virFileIsSharedFS() does is calling the latter.
-If it finds a FUSE mount it'll call the former.
-
-The mock might look a bit complicated, but in fact it's quite
-simple. The test sets LIBVIRT_MTAB env variable to hold the
-absolute path to a file containing mount table. Then, statfs()
-returns matching FS it finds, and setmntent() is there just to
-replace /proc/mounts with the file the test wants to load.
-
-Adding this test also exposed a bug we have - because we assume
-the given path points to a file we cut off what we assume is a
-file name to obtain directory path and only then we call
-statfs(). This is buggy because the passed path could be already
-a mount point.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit a7b4eb7d261255d70d90047ae34e8eea849053f2)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tests/Makefile.am             |   7 +-
- tests/virfiledata/mounts3.txt |  33 ++++++++
- tests/virfilemock.c           | 154 ++++++++++++++++++++++++++++++++++
- tests/virfiletest.c           |  62 +++++++++++++-
- 4 files changed, 254 insertions(+), 2 deletions(-)
- create mode 100644 tests/virfiledata/mounts3.txt
- create mode 100644 tests/virfilemock.c
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 41905d1a4d..c0337ea10c 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -242,6 +242,7 @@ test_libraries += virusbmock.la \
- 	virnetdevbandwidthmock.la \
- 	virnumamock.la \
- 	virtestmock.la \
-+	virfilemock.la \
- 	$(NULL)
- endif WITH_LINUX
- 
-@@ -1163,9 +1164,13 @@ virresctrltest_SOURCES = \
- 	virresctrltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c
- virresctrltest_LDADD = $(LDADDS)
- 
-+virfilemock_la_SOURCES = \
-+	virfilemock.c
-+virfilemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-+virfilemock_la_LIBADD = $(MOCKLIBS_LIBS)
- else ! WITH_LINUX
- EXTRA_DIST += vircaps2xmltest.c virnumamock.c virfilewrapper.c \
--			  virfilewrapper.h virresctrltest.c
-+			  virfilewrapper.h virresctrltest.c virfilemock.c
- endif ! WITH_LINUX
- 
- if WITH_NSS
-diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
-new file mode 100644
-index 0000000000..226f67dc00
---- /dev/null
-+++ b/tests/virfiledata/mounts3.txt
-@@ -0,0 +1,33 @@
-+/dev/root / xfs rw,noatime,attr2,inode64,noquota 0 0
-+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-+tmpfs /run tmpfs rw,nodev,relatime,size=3281436k,mode=755 0 0
-+sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-+dev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
-+securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0
-+debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
-+mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
-+configfs /sys/kernel/config configfs rw,nosuid,nodev,noexec,relatime 0 0
-+devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
-+fusectl /sys/fs/fuse/connections fusectl rw,nosuid,nodev,noexec,relatime 0 0
-+shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
-+cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
-+openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
-+none /sys/fs/cgroup/unified cgroup2 rw,nosuid,nodev,noexec,relatime,nsdelegate 0 0
-+cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
-+cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
-+blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
-+memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
-+devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0
-+freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-+net_cls /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0
-+perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0
-+net_prio /sys/fs/cgroup/net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio 0 0
-+hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
-+pids /sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0
-+rdma /sys/fs/cgroup/rdma cgroup rw,nosuid,nodev,noexec,relatime,rdma 0 0
-+binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
-+hugetlbfs /hugepages2M hugetlbfs rw,relatime,mode=1777,pagesize=2M 0 0
-+none /run/user/1000 tmpfs rw,relatime,mode=700,uid=1000 0 0
-+host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp6,timeo=600,retrans=2,sec=sys,clientaddr=::,local_lock=none,addr=:: 0 0
-+dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
-diff --git a/tests/virfilemock.c b/tests/virfilemock.c
-new file mode 100644
-index 0000000000..822c757380
---- /dev/null
-+++ b/tests/virfilemock.c
-@@ -0,0 +1,154 @@
-+/*
-+ * Copyright (C) 2018 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/>.
-+ *
-+ * Author: Michal Privoznik <mprivozn@redhat.com>
-+ */
-+
-+#include <config.h>
-+
-+#include <stdio.h>
-+#include <mntent.h>
-+#include <sys/vfs.h>
-+#if HAVE_LINUX_MAGIC_H
-+# include <linux/magic.h>
-+#endif
-+
-+#include "virmock.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_NONE
-+
-+static FILE *(*real_setmntent)(const char *filename, const char *type);
-+static int (*real_statfs)(const char *path, struct statfs *buf);
-+
-+
-+static void
-+init_syms(void)
-+{
-+    if (real_setmntent)
-+        return;
-+
-+    VIR_MOCK_REAL_INIT(setmntent);
-+    VIR_MOCK_REAL_INIT(statfs);
-+}
-+
-+
-+FILE *
-+setmntent(const char *filename, const char *type)
-+{
-+    const char *mtab;
-+
-+    init_syms();
-+
-+    if ((mtab = getenv("LIBVIRT_MTAB")))
-+        filename = mtab;
-+
-+    return real_setmntent(filename, type);
-+}
-+
-+
-+#ifndef NFS_SUPER_MAGIC
-+# define NFS_SUPER_MAGIC 0x6969
-+#endif
-+#ifndef OCFS2_SUPER_MAGIC
-+# define OCFS2_SUPER_MAGIC 0x7461636f
-+#endif
-+#ifndef GFS2_MAGIC
-+# define GFS2_MAGIC 0x01161970
-+#endif
-+#ifndef AFS_FS_MAGIC
-+# define AFS_FS_MAGIC 0x6B414653
-+#endif
-+#ifndef SMB_SUPER_MAGIC
-+# define SMB_SUPER_MAGIC 0x517B
-+#endif
-+#ifndef CIFS_SUPER_MAGIC
-+# define CIFS_SUPER_MAGIC 0xFF534D42
-+#endif
-+#ifndef HUGETLBFS_MAGIC
-+# define HUGETLBFS_MAGIC 0x958458f6
-+#endif
-+#ifndef FUSE_SUPER_MAGIC
-+# define FUSE_SUPER_MAGIC 0x65735546
-+#endif
-+
-+
-+static int
-+statfs_mock(const char *mtab,
-+            const char *path,
-+            struct statfs *buf)
-+{
-+    FILE *f;
-+    struct mntent mb;
-+    char mntbuf[1024];
-+    int ret = -1;
-+
-+    if (!(f = real_setmntent(mtab, "r"))) {
-+        fprintf(stderr, "Unable to open %s", mtab);
-+        return -1;
-+    }
-+
-+    while (getmntent_r(f, &mb, mntbuf, sizeof(mntbuf))) {
-+        int ftype;
-+
-+        if (STRNEQ(mb.mnt_dir, path))
-+            continue;
-+
-+        if (STREQ(mb.mnt_type, "nfs") ||
-+            STREQ(mb.mnt_type, "nfs4")) {
-+            ftype = NFS_SUPER_MAGIC;
-+        } else if (STREQ(mb.mnt_type, "gfs2")||
-+                   STREQ(mb.mnt_type, "gfs2meta")) {
-+            ftype = GFS2_MAGIC;
-+        } else if (STREQ(mb.mnt_type, "ocfs2")) {
-+            ftype = OCFS2_SUPER_MAGIC;
-+        } else if (STREQ(mb.mnt_type, "afs")) {
-+            ftype = AFS_FS_MAGIC;
-+        } else if (STREQ(mb.mnt_type, "smb3")) {
-+            ftype = SMB_SUPER_MAGIC;
-+        } else if (STREQ(mb.mnt_type, "cifs")) {
-+            ftype = CIFS_SUPER_MAGIC;
-+        } else if (STRPREFIX(mb.mnt_type, "fuse")) {
-+            ftype = FUSE_SUPER_MAGIC;
-+        } else {
-+            /* Everything else is EXT4. We don't care really for other paths. */
-+            ftype = EXT4_SUPER_MAGIC;
-+        }
-+
-+        memset(buf, 0, sizeof(*buf));
-+        /* We only care about f_type so far. */
-+        buf->f_type = ftype;
-+        ret = 0;
-+        break;
-+    }
-+
-+    endmntent(f);
-+    return ret;
-+}
-+
-+
-+int
-+statfs(const char *path, struct statfs *buf)
-+{
-+    const char *mtab;
-+
-+    init_syms();
-+
-+    if ((mtab = getenv("LIBVIRT_MTAB")))
-+        return statfs_mock(mtab, path, buf);
-+
-+    return real_statfs(path, buf);
-+}
-diff --git a/tests/virfiletest.c b/tests/virfiletest.c
-index 790911cacb..85f22063fe 100644
---- a/tests/virfiletest.c
-+++ b/tests/virfiletest.c
-@@ -31,6 +31,7 @@
- # include <linux/falloc.h>
- #endif
- 
-+#define VIR_FROM_THIS VIR_FROM_NONE
- 
- #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
- static int testFileCheckMounts(const char *prefix,
-@@ -310,6 +311,48 @@ testFileInData(const void *opaque)
- }
- 
- 
-+struct testFileIsSharedFSType {
-+    const char *mtabFile;
-+    const char *filename;
-+    const bool expected;
-+};
-+
-+static int
-+testFileIsSharedFSType(const void *opaque ATTRIBUTE_UNUSED)
-+{
-+#ifndef __linux__
-+    return EXIT_AM_SKIP;
-+#else
-+    const struct testFileIsSharedFSType *data = opaque;
-+    char *mtabFile = NULL;
-+    bool actual;
-+    int ret = -1;
-+
-+    if (virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFile) < 0)
-+        return -1;
-+
-+    if (setenv("LIBVIRT_MTAB", mtabFile, 1) < 0) {
-+        fprintf(stderr, "Unable to set env variable\n");
-+        goto cleanup;
-+    }
-+
-+    actual = virFileIsSharedFS(data->filename);
-+
-+    if (actual != data->expected) {
-+        fprintf(stderr, "Unexpected FS type. Expected %d got %d\n",
-+                data->expected, actual);
-+        goto cleanup;
-+    }
-+
-+    ret = 0;
-+ cleanup:
-+    VIR_FREE(mtabFile);
-+    unsetenv("LIBVIRT_MTAB");
-+    return ret;
-+#endif
-+}
-+
-+
- static int
- mymain(void)
- {
-@@ -397,7 +440,24 @@ mymain(void)
-         DO_TEST_IN_DATA(true, 8, 16, 32, 64, 128, 256, 512);
-         DO_TEST_IN_DATA(false, 8, 16, 32, 64, 128, 256, 512);
-     }
-+
-+#define DO_TEST_FILE_IS_SHARED_FS_TYPE(mtab, file, exp) \
-+    do { \
-+        struct testFileIsSharedFSType data = { \
-+            .mtabFile = mtab, .filename = file, .expected = exp \
-+        }; \
-+        if (virTestRun(virTestCounterNext(), testFileIsSharedFSType, &data) < 0) \
-+            ret = -1; \
-+    } while (0)
-+
-+    virTestCounterReset("testFileIsSharedFSType ");
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts1.txt", "/boot/vmlinuz", false);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts2.txt", "/run/user/501/gvfs/some/file", false);
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/file", true);
-+    /* TODO Detect bind mounts */
-+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/nfs/blah", true);
-+
-     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- }
- 
--VIR_TEST_MAIN(mymain)
-+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virfilemock.so")
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virhash-Fix-the-expectations-of-virHashKeyEqual-implementations.patch b/SOURCES/libvirt-virhash-Fix-the-expectations-of-virHashKeyEqual-implementations.patch
new file mode 100644
index 0000000..be07d36
--- /dev/null
+++ b/SOURCES/libvirt-virhash-Fix-the-expectations-of-virHashKeyEqual-implementations.patch
@@ -0,0 +1,74 @@
+From 946b656463d4947801be9ac138113feec1f0cf48 Mon Sep 17 00:00:00 2001
+Message-Id: <946b656463d4947801be9ac138113feec1f0cf48@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Tue, 4 Feb 2020 15:08:19 +0100
+Subject: [PATCH] virhash: Fix the expectations of virHashKeyEqual
+ implementations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tweak the return value expectation comment so that it doesn't
+necessarily require to allocate memory and refactor the implementations.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 6cf3ec4428c6b3f3dae30286e50bb7396615cf56)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1207659
+Message-Id: <2b3b0d52d6baa6ddb67b26520cfae1a5f247d803.1580824112.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/conf/domain_addr.c | 5 +----
+ src/util/virhash.c     | 4 +---
+ src/util/virhash.h     | 3 ++-
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
+index f07b3d9725..e0be655772 100644
+--- a/src/conf/domain_addr.c
++++ b/src/conf/domain_addr.c
+@@ -997,10 +997,7 @@ virZPCIAddrKeyEqual(const void *namea,
+ static void *
+ virZPCIAddrKeyCopy(const void *name)
+ {
+-    unsigned int *copy;
+-
+-    if (VIR_ALLOC(copy) < 0)
+-        return NULL;
++    unsigned int *copy = g_new0(unsigned int, 1);
+ 
+     *copy = *((unsigned int *)name);
+     return (void *)copy;
+diff --git a/src/util/virhash.c b/src/util/virhash.c
+index d5c5e017a1..c57d9f8292 100644
+--- a/src/util/virhash.c
++++ b/src/util/virhash.c
+@@ -94,9 +94,7 @@ static bool virHashStrEqual(const void *namea, const void *nameb)
+ 
+ static void *virHashStrCopy(const void *name)
+ {
+-    char *ret;
+-    ret = g_strdup(name);
+-    return ret;
++    return g_strdup(name);
+ }
+ 
+ 
+diff --git a/src/util/virhash.h b/src/util/virhash.h
+index 08f99d8a3d..cb59fb639b 100644
+--- a/src/util/virhash.h
++++ b/src/util/virhash.h
+@@ -83,7 +83,8 @@ typedef bool (*virHashKeyEqual)(const void *namea, const void *nameb);
+  * Create a copy of the hash key, duplicating
+  * memory allocation where applicable
+  *
+- * Returns a newly allocated copy of @name
++ * Returns a copy of @name which will eventually be passed to the
++ * 'virHashKeyFree' callback at the end of its lifetime.
+  */
+ typedef void *(*virHashKeyCopy)(const void *name);
+ /**
+-- 
+2.25.0
+
diff --git a/SOURCES/libvirt-virhostcpu-Make-virHostCPUGetMSR-work-only-on-x86.patch b/SOURCES/libvirt-virhostcpu-Make-virHostCPUGetMSR-work-only-on-x86.patch
deleted file mode 100644
index e9b18c4..0000000
--- a/SOURCES/libvirt-virhostcpu-Make-virHostCPUGetMSR-work-only-on-x86.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 7ff2ecfcd684bcf4865ceac786f1c6809d84d0aa Mon Sep 17 00:00:00 2001
-Message-Id: <7ff2ecfcd684bcf4865ceac786f1c6809d84d0aa@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 21 Jun 2019 09:25:44 +0200
-Subject: [PATCH] virhostcpu: Make virHostCPUGetMSR() work only on x86
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Model specific registers are a thing only on x86. Also, the
-/dev/cpu/0/msr path exists only on Linux and the fallback
-mechanism (asking KVM) exists on Linux and FreeBSD only.
-
-Therefore, move the function within #ifdef that checks all
-aforementioned constraints and provide a dummy stub for all
-other cases.
-
-This fixes the build on my arm box, mingw-* builds, etc.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit ae3d812b006b84c6d06605868d19554ea0156392)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697627
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Message-Id: <0f234c69059ad57462bb71d42983cdaedea26e78.1561068591.git.jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virhostcpu.c | 32 ++++++++++++++++++--------------
- 1 file changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index d0c47faa18..aafa84c8e5 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -1269,7 +1269,9 @@ virHostCPUGetMicrocodeVersion(void)
- #endif /* __linux__ */
- 
- 
--#if HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS)
-+#if HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) && \
-+    (defined(__i386__) || defined(__x86_64__)) && \
-+    (defined(__linux__) || defined(__FreeBSD__))
- static int
- virHostCPUGetMSRFromKVM(unsigned long index,
-                         uint64_t *result)
-@@ -1297,19 +1299,6 @@ virHostCPUGetMSRFromKVM(unsigned long index,
-     return 0;
- }
- 
--#else
--
--static int
--virHostCPUGetMSRFromKVM(unsigned long index ATTRIBUTE_UNUSED,
--                        uint64_t *result ATTRIBUTE_UNUSED)
--{
--    virReportSystemError(ENOSYS, "%s",
--                         _("Reading MSRs via KVM is not supported on this platform"));
--    return -1;
--}
--#endif /* HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) */
--
--
- /*
-  * Returns 0 on success,
-  *         1 when the MSR is not supported by the host CPU,
-@@ -1346,3 +1335,18 @@ virHostCPUGetMSR(unsigned long index,
- 
-     return virHostCPUGetMSRFromKVM(index, msr);
- }
-+
-+#else
-+
-+int
-+virHostCPUGetMSR(unsigned long index ATTRIBUTE_UNUSED,
-+                 uint64_t *msr ATTRIBUTE_UNUSED)
-+{
-+    virReportSystemError(ENOSYS, "%s",
-+                         _("Reading MSRs is not supported on this platform"));
-+    return -1;
-+}
-+
-+#endif /* HAVE_LINUX_KVM_H && defined(KVM_GET_MSRS) && \
-+          (defined(__i386__) || defined(__x86_64__)) && \
-+          (defined(__linux__) || defined(__FreeBSD__)) */
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virnetdevtap-Don-t-crash-on-ifname-in-virNetDevTapInterfaceStats.patch b/SOURCES/libvirt-virnetdevtap-Don-t-crash-on-ifname-in-virNetDevTapInterfaceStats.patch
deleted file mode 100644
index 060848f..0000000
--- a/SOURCES/libvirt-virnetdevtap-Don-t-crash-on-ifname-in-virNetDevTapInterfaceStats.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 340b09010e2c329608af82c2fbd8cb73209eb58c Mon Sep 17 00:00:00 2001
-Message-Id: <340b09010e2c329608af82c2fbd8cb73209eb58c@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 13 Jul 2018 15:44:42 +0200
-Subject: [PATCH] virnetdevtap: Don't crash on !ifname in
- virNetDevTapInterfaceStats
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1595184
-
-Some domain <interfaces/> do not have a name (because they are
-not TAP devices). Therefore, if
-virNetDevTapInterfaceStats(net->ifname, ...) is called an instant
-crash occurs. In Linux version of the function strlen() is called
-over the name and in BSD version STREQ() is called.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 318d54e5201295239869655c2c60fb44d9d9466e)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virnetdevtap.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
-index bd0710ad2e..3118ca18e8 100644
---- a/src/util/virnetdevtap.c
-+++ b/src/util/virnetdevtap.c
-@@ -691,6 +691,12 @@ virNetDevTapInterfaceStats(const char *ifname,
-     FILE *fp;
-     char line[256], *colon;
- 
-+    if (!ifname) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Interface name not provided"));
-+        return -1;
-+    }
-+
-     fp = fopen("/proc/net/dev", "r");
-     if (!fp) {
-         virReportSystemError(errno, "%s",
-@@ -768,6 +774,12 @@ virNetDevTapInterfaceStats(const char *ifname,
-     struct if_data *ifd;
-     int ret = -1;
- 
-+    if (!ifname) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("Interface name not provided"));
-+        return -1;
-+    }
-+
-     if (getifaddrs(&ifap) < 0) {
-         virReportSystemError(errno, "%s",
-                              _("Could not get interface list"));
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virrandom-Avoid-undefined-behaviour-in-virRandomBits.patch b/SOURCES/libvirt-virrandom-Avoid-undefined-behaviour-in-virRandomBits.patch
deleted file mode 100644
index 247a39e..0000000
--- a/SOURCES/libvirt-virrandom-Avoid-undefined-behaviour-in-virRandomBits.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0a774bbd6c55f95a9cd106a0c79881a52b9cbdbc Mon Sep 17 00:00:00 2001
-Message-Id: <0a774bbd6c55f95a9cd106a0c79881a52b9cbdbc@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 3 Dec 2018 08:46:19 -0500
-Subject: [PATCH] virrandom: Avoid undefined behaviour in virRandomBits
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1655586 [RHEL8]
-https://bugzilla.redhat.com/show_bug.cgi?id=1652894 [RHEL7]
-
-If nbits is 64 (or greater) then shifting 1ULL left is undefined.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 0a5a6f0d019996b015bb0acbe30efa8f2fbbb351)
-Signed-off-by: John Ferlan <jferlan@redhat.com>
----
- src/util/virrandom.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virrandom.c b/src/util/virrandom.c
-index 3c011a8615..7915f6531e 100644
---- a/src/util/virrandom.c
-+++ b/src/util/virrandom.c
-@@ -68,7 +68,9 @@ uint64_t virRandomBits(int nbits)
-         return 0;
-     }
- 
--    ret &= (1ULL << nbits) - 1;
-+    if (nbits < 64)
-+        ret &= (1ULL << nbits) - 1;
-+
-     return ret;
- }
- 
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-virsh-Require-explicit-domain-for-domxml-to-native.patch b/SOURCES/libvirt-virsh-Require-explicit-domain-for-domxml-to-native.patch
deleted file mode 100644
index e566fb7..0000000
--- a/SOURCES/libvirt-virsh-Require-explicit-domain-for-domxml-to-native.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 7875a7866086dc80e174dd62a53aa687daa012c7 Mon Sep 17 00:00:00 2001
-Message-Id: <7875a7866086dc80e174dd62a53aa687daa012c7@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 26 Sep 2018 09:59:08 +0200
-Subject: [PATCH] virsh: Require explicit --domain for domxml-to-native
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The domxml-to-native virsh command accepts either --xml or --domain
-option followed by a file or domain name respectively. The --domain
-option is documented as required, which means an argument with no option
-is treated as --xml. Commit v4.3.0-127-gd86531daf2 broke this by making
---domain optional and thus an argument with no option was treated as
---domain.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1633077
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit b7ccd0757de73344a4b973ede946dad40de846c7)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1634769
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virsh-domain.c | 6 +++---
- tools/virsh.h        | 8 +++++---
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 6aa79f11b9..db4834dd1f 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -9387,7 +9387,7 @@ static const vshCmdInfo info_qemu_monitor_event[] = {
- 
- static const vshCmdOptDef opts_qemu_monitor_event[] = {
-     VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"),
--                                      0),
-+                                      0, 0),
-     {.name = "event",
-      .type = VSH_OT_STRING,
-      .help = N_("filter by event name")
-@@ -9940,7 +9940,7 @@ static const vshCmdOptDef opts_domxmltonative[] = {
-      .flags = VSH_OFLAG_REQ,
-      .help = N_("target config data type format")
-     },
--    VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(0),
-+    VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(VSH_OFLAG_REQ_OPT, 0),
-     {.name = "xml",
-      .type = VSH_OT_STRING,
-      .help = N_("xml data file to export from")
-@@ -13189,7 +13189,7 @@ static const vshCmdInfo info_event[] = {
- 
- static const vshCmdOptDef opts_event[] = {
-     VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"),
--                                      0),
-+                                      0, 0),
-     {.name = "event",
-      .type = VSH_OT_STRING,
-      .completer = virshDomainEventNameCompleter,
-diff --git a/tools/virsh.h b/tools/virsh.h
-index e164aabcee..b0a3cdbb97 100644
---- a/tools/virsh.h
-+++ b/tools/virsh.h
-@@ -110,16 +110,18 @@
-      .help = _helpstr \
-     }
- 
--# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, cflags) \
-+# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, oflags, cflags) \
-     {.name = "domain", \
-      .type = VSH_OT_STRING, \
-+     .flags = oflags, \
-      .help = _helpstr, \
-      .completer = virshDomainNameCompleter, \
-      .completer_flags = cflags, \
-     }
- 
--# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \
--    VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags)
-+# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(oflags, cflags) \
-+    VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), \
-+                                      oflags, cflags)
- 
- # define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(_helpstr, cflags) \
-     {.name = "domain", \
--- 
-2.19.1
-
diff --git a/SOURCES/libvirt-virsh-Strip-XML-declaration-when-extracting-CPU-XMLs.patch b/SOURCES/libvirt-virsh-Strip-XML-declaration-when-extracting-CPU-XMLs.patch
deleted file mode 100644
index 9a80dee..0000000
--- a/SOURCES/libvirt-virsh-Strip-XML-declaration-when-extracting-CPU-XMLs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 45fb61b56bbd74f365b71e9e35bf953dc045833e Mon Sep 17 00:00:00 2001
-Message-Id: <45fb61b56bbd74f365b71e9e35bf953dc045833e@dist-git>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 22 Nov 2018 16:28:56 +0100
-Subject: [PATCH] virsh: Strip XML declaration when extracting CPU XMLs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit v4.3.0-336-gc84726fbdd all
-{hypervisor-,}cpu-{baseline,compare} commands use a generic
-vshExtractCPUDefXMLs helper for extracting individual CPU definitions
-from the provided input file. The helper wraps the input file in a
-<container> element so that several independent elements can be easily
-parsed from the file. This works fine except when the file starts with
-XML declaration (<?xml version="1.0" ... ?>) because the XML declaration
-cannot be put inside any element. In fact it has to be at the very
-beginning of the XML document without any preceding white space
-characters. We can just simply skip the XML declaration.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1592737
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fcd1c865e168bdb9763b19e790c15e80aa29be66)
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1659048
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virsh-host.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/tools/virsh-host.c b/tools/virsh-host.c
-index 16f504bafe..b7f86bdd91 100644
---- a/tools/virsh-host.c
-+++ b/tools/virsh-host.c
-@@ -1130,13 +1130,20 @@ vshExtractCPUDefXMLs(vshControl *ctl,
-     xmlDocPtr xml = NULL;
-     xmlXPathContextPtr ctxt = NULL;
-     xmlNodePtr *nodes = NULL;
-+    char *doc;
-     size_t i;
-     int n;
- 
-     if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &buffer) < 0)
-         goto error;
- 
--    if (virAsprintf(&xmlStr, "<container>%s</container>", buffer) < 0)
-+    /* Strip possible XML declaration */
-+    if (STRPREFIX(buffer, "<?xml") && (doc = strstr(buffer, "?>")))
-+        doc += 2;
-+    else
-+        doc = buffer;
-+
-+    if (virAsprintf(&xmlStr, "<container>%s</container>", doc) < 0)
-         goto error;
- 
-     if (!(xml = virXMLParseStringCtxt(xmlStr, xmlFile, &ctxt)))
--- 
-2.20.1
-
diff --git a/SOURCES/libvirt-virsh.pod-Drop-persistent-for-detach-device-alias.patch b/SOURCES/libvirt-virsh.pod-Drop-persistent-for-detach-device-alias.patch
deleted file mode 100644
index 91c3355..0000000
--- a/SOURCES/libvirt-virsh.pod-Drop-persistent-for-detach-device-alias.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e0cfb484ad357016730e78d216b901c8a682ff2d Mon Sep 17 00:00:00 2001
-Message-Id: <e0cfb484ad357016730e78d216b901c8a682ff2d@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 5 Jul 2018 09:35:01 +0200
-Subject: [PATCH] virsh.pod: Drop --persistent for detach-device-alias
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1598087
-
-The detach-device-alias never supported --persistent argument.
-Drop it from the man page.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 31afed468544ad631a7d033fd9cf225e2a1362ad)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- tools/virsh.pod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh.pod b/tools/virsh.pod
-index dc100db9f3..003becb7c3 100644
---- a/tools/virsh.pod
-+++ b/tools/virsh.pod
-@@ -3197,7 +3197,7 @@ Note that older versions of virsh used I<--config> as an alias for
- I<--persistent>.
- 
- =item B<detach-device-alias> I<domain> I<alias>
--[[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]]
-+[[[I<--live>] [I<--config>] | [I<--current>]]]]
- 
- Detach a device with given I<alias> from the I<domain>.
- 
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virsh.pod-Fix-a-command-name-typo-in-nwfilter-binding-undefine.patch b/SOURCES/libvirt-virsh.pod-Fix-a-command-name-typo-in-nwfilter-binding-undefine.patch
deleted file mode 100644
index 59da4a3..0000000
--- a/SOURCES/libvirt-virsh.pod-Fix-a-command-name-typo-in-nwfilter-binding-undefine.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3343d86b88ab3b1558bd5b743b2b4bab650f6a71 Mon Sep 17 00:00:00 2001
-Message-Id: <3343d86b88ab3b1558bd5b743b2b4bab650f6a71@dist-git>
-From: Han Han <hhan@redhat.com>
-Date: Fri, 13 Jul 2018 13:05:16 +0200
-Subject: [PATCH] virsh.pod: Fix a command name typo in
- nwfilter-binding-undefine
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The true name of the command is nwfilter-binding-delete.
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 955c4318bf7a74d717ce5ce8b3a9040ad657a94c)
-
-https: //bugzilla.redhat.com/show_bug.cgi?id=1600329
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virsh.pod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 003becb7c3..368ce89ed8 100644
---- a/tools/virsh.pod
-+++ b/tools/virsh.pod
-@@ -4827,7 +4827,7 @@ of the network filters directly.
- Associate a network port with a network filter. The network filter backend
- will immediately attempt to instantiate the filter rules on the port.
- 
--=item B<nwfilter-binding-undefine> I<port-name>
-+=item B<nwfilter-binding-delete> I<port-name>
- 
- Disassociate a network port from a network filter. The network filter
- backend will immediately tear down the filter rules that exist on the
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-virstoragefile-Add-JSON-parser-for-sslverify-readahead-cookies-and-timeout.patch b/SOURCES/libvirt-virstoragefile-Add-JSON-parser-for-sslverify-readahead-cookies-and-timeout.patch
new file mode 100644
index 0000000..d81170f
--- /dev/null
+++ b/SOURCES/libvirt-virstoragefile-Add-JSON-parser-for-sslverify-readahead-cookies-and-timeout.patch
@@ -0,0 +1,183 @@
+From 1fdf4e4f9180b74d59882c1a70ad99e1d5165a14 Mon Sep 17 00:00:00 2001
+Message-Id: <1fdf4e4f9180b74d59882c1a70ad99e1d5165a14@dist-git>
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Mon, 16 Mar 2020 22:12:07 +0100
+Subject: [PATCH] virstoragefile: Add JSON parser for 'sslverify', 'readahead',
+ 'cookies' and 'timeout'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add support for parsing the recently added fields from backing file
+pseudo-protocol strings.
+
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 77194db01c4ab785a4668257bc9409b164f059aa)
+https://bugzilla.redhat.com/show_bug.cgi?id=1804750
+Message-Id: <9c5ef44994a5e60b08ad421762acefa26cde5a28.1584391727.git.pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/util/virstoragefile.c | 91 ++++++++++++++++++++++++++++++++++++++-
+ tests/qemublocktest.c     |  6 +++
+ tests/virstoragetest.c    | 15 +++++++
+ 3 files changed, 111 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
+index 7893e054c3..931f2db6e9 100644
+--- a/src/util/virstoragefile.c
++++ b/src/util/virstoragefile.c
+@@ -3210,10 +3210,61 @@ virStorageSourceParseBackingJSONUriStr(virStorageSourcePtr src,
+ }
+ 
+ 
++static int
++virStorageSourceParseBackingJSONUriCookies(virStorageSourcePtr src,
++                                           virJSONValuePtr json,
++                                           const char *jsonstr)
++{
++    const char *cookiestr;
++    VIR_AUTOSTRINGLIST cookies = NULL;
++    size_t ncookies = 0;
++    size_t i;
++
++    if (!virJSONValueObjectHasKey(json, "cookie"))
++        return 0;
++
++    if (!(cookiestr = virJSONValueObjectGetString(json, "cookie"))) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("wrong format of 'cookie' field in backing store definition '%s'"),
++                       jsonstr);
++        return -1;
++    }
++
++    if (!(cookies = virStringSplitCount(cookiestr, ";", 0, &ncookies)))
++        return -1;
++
++    src->cookies = g_new0(virStorageNetCookieDefPtr, ncookies);
++    src->ncookies = ncookies;
++
++    for (i = 0; i < ncookies; i++) {
++        char *cookiename = cookies[i];
++        char *cookievalue;
++
++        virSkipSpaces((const char **) &cookiename);
++
++        if (!(cookievalue = strchr(cookiename, '='))) {
++            virReportError(VIR_ERR_INVALID_ARG,
++                           _("malformed http cookie '%s' in backing store definition '%s'"),
++                           cookies[i], jsonstr);
++            return -1;
++        }
++
++        *cookievalue = '\0';
++        cookievalue++;
++
++        src->cookies[i] = g_new0(virStorageNetCookieDef, 1);
++        src->cookies[i]->name = g_strdup(cookiename);
++        src->cookies[i]->value = g_strdup(cookievalue);
++    }
++
++    return 0;
++}
++
++
+ static int
+ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
+                                     virJSONValuePtr json,
+-                                    const char *jsonstr G_GNUC_UNUSED,
++                                    const char *jsonstr,
+                                     int protocol)
+ {
+     const char *uri;
+@@ -3224,6 +3275,44 @@ virStorageSourceParseBackingJSONUri(virStorageSourcePtr src,
+         return -1;
+     }
+ 
++    if (protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
++        protocol == VIR_STORAGE_NET_PROTOCOL_FTPS) {
++        if (virJSONValueObjectHasKey(json, "sslverify")) {
++            bool tmp;
++
++            if (virJSONValueObjectGetBoolean(json, "sslverify", &tmp) < 0) {
++                virReportError(VIR_ERR_INVALID_ARG,
++                               _("malformed 'sslverify' field in backing store definition '%s'"),
++                               jsonstr);
++                return -1;
++            }
++
++            src->sslverify = virTristateBoolFromBool(tmp);
++        }
++    }
++
++    if (protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
++        protocol == VIR_STORAGE_NET_PROTOCOL_HTTP) {
++        if (virStorageSourceParseBackingJSONUriCookies(src, json, jsonstr) < 0)
++            return -1;
++    }
++
++    if (virJSONValueObjectHasKey(json, "readahead") &&
++        virJSONValueObjectGetNumberUlong(json, "readahead", &src->readahead) < 0) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("malformed 'readahead' field in backing store definition '%s'"),
++                       jsonstr);
++        return -1;
++    }
++
++    if (virJSONValueObjectHasKey(json, "timeout") &&
++        virJSONValueObjectGetNumberUlong(json, "timeout", &src->timeout) < 0) {
++        virReportError(VIR_ERR_INVALID_ARG,
++                       _("malformed 'timeout' field in backing store definition '%s'"),
++                       jsonstr);
++        return -1;
++    }
++
+     return virStorageSourceParseBackingJSONUriStr(src, uri, protocol);
+ }
+ 
+diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
+index 29af0781fc..3057db6930 100644
+--- a/tests/qemublocktest.c
++++ b/tests/qemublocktest.c
+@@ -913,6 +913,12 @@ mymain(void)
+     TEST_JSON_FORMAT_NET("<source protocol='https' name='file'>\n"
+                          "  <host name='example.com' port='432'/>\n"
+                          "</source>\n");
++    TEST_JSON_FORMAT_NET("<source protocol='https' name='file'>\n"
++                         "  <host name='example.com' port='432'/>\n"
++                         "  <ssl verify='no'/>\n"
++                         "  <readahead size='1024'/>\n"
++                         "  <timeout seconds='1337'/>\n"
++                         "</source>\n");
+     TEST_JSON_FORMAT_NET("<source protocol='gluster' name='vol/file'>\n"
+                          "  <host name='example.com' port='24007'/>\n"
+                          "</source>\n");
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index e7794d6168..63b991eb71 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -1606,6 +1606,21 @@ mymain(void)
+                             "  </slices>\n"
+                             "</source>\n", 0);
+ 
++    TEST_BACKING_PARSE_FULL("json:{ \"file.cookie\": \"vmware_soap_session=\\\"0c8db85112873a79b7ef74f294cb70ef7f\\\"\","
++                                   "\"file.sslverify\": false,"
++                                   "\"file.driver\": \"https\","
++                                   "\"file.url\": \"https://host/folder/esx6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=data&dsName=esx6.5-matrix\","
++                                   "\"file.timeout\": 2000"
++                                 "}",
++                           "<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk'>\n"
++                           "  <host name='host' port='443'/>\n"
++                           "  <ssl verify='no'/>\n"
++                           "  <cookies>\n"
++                           "    <cookie name='vmware_soap_session'>&quot;0c8db85112873a79b7ef74f294cb70ef7f&quot;</cookie>\n"
++                           "  </cookies>\n"
++                           "  <timeout seconds='2000'/>\n"
++                           "</source>\n", 0);
++
+ #endif /* WITH_YAJL */
+ 
+  cleanup:
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-virt-host-validate-Fix-build-on-non-Linux.patch b/SOURCES/libvirt-virt-host-validate-Fix-build-on-non-Linux.patch
deleted file mode 100644
index 39c9f15..0000000
--- a/SOURCES/libvirt-virt-host-validate-Fix-build-on-non-Linux.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f3366321b1911d327985ed16717a8589869d6fb3 Mon Sep 17 00:00:00 2001
-Message-Id: <f3366321b1911d327985ed16717a8589869d6fb3@dist-git>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:05 +0200
-Subject: [PATCH] virt-host-validate: Fix build on non-Linux
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For non-Linux platforms we have
-virHostValidateCGroupControllers() stub which only reports an
-error. But we are not marking the ignored arguments the way we
-should.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 8524faf8c4007edfbc5363a018821139667a9e32)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <34a0cf3fd56060036b473a82c9b2b39beba0d589.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virt-host-validate-common.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
-index 73165d673a..5dd1605daa 100644
---- a/tools/virt-host-validate-common.c
-+++ b/tools/virt-host-validate-common.c
-@@ -324,8 +324,8 @@ int virHostValidateCGroupControllers(const char *hvname,
-     return ret;
- }
- #else /*  !__linux__ */
--int virHostValidateCGroupControllers(const char *hvname,
--                                     int controllers,
-+int virHostValidateCGroupControllers(const char *hvname ATTRIBUTE_UNUSED,
-+                                     int controllers ATTRIBUTE_UNUSED,
-                                      virHostValidateLevel level)
- {
-     virHostMsgFail(level, "%s", "This platform does not support cgroups");
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virt-host-validate-require-freezer-for-LXC.patch b/SOURCES/libvirt-virt-host-validate-require-freezer-for-LXC.patch
deleted file mode 100644
index a54edba..0000000
--- a/SOURCES/libvirt-virt-host-validate-require-freezer-for-LXC.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f150121476cbe99dcca7378583aa1f0533c072d1 Mon Sep 17 00:00:00 2001
-Message-Id: <f150121476cbe99dcca7378583aa1f0533c072d1@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:04 +0200
-Subject: [PATCH] virt-host-validate: require freezer for LXC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Cgroup freezer support for LXC was added in libvirt-0.7.2.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0a7101c89b787d2f45690f8ad3a4b932b000b758)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <ffd30e592e34a26e5b610b07b705da9727ce3cd2.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virt-host-validate-lxc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c
-index 3c55b1b26d..8613f37cc7 100644
---- a/tools/virt-host-validate-lxc.c
-+++ b/tools/virt-host-validate-lxc.c
-@@ -70,6 +70,7 @@ int virHostValidateLXC(void)
-                                          (1 << VIR_CGROUP_CONTROLLER_CPUACCT) |
-                                          (1 << VIR_CGROUP_CONTROLLER_CPUSET) |
-                                          (1 << VIR_CGROUP_CONTROLLER_DEVICES) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_FREEZER) |
-                                          (1 << VIR_CGROUP_CONTROLLER_BLKIO),
-                                          VIR_HOST_VALIDATE_FAIL) < 0) {
-         ret = -1;
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virt-host-validate-rewrite-cgroup-detection-to-use-util-vircgroup.patch b/SOURCES/libvirt-virt-host-validate-rewrite-cgroup-detection-to-use-util-vircgroup.patch
deleted file mode 100644
index 9e9a6fe..0000000
--- a/SOURCES/libvirt-virt-host-validate-rewrite-cgroup-detection-to-use-util-vircgroup.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-From 0ede215415509022d94092b75ef075495c91a5d5 Mon Sep 17 00:00:00 2001
-Message-Id: <0ede215415509022d94092b75ef075495c91a5d5@dist-git>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 1 Jul 2019 17:08:03 +0200
-Subject: [PATCH] virt-host-validate: rewrite cgroup detection to use
- util/vircgroup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This removes code duplication and simplifies cgroup detection.
-As a drawback we will not have separate messages to enable cgroup
-controller in kernel or to mount it.  On the other side the rewrite
-adds support for cgroup v2.
-
-The kernel config support was wrong because it was parsing
-'/proc/self/cgroup' instead of '/proc/cgroups/' file.
-
-The mount suggestion is removed as well because it will not work
-with cgroup v2.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 0f4d7daa8cd43b62911413c2cc1614f87380e459)
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Message-Id: <0a79b9dcaee25d04b993c4e6576d75ce7c45ac0f.1561993100.git.phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virt-host-validate-common.c | 164 ++++++------------------------
- tools/virt-host-validate-common.h |   7 +-
- tools/virt-host-validate-lxc.c    |  38 ++-----
- tools/virt-host-validate-qemu.c   |  38 ++-----
- 4 files changed, 53 insertions(+), 194 deletions(-)
-
-diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
-index c45dfc5d8c..73165d673a 100644
---- a/tools/virt-host-validate-common.c
-+++ b/tools/virt-host-validate-common.c
-@@ -26,12 +26,10 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/utsname.h>
--#ifdef HAVE_MNTENT_H
--# include <mntent.h>
--#endif /* HAVE_MNTENT_H */
- #include <sys/stat.h>
- 
- #include "viralloc.h"
-+#include "vircgroup.h"
- #include "virfile.h"
- #include "virt-host-validate-common.h"
- #include "virstring.h"
-@@ -290,152 +288,50 @@ int virHostValidateLinuxKernel(const char *hvname,
-     }
- }
- 
--
--static int virHostValidateCGroupSupport(const char *hvname,
--                                        const char *cg_name,
--                                        virHostValidateLevel level,
--                                        const char *config_name)
-+#ifdef __linux__
-+int virHostValidateCGroupControllers(const char *hvname,
-+                                     int controllers,
-+                                     virHostValidateLevel level)
- {
--    virHostMsgCheck(hvname, "for cgroup '%s' controller support", cg_name);
--    FILE *fp = fopen("/proc/self/cgroup", "r");
--    size_t len = 0;
--    char *line = NULL;
--    ssize_t ret;
--    bool matched = false;
-+    virCgroupPtr group = NULL;
-+    int ret = 0;
-+    size_t i;
- 
--    if (!fp)
--        goto error;
-+    if (virCgroupNewSelf(&group) < 0)
-+        return -1;
- 
--    while ((ret = getline(&line, &len, fp)) >= 0 && !matched) {
--        char **cgroups;
--        char *start;
--        char *end;
--        size_t ncgroups;
--        size_t i;
-+    for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-+        int flag = 1 << i;
-+        const char *cg_name = virCgroupControllerTypeToString(i);
- 
--        /* Each line in this file looks like
--         *
--         *   4:cpu,cpuacct:/machine.slice/machine-qemu\x2dtest.scope/emulator
--         *
--         * Since multiple cgroups can be part of the same line and some cgroup
--         * names can appear as part of other cgroup names (eg. 'cpu' is a
--         * prefix for both 'cpuacct' and 'cpuset'), it's not enough to simply
--         * check whether the cgroup name is present somewhere inside the file.
--         *
--         * Moreover, there's nothing stopping the cgroup name from appearing
--         * in an unrelated mount point name as well */
--
--        /* Look for the first colon.
--         * The part we're interested in starts right after it */
--        if (!(start = strchr(line, ':')))
--            continue;
--        start++;
--
--        /* Look for the second colon.
--         * The part we're interested in ends exactly there */
--        if (!(end = strchr(start, ':')))
--            continue;
--        *end = '\0';
--
--        if (!(cgroups = virStringSplitCount(start, ",", 0, &ncgroups)))
-+        if (!(controllers & flag))
-             continue;
- 
--        /* Look for the matching cgroup */
--        for (i = 0; i < ncgroups; i++) {
--            if (STREQ(cgroups[i], cg_name))
--                matched = true;
-+        virHostMsgCheck(hvname, "for cgroup '%s' controller support", cg_name);
-+
-+        if (!virCgroupHasController(group, i)) {
-+            ret = -1;
-+            virHostMsgFail(level, "Enable '%s' in kernel Kconfig file or "
-+                           "mount/enable cgroup controller in your system",
-+                           cg_name);
-+        } else {
-+            virHostMsgPass();
-         }
--
--        virStringListFreeCount(cgroups, ncgroups);
-     }
- 
--    VIR_FREE(line);
--    VIR_FORCE_FCLOSE(fp);
--    if (!matched)
--        goto error;
-+    virCgroupFree(&group);
- 
--    virHostMsgPass();
--    return 0;
--
-- error:
--    VIR_FREE(line);
--    virHostMsgFail(level, "Enable CONFIG_%s in kernel Kconfig file", config_name);
--    return -1;
-+    return ret;
- }
--
--#ifdef HAVE_MNTENT_H
--static int virHostValidateCGroupMount(const char *hvname,
--                                      const char *cg_name,
--                                      virHostValidateLevel level)
-+#else /*  !__linux__ */
-+int virHostValidateCGroupControllers(const char *hvname,
-+                                     int controllers,
-+                                     virHostValidateLevel level)
- {
--    virHostMsgCheck(hvname, "for cgroup '%s' controller mount-point", cg_name);
--    FILE *fp = setmntent("/proc/mounts", "r");
--    struct mntent ent;
--    char mntbuf[1024];
--    bool matched = false;
--
--    if (!fp)
--        goto error;
--
--    while (getmntent_r(fp, &ent, mntbuf, sizeof(mntbuf)) && !matched) {
--        char **opts;
--        size_t nopts;
--        size_t i;
--
--        /* Ignore non-cgroup mounts */
--        if (STRNEQ(ent.mnt_type, "cgroup"))
--            continue;
--
--        if (!(opts = virStringSplitCount(ent.mnt_opts, ",", 0, &nopts)))
--            continue;
--
--        /* Look for a mount option matching the cgroup name */
--        for (i = 0; i < nopts; i++) {
--            if (STREQ(opts[i], cg_name))
--                matched = true;
--        }
--
--        virStringListFreeCount(opts, nopts);
--    }
--    endmntent(fp);
--    if (!matched)
--        goto error;
--
--    virHostMsgPass();
--    return 0;
--
-- error:
--    virHostMsgFail(level, "Mount '%s' cgroup controller (suggested at /sys/fs/cgroup/%s)",
--                   cg_name, cg_name);
--    return -1;
--}
--#else /* ! HAVE_MNTENT_H */
--static int virHostValidateCGroupMount(const char *hvname,
--                                      const char *cg_name,
--                                      virHostValidateLevel level)
--{
--    virHostMsgCheck(hvname, "for cgroup '%s' controller mount-point", cg_name);
-     virHostMsgFail(level, "%s", "This platform does not support cgroups");
-     return -1;
- }
--#endif /* ! HAVE_MNTENT_H */
--
--int virHostValidateCGroupController(const char *hvname,
--                                    const char *cg_name,
--                                    virHostValidateLevel level,
--                                    const char *config_name)
--{
--    if (virHostValidateCGroupSupport(hvname,
--                                     cg_name,
--                                     level,
--                                     config_name) < 0)
--        return -1;
--    if (virHostValidateCGroupMount(hvname,
--                                   cg_name,
--                                   level) < 0)
--        return -1;
--    return 0;
--}
-+#endif /* !__linux__ */
- 
- int virHostValidateIOMMU(const char *hvname,
-                          virHostValidateLevel level)
-diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h
-index b6fe17daa7..b23dd7cdbe 100644
---- a/tools/virt-host-validate-common.h
-+++ b/tools/virt-host-validate-common.h
-@@ -77,10 +77,9 @@ int virHostValidateNamespace(const char *hvname,
-                              virHostValidateLevel level,
-                              const char *hint);
- 
--int virHostValidateCGroupController(const char *hvname,
--                                    const char *cg_name,
--                                    virHostValidateLevel level,
--                                    const char *config_name);
-+int virHostValidateCGroupControllers(const char *hvname,
-+                                     int controllers,
-+                                     virHostValidateLevel level);
- 
- int virHostValidateIOMMU(const char *hvname,
-                          virHostValidateLevel level);
-diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c
-index 64d9279c30..3c55b1b26d 100644
---- a/tools/virt-host-validate-lxc.c
-+++ b/tools/virt-host-validate-lxc.c
-@@ -23,6 +23,7 @@
- 
- #include "virt-host-validate-lxc.h"
- #include "virt-host-validate-common.h"
-+#include "vircgroup.h"
- 
- int virHostValidateLXC(void)
- {
-@@ -63,35 +64,16 @@ int virHostValidateLXC(void)
-                                  _("User namespace support is recommended")) < 0)
-         ret = -1;
- 
--    if (virHostValidateCGroupController("LXC", "memory",
--                                        VIR_HOST_VALIDATE_FAIL,
--                                        "MEMCG") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("LXC", "cpu",
--                                        VIR_HOST_VALIDATE_FAIL,
--                                        "CGROUP_CPU") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("LXC", "cpuacct",
--                                        VIR_HOST_VALIDATE_FAIL,
--                                        "CGROUP_CPUACCT") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("LXC", "cpuset",
--                                        VIR_HOST_VALIDATE_FAIL,
--                                        "CPUSETS") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("LXC", "devices",
--                                        VIR_HOST_VALIDATE_FAIL,
--                                        "CGROUP_DEVICE") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("LXC", "blkio",
--                                        VIR_HOST_VALIDATE_FAIL,
--                                        "BLK_CGROUP") < 0)
-+    if (virHostValidateCGroupControllers("LXC",
-+                                         (1 << VIR_CGROUP_CONTROLLER_MEMORY) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_CPU) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_CPUACCT) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_CPUSET) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_DEVICES) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_BLKIO),
-+                                         VIR_HOST_VALIDATE_FAIL) < 0) {
-         ret = -1;
-+    }
- 
- #if WITH_FUSE
-     if (virHostValidateDeviceExists("LXC", "/sys/fs/fuse/connections",
-diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c
-index d7573ea8b3..ff3c1f0231 100644
---- a/tools/virt-host-validate-qemu.c
-+++ b/tools/virt-host-validate-qemu.c
-@@ -26,6 +26,7 @@
- #include "virt-host-validate-common.h"
- #include "virarch.h"
- #include "virbitmap.h"
-+#include "vircgroup.h"
- 
- int virHostValidateQEMU(void)
- {
-@@ -96,35 +97,16 @@ int virHostValidateQEMU(void)
-                                     _("Load the 'tun' module to enable networking for QEMU guests")) < 0)
-         ret = -1;
- 
--    if (virHostValidateCGroupController("QEMU", "memory",
--                                        VIR_HOST_VALIDATE_WARN,
--                                        "MEMCG") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("QEMU", "cpu",
--                                        VIR_HOST_VALIDATE_WARN,
--                                        "CGROUP_CPU") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("QEMU", "cpuacct",
--                                        VIR_HOST_VALIDATE_WARN,
--                                        "CGROUP_CPUACCT") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("QEMU", "cpuset",
--                                        VIR_HOST_VALIDATE_WARN,
--                                        "CPUSETS") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("QEMU", "devices",
--                                        VIR_HOST_VALIDATE_WARN,
--                                        "CGROUP_DEVICES") < 0)
--        ret = -1;
--
--    if (virHostValidateCGroupController("QEMU", "blkio",
--                                        VIR_HOST_VALIDATE_WARN,
--                                        "BLK_CGROUP") < 0)
-+    if (virHostValidateCGroupControllers("QEMU",
-+                                         (1 << VIR_CGROUP_CONTROLLER_MEMORY) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_CPU) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_CPUACCT) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_CPUSET) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_DEVICES) |
-+                                         (1 << VIR_CGROUP_CONTROLLER_BLKIO),
-+                                         VIR_HOST_VALIDATE_WARN) < 0) {
-         ret = -1;
-+    }
- 
-     if (virHostValidateIOMMU("QEMU",
-                              VIR_HOST_VALIDATE_WARN) < 0)
--- 
-2.22.0
-
diff --git a/SOURCES/libvirt-virt-xml-validate-Add-schema-for-nwfilterbinding.patch b/SOURCES/libvirt-virt-xml-validate-Add-schema-for-nwfilterbinding.patch
deleted file mode 100644
index 4b1ada4..0000000
--- a/SOURCES/libvirt-virt-xml-validate-Add-schema-for-nwfilterbinding.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 988f1476012e203e0610d891d6d59d76ec196395 Mon Sep 17 00:00:00 2001
-Message-Id: <988f1476012e203e0610d891d6d59d76ec196395@dist-git>
-From: Han Han <hhan@redhat.com>
-Date: Thu, 19 Jul 2018 16:23:39 -0400
-Subject: [PATCH] virt-xml-validate: Add schema for nwfilterbinding
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1600330
-
-Add nwfilterbinding schema in virt-xml-validate for autoprobing.
-Add document of nwfilterbinding schema in tools/virt-xml-validate.pod.
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit a47d053720f3b4965184bc9a5a87a86d301957ea)
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- tools/virt-xml-validate.in  | 3 +++
- tools/virt-xml-validate.pod | 4 ++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in
-index 81fde4d832..7513413189 100644
---- a/tools/virt-xml-validate.in
-+++ b/tools/virt-xml-validate.in
-@@ -77,6 +77,9 @@ if [ -z "$TYPE" ]; then
-      *device*)
-         TYPE="nodedev"
-         ;;
-+     *filterbinding*)
-+        TYPE="nwfilterbinding"
-+        ;;
-      *filter*)
-         TYPE="nwfilter"
-         ;;
-diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod
-index f8e67503fd..a51a57002a 100644
---- a/tools/virt-xml-validate.pod
-+++ b/tools/virt-xml-validate.pod
-@@ -52,6 +52,10 @@ The schema for the XML format used to declare driver capabilities
- 
- The schema for the XML format used by network traffic filters
- 
-+=item C<nwfilterbinding>
-+
-+The schema for XML format used by network filter bindings.
-+
- =item C<secret>
- 
- The schema for the XML format used by secrets descriptions
--- 
-2.18.0
-
diff --git a/SOURCES/libvirt-vmx-make-fileName-optional-for-CD-ROMs.patch b/SOURCES/libvirt-vmx-make-fileName-optional-for-CD-ROMs.patch
new file mode 100644
index 0000000..1171d7a
--- /dev/null
+++ b/SOURCES/libvirt-vmx-make-fileName-optional-for-CD-ROMs.patch
@@ -0,0 +1,196 @@
+From f600a3df720e1d68c621e739acbed0554f5f5fb0 Mon Sep 17 00:00:00 2001
+Message-Id: <f600a3df720e1d68c621e739acbed0554f5f5fb0@dist-git>
+From: Pino Toscano <ptoscano@redhat.com>
+Date: Fri, 20 Mar 2020 13:25:39 +0100
+Subject: [PATCH] vmx: make 'fileName' optional for CD-ROMs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It seems like CD-ROMs may have no 'fileName' property specified in case
+there is nothing configured as attachment for the drive. Hence, make
+sure that virVMXParseDisk() do not consider it mandatory anymore,
+considering it an empty block cdrom device. Sadly virVMXParseDisk() is
+used also to parse disk and floppies, so make sure that a NULL fileName
+is handled in cdrom- and floppy-related paths.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1808610
+
+Signed-off-by: Pino Toscano <ptoscano@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+(cherry picked from commit c5ee737bc5c0fc61451e45ff41526270bdf0113c)
+Signed-off-by: Pino Toscano <ptoscano@redhat.com>
+Message-Id: <20200320122539.141785-3-ptoscano@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/vmx/vmx.c                                 | 25 ++++++++++---------
+ .../vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx |  4 +++
+ .../vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml | 23 +++++++++++++++++
+ tests/vmx2xmltest.c                           |  1 +
+ 4 files changed, 41 insertions(+), 12 deletions(-)
+ create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx
+ create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml
+
+diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
+index fc4fa1c22b..d0bcb9c2de 100644
+--- a/src/vmx/vmx.c
++++ b/src/vmx/vmx.c
+@@ -2206,7 +2206,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+         goto cleanup;
+ 
+     /* vmx:fileName -> def:src, def:type */
+-    if (virVMXGetConfigString(conf, fileName_name, &fileName, false) < 0)
++    if (virVMXGetConfigString(conf, fileName_name, &fileName, true) < 0)
+         goto cleanup;
+ 
+     /* vmx:writeThrough -> def:cachemode */
+@@ -2217,7 +2217,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+ 
+     /* Setup virDomainDiskDef */
+     if (device == VIR_DOMAIN_DISK_DEVICE_DISK) {
+-        if (virStringHasCaseSuffix(fileName, ".iso") ||
++        if (fileName == NULL ||
++            virStringHasCaseSuffix(fileName, ".iso") ||
+             STREQ(fileName, "emptyBackingString") ||
+             (deviceType &&
+              (STRCASEEQ(deviceType, "atapi-cdrom") ||
+@@ -2276,7 +2277,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             goto cleanup;
+         }
+     } else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
+-        if (virStringHasCaseSuffix(fileName, ".vmdk")) {
++        if (fileName && virStringHasCaseSuffix(fileName, ".vmdk")) {
+             /*
+              * This function was called in order to parse a CDROM device, but
+              * .vmdk files are for harddisk devices only. Just ignore it,
+@@ -2284,7 +2285,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+              * handle it.
+              */
+             goto ignore;
+-        } else if (virStringHasCaseSuffix(fileName, ".iso")) {
++        } else if (fileName && virStringHasCaseSuffix(fileName, ".iso")) {
+             char *tmp;
+ 
+             if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) {
+@@ -2305,7 +2306,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+         } else if (deviceType && STRCASEEQ(deviceType, "atapi-cdrom")) {
+             virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK);
+ 
+-            if (STRCASEEQ(fileName, "auto detect")) {
++            if (fileName && STRCASEEQ(fileName, "auto detect")) {
+                 ignore_value(virDomainDiskSetSource(*def, NULL));
+                 (*def)->startupPolicy = VIR_DOMAIN_STARTUP_POLICY_OPTIONAL;
+             } else if (virDomainDiskSetSource(*def, fileName) < 0) {
+@@ -2316,7 +2317,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             (*def)->device = VIR_DOMAIN_DISK_DEVICE_LUN;
+             virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK);
+ 
+-            if (STRCASEEQ(fileName, "auto detect")) {
++            if (fileName && STRCASEEQ(fileName, "auto detect")) {
+                 ignore_value(virDomainDiskSetSource(*def, NULL));
+                 (*def)->startupPolicy = VIR_DOMAIN_STARTUP_POLICY_OPTIONAL;
+             } else if (virDomainDiskSetSource(*def, fileName) < 0) {
+@@ -2324,7 +2325,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             }
+         } else if (busType == VIR_DOMAIN_DISK_BUS_SCSI &&
+                    deviceType && STRCASEEQ(deviceType, "scsi-passthru")) {
+-            if (STRPREFIX(fileName, "/vmfs/devices/cdrom/")) {
++            if (fileName && STRPREFIX(fileName, "/vmfs/devices/cdrom/")) {
+                 /* SCSI-passthru CD-ROMs actually are device='lun' */
+                 (*def)->device = VIR_DOMAIN_DISK_DEVICE_LUN;
+                 virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK);
+@@ -2340,7 +2341,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+                  */
+                 goto ignore;
+             }
+-        } else if (STREQ(fileName, "emptyBackingString")) {
++        } else if (fileName && STREQ(fileName, "emptyBackingString")) {
+             if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("Expecting VMX entry '%s' to be 'cdrom-image' "
+@@ -2354,7 +2355,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid or not yet handled value '%s' "
+                              "for VMX entry '%s' for device type '%s'"),
+-                           fileName, fileName_name,
++                           NULLSTR(fileName), fileName_name,
+                            deviceType ? deviceType : "unknown");
+             goto cleanup;
+         }
+@@ -2364,10 +2365,10 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             if (virDomainDiskSetSource(*def, fileName) < 0)
+                 goto cleanup;
+         } else if (fileType != NULL && STRCASEEQ(fileType, "file")) {
+-            char *tmp;
++            char *tmp = NULL;
+ 
+             virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE);
+-            if (!(tmp = ctx->parseFileName(fileName, ctx->opaque)))
++            if (fileName && !(tmp = ctx->parseFileName(fileName, ctx->opaque)))
+                 goto cleanup;
+             if (virDomainDiskSetSource(*def, tmp) < 0) {
+                 VIR_FREE(tmp);
+@@ -2378,7 +2379,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid or not yet handled value '%s' "
+                              "for VMX entry '%s' for device type '%s'"),
+-                           fileName, fileName_name,
++                           NULLSTR(fileName), fileName_name,
+                            deviceType ? deviceType : "unknown");
+             goto cleanup;
+         }
+diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx
+new file mode 100644
+index 0000000000..36286cb20f
+--- /dev/null
++++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.vmx
+@@ -0,0 +1,4 @@
++config.version = "8"
++virtualHW.version = "4"
++ide0:0.present = "true"
++ide0:0.deviceType = "atapi-cdrom"
+diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml
+new file mode 100644
+index 0000000000..af4a5ff9f6
+--- /dev/null
++++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty-2.xml
+@@ -0,0 +1,23 @@
++<domain type='vmware'>
++  <uuid>00000000-0000-0000-0000-000000000000</uuid>
++  <memory unit='KiB'>32768</memory>
++  <currentMemory unit='KiB'>32768</currentMemory>
++  <vcpu placement='static'>1</vcpu>
++  <os>
++    <type arch='i686'>hvm</type>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <disk type='block' device='cdrom'>
++      <target dev='hda' bus='ide'/>
++      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
++    </disk>
++    <controller type='ide' index='0'/>
++    <video>
++      <model type='vmvga' vram='4096' primary='yes'/>
++    </video>
++  </devices>
++</domain>
+diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
+index 8d7b8ba2a4..1966aed6fe 100644
+--- a/tests/vmx2xmltest.c
++++ b/tests/vmx2xmltest.c
+@@ -218,6 +218,7 @@ mymain(void)
+     DO_TEST("cdrom-scsi-passthru", "cdrom-scsi-passthru");
+     DO_TEST("cdrom-ide-file", "cdrom-ide-file");
+     DO_TEST("cdrom-ide-empty", "cdrom-ide-empty");
++    DO_TEST("cdrom-ide-empty-2", "cdrom-ide-empty-2");
+     DO_TEST("cdrom-ide-device", "cdrom-ide-device");
+     DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device");
+     DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect");
+-- 
+2.25.1
+
diff --git a/SOURCES/libvirt-vmx-shortcut-earlier-few-ignore-cases-in-virVMXParseDisk.patch b/SOURCES/libvirt-vmx-shortcut-earlier-few-ignore-cases-in-virVMXParseDisk.patch
new file mode 100644
index 0000000..0f4137a
--- /dev/null
+++ b/SOURCES/libvirt-vmx-shortcut-earlier-few-ignore-cases-in-virVMXParseDisk.patch
@@ -0,0 +1,109 @@
+From e8bd352038f46facdb4891d4df109a3c6351479c Mon Sep 17 00:00:00 2001
+Message-Id: <e8bd352038f46facdb4891d4df109a3c6351479c@dist-git>
+From: Pino Toscano <ptoscano@redhat.com>
+Date: Fri, 20 Mar 2020 13:25:38 +0100
+Subject: [PATCH] vmx: shortcut earlier few 'ignore' cases in virVMXParseDisk()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move earlier the checks for skipping a hard disk when parsing a CD-DROM,
+and for skipping a CD-ROM when parsing a hard disk. This should have no
+behaviour changes, and avoids to add repeated checks in following
+commits.
+
+Signed-off-by: Pino Toscano <ptoscano@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Tested-by: Richard W.M. Jones <rjones@redhat.com>
+https://bugzilla.redhat.com/show_bug.cgi?id=1808610
+(cherry picked from commit 9a469c0d358bf3fd4b4e55b20360620d6fda44b5)
+Signed-off-by: Pino Toscano <ptoscano@redhat.com>
+Message-Id: <20200320122539.141785-2-ptoscano@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/vmx/vmx.c | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
+index 4362da6cee..fc4fa1c22b 100644
+--- a/src/vmx/vmx.c
++++ b/src/vmx/vmx.c
+@@ -2217,7 +2217,21 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+ 
+     /* Setup virDomainDiskDef */
+     if (device == VIR_DOMAIN_DISK_DEVICE_DISK) {
+-        if (virStringHasCaseSuffix(fileName, ".vmdk")) {
++        if (virStringHasCaseSuffix(fileName, ".iso") ||
++            STREQ(fileName, "emptyBackingString") ||
++            (deviceType &&
++             (STRCASEEQ(deviceType, "atapi-cdrom") ||
++              STRCASEEQ(deviceType, "cdrom-raw") ||
++              (STRCASEEQ(deviceType, "scsi-passthru") &&
++               STRPREFIX(fileName, "/vmfs/devices/cdrom/"))))) {
++            /*
++             * This function was called in order to parse a harddisk device,
++             * but .iso files, 'atapi-cdrom', 'cdrom-raw', and 'scsi-passthru'
++             * CDROM devices are for CDROM devices only. Just ignore it, another
++             * call to this function to parse a CDROM device may handle it.
++             */
++            goto ignore;
++        } else if (virStringHasCaseSuffix(fileName, ".vmdk")) {
+             char *tmp;
+ 
+             if (deviceType != NULL) {
+@@ -2253,20 +2267,6 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             if (mode)
+                 (*def)->transient = STRCASEEQ(mode,
+                                               "independent-nonpersistent");
+-        } else if (virStringHasCaseSuffix(fileName, ".iso") ||
+-                   STREQ(fileName, "emptyBackingString") ||
+-                   (deviceType &&
+-                    (STRCASEEQ(deviceType, "atapi-cdrom") ||
+-                     STRCASEEQ(deviceType, "cdrom-raw") ||
+-                     (STRCASEEQ(deviceType, "scsi-passthru") &&
+-                      STRPREFIX(fileName, "/vmfs/devices/cdrom/"))))) {
+-            /*
+-             * This function was called in order to parse a harddisk device,
+-             * but .iso files, 'atapi-cdrom', 'cdrom-raw', and 'scsi-passthru'
+-             * CDROM devices are for CDROM devices only. Just ignore it, another
+-             * call to this function to parse a CDROM device may handle it.
+-             */
+-            goto ignore;
+         } else {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid or not yet handled value '%s' "
+@@ -2276,7 +2276,15 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+             goto cleanup;
+         }
+     } else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
+-        if (virStringHasCaseSuffix(fileName, ".iso")) {
++        if (virStringHasCaseSuffix(fileName, ".vmdk")) {
++            /*
++             * This function was called in order to parse a CDROM device, but
++             * .vmdk files are for harddisk devices only. Just ignore it,
++             * another call to this function to parse a harddisk device may
++             * handle it.
++             */
++            goto ignore;
++        } else if (virStringHasCaseSuffix(fileName, ".iso")) {
+             char *tmp;
+ 
+             if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) {
+@@ -2294,14 +2302,6 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con
+                 goto cleanup;
+             }
+             VIR_FREE(tmp);
+-        } else if (virStringHasCaseSuffix(fileName, ".vmdk")) {
+-            /*
+-             * This function was called in order to parse a CDROM device, but
+-             * .vmdk files are for harddisk devices only. Just ignore it,
+-             * another call to this function to parse a harddisk device may
+-             * handle it.
+-             */
+-            goto ignore;
+         } else if (deviceType && STRCASEEQ(deviceType, "atapi-cdrom")) {
+             virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK);
+ 
+-- 
+2.25.1
+
diff --git a/SOURCES/symlinks b/SOURCES/symlinks
index bfa5b22..8ddd1c3 100644
--- a/SOURCES/symlinks
+++ b/SOURCES/symlinks
@@ -1,14 +1,24 @@
 ABOUT-NLS po/README.md
 README README.md
+.ctags.d/libvirt.ctags ../.ctags
 tests/virt-admin-self-test ./virsh-self-test
+tests/qemublocktestdata/imagecreate/qcow2-backing-luks.xml qcow2.xml
+tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.xml qcow2.xml
+tests/qemublocktestdata/imagecreate/qcow2-backing-raw.xml qcow2.xml
+tests/qemublocktestdata/imagecreate/qcow2-luks-encopts-backing.xml qcow2-luks-encopts.xml
+tests/qemufirmwaredata/etc/qemu/firmware/40-ovmf-sb-keys.json ../../../usr/share/qemu/firmware/50-ovmf-sb-keys.json
 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell-detach.xml qemuhotplug-base-live+ivshmem-plain.xml
 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain-detach.xml qemuhotplug-base-live.xml
+tests/qemustatusxml2xmldata/backup-pull-out.xml backup-pull-in.xml
+tests/qemustatusxml2xmldata/blockjob-blockdev-out.xml blockjob-blockdev-in.xml
 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml blockjob-mirror-in.xml
 tests/qemustatusxml2xmldata/migration-in-params-out.xml migration-in-params-in.xml
-tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml migration-out-nbd-tls-in.xml
 tests/qemustatusxml2xmldata/migration-out-params-out.xml migration-out-params-in.xml
 tests/qemustatusxml2xmldata/modern-out.xml modern-in.xml
 tests/qemustatusxml2xmldata/vcpus-multi-out.xml vcpus-multi-in.xml
+tests/qemuvhostuserdata/etc/qemu/vhost-user/40-gpu.json ../../../usr/share/qemu/vhost-user/50-gpu.json
+tests/qemuvhostuserdata/usr/share/qemu/vhost-user/30-gpu.json 50-gpu.json
+tests/qemuvhostuserdata/usr/share/qemu/vhost-user/60-gpu.json 50-gpu.json
 tests/qemuxml2argvdata/aarch64-gic-default-both.args aarch64-gic-v3.args
 tests/qemuxml2argvdata/aarch64-gic-default-both.xml aarch64-gic-default.xml
 tests/qemuxml2argvdata/aarch64-gic-default-v2.args aarch64-gic-v2.args
@@ -25,6 +35,8 @@ tests/qemuxml2argvdata/aarch64-gic-none-v3.xml aarch64-gic-none-v2.xml
 tests/qemuxml2argvdata/aarch64-gic-none.args aarch64-gic-v2.args
 tests/qemuxml2argvdata/cpu-check-full.args cpu-check-none.args
 tests/qemuxml2argvdata/cpu-check-partial.args cpu-check-none.args
+tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args disk-backing-chains-noindex.x86_64-2.12.0.args
+tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args disk-backing-chains-noindex.x86_64-latest.args
 tests/qemuxml2argvdata/mach-virt-console-native.args mach-virt-serial-native.args
 tests/qemuxml2argvdata/mach-virt-serial+console-native.args mach-virt-serial-native.args
 tests/qemuxml2argvdata/mach-virt-serial-compat.args mach-virt-serial-native.args
@@ -53,48 +65,67 @@ tests/qemuxml2xmloutdata/aarch64-gic-v3.xml ../qemuxml2argvdata/aarch64-gic-v3.x
 tests/qemuxml2xmloutdata/blkdeviotune-group-num.xml ../qemuxml2argvdata/blkdeviotune-group-num.xml
 tests/qemuxml2xmloutdata/blkdeviotune-max-length.xml ../qemuxml2argvdata/blkdeviotune-max-length.xml
 tests/qemuxml2xmloutdata/blkdeviotune-max.xml ../qemuxml2argvdata/blkdeviotune-max.xml
-tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml ../qemuxml2argvdata/disk-drive-detect-zeroes.xml
+tests/qemuxml2xmloutdata/boot-floppy-q35.xml ../qemuxml2argvdata/boot-floppy-q35.xml
+tests/qemuxml2xmloutdata/disk-detect-zeroes.xml ../qemuxml2argvdata/disk-detect-zeroes.xml
+tests/qemuxml2xmloutdata/disk-nvme.xml ../qemuxml2argvdata/disk-nvme.xml
+tests/qemuxml2xmloutdata/disk-virtio-queues.xml ../qemuxml2argvdata/disk-virtio-queues.xml
 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml ../qemuxml2argvdata/disk-virtio-scsi-reservations.xml
 tests/qemuxml2xmloutdata/encrypted-disk-usage.xml ../qemuxml2argvdata/encrypted-disk-usage.xml
+tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml ../qemuxml2argvdata/fd-memory-no-numa-topology.xml
+tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml ../qemuxml2argvdata/fd-memory-numa-topology.xml
+tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml ../qemuxml2argvdata/fd-memory-numa-topology2.xml
+tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml ../qemuxml2argvdata/fd-memory-numa-topology3.xml
+tests/qemuxml2xmloutdata/hugepages-default-2M.xml ../qemuxml2argvdata/hugepages-default-2M.xml
+tests/qemuxml2xmloutdata/hugepages-default-system-size.xml ../qemuxml2argvdata/hugepages-default-system-size.xml
 tests/qemuxml2xmloutdata/hugepages-memaccess.xml ../qemuxml2argvdata/hugepages-memaccess.xml
 tests/qemuxml2xmloutdata/hugepages-memaccess2.xml ../qemuxml2argvdata/hugepages-memaccess2.xml
-tests/qemuxml2xmloutdata/hugepages-pages4.xml ../qemuxml2argvdata/hugepages-pages4.xml
-tests/qemuxml2xmloutdata/hugepages-pages5.xml ../qemuxml2argvdata/hugepages-pages5.xml
-tests/qemuxml2xmloutdata/hugepages-pages6.xml ../qemuxml2argvdata/hugepages-pages6.xml
-tests/qemuxml2xmloutdata/hugepages-pages7.xml ../qemuxml2argvdata/hugepages-pages7.xml
-tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml ../qemuxml2argvdata/intel-iommu-caching-mode.xml
-tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml ../qemuxml2argvdata/intel-iommu-device-iotlb.xml
-tests/qemuxml2xmloutdata/intel-iommu-eim.xml ../qemuxml2argvdata/intel-iommu-eim.xml
+tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml ../qemuxml2argvdata/hugepages-numa-default-dimm.xml
+tests/qemuxml2xmloutdata/hugepages-nvdimm.xml ../qemuxml2argvdata/hugepages-nvdimm.xml
+tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-caching-mode.xml
+tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-device-iotlb.xml
+tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-eim.xml
+tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu.xml
+tests/qemuxml2xmloutdata/luks-disks.xml ../qemuxml2argvdata/luks-disks.xml
 tests/qemuxml2xmloutdata/mach-virt-console-native.xml mach-virt-serial-compat.xml
 tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml mach-virt-serial-compat.xml
 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml mach-virt-serial-compat.xml
+tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml ../qemuxml2argvdata/memfd-memory-default-hugepage.xml
+tests/qemuxml2xmloutdata/memfd-memory-numa.xml ../qemuxml2argvdata/memfd-memory-numa.xml
 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml ../qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml ../qemuxml2argvdata/memory-hotplug-nvdimm.xml
 tests/qemuxml2xmloutdata/net-user-addr.xml ../qemuxml2argvdata/net-user-addr.xml
+tests/qemuxml2xmloutdata/pages-dimm-discard.xml ../qemuxml2argvdata/pages-dimm-discard.xml
+tests/qemuxml2xmloutdata/pages-discard-hugepages.xml ../qemuxml2argvdata/pages-discard-hugepages.xml
+tests/qemuxml2xmloutdata/pages-discard.xml ../qemuxml2argvdata/pages-discard.xml
 tests/qemuxml2xmloutdata/pseries-console-native.xml pseries-serial-native.xml
 tests/qemuxml2xmloutdata/pseries-serial+console-native.xml pseries-serial-native.xml
 tests/qemuxml2xmloutdata/pseries-serial-compat.xml pseries-serial-native.xml
 tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml ../qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
 tests/qemuxml2xmloutdata/user-aliases.xml ../qemuxml2argvdata/user-aliases.xml
+tests/qemuxml2xmloutdata/vcpu-placement-static.xml ../qemuxml2argvdata/vcpu-placement-static.xml
+tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml ../qemuxml2argvdata/vhost-vsock-ccw.xml
 tests/qemuxml2xmloutdata/vhost-vsock.xml ../qemuxml2argvdata/vhost-vsock.xml
 tests/qemuxml2xmloutdata/virtio-options.xml ../qemuxml2argvdata/virtio-options.xml
-tests/vircaps2xmldata/linux-basic/node/node0/cpu0 ../../cpu/cpu0
-tests/vircaps2xmldata/linux-basic/node/node0/cpu1 ../../cpu/cpu1
-tests/vircaps2xmldata/linux-basic/node/node0/cpu2 ../../cpu/cpu2
-tests/vircaps2xmldata/linux-basic/node/node0/cpu3 ../../cpu/cpu3
-tests/vircaps2xmldata/linux-basic/node/node1/cpu4 ../../cpu/cpu4
-tests/vircaps2xmldata/linux-basic/node/node1/cpu5 ../../cpu/cpu5
-tests/vircaps2xmldata/linux-basic/node/node1/cpu6 ../../cpu/cpu6
-tests/vircaps2xmldata/linux-basic/node/node1/cpu7 ../../cpu/cpu7
-tests/vircaps2xmldata/linux-basic/node/node2/cpu10 ../../cpu/cpu10
-tests/vircaps2xmldata/linux-basic/node/node2/cpu11 ../../cpu/cpu11
-tests/vircaps2xmldata/linux-basic/node/node2/cpu8 ../../cpu/cpu8
-tests/vircaps2xmldata/linux-basic/node/node2/cpu9 ../../cpu/cpu9
-tests/vircaps2xmldata/linux-basic/node/node3/cpu12 ../../cpu/cpu12
-tests/vircaps2xmldata/linux-basic/node/node3/cpu13 ../../cpu/cpu13
-tests/vircaps2xmldata/linux-basic/node/node3/cpu14 ../../cpu/cpu14
-tests/vircaps2xmldata/linux-basic/node/node3/cpu15 ../../cpu/cpu15
+tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0 ../../cpu/cpu0
+tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1 ../../cpu/cpu1
+tests/vircaps2xmldata/linux-basic/system/node/node0/cpu2 ../../cpu/cpu2
+tests/vircaps2xmldata/linux-basic/system/node/node0/cpu3 ../../cpu/cpu3
+tests/vircaps2xmldata/linux-basic/system/node/node1/cpu4 ../../cpu/cpu4
+tests/vircaps2xmldata/linux-basic/system/node/node1/cpu5 ../../cpu/cpu5
+tests/vircaps2xmldata/linux-basic/system/node/node1/cpu6 ../../cpu/cpu6
+tests/vircaps2xmldata/linux-basic/system/node/node1/cpu7 ../../cpu/cpu7
+tests/vircaps2xmldata/linux-basic/system/node/node2/cpu10 ../../cpu/cpu10
+tests/vircaps2xmldata/linux-basic/system/node/node2/cpu11 ../../cpu/cpu11
+tests/vircaps2xmldata/linux-basic/system/node/node2/cpu8 ../../cpu/cpu8
+tests/vircaps2xmldata/linux-basic/system/node/node2/cpu9 ../../cpu/cpu9
+tests/vircaps2xmldata/linux-basic/system/node/node3/cpu12 ../../cpu/cpu12
+tests/vircaps2xmldata/linux-basic/system/node/node3/cpu13 ../../cpu/cpu13
+tests/vircaps2xmldata/linux-basic/system/node/node3/cpu14 ../../cpu/cpu14
+tests/vircaps2xmldata/linux-basic/system/node/node3/cpu15 ../../cpu/cpu15
 tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0 ../../cpu/cpu0
 tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1 ../../cpu/cpu1
 tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2 ../../cpu/cpu2
@@ -104,6 +135,8 @@ tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5 ../../cpu/cpu5
 tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6 ../../cpu/cpu6
 tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7 ../../cpu/cpu7
 tests/vircaps2xmldata/linux-resctrl-cdp/system ../linux-resctrl/system/
+tests/vircaps2xmldata/linux-resctrl-cmt/system ../linux-resctrl/system
+tests/vircaps2xmldata/linux-resctrl-fake-feature/system ../linux-resctrl/system
 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0 ../../cpu/cpu0
 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 ../../cpu/cpu0
 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0 ../../cpu/cpu0
@@ -279,6 +312,22 @@ tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu140 ../../cpu/cpu140
 tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu141 ../../cpu/cpu141
 tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu142 ../../cpu/cpu142
 tests/virhostcpudata/linux-deconf-cpus/node/node17/cpu143 ../../cpu/cpu143
+tests/virhostcpudata/linux-high-ids/node/node0/cpu0 ../../cpu/cpu0
+tests/virhostcpudata/linux-high-ids/node/node0/cpu1 ../../cpu/cpu1
+tests/virhostcpudata/linux-high-ids/node/node0/cpu2 ../../cpu/cpu2
+tests/virhostcpudata/linux-high-ids/node/node0/cpu3 ../../cpu/cpu3
+tests/virhostcpudata/linux-high-ids/node/node0/cpu4 ../../cpu/cpu4
+tests/virhostcpudata/linux-high-ids/node/node0/cpu5 ../../cpu/cpu5
+tests/virhostcpudata/linux-high-ids/node/node0/cpu6 ../../cpu/cpu6
+tests/virhostcpudata/linux-high-ids/node/node0/cpu7 ../../cpu/cpu7
+tests/virhostcpudata/linux-high-ids/node/node1/cpu10 ../../cpu/cpu10
+tests/virhostcpudata/linux-high-ids/node/node1/cpu11 ../../cpu/cpu11
+tests/virhostcpudata/linux-high-ids/node/node1/cpu12 ../../cpu/cpu12
+tests/virhostcpudata/linux-high-ids/node/node1/cpu13 ../../cpu/cpu13
+tests/virhostcpudata/linux-high-ids/node/node1/cpu14 ../../cpu/cpu14
+tests/virhostcpudata/linux-high-ids/node/node1/cpu15 ../../cpu/cpu15
+tests/virhostcpudata/linux-high-ids/node/node1/cpu8 ../../cpu/cpu8
+tests/virhostcpudata/linux-high-ids/node/node1/cpu9 ../../cpu/cpu9
 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu0 ../../cpu/cpu0
 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu1 ../../cpu/cpu1
 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu2 ../../cpu/cpu2
diff --git a/SPECS/libvirt.spec b/SPECS/libvirt.spec
index 524f65b..f221a1b 100644
--- a/SPECS/libvirt.spec
+++ b/SPECS/libvirt.spec
@@ -3,8 +3,8 @@
 # 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 6
-%define min_fedora 26
+%define min_rhel 7
+%define min_fedora 30
 
 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel})
     %define supported_platform 1
@@ -21,7 +21,6 @@
 # The hypervisor drivers that run in libvirtd
 %define with_qemu          0%{!?_without_qemu:1}
 %define with_lxc           0%{!?_without_lxc:1}
-%define with_uml           0%{!?_without_uml:1}
 %define with_libxl         0%{!?_without_libxl:1}
 %define with_vbox          0%{!?_without_vbox:1}
 
@@ -35,10 +34,12 @@
 
 %if 0%{?rhel}
     %define with_qemu_tcg 0
-    %define qemu_kvm_arches x86_64
-    %if 0%{?rhel} >= 7
-        %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
-    %endif
+    %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
+%endif
+
+# On RHEL 7 and older macro _vpath_builddir is not defined.
+%if 0%{?rhel} <= 7
+    %define _vpath_builddir %{_target_platform}
 %endif
 
 %ifarch %{qemu_kvm_arches}
@@ -54,22 +55,16 @@
 # Then the hypervisor drivers that run outside libvirtd, in libvirt.so
 %define with_openvz        0%{!?_without_openvz:1}
 %define with_vmware        0%{!?_without_vmware:1}
-%define with_phyp          0%{!?_without_phyp:1}
 %define with_esx           0%{!?_without_esx:1}
 %define with_hyperv        0%{!?_without_hyperv:1}
 
 # Then the secondary host drivers, which run inside libvirtd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_storage_rbd      0%{!?_without_storage_rbd:1}
-%else
-    %define with_storage_rbd      0
-%endif
+%define with_storage_rbd      0%{!?_without_storage_rbd:1}
 %if 0%{?fedora}
     %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:1}
 %else
     %define with_storage_sheepdog 0
 %endif
-%define with_numactl          0%{!?_without_numactl:1}
 
 %define with_storage_gluster 0%{!?_without_storage_gluster:1}
 %ifnarch %{qemu_kvm_arches}
@@ -79,6 +74,7 @@
     %endif
 %endif
 
+%define with_numactl          0%{!?_without_numactl:1}
 
 # F25+ has zfs-fuse
 %if 0%{?fedora}
@@ -87,10 +83,16 @@
     %define with_storage_zfs      0
 %endif
 
+# We need a recent enough libiscsi (>= 1.18.0)
+%if 0%{?fedora} || 0%{?rhel} > 7
+    %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
+%else
+    %define with_storage_iscsi_direct 0
+%endif
+
 # A few optional bits off by default, we enable later
 %define with_fuse          0%{!?_without_fuse:0}
 %define with_sanlock       0%{!?_without_sanlock:0}
-%define with_systemd       0%{!?_without_systemd:0}
 %define with_numad         0%{!?_without_numad:0}
 %define with_firewalld     0%{!?_without_firewalld:0}
 %define with_firewalld_zone 0%{!?_without_firewalld_zone:0}
@@ -98,7 +100,6 @@
 %define with_wireshark     0%{!?_without_wireshark:0}
 %define with_libssh        0%{!?_without_libssh:0}
 %define with_bash_completion  0%{!?_without_bash_completion:0}
-%define with_pm_utils      1
 
 # Finally set the OS / architecture specific special cases
 
@@ -112,27 +113,30 @@
     %define with_vbox 0
 %endif
 
-# Numactl is not available on s390[x] and ARM
-%ifarch s390 s390x %{arm}
+# Numactl is not available on many non-x86 archs
+%ifarch s390 s390x %{arm} riscv64
     %define with_numactl 0
 %endif
 
 # zfs-fuse is not available on some architectures
-%ifarch s390 s390x aarch64
+%ifarch s390 s390x aarch64 riscv64
     %define with_storage_zfs 0
 %endif
 
+# Ceph dropping support for 32-bit hosts
+%if 0%{?fedora} >= 30
+    %ifarch %{arm} %{ix86}
+        %define with_storage_rbd 0
+    %endif
+%endif
 
-# RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
-# VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
+# RHEL doesn't ship OpenVZ, VBox, PowerHypervisor,
+# VMware, libxenlight (Xen 4.1 and newer),
 # or HyperV.
 %if 0%{?rhel}
     %define with_openvz 0
     %define with_vbox 0
-    %define with_uml 0
-    %define with_phyp 0
     %define with_vmware 0
-    %define with_xenapi 0
     %define with_libxl 0
     %define with_hyperv 0
     %define with_vz 0
@@ -142,25 +146,15 @@
     %endif
 %endif
 
-# Fedora 17 / RHEL-7 are first where we use systemd. Although earlier
-# Fedora has systemd, libvirt still used sysvinit there.
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_systemd 1
-    %define with_pm_utils 0
-%endif
+%define with_firewalld 1
 
-# Fedora 18 / RHEL-7 are first where firewalld support is enabled
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_firewalld 1
-%endif
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 31 || 0%{?rhel} > 7
     %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 %endif
 
 
 # fuse is used to provide virtualized /proc for LXC
-%if %{with_lxc} && 0%{?rhel} != 6
+%if %{with_lxc}
     %define with_fuse      0%{!?_without_fuse:1}
 %endif
 
@@ -183,11 +177,7 @@
 # Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer
 %if 0%{?fedora}
     %define with_wireshark 0%{!?_without_wireshark:1}
-%endif
-%if 0%{?fedora} || 0%{?rhel} > 7
-    %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)
-%else
-    %define wireshark_plugindir %{_libdir}/wireshark/plugins
+    %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
 %endif
 
 # Enable libssh transport for new enough distros
@@ -195,27 +185,12 @@
     %define with_libssh 0%{!?_without_libssh:1}
 %endif
 
-# Enable bash-completion for new enough distros
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_bash_completion  0%{!?_without_bash_completion:1}
-%endif
+%define with_bash_completion  0%{!?_without_bash_completion:1}
 
-# Use Python 3 when possible, Python 2 otherwise
-%if 0%{?fedora}
-    %define python python3
-%else
-    %if 0%{?rhel} > 7
-        %define python python3-devel
-    %else
-        %define python python2
-    %endif
-%endif
-
-
-%if %{with_qemu} || %{with_lxc} || %{with_uml}
+%if %{with_qemu} || %{with_lxc}
 # numad is used to manage the CPU and memory placement dynamically,
-# it's not available on s390[x] and ARM.
-    %ifnarch s390 s390x %{arm}
+# it's not available on many non-x86 architectures.
+    %ifnarch s390 s390x %{arm} riscv64
         %define with_numad    0%{!?_without_numad:1}
     %endif
 %endif
@@ -225,13 +200,6 @@
 %define qemu_group  qemu
 
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define with_systemd_macros 1
-%else
-    %define with_systemd_macros 0
-%endif
-
-
 # RHEL releases provide stable tool chains and so it is safe to turn
 # compiler warning into errors without being worried about frequent
 # changes in reported warnings
@@ -250,8 +218,8 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 4.5.0
-Release: 42%{?dist}%{?extra_release}
+Version: 6.0.0
+Release: 28%{?dist}%{?extra_release}
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -263,572 +231,444 @@ Source1: symlinks
 
 Patch1: libvirt-RHEL-Hack-around-changed-Broadwell-Haswell-CPUs.patch
 Patch2: libvirt-RHEL-Add-rhel-machine-types-to-qemuDomainMachineNeedsFDC.patch
-Patch3: libvirt-qemu-Add-capability-for-the-HTM-pSeries-feature.patch
-Patch4: libvirt-conf-Parse-and-format-the-HTM-pSeries-feature.patch
-Patch5: libvirt-qemu-Format-the-HTM-pSeries-feature.patch
-Patch6: libvirt-qemu-hotplug-Don-t-access-srcPriv-when-it-s-not-allocated.patch
-Patch7: libvirt-qemuDomainNestedJobAllowed-Allow-QEMU_JOB_NONE.patch
-Patch8: libvirt-src-Mention-DEVICE_REMOVAL_FAILED-event-in-virDomainDetachDeviceAlias-docs.patch
-Patch9: libvirt-virsh.pod-Drop-persistent-for-detach-device-alias.patch
-Patch10: libvirt-qemu-don-t-use-chardev-FD-passing-with-standalone-args.patch
-Patch11: libvirt-qemu-remove-chardevStdioLogd-param-from-vhostuser-code-path.patch
-Patch12: libvirt-qemu-consolidate-parameters-of-qemuBuildChrChardevStr-into-flags.patch
-Patch13: libvirt-qemu-don-t-use-chardev-FD-passing-for-vhostuser-backend.patch
-Patch14: libvirt-qemu-fix-UNIX-socket-chardevs-operating-in-client-mode.patch
-Patch15: libvirt-qemuDomainDeviceDefValidateNetwork-Check-for-range-only-if-IP-prefix-set.patch
-Patch16: libvirt-qemu-hotplug-Do-not-try-to-add-secret-object-for-TLS-if-it-does-not-exist.patch
-Patch17: libvirt-qemu-monitor-Make-qemuMonitorAddObject-more-robust-against-programming-errors.patch
-Patch18: libvirt-virDomainConfNWFilterInstantiate-initialize-xml-to-avoid-random-crash.patch
-Patch19: libvirt-qemuProcessStartPRDaemonHook-Try-to-set-NS-iff-domain-was-started-with-one.patch
-Patch20: libvirt-qemuDomainValidateStorageSource-Relax-PR-validation.patch
-Patch21: libvirt-virStoragePRDefFormat-Suppress-path-formatting-for-migratable-XML.patch
-Patch22: libvirt-qemu-Wire-up-PR_MANAGER_STATUS_CHANGED-event.patch
-Patch23: libvirt-qemu_monitor-Introduce-qemuMonitorJSONGetPRManagerInfo.patch
-Patch24: libvirt-qemu-Fetch-pr-helper-process-info-on-reconnect.patch
-Patch25: libvirt-qemu-Fix-ATTRIBUTE_NONNULL-for-qemuMonitorAddObject.patch
-Patch26: libvirt-virsh.pod-Fix-a-command-name-typo-in-nwfilter-binding-undefine.patch
-Patch27: libvirt-docs-schema-Add-missing-alias-to-vsock-device.patch
-Patch28: libvirt-virnetdevtap-Don-t-crash-on-ifname-in-virNetDevTapInterfaceStats.patch
-Patch29: libvirt-tests-fix-TLS-handshake-failure-with-TLS-1.3.patch
-Patch30: libvirt-qemu-hotplug-don-t-overwrite-error-message-in-qemuDomainAttachNetDevice.patch
-Patch31: libvirt-qemu-hotplug-report-error-when-changing-rom-enabled-attr-for-net-iface.patch
-Patch32: libvirt-qemu-Fix-setting-global_period-cputune-element.patch
-Patch33: libvirt-tests-qemucaps-Add-test-data-for-upcoming-qemu-3.0.0.patch
-Patch34: libvirt-qemu-capabilities-Add-capability-for-werror-rerror-for-usb-device-frontend.patch
-Patch35: libvirt-qemu-command-Move-graphics-iteration-to-its-own-function.patch
-Patch36: libvirt-qemu-address-Handle-all-the-video-devices-within-a-single-loop.patch
-Patch37: libvirt-conf-Introduce-virDomainVideoDefClear-helper.patch
-Patch38: libvirt-conf-Introduce-virDomainDefPostParseVideo-helper.patch
-Patch39: libvirt-qemu-validate-Enforce-compile-time-switch-type-checking-for-videos.patch
-Patch40: libvirt-tests-Add-capabilities-data-for-QEMU-2.11-x86_64.patch
-Patch41: libvirt-tests-Update-capabilities-data-for-QEMU-3.0.0-x86_64.patch
-Patch42: libvirt-qemu-qemuBuildHostdevCommandLine-Use-a-helper-variable-mdevsrc.patch
-Patch43: libvirt-qemu-caps-Introduce-a-capability-for-egl-headless.patch
-Patch44: libvirt-qemu-Introduce-a-new-graphics-display-type-headless.patch
-Patch45: libvirt-qemu-caps-Add-vfio-pci.display-capability.patch
-Patch46: libvirt-conf-Introduce-virDomainGraphicsDefHasOpenGL-helper.patch
-Patch47: libvirt-conf-Replace-error-with-cleanup-in-virDomainHostdevDefParseXMLSubsys.patch
-Patch48: libvirt-conf-Introduce-new-hostdev-attribute-display.patch
-Patch49: libvirt-qemu-command-Enable-formatting-vfio-pci.display-option-onto-cmdline.patch
-Patch50: libvirt-docs-Rephrase-the-mediated-devices-hostdev-section-a-bit.patch
-Patch51: libvirt-conf-Introduce-new-video-type-none.patch
-Patch52: libvirt-virt-xml-validate-Add-schema-for-nwfilterbinding.patch
-Patch53: libvirt-tools-Fix-typo-generating-adapter_wwpn-field.patch
-Patch54: libvirt-src-Fix-memory-leak-in-virNWFilterBindingDispose.patch
-Patch55: libvirt-esx-storage-Fix-typo-lsilogic-lsiLogic.patch
-Patch56: libvirt-networkGetDHCPLeases-Don-t-always-report-error-if-unable-to-read-leases-file.patch
-Patch57: libvirt-nwfilter-Resolve-SEGV-for-NWFilter-Snoop-processing.patch
-Patch58: libvirt-qemu-Remove-unused-bypassSecurityDriver-from-qemuOpenFileAs.patch
-Patch59: libvirt-qemuDomainSaveMemory-Don-t-enforce-dynamicOwnership.patch
-Patch60: libvirt-domain_nwfilter-Return-early-if-net-has-no-name-in-virDomainConfNWFilterTeardownImpl.patch
-Patch61: libvirt-examples-Add-clean-traffic-gateway-into-nwfilters.patch
-Patch62: libvirt-qemu-Exempt-video-model-none-from-getting-a-PCI-address-on-Q35.patch
-Patch63: libvirt-conf-Fix-a-error-msg-typo-in-virDomainVideoDefValidate.patch
-Patch64: libvirt-qemu_migration-Avoid-writing-to-freed-memory.patch
-Patch65: libvirt-tests-Add-missing-thread_siblings_list-files.patch
-Patch66: libvirt-util-Rewrite-virHostCPUCountThreadSiblings.patch
-Patch67: libvirt-utils-Remove-arbitrary-limit-on-socket_id-core_id.patch
-Patch68: libvirt-tests-Add-linux-high-ids-test.patch
-Patch69: libvirt-qemu-hotplug-Fix-asynchronous-unplug-of-shmem.patch
-Patch70: libvirt-tests-rename-hugepages-to-hugepages-default.patch
-Patch71: libvirt-tests-extract-hugepages-numa-default-dimm-out-of-hugepages-numa.patch
-Patch72: libvirt-tests-rename-hugepages-numa-into-hugepages-numa-default.patch
-Patch73: libvirt-tests-remove-unnecessary-XML-elements-from-hugepages-numa-default.patch
-Patch74: libvirt-tests-extract-pages-discard-out-of-hugepages-pages.patch
-Patch75: libvirt-tests-rename-hugepages-pages-into-hugepages-numa-nodeset.patch
-Patch76: libvirt-tests-rename-hugepages-pages2-into-hugepages-numa-default-2M.patch
-Patch77: libvirt-tests-extract-pages-discard-hugepages-out-of-hugepages-pages3.patch
-Patch78: libvirt-tests-rename-hugepages-pages3-into-hugepages-numa-nodeset-part.patch
-Patch79: libvirt-tests-rename-hugepages-pages4-into-hugepages-numa-nodeset-nonexist.patch
-Patch80: libvirt-tests-rename-hugepages-pages5-into-hugepages-default-2M.patch
-Patch81: libvirt-tests-rename-hugepages-pages6-into-hugepages-default-system-size.patch
-Patch82: libvirt-tests-rename-hugepages-pages7-into-pages-dimm-discard.patch
-Patch83: libvirt-tests-rename-hugepages-pages8-into-hugepages-nodeset-nonexist.patch
-Patch84: libvirt-tests-introduce-hugepages-default-1G-nodeset-2M.patch
-Patch85: libvirt-tests-introduce-hugepages-nodeset.patch
-Patch86: libvirt-conf-Move-hugepage-XML-validation-check-out-of-qemu_command.patch
-Patch87: libvirt-conf-Move-hugepages-validation-out-of-XML-parser.patch
-Patch88: libvirt-conf-Introduce-virDomainDefPostParseMemtune.patch
-Patch89: libvirt-tests-sev-Test-launch-security-with-specific-QEMU-version.patch
-Patch90: libvirt-qemu-Fix-probing-of-AMD-SEV-support.patch
-Patch91: libvirt-qemu-caps-Format-SEV-platform-data-into-qemuCaps-cache.patch
-Patch92: libvirt-conf-Parse-guestfwd-channel-device-info-again.patch
-Patch93: libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
-Patch94: libvirt-storage-Add-shrink-to-qemu-img-command-when-shrinking-vol.patch
-Patch95: libvirt-access-Fix-nwfilter-binding-ACL-access-API-name-generation.patch
-Patch96: libvirt-conf-Add-validation-of-input-devices.patch
-Patch97: libvirt-tests-qemu-Remove-disk-from-graphics-vnc-tls.patch
-Patch98: libvirt-tests-qemu-test-more-versions-for-graphics-vnc-tls.patch
-Patch99: libvirt-qemu-vnc-switch-to-tls-creds-x509.patch
-Patch100: libvirt-qemu-mdev-Use-vfio-pci-display-property-only-with-vfio-pci-mdevs.patch
-Patch101: libvirt-virDomainDefCompatibleDevice-Relax-alias-change-check.patch
-Patch102: libvirt-virDomainDetachDeviceFlags-Clarify-update-semantics.patch
-Patch103: libvirt-virDomainNetDefCheckABIStability-Check-for-MTU-change-too.patch
-Patch104: libvirt-qemu-monitor-Remove-qemuMonitorJSONExtractCPUArchInfo-wrapper.patch
-Patch105: libvirt-qemu-monitor-Use-target-instead-of-arch-in-reply-of-query-cpus-fast.patch
-Patch106: libvirt-conf-Fix-check-for-chardev-source-path.patch
-Patch107: libvirt-tests-Reuse-qemucapabilities-data-for-qemucaps2xml.patch
-Patch108: libvirt-tests-Add-more-tests-to-qemucaps2xml.patch
-Patch109: libvirt-qemu-Drop-QEMU_CAPS_ENABLE_KVM.patch
-Patch110: libvirt-qemu-Avoid-probing-non-native-binaries-all-the-time.patch
-Patch111: libvirt-qemu-Clarify-QEMU_CAPS_KVM.patch
-Patch112: libvirt-qemu-Don-t-check-for-dev-kvm-presence.patch
-Patch113: libvirt-tests-Follow-up-on-qemucaps2xmldata-rename.patch
-Patch114: libvirt-security-dac-also-label-listen-UNIX-sockets.patch
-Patch115: libvirt-virsh-Require-explicit-domain-for-domxml-to-native.patch
-Patch116: libvirt-virFileIsSharedFSType-Check-for-fuse.glusterfs-too.patch
-Patch117: libvirt-qemu-fix-up-permissions-for-pre-created-UNIX-sockets.patch
-Patch118: libvirt-cpu_map-Add-features-for-Icelake-CPUs.patch
-Patch119: libvirt-cpu_map-Add-Icelake-CPU-models.patch
-Patch120: libvirt-qemu-Properly-report-VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT.patch
-Patch121: libvirt-qemu-Report-more-appropriate-running-reasons.patch
-Patch122: libvirt-qemu-Pass-running-reason-to-RESUME-event-handler.patch
-Patch123: libvirt-qemu-Map-running-reason-to-resume-event-detail.patch
-Patch124: libvirt-qemu-Avoid-duplicate-resume-events-and-state-changes.patch
-Patch125: libvirt-conf-qemu-add-support-for-Hyper-V-frequency-MSRs.patch
-Patch126: libvirt-conf-qemu-add-support-for-Hyper-V-reenlightenment-notifications.patch
-Patch127: libvirt-conf-qemu-add-support-for-Hyper-V-PV-TLB-flush.patch
-Patch128: libvirt-virfile-fix-cast-align-error.patch
-Patch129: libvirt-virfiletest-Fix-test-name-prefix-for-virFileInData-test.patch
-Patch130: libvirt-virfiletst-Test-virFileIsSharedFS.patch
-Patch131: libvirt-virFileIsSharedFSType-Detect-direct-mount-points.patch
-Patch132: libvirt-virfile-Rework-virFileIsSharedFixFUSE.patch
-Patch133: libvirt-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
-Patch134: libvirt-storage-Remove-secretPath-from-_virStorageBackendQemuImgInfo.patch
-Patch135: libvirt-storage-Allow-for-inputvol-to-have-any-format-for-encryption.patch
-Patch136: libvirt-storage-Allow-inputvol-to-be-encrypted.patch
-Patch137: libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
-Patch138: libvirt-docs-Enhance-polkit-documentation-to-describe-secondary-connection.patch
-Patch139: libvirt-qemu-Don-t-ignore-resume-events.patch
-Patch140: libvirt-virfile-Take-symlink-into-account-in-virFileIsSharedFixFUSE.patch
-Patch141: libvirt-qemu-Ignore-nwfilter-binding-instantiation-issues-during-reconnect.patch
-Patch142: libvirt-qemu-Set-identity-for-the-reconnect-all-thread.patch
-Patch143: libvirt-Revert-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName.patch
-Patch144: libvirt-access-Modify-the-VIR_ERR_ACCESS_DENIED-to-include-driverName_1.patch
-Patch145: libvirt-qemu-add-vfio-ap-capability.patch
-Patch146: libvirt-qemu-vfio-ap-device-support.patch
-Patch147: libvirt-qemu-Extract-MDEV-VFIO-PCI-validation-code-into-a-separate-helper.patch
-Patch148: libvirt-conf-Move-VFIO-AP-validation-from-post-parse-to-QEMU-validation-code.patch
-Patch149: libvirt-qemu-Fix-post-copy-migration-on-the-source.patch
-Patch150: libvirt-util-Don-t-overflow-in-virRandomBits.patch
-Patch151: libvirt-virrandom-Avoid-undefined-behaviour-in-virRandomBits.patch
-Patch152: libvirt-qemu-Drop-duplicated-code-from-qemuDomainDefValidateFeatures.patch
-Patch153: libvirt-tests-Add-capabilities-data-for-QEMU-3.1.0-on-ppc64.patch
-Patch154: libvirt-qemu-Introduce-QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV.patch
-Patch155: libvirt-conf-Parse-and-format-nested-hv-feature.patch
-Patch156: libvirt-qemu-Format-nested-hv-feature-on-the-command-line.patch
-Patch157: libvirt-qemu-Add-check-for-whether-KVM-nesting-is-enabled.patch
-Patch158: libvirt-secret-Add-check-validation-for-correct-usage-when-LookupByUUID.patch
-Patch159: libvirt-cpu-Add-support-for-stibp-x86_64-feature.patch
-Patch160: libvirt-virsh-Strip-XML-declaration-when-extracting-CPU-XMLs.patch
-Patch161: libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
-Patch162: libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
-Patch163: libvirt-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
-Patch164: libvirt-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
-Patch165: libvirt-conf-correct-false-boot-order-error-during-domain-parse.patch
-Patch166: libvirt-qemu-Remove-duplicated-qemuAgentCheckError.patch
-Patch167: libvirt-qemu-require-reply-from-guest-agent-in-qemuAgentGetInterfaces.patch
-Patch168: libvirt-qemu-Filter-non-SCSI-hostdevs-in-qemuHostdevPrepareSCSIDevices.patch
-Patch169: libvirt-util-remove-const-specifier-from-nlmsghdr-arg-to-virNetlinkDumpCallback.patch
-Patch170: libvirt-util-add-a-function-to-insert-new-interfaces-to-IPv6CheckForwarding-list.patch
-Patch171: libvirt-util-use-nlmsg_find_attr-instead-of-an-open-coded-loop.patch
-Patch172: libvirt-util-check-accept_ra-for-all-nexthop-interfaces-of-multipath-routes.patch
-Patch173: libvirt-util-make-forgotten-changes-suggested-during-review-of-commit-d40b820c.patch
-Patch174: libvirt-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
-Patch175: libvirt-tests-qemuxml2argv-Add-test-case-for-empty-CDROM-with-cache-mode.patch
-Patch176: libvirt-qemu-command-Don-t-format-image-properties-for-empty-drive.patch
-Patch177: libvirt-RHEL-qemu-Fix-crash-trying-to-use-iSCSI-hostdev.patch
-Patch178: libvirt-docs-Drop-dev-net-tun-from-the-list-of-shared-devices.patch
-Patch179: libvirt-qemu-conf-Remove-dev-sev-from-the-default-cgroup-device-acl-list.patch
-Patch180: libvirt-qemu-cgroup-Expose-dev-sev-only-to-domains-that-require-SEV.patch
-Patch181: libvirt-qemu-domain-Add-dev-sev-into-the-domain-mount-namespace-selectively.patch
-Patch182: libvirt-security-dac-Relabel-dev-sev-in-the-namespace.patch
-Patch183: libvirt-qemu-caps-Use-CAP_DAC_OVERRIDE-for-probing-to-avoid-permission-issues.patch
-Patch184: libvirt-qemu-caps-Don-t-try-to-ask-for-CAP_DAC_OVERRIDE-if-non-root.patch
-Patch185: libvirt-Revert-RHEL-network-regain-guest-network-connectivity-after-firewalld-switch-to-nftables.patch
-Patch186: libvirt-configure-change-HAVE_FIREWALLD-to-WITH_FIREWALLD.patch
-Patch187: libvirt-util-move-all-firewalld-specific-stuff-into-its-own-files.patch
-Patch188: libvirt-util-new-virFirewallD-APIs-docs.patch
-Patch189: libvirt-configure-selectively-install-a-firewalld-libvirt-zone.patch
-Patch190: libvirt-network-set-firewalld-zone-of-bridges-to-libvirt-zone-when-appropriate.patch
-Patch191: libvirt-network-allow-configuring-firewalld-zone-for-virtual-network-bridge-device.patch
-Patch192: libvirt-util-remove-test-code-accidentally-committed-to-virFirewallDZoneExists.patch
-Patch193: libvirt-qemu-command-Don-t-skip-readonly-and-throttling-info-for-empty-drive.patch
-Patch194: libvirt-util-fix-memory-leak-in-virFirewallDInterfaceSetZone.patch
-Patch195: libvirt-network-explicitly-allow-icmp-icmpv6-in-libvirt-zonefile.patch
-Patch196: libvirt-tests-qemuxml2argv-add-CAPS_ARCH_LATEST-macro.patch
-Patch197: libvirt-qemu-Add-ccw-support-for-vhost-vsock.patch
-Patch198: libvirt-qemu-Allow-creating-ppc64-guests-with-graphics-and-no-USB-mouse.patch
-Patch199: libvirt-conf-Expose-virDomainSCSIDriveAddressIsUsed.patch
-Patch200: libvirt-qemuhotplugtest-Don-t-plug-a-SCSI-disk-at-unit-7.patch
-Patch201: libvirt-qemu_hotplug-Check-for-duplicate-drive-addresses.patch
-Patch202: libvirt-cpu_map-Add-support-for-cldemote-CPU-feature.patch
-Patch203: libvirt-util-alloc-add-macros-for-implementing-automatic-cleanup-functionality.patch
-Patch204: libvirt-qemu-domain-Simplify-non-VFIO-memLockLimit-calculation-for-PPC64.patch
-Patch205: libvirt-qemu_domain-add-a-PPC64-memLockLimit-helper.patch
-Patch206: libvirt-qemu_domain-NVLink2-bridge-detection-function-for-PPC64.patch
-Patch207: libvirt-PPC64-support-for-NVIDIA-V100-GPU-with-NVLink2-passthrough.patch
-Patch208: libvirt-cpu_x86-Do-not-cache-microcode-version.patch
-Patch209: libvirt-qemu-Don-t-cache-microcode-version.patch
-Patch210: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch
-Patch211: libvirt-cpu_map-Define-md-clear-CPUID-bit.patch
-Patch212: libvirt-admin-reject-clients-unless-their-UID-matches-the-current-UID.patch
-Patch213: libvirt-locking-restrict-sockets-to-mode-0600.patch
-Patch214: libvirt-logging-restrict-sockets-to-mode-0600.patch
-Patch215: libvirt-util-skip-RDMA-detection-for-non-PCI-network-devices.patch
-Patch216: libvirt-virfile-Detect-ceph-as-shared-FS.patch
-Patch217: libvirt-virfile-added-GPFS-as-shared-fs.patch
-Patch218: libvirt-util-bitmap-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
-Patch219: libvirt-qemu-Rework-setting-process-affinity.patch
-Patch220: libvirt-qemu-Set-up-EMULATOR-thread-and-cpuset.mems-before-exec-ing-qemu.patch
-Patch221: libvirt-conf-Add-definitions-for-uid-and-fid-PCI-address-attributes.patch
-Patch222: libvirt-qemu-Introduce-zPCI-capability.patch
-Patch223: libvirt-qemu-Enable-PCI-multi-bus-for-S390-guests.patch
-Patch224: libvirt-conf-Introduce-extension-flag-and-zPCI-member-for-PCI-address.patch
-Patch225: libvirt-conf-Introduce-address-caching-for-PCI-extensions.patch
-Patch226: libvirt-qemu-Auto-add-pci-root-for-s390-s390x-guests.patch
-Patch227: libvirt-conf-use-virXMLFormatElement-in-virDomainDeviceInfoFormat.patch
-Patch228: libvirt-conf-Introduce-parser-formatter-for-uid-and-fid.patch
-Patch229: libvirt-qemu-Add-zPCI-address-definition-check.patch
-Patch230: libvirt-conf-Allocate-release-uid-and-fid-in-PCI-address.patch
-Patch231: libvirt-qemu-Generate-and-use-zPCI-device-in-QEMU-command-line.patch
-Patch232: libvirt-qemu-Add-hotpluging-support-for-PCI-devices-on-S390-guests.patch
-Patch233: libvirt-qemuDomainRemoveRNGDevice-Remove-associated-chardev-too.patch
-Patch234: libvirt-qemu_hotplug-remove-erroneous-call-to-qemuDomainDetachExtensionDevice.patch
-Patch235: libvirt-qemu_hotplug-remove-another-erroneous-qemuDomainDetachExtensionDevice-call.patch
-Patch236: libvirt-util-Propagate-numad-failures-correctly.patch
-Patch237: libvirt-util-Introduce-virBitmapUnion.patch
-Patch238: libvirt-util-Introduce-virNumaNodesetToCPUset.patch
-Patch239: libvirt-qemu-Fix-qemuProcessInitCpuAffinity.patch
-Patch240: libvirt-qemu-Fix-leak-in-qemuProcessInitCpuAffinity.patch
-Patch241: libvirt-qemu-Drop-cleanup-label-from-qemuProcessInitCpuAffinity.patch
-Patch242: libvirt-qemu-Fix-NULL-pointer-access-in-qemuProcessInitCpuAffinity.patch
-Patch243: libvirt-qemuBuildMemoryBackendProps-Pass-priv-instead-of-its-individual-members.patch
-Patch244: libvirt-qemu-Don-t-use-mem-prealloc-among-with-.prealloc-yes.patch
-Patch245: libvirt-nwfilter-fix-adding-std-MAC-and-IP-values-to-filter-binding.patch
-Patch246: libvirt-qemuProcessBuildDestroyMemoryPathsImpl-Don-t-overwrite-error.patch
-Patch247: libvirt-qemu_security-Fully-implement-qemuSecurityDomainSetPathLabel.patch
-Patch248: libvirt-qemu-process-SEV-Assume-libDir-to-be-the-directory-to-create-files-in.patch
-Patch249: libvirt-qemu-process-SEV-Relabel-guest-owner-s-SEV-files-created-before-start.patch
-Patch250: libvirt-api-disallow-virDomainSaveImageGetXMLDesc-on-read-only-connections.patch
-Patch251: libvirt-api-disallow-virDomainManagedSaveDefineXML-on-read-only-connections.patch
-Patch252: libvirt-api-disallow-virConnectGetDomainCapabilities-on-read-only-connections.patch
-Patch253: libvirt-api-disallow-virConnect-HypervisorCPU-on-read-only-connections.patch
-Patch254: libvirt-rpc-virnetlibsshsession-update-deprecated-functions.patch
-Patch255: libvirt-cpu-allow-include-files-for-CPU-definition.patch
-Patch256: libvirt-cpu-fix-cleanup-when-signature-parsing-fails.patch
-Patch257: libvirt-cpu-push-more-parsing-logic-into-common-code.patch
-Patch258: libvirt-cpu-simplify-failure-cleanup-paths.patch
-Patch259: libvirt-cpu_map-Add-support-for-arch-capabilities-feature.patch
-Patch260: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2630-v4.patch
-Patch261: libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-7600U.patch
-Patch262: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E7540.patch
-Patch263: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E5-2650.patch
-Patch264: libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8700.patch
-Patch265: libvirt-cpu_x86-Separate-ancestor-model-parsing-from-x86ModelParse.patch
-Patch266: libvirt-cpu_x86-Separate-signature-parsing-from-x86ModelParse.patch
-Patch267: libvirt-cpu_x86-Separate-vendor-parsing-from-x86ModelParse.patch
-Patch268: libvirt-cpu_x86-Separate-feature-list-parsing-from-x86ModelParse.patch
-Patch269: libvirt-cpu_x86-Make-sure-CPU-model-names-are-unique-in-cpu_map.patch
-Patch270: libvirt-cpu_x86-Add-x86ModelCopySignatures-helper.patch
-Patch271: libvirt-cpu_x86-Store-CPU-signature-in-an-array.patch
-Patch272: libvirt-cpu_x86-Allow-multiple-signatures-for-a-CPU-model.patch
-Patch273: libvirt-cpu_x86-Log-decoded-CPU-model-and-signatures.patch
-Patch274: libvirt-qemu_capabilities-Inroduce-virQEMUCapsGetCPUModelX86Data.patch
-Patch275: libvirt-qemu_capabilities-Introduce-virQEMUCapsGetCPUModelInfo.patch
-Patch276: libvirt-qemu_capabilities-Use-virQEMUCapsGetCPUModelInfo.patch
-Patch277: libvirt-cpu_x86-Add-virCPUx86DataGetSignature-for-tests.patch
-Patch278: libvirt-cpu_map-Add-hex-representation-of-signatures.patch
-Patch279: libvirt-cputest-Test-CPU-signatures.patch
-Patch280: libvirt-cpu_map-Add-more-signatures-for-Conroe-CPU-model.patch
-Patch281: libvirt-cpu_map-Add-more-signatures-for-Penryn-CPU-model.patch
-Patch282: libvirt-cpu_map-Add-more-signatures-for-Nehalem-CPU-models.patch
-Patch283: libvirt-cpu_map-Add-more-signatures-for-Westmere-CPU-model.patch
-Patch284: libvirt-cpu_map-Add-more-signatures-for-SandyBridge-CPU-models.patch
-Patch285: libvirt-cpu_map-Add-more-signatures-for-IvyBridge-CPU-models.patch
-Patch286: libvirt-cpu_map-Add-more-signatures-for-Haswell-CPU-models.patch
-Patch287: libvirt-cpu_map-Add-more-signatures-for-Broadwell-CPU-models.patch
-Patch288: libvirt-cpu_map-Add-more-signatures-for-Skylake-Client-CPU-models.patch
-Patch289: libvirt-cpu-Don-t-access-invalid-memory-in-virCPUx86Translate.patch
-Patch290: libvirt-cpu_x86-Require-cpuid-within-feature-in-CPU-map.patch
-Patch291: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-8268-CPU.patch
-Patch292: libvirt-cpu_map-Add-Cascadelake-Server-CPU-model.patch
-Patch293: libvirt-cpu_x86-Introduce-virCPUx86DataItem-container-struct.patch
-Patch294: libvirt-cpu_x86-Rename-virCPUx86Vendor.cpuid.patch
-Patch295: libvirt-cpu_x86-Rename-virCPUx86DataItem-variables.patch
-Patch296: libvirt-cpu_x86-Rename-x86DataCpuidNext-function.patch
-Patch297: libvirt-cpu_x86-Rename-x86DataCpuid.patch
-Patch298: libvirt-cpu_x86-Rename-virCPUx86CPUIDSorter.patch
-Patch299: libvirt-cpu_x86-Rename-virCPUx86DataAddCPUIDInt.patch
-Patch300: libvirt-cpu_x86-Rename-virCPUx86DataAddCPUID.patch
-Patch301: libvirt-cpu_x86-Rename-virCPUx86VendorToCPUID.patch
-Patch302: libvirt-cpu_x86-Simplify-x86DataAdd.patch
-Patch303: libvirt-cpu_x86-Introduce-virCPUx86DataCmp.patch
-Patch304: libvirt-cpu_x86-Make-x86cpuidSetBits-more-general.patch
-Patch305: libvirt-cpu_x86-Make-x86cpuidClearBits-more-general.patch
-Patch306: libvirt-cpu_x86-Make-x86cpuidAndBits-more-general.patch
-Patch307: libvirt-cpu_x86-Make-x86cpuidMatchMasked-more-general.patch
-Patch308: libvirt-cpu_x86-Make-x86cpuidMatch-more-general.patch
-Patch309: libvirt-cpu_x86-Store-virCPUx86DataItem-content-in-union.patch
-Patch310: libvirt-cpu_x86-Add-support-for-storing-MSR-features-in-CPU-map.patch
-Patch311: libvirt-cpu_x86-Move-CheckFeature-functions.patch
-Patch312: libvirt-cputest-Add-support-for-MSR-features-to-cpu-parse.sh.patch
-Patch313: libvirt-util-file-introduce-VIR_AUTOCLOSE-macro-to-close-fd-of-the-file-automatically.patch
-Patch314: libvirt-vircpuhost-Add-support-for-reading-MSRs.patch
-Patch315: libvirt-virhostcpu-Make-virHostCPUGetMSR-work-only-on-x86.patch
-Patch316: libvirt-cpu_x86-Fix-placement-of-CheckFeature-functions.patch
-Patch317: libvirt-cpu_conf-Introduce-virCPUDefFilterFeatures.patch
-Patch318: libvirt-qemu_command-Use-consistent-syntax-for-CPU-features.patch
-Patch319: libvirt-tests-Add-QEMU-caps-data-for-future-4.1.0.patch
-Patch320: libvirt-tests-Add-domain-capabilities-case-for-QEMU-4.1.0.patch
-Patch321: libvirt-qemuxml2argvtest-Add-test-for-CPU-features-translation.patch
-Patch322: libvirt-qemu-Add-APIs-for-translating-CPU-features.patch
-Patch323: libvirt-qemu-Probe-for-max-x86_64-cpu-type.patch
-Patch324: libvirt-qemu-Probe-for-unavailable-features-CPU-property.patch
-Patch325: libvirt-qemu-Probe-host-CPU-after-capabilities.patch
-Patch326: libvirt-qemu_command-Use-canonical-names-of-CPU-features.patch
-Patch327: libvirt-qemu-Translate-feature-names-from-query-cpu-model-expansion.patch
-Patch328: libvirt-qemu-Don-t-use-full-CPU-model-expansion.patch
-Patch329: libvirt-qemu-Make-qemuMonitorGetGuestCPU-usable-on-x86-only.patch
-Patch330: libvirt-cpu-Introduce-virCPUDataAddFeature.patch
-Patch331: libvirt-qemu-Add-type-filter-to-qemuMonitorJSONParsePropsList.patch
-Patch332: libvirt-util-string-Introduce-macro-for-automatic-string-lists.patch
-Patch333: libvirt-util-json-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
-Patch334: libvirt-qemu-Introduce-generic-qemuMonitorGetGuestCPU.patch
-Patch335: libvirt-qemu_process-Prefer-generic-qemuMonitorGetGuestCPU.patch
-Patch336: libvirt-util-Rework-virStringListAdd.patch
-Patch337: libvirt-conf-Introduce-virCPUDefCheckFeatures.patch
-Patch338: libvirt-cpu_x86-Turn-virCPUx86DataIteratorInit-into-a-function.patch
-Patch339: libvirt-cpu_x86-Introduce-virCPUx86FeatureFilter-MSR.patch
-Patch340: libvirt-cpu_x86-Read-CPU-features-from-IA32_ARCH_CAPABILITIES-MSR.patch
-Patch341: libvirt-cpu_map-Introduce-IA32_ARCH_CAPABILITIES-MSR-features.patch
-Patch342: libvirt-qemu-Forbid-MSR-features-with-old-QEMU.patch
-Patch343: libvirt-qemu-Drop-MSR-features-from-host-model-with-old-QEMU.patch
-Patch344: libvirt-cpu_x86-Fix-memory-leak-virCPUx86GetHost.patch
-Patch345: libvirt-qemu-Use-tmpChr-in-qemuDomainDetachChrDevice-to-build-device-string.patch
-Patch346: libvirt-qemu-Drop-user-prefix-for-guestfwd-netdev.patch
-Patch347: libvirt-qemu_hotplug-Attach-guestfwd-using-netdev_add.patch
-Patch348: libvirt-qemu_hotplug-Detach-guestfwd-using-netdev_del.patch
-Patch349: libvirt-qemuhotplugtest-Test-guestfwd-attach-and-detach.patch
-Patch350: libvirt-daemon-Register-secret-driver-before-storage-driver.patch
-Patch351: libvirt-bhyve-Move-autostarting-of-domains-into-bhyveStateInitialize.patch
-Patch352: libvirt-Revert-virStateDriver-Separate-AutoStart-from-Initialize.patch
-Patch353: libvirt-Revert-Separate-out-StateAutoStart-from-StateInitialize.patch
-Patch354: libvirt-util-moving-type-argument-to-avoid-issues-with-mount-syscall.patch
-Patch355: libvirt-util-cgroup-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
-Patch356: libvirt-vircgroup-Rename-structs-to-start-with-underscore.patch
-Patch357: libvirt-vircgroup-Introduce-standard-set-of-typedefs-and-use-them.patch
-Patch358: libvirt-vircgroup-Extract-file-link-resolving-into-separate-function.patch
-Patch359: libvirt-vircgroup-Remove-unused-function-virCgroupKill.patch
-Patch360: libvirt-vircgroup-Unexport-unused-function-virCgroupAddTaskController.patch
-Patch361: libvirt-vircgroup-Unexport-unused-function-virCgroupRemoveRecursively.patch
-Patch362: libvirt-vircgroup-Move-function-used-in-tests-into-vircgrouppriv.h.patch
-Patch363: libvirt-vircgroup-Remove-pointless-bool-parameter.patch
-Patch364: libvirt-vircgroup-Extract-mount-options-matching-into-function.patch
-Patch365: libvirt-vircgroup-Use-virCgroupMountOptsMatchController-in-virCgroupDetectPlacement.patch
-Patch366: libvirt-vircgroup-Introduce-virCgroupEnableMissingControllers.patch
-Patch367: libvirt-vircgroup-machinename-will-never-be-NULL.patch
-Patch368: libvirt-vircgroup-Remove-virCgroupAddTaskController.patch
-Patch369: libvirt-vircgroup-Introduce-virCgroupGetMemoryStat.patch
-Patch370: libvirt-lxc-Use-virCgroupGetMemoryStat.patch
-Patch371: libvirt-vircgroup-fix-MinGW-build.patch
-Patch372: libvirt-vircgroup-Duplicate-string-before-modifying.patch
-Patch373: libvirt-vircgroup-Extract-controller-detection-into-function.patch
-Patch374: libvirt-vircgroup-Extract-placement-validation-into-function.patch
-Patch375: libvirt-vircgroup-Split-virCgroupPathOfController-into-two-functions.patch
-Patch376: libvirt-vircgroup-Call-virCgroupRemove-inside-virCgroupMakeGroup.patch
-Patch377: libvirt-vircgroup-Simplify-if-conditions-in-virCgroupMakeGroup.patch
-Patch378: libvirt-vircgroup-Remove-obsolete-sa_assert.patch
-Patch379: libvirt-tests-Resolve-possible-overrun.patch
-Patch380: libvirt-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
-Patch381: libvirt-vircgroup-fix-bug-in-virCgroupEnableMissingControllers.patch
-Patch382: libvirt-vircgroup-rename-virCgroupAdd.-Task-to-virCgroupAdd.-Process.patch
-Patch383: libvirt-vircgroup-introduce-virCgroupTaskFlags.patch
-Patch384: libvirt-vircgroup-introduce-virCgroupAddThread.patch
-Patch385: libvirt-vircgroupmock-cleanup-unused-cgroup-files.patch
-Patch386: libvirt-vircgroupmock-rewrite-cgroup-fopen-mocking.patch
-Patch387: libvirt-vircgrouptest-call-virCgroupDetectMounts-directly.patch
-Patch388: libvirt-vircgrouptest-call-virCgroupNewSelf-instead-virCgroupDetectMounts.patch
-Patch389: libvirt-util-introduce-vircgroupbackend-files.patch
-Patch390: libvirt-vircgroup-introduce-cgroup-v1-backend-files.patch
-Patch391: libvirt-vircgroup-extract-virCgroupV1Available.patch
-Patch392: libvirt-vircgroup-detect-available-backend-for-cgroup.patch
-Patch393: libvirt-vircgroup-extract-virCgroupV1ValidateMachineGroup.patch
-Patch394: libvirt-vircgroup-extract-virCgroupV1CopyMounts.patch
-Patch395: libvirt-vircgroup-extract-v1-detect-functions.patch
-Patch396: libvirt-vircgroup-extract-virCgroupV1CopyPlacement.patch
-Patch397: libvirt-vircgroup-extract-virCgroupV1ValidatePlacement.patch
-Patch398: libvirt-vircgroup-extract-virCgroupV1StealPlacement.patch
-Patch399: libvirt-vircgroup-extract-virCgroupV1DetectControllers.patch
-Patch400: libvirt-vircgroup-extract-virCgroupV1HasController.patch
-Patch401: libvirt-vircgroup-extract-virCgroupV1GetAnyController.patch
-Patch402: libvirt-vircgroup-extract-virCgroupV1PathOfController.patch
-Patch403: libvirt-vircgroup-extract-virCgroupV1MakeGroup.patch
-Patch404: libvirt-vircgroup-extract-virCgroupV1Remove.patch
-Patch405: libvirt-vircgroup-extract-virCgroupV1AddTask.patch
-Patch406: libvirt-vircgroup-extract-virCgroupV1HasEmptyTasks.patch
-Patch407: libvirt-vircgroup-extract-virCgroupV1BindMount.patch
-Patch408: libvirt-vircgroup-extract-virCgroupV1SetOwner.patch
-Patch409: libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioWeight.patch
-Patch410: libvirt-vircgroup-extract-virCgroupV1GetBlkioIoServiced.patch
-Patch411: libvirt-vircgroup-extract-virCgroupV1GetBlkioIoDeviceServiced.patch
-Patch412: libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWeight.patch
-Patch413: libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadIops.patch
-Patch414: libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteIops.patch
-Patch415: libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceReadBps.patch
-Patch416: libvirt-vircgroup-extract-virCgroupV1-Set-Get-BlkioDeviceWriteBps.patch
-Patch417: libvirt-vircgroup-extract-virCgroupV1SetMemory.patch
-Patch418: libvirt-vircgroup-extract-virCgroupV1GetMemoryStat.patch
-Patch419: libvirt-vircgroup-extract-virCgroupV1GetMemoryUsage.patch
-Patch420: libvirt-vircgroup-extract-virCgroupV1-Set-Get-Memory-Limit.patch
-Patch421: libvirt-vircgroup-extract-virCgroupV1GetMemSwapUsage.patch
-Patch422: libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-Device.patch
-Patch423: libvirt-vircgroup-extract-virCgroupV1-Allow-Deny-AllDevices.patch
-Patch424: libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuShares.patch
-Patch425: libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsPeriod.patch
-Patch426: libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpuCfsQuota.patch
-Patch427: libvirt-vircgroup-extract-virCgroupV1SupportsCpuBW.patch
-Patch428: libvirt-vircgroup-extract-virCgroupV1GetCpuacct-Usage.patch
-Patch429: libvirt-vircgroup-extract-virCgroupV1GetCpuacctStat.patch
-Patch430: libvirt-vircgroup-extract-virCgroupV1-Set-Get-FreezerState.patch
-Patch431: libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMems.patch
-Patch432: libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetMemoryMigrate.patch
-Patch433: libvirt-vircgroup-extract-virCgroupV1-Set-Get-CpusetCpus.patch
-Patch434: libvirt-vircgroup-rename-virCgroupController-into-virCgroupV1Controller.patch
-Patch435: libvirt-vircgroup-rename-controllers-to-legacy.patch
-Patch436: libvirt-vircgroup-remove-VIR_CGROUP_SUPPORTED.patch
-Patch437: libvirt-vircgroup-include-system-headers-only-on-linux.patch
-Patch438: libvirt-vircgroupv1-fix-build-on-non-linux-OSes.patch
-Patch439: libvirt-Revert-vircgroup-cleanup-controllers-not-managed-by-systemd-on-error.patch
-Patch440: libvirt-util-introduce-cgroup-v2-files.patch
-Patch441: libvirt-vircgroup-introduce-virCgroupV2Available.patch
-Patch442: libvirt-vircgroup-introduce-virCgroupV2ValidateMachineGroup.patch
-Patch443: libvirt-vircgroup-introduce-virCgroupV2CopyMounts.patch
-Patch444: libvirt-vircgroup-introduce-virCgroupV2CopyPlacement.patch
-Patch445: libvirt-vircgroup-introduce-virCgroupV2DetectMounts.patch
-Patch446: libvirt-vircgroup-introduce-virCgroupV2DetectPlacement.patch
-Patch447: libvirt-vircgroup-introduce-virCgroupV2ValidatePlacement.patch
-Patch448: libvirt-vircgroup-introduce-virCgroupV2StealPlacement.patch
-Patch449: libvirt-vircgroup-introduce-virCgroupV2DetectControllers.patch
-Patch450: libvirt-vircgroup-introduce-virCgroupV2HasController.patch
-Patch451: libvirt-vircgroup-introduce-virCgroupV2GetAnyController.patch
-Patch452: libvirt-vircgroup-introduce-virCgroupV2PathOfController.patch
-Patch453: libvirt-vircgroup-introduce-virCgroupV2MakeGroup.patch
-Patch454: libvirt-vircgroup-introduce-virCgroupV2Remove.patch
-Patch455: libvirt-vircgroup-introduce-virCgroupV2AddTask.patch
-Patch456: libvirt-vircgroup-introduce-virCgroupV2HasEmptyTasks.patch
-Patch457: libvirt-vircgroup-introduce-virCgroupV2BindMount.patch
-Patch458: libvirt-vircgroup-introduce-virCgroupV2SetOwner.patch
-Patch459: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioWeight.patch
-Patch460: libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoServiced.patch
-Patch461: libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoDeviceServiced.patch
-Patch462: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWeight.patch
-Patch463: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadIops.patch
-Patch464: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteIops.patch
-Patch465: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceReadBps.patch
-Patch466: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-BlkioDeviceWriteBps.patch
-Patch467: libvirt-vircgroup-introduce-virCgroupV2SetMemory.patch
-Patch468: libvirt-vircgroup-introduce-virCgroupV2GetMemoryStat.patch
-Patch469: libvirt-vircgroup-introduce-virCgroupV2GetMemoryUsage.patch
-Patch470: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemoryHardLimit.patch
-Patch471: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemorySoftLimit.patch
-Patch472: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-MemSwapHardLimit.patch
-Patch473: libvirt-vircgroup-introduce-virCgroupV2GetMemSwapUsage.patch
-Patch474: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuShares.patch
-Patch475: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsPeriod.patch
-Patch476: libvirt-vircgroup-introduce-virCgroupV2-Set-Get-CpuCfsQuota.patch
-Patch477: libvirt-vircgroup-introduce-virCgroupV2SupportsCpuBW.patch
-Patch478: libvirt-vircgroup-introduce-virCgroupV2GetCpuacctUsage.patch
-Patch479: libvirt-vircgroup-introduce-virCgroupV2GetCpuacctStat.patch
-Patch480: libvirt-vircgroup-register-cgroup-v2-backend.patch
-Patch481: libvirt-vircgroup-add-support-for-hybrid-configuration.patch
-Patch482: libvirt-vircgroupmock-change-cgroup-prefix.patch
-Patch483: libvirt-vircgroupmock-add-support-to-test-cgroup-v2.patch
-Patch484: libvirt-vircgrouptest-introduce-initFakeFS-and-cleanupFakeFS-helpers.patch
-Patch485: libvirt-vircgrouptest-prepare-testCgroupDetectMounts-for-cgroup-v2.patch
-Patch486: libvirt-vircgrouptest-add-detect-mounts-test-for-cgroup-v2.patch
-Patch487: libvirt-vircgrouptest-add-detect-mounts-test-for-hybrid-cgroups.patch
-Patch488: libvirt-vircgrouptest-prepare-validateCgroup-for-cgroupv2.patch
-Patch489: libvirt-vircgrouptest-add-cgroup-v2-tests.patch
-Patch490: libvirt-vircgrouptest-add-hybrid-tests.patch
-Patch491: libvirt-virt-host-validate-rewrite-cgroup-detection-to-use-util-vircgroup.patch
-Patch492: libvirt-virt-host-validate-require-freezer-for-LXC.patch
-Patch493: libvirt-virt-host-validate-Fix-build-on-non-Linux.patch
-Patch494: libvirt-tests-Use-correct-function-name-in-error-path.patch
-Patch495: libvirt-util-Fix-virCgroupGetMemoryStat.patch
-Patch496: libvirt-tests-Augment-vcgrouptest-to-add-virCgroupGetMemoryStat.patch
-Patch497: libvirt-vircgroup-introduce-virCgroupKillRecursiveCB.patch
-Patch498: libvirt-vircgroupv2-fix-virCgroupV2ValidateMachineGroup.patch
-Patch499: libvirt-util-implement-virCgroupV2-Set-Get-CpusetMems.patch
-Patch500: libvirt-util-implement-virCgroupV2-Set-Get-CpusetMemoryMigrate.patch
-Patch501: libvirt-util-implement-virCgroupV2-Set-Get-CpusetCpus.patch
-Patch502: libvirt-util-enable-cgroups-v2-cpuset-controller-for-threads.patch
-Patch503: libvirt-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
-Patch504: libvirt-internal-introduce-a-family-of-NULLSTR-macros.patch
-Patch505: libvirt-util-vircgroup-improve-controller-detection.patch
-Patch506: libvirt-util-vircgroupv2-use-any-controller-to-create-thread-directory.patch
-Patch507: libvirt-util-vircgroupv2-enable-CPU-controller-only-if-it-s-available.patch
-Patch508: libvirt-util-vircgroupv2-separate-return-values-of-virCgroupV2EnableController.patch
-Patch509: libvirt-util-vircgroupv2-don-t-error-out-if-enabling-controller-fails.patch
-Patch510: libvirt-util-vircgroupv2-mark-only-requested-controllers-as-available.patch
-Patch511: libvirt-Revert-util-vircgroup-pass-parent-cgroup-into-virCgroupDetectControllersCB.patch
-Patch512: libvirt-util-vircgroupv2-stop-enabling-missing-controllers-with-systemd.patch
-Patch513: libvirt-virWaitForDevices-Drop-confusing-part-of-comment.patch
-Patch514: libvirt-lib-Drop-UDEVSETTLE.patch
-Patch515: libvirt-m4-Provide-default-value-fore-UDEVADM.patch
-Patch516: libvirt-m4-Drop-needless-string-checks.patch
-Patch517: libvirt-util-vircgroup-introduce-virCgroup-Get-Set-ValueRaw.patch
-Patch518: libvirt-util-vircgroup-move-virCgroupGetValueStr-out-of-virCgroupGetValueForBlkDev.patch
-Patch519: libvirt-util-vircgroupv1-add-support-for-BFQ-blkio-files.patch
-Patch520: libvirt-util-vircgroupv2-add-support-for-BFQ-files.patch
-Patch521: libvirt-Handle-copying-bitmaps-to-larger-data-buffers.patch
-Patch522: libvirt-virDomainObjListAddLocked-fix-double-free.patch
-Patch523: libvirt-docs-schemas-Decouple-the-virtio-options-from-each-other.patch
-Patch524: libvirt-util-command-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
-Patch525: libvirt-util-command-define-cleanup-function-using-VIR_DEFINE_AUTOPTR_FUNC.patch
-Patch526: libvirt-util-netdevopenvswitch-use-VIR_AUTOFREE-instead-of-VIR_FREE-for-scalar-types.patch
-Patch527: libvirt-util-virnetdevopenvswitch-Drop-an-unused-variable-ovs_timeout.patch
-Patch528: libvirt-util-netdevopenvswitch-use-VIR_AUTOPTR-for-aggregate-types.patch
-Patch529: libvirt-util-suppress-unimportant-ovs-vsctl-errors-when-getting-interface-stats.patch
-Patch530: libvirt-virNetDevOpenvswitchInterfaceStats-Optimize-for-speed.patch
-Patch531: libvirt-test-Introduce-virnetdevopenvswitchtest.patch
-Patch532: libvirt-vircommand-Separate-mass-FD-closing-into-a-function.patch
-Patch533: libvirt-virCommand-use-procfs-to-learn-opened-FDs.patch
-Patch534: libvirt-util-command-Ignore-bitmap-errors-when-enumerating-file-descriptors-to-close.patch
-Patch535: libvirt-util-Avoid-possible-error-in-virCommandMassClose.patch
-Patch536: libvirt-vircgroup-fix-cgroups-v2-controllers-detection.patch
-Patch537: libvirt-vircgroupv2-store-enabled-controllers.patch
-Patch538: libvirt-virDomainObjListAddLocked-Produce-better-error-message-than-Duplicate-key.patch
-Patch539: libvirt-virdbus-Grab-a-ref-as-long-as-the-while-loop-is-executed.patch
-Patch540: libvirt-vircgroupv2-fix-parsing-multiple-values-in-single-file.patch
-Patch541: libvirt-vircgroupv2-fix-virCgroupV2GetCpuCfsQuota-for-max-value.patch
-Patch542: libvirt-vircgroupv2-fix-abort-in-VIR_AUTOFREE.patch
-Patch543: libvirt-vircgroupv2-fix-setting-cpu.max-period.patch
-Patch544: libvirt-cpu_conf-Pass-policy-to-CPU-feature-filtering-callbacks.patch
-Patch545: libvirt-qemuxml2-test-Add-tests-for-Icelake-Server-pconfig.patch
-Patch546: libvirt-qemu-Drop-disabled-CPU-features-unknown-to-QEMU.patch
-Patch547: libvirt-cputest-Add-data-for-Ice-Lake-Server-CPU.patch
-Patch548: libvirt-cpu_map-Drop-pconfig-from-Icelake-Server-CPU-model.patch
-Patch549: libvirt-qemu-Fix-NULL-ptr-dereference-caused-by-qemuDomainDefFormatBufInternal.patch
-Patch550: libvirt-cpu_map-Add-TAA_NO-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
-Patch551: libvirt-cpu_map-Add-TSX_CTRL-bit-for-IA32_ARCH_CAPABILITIES-MSR.patch
-Patch552: libvirt-cpu_map-x86-Add-support-for-BFLOAT16-data-type.patch
-Patch553: libvirt-selinux-Do-not-report-an-error-when-not-returning-1.patch
-Patch554: libvirt-qemu-Fix-hyperv-features-with-QEMU-4.1.patch
-Patch555: libvirt-qemu-Prefer-dashes-for-hyperv-features.patch
-Patch556: libvirt-cpu-Drop-KVM_-from-hyperv-feature-macros.patch
-Patch557: libvirt-cpu-Drop-unused-KVM-features.patch
-Patch558: libvirt-qemu-Fix-KVM-features-with-QEMU-4.1.patch
-Patch559: libvirt-cpu-Drop-CPUID-definition-for-hv-spinlocks.patch
-Patch560: libvirt-process-wait-longer-on-kill-per-assigned-Hostdev.patch
-Patch561: libvirt-process-wait-longer-5-30s-on-hard-shutdown.patch
-Patch562: libvirt-qemu-Translate-features-in-virQEMUCapsGetCPUFeatures.patch
-Patch563: libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
-Patch564: libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
-Patch565: libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
-Patch566: libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
-Patch567: libvirt-RHEL-qemuSetUnprivSGIO-Actually-use-calculated-sysfs_path-to-set-unpriv_sgio.patch
-Patch568: libvirt-RHEL-qemuCheckUnprivSGIO-use-sysfs_path-to-get-unpriv_sgio.patch
+Patch3: libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
+Patch4: libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
+Patch5: libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
+Patch6: libvirt-RHEL-qemu-Alter-val-usage-in-qemuSetUnprivSGIO.patch
+Patch7: libvirt-RHEL-qemu-Alter-qemuSetUnprivSGIO-hostdev-shareable-logic.patch
+Patch8: libvirt-RHEL-qemu-Fix-logic-error-in-qemuSetUnprivSGIO.patch
+Patch9: libvirt-RHEL-qemu-Fix-crash-trying-to-use-iSCSI-hostdev.patch
+Patch10: libvirt-qemuDomainSaveImageStartVM-Use-VIR_AUTOCLOSE-for-intermediatefd.patch
+Patch11: libvirt-qemuDomainSaveImageStartVM-Use-g_autoptr-for-virCommand.patch
+Patch12: libvirt-qemu-Use-g_autoptr-for-qemuDomainSaveCookie.patch
+Patch13: libvirt-qemu-Stop-domain-on-failed-restore.patch
+Patch14: libvirt-qemu-Don-t-emit-SUSPENDED_POSTCOPY-event-on-destination.patch
+Patch15: libvirt-util-storagefile-Properly-set-transport-type-when-parsing-NBD-strings.patch
+Patch16: libvirt-tests-virstorage-Add-tests-for-NBD-URI-style-syntax-over-UNIX.patch
+Patch17: libvirt-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch
+Patch18: libvirt-cpu.c-Check-properly-for-virCapabilitiesGetNodeInfo-retval.patch
+Patch19: libvirt-qemu_conf-Avoid-dereferencing-NULL-in-virQEMUDriverGetHost-NUMACaps-CPU.patch
+Patch20: libvirt-qemu_capabilities-Rework-domain-caps-cache.patch
+Patch21: libvirt-conf-add-support-for-specifying-CPU-dies-parameter.patch
+Patch22: libvirt-conf-remove-unused-virCapabilitiesSetHostCPU-method.patch
+Patch23: libvirt-qemu-add-support-for-specifying-CPU-dies-topology-parameter.patch
+Patch24: libvirt-hostcpu-add-support-for-reporting-die_id-in-NUMA-topology.patch
+Patch25: libvirt-tests-add-host-CPU-data-files-for-validating-die_id.patch
+Patch26: libvirt-qemu-add-capabilities-flag-for-failover-feature.patch
+Patch27: libvirt-conf-parse-format-teaming-subelement-of-interface.patch
+Patch28: libvirt-qemu-support-interface-teaming-functionality.patch
+Patch29: libvirt-qemu-allow-migration-with-assigned-PCI-hostdev-if-teaming-is-set.patch
+Patch30: libvirt-qemu-add-wait-unplug-to-qemu-migration-status-enum.patch
+Patch31: libvirt-docs-document-interface-subelement-teaming.patch
+Patch32: libvirt-qemu-blockcopy-Actually-unplug-unused-images-when-mirror-job-fails-to-start.patch
+Patch33: libvirt-qemu-domain-Extract-code-to-determine-topmost-nodename-to-qemuDomainDiskGetTopNodename.patch
+Patch34: libvirt-qemu-Fix-value-of-device-argument-for-blockdev-mirror.patch
+Patch35: libvirt-qemu-Fix-value-of-device-argument-for-block-commit.patch
+Patch36: libvirt-conf-backup-Allow-configuration-of-names-exported-via-NBD.patch
+Patch37: libvirt-qemu-backup-Implement-support-for-backup-disk-export-name-configuration.patch
+Patch38: libvirt-qemu-backup-Implement-support-for-backup-disk-bitmap-name-configuration.patch
+Patch39: libvirt-util-hash-Improve-debugability-of-Duplicate-key-error-message.patch
+Patch40: libvirt-tests-hash-Test-case-for-adding-duplicate-hash-entry.patch
+Patch41: libvirt-qemu-block-Don-t-skip-creation-of-luks-formatted-images.patch
+Patch42: libvirt-qemu-monitor-Improve-error-message-when-QEMU-reply-is-too-large.patch
+Patch43: libvirt-qemu-snapshot-Always-rewrite-backingStore-data-when-reusing-existing-images.patch
+Patch44: libvirt-qemu-snapshot-Prevent-too-nested-domain-XML-when-doing-inactive-snapshot.patch
+Patch45: libvirt-qemu-checkpoint-Store-whether-deleted-checkpoint-is-current-in-a-variable.patch
+Patch46: libvirt-qemu-checkpoint-split-out-checkpoint-deletion-bitmaps.patch
+Patch47: libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointDiscardBitmaps.patch
+Patch48: libvirt-qemu-checkpoint-rename-disk-chkdisk-in-qemuCheckpointAddActions.patch
+Patch49: libvirt-qemu-checkpoint-Use-disk-definition-directly-when-creating-checkpoint.patch
+Patch50: libvirt-qemu-checkpoint-tolerate-missing-disks-on-checkpoint-deletion.patch
+Patch51: libvirt-qemu-domain-Remove-unused-qemuDomainDiskNodeFormatLookup.patch
+Patch52: libvirt-qemu-checkpoint-Introduce-helper-to-find-checkpoint-disk-definition-in-parents.patch
+Patch53: libvirt-qemu-checkpoint-Extract-calculation-of-bitmap-merging-for-checkpoint-deletion.patch
+Patch54: libvirt-qemu-snapshot-go-through-cleanup-on-error.patch
+Patch55: libvirt-util-hash-Use-g_new0-for-allocating-hash-internals.patch
+Patch56: libvirt-conf-domain-Remove-checking-of-return-value-of-virHashCreateFull.patch
+Patch57: libvirt-Remove-checking-of-return-value-of-virHashNew.patch
+Patch58: libvirt-qemuMigrationCookieAddNBD-Exit-early-if-there-are-no-disks.patch
+Patch59: libvirt-qemuMigrationCookieNBD-Extract-embedded-struct.patch
+Patch60: libvirt-qemuMigrationCookieAddNBD-Use-glib-memory-allocators.patch
+Patch61: libvirt-qemuMigrationCookieAddNBD-Move-monitor-call-out-of-the-loop.patch
+Patch62: libvirt-qemuMigrationCookieAddNBD-Use-virHashNew-and-automatic-freeing-of-virHashTablePtr.patch
+Patch63: libvirt-qemuMigrationCookieAddNBD-Remove-ret-variable-and-cleanup-label.patch
+Patch64: libvirt-qemuMigrationCookieAddNBD-Fix-filling-of-capacity-when-blockdev-is-used.patch
+Patch65: libvirt-tests-qemublock-Add-test-for-checkpoint-deletion-bitmap-merge.patch
+Patch66: libvirt-tests-qemublock-Add-few-more-test-cases-for-checkpoint-deletion.patch
+Patch67: libvirt-tests-qemublock-Add-synthetic-snapshot-checkpoint-test-data.patch
+Patch68: libvirt-qemu-checkpoint-Introduce-support-for-deleting-checkpoints-accross-snapshots.patch
+Patch69: libvirt-tests-qemublock-Add-checkpoint-deletion-test-for-deep-backing-chain.patch
+Patch70: libvirt-tests-qemublock-Add-checkpoint-deletion-tests-for-some-special-cases.patch
+Patch71: libvirt-qemu-checkpoint-Track-and-relabel-images-for-bitmap-merging.patch
+Patch72: libvirt-qemu-block-Extract-calls-of-qemuBlockGetNamedNodeData-into-a-helper-function.patch
+Patch73: libvirt-util-json-Introduce-virJSONValueArrayConcat.patch
+Patch74: libvirt-virJSONValueNewArray-Use-g_new0-to-allocate-and-remove-NULL-checks-from-callers.patch
+Patch75: libvirt-virhash-Fix-the-expectations-of-virHashKeyEqual-implementations.patch
+Patch76: libvirt-virHashAddOrUpdateEntry-Simplify-allocation-of-new-entry.patch
+Patch77: libvirt-qemu-blockjob-Store-jobflags-with-block-job-data.patch
+Patch78: libvirt-qemu-blockjob-Store-flags-for-all-the-block-job-types.patch
+Patch79: libvirt-qemu-block-Add-validator-for-bitmap-chains-accross-backing-chains.patch
+Patch80: libvirt-tests-qemublocktest-Add-another-synthetic-test-case-for-broken-bitmaps.patch
+Patch81: libvirt-qemu-block-Introduce-function-to-calculate-bitmap-handling-for-block-copy.patch
+Patch82: libvirt-tests-qemublock-Add-tests-for-qemuBlockBitmapsHandleBlockcopy.patch
+Patch83: libvirt-qemuDomainBlockPivot-Copy-bitmaps-backing-checkpoints-for-virDomainBlockCopy.patch
+Patch84: libvirt-docs-domaincaps-Mention-VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA.patch
+Patch85: libvirt-qemu-do-not-revert-to-NULL-bandwidth.patch
+Patch86: libvirt-qemu-preserve-error-on-bandwidth-rollback.patch
+Patch87: libvirt-tests-Add-capabilities-for-QEMU-5.0.0-on-aarch64.patch
+Patch88: libvirt-qemu-Use-switch-statement-in-qemuBuildCpuCommandLine.patch
+Patch89: libvirt-qemu-Add-the-QEMU_CAPS_CPU_KVM_NO_ADJVTIME-capability.patch
+Patch90: libvirt-conf-Introduce-VIR_DOMAIN_TIMER_NAME_ARMVTIMER.patch
+Patch91: libvirt-qemu-Validate-configuration-for-the-armvtimer-timer.patch
+Patch92: libvirt-qemu-Format-the-armvtimer-timer-on-the-command-line.patch
+Patch93: libvirt-tests-Add-test-case-for-the-armvtimer-timer.patch
+Patch94: libvirt-docs-List-the-armvtimer-timer-among-all-others.patch
+Patch95: libvirt-qemu_domain-Modify-access-to-a-NVMe-disk-iff-needed.patch
+Patch96: libvirt-qemuBlockStorageSourceGetBackendProps-Report-errors-on-all-switch-cases.patch
+Patch97: libvirt-virDomainDiskAddISCSIPoolSourceHost-Sanitize-handling-of-string-list.patch
+Patch98: libvirt-virDomainDiskAddISCSIPoolSourceHost-use-g_new0-instead-of-VIR_ALLOC_N.patch
+Patch99: libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-cleanup-label.patch
+Patch100: libvirt-virDomainDiskAddISCSIPoolSourceHost-Remove-ternary-operator.patch
+Patch101: libvirt-virDomainDiskAddISCSIPoolSourceHost-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
+Patch102: libvirt-virDomainDiskTranslateSourcePoolAuth-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
+Patch103: libvirt-virDomainDiskTranslateISCSIDirect-Take-virStorageSourcePtr-instead-of-virDomainDiskDefPtr.patch
+Patch104: libvirt-virDomainDiskTranslateSourcePool-split-code-to-setup-one-storage-source.patch
+Patch105: libvirt-virDomainDiskTranslateSourcePool-Translate-volume-disks-in-whole-backing-chain.patch
+Patch106: libvirt-qemuMonitorJSONBlockdevAdd-Refactor-cleanup.patch
+Patch107: libvirt-qemuMonitorJSONBlockdevDel-Refactor-cleanup.patch
+Patch108: libvirt-qemuMonitorBlockdevAdd-Take-double-pointer-argument.patch
+Patch109: libvirt-qemu-hotplug-Fix-handling-of-the-copy-on-read-layer-with-blockdev.patch
+Patch110: libvirt-virStorageSourceParseBackingJSON-Pass-around-original-backing-file-string.patch
+Patch111: libvirt-virStorageSourceParseBackingJSON-Move-deflattening-of-json-URIs-out-of-recursion.patch
+Patch112: libvirt-virStorageSourceJSONDriverParser-annotate-format-drivers.patch
+Patch113: libvirt-virStorageSourceParseBackingJSON-Allow-json-pseudo-URIs-without-file-wrapper.patch
+Patch114: libvirt-virStorageSourceParseBackingJSON-Prevent-arbitrary-nesting-with-format-drivers.patch
+Patch115: libvirt-tests-virstorage-Add-test-cases-for-json-pseudo-URI-without-file-wrapper.patch
+Patch116: libvirt-qemu-domain-Refactor-formatting-of-node-names-into-status-XML.patch
+Patch117: libvirt-docs-formatdomain-Close-source-on-one-of-disk-examples.patch
+Patch118: libvirt-tests-virstorage-Add-test-data-for-json-specified-raw-image-with-offset-size.patch
+Patch119: libvirt-util-virstoragefile-Add-data-structure-for-storing-storage-source-slices.patch
+Patch120: libvirt-qemuBlockStorageSourceGetFormatRawProps-format-offset-and-size-for-slice.patch
+Patch121: libvirt-qemuDomainValidateStorageSource-Reject-unsupported-slices.patch
+Patch122: libvirt-qemu-block-forbid-creation-of-storage-sources-with-slice.patch
+Patch123: libvirt-docs-Document-the-new-slices-sub-element-of-disk-s-source.patch
+Patch124: libvirt-conf-Implement-support-for-slices-of-disk-source.patch
+Patch125: libvirt-qemu-domain-Store-nodenames-of-slice-in-status-XML.patch
+Patch126: libvirt-qemu-block-Properly-format-storage-slice-into-backing-store-strings.patch
+Patch127: libvirt-tests-qemublock-Add-cases-for-creating-image-overlays-on-top-of-disks-with-slice.patch
+Patch128: libvirt-qemu-Add-support-for-slices-of-type-storage.patch
+Patch129: libvirt-tests-qemu-Add-test-data-for-the-new-slice-element.patch
+Patch130: libvirt-virStorageSourceParseBackingJSONRaw-Parse-offset-and-size-attributes.patch
+Patch131: libvirt-qemuDomainGetStatsIOThread-Don-t-leak-array-with-0-iothreads.patch
+Patch132: libvirt-qemuxml2xmltest-Add-case-for-host-model-vendor_id.patch
+Patch133: libvirt-cpu_conf-Format-vendor_id-for-host-model-CPUs.patch
+Patch134: libvirt-qemu-rename-qemuAgentGetFSInfoInternalDisk.patch
+Patch135: libvirt-qemu-store-complete-agent-filesystem-information.patch
+Patch136: libvirt-qemu-Don-t-store-disk-alias-in-qemuAgentDiskInfo.patch
+Patch137: libvirt-qemu-don-t-access-vmdef-within-qemu_agent.c.patch
+Patch138: libvirt-qemu-remove-qemuDomainObjBegin-EndJobWithAgent.patch
+Patch139: libvirt-docs-fix-a-typo.patch
+Patch140: libvirt-virDomainNetDefClear-Free-persistent-name.patch
+Patch141: libvirt-virSecurityManagerMetadataLock-Store-locked-paths.patch
+Patch142: libvirt-security-Don-t-remember-seclabel-for-paths-we-haven-t-locked-successfully.patch
+Patch143: libvirt-security-Don-t-fail-if-locking-a-file-on-NFS-mount-fails.patch
+Patch144: libvirt-util-storagefile-Drop-image-format-probing-by-file-suffix.patch
+Patch145: libvirt-virStorageFileGetMetadataRecurse-Remove-impossible-error-report.patch
+Patch146: libvirt-virStorageFileGetMetadataRecurse-Shuffle-around-assignment-of-backing-chain-depth.patch
+Patch147: libvirt-virStorageFileGetMetadataRecurse-Expect-NULL-src-path.patch
+Patch148: libvirt-virStorageFileGetMetadataRecurse-Use-virHashHasEntry-instead-of-fake-pointers.patch
+Patch149: libvirt-virStorageFileGetMetadataRecurse-Extract-storage-access.patch
+Patch150: libvirt-virStorageFileGetMetadataRecurse-Remove-cleanup-label.patch
+Patch151: libvirt-tests-virstorage-Fix-backing-file-format-of-created-image.patch
+Patch152: libvirt-virStorageSourceUpdateCapacity-Drop-probe-argument.patch
+Patch153: libvirt-util-storage-Store-backing-store-format-in-virStorageSource.patch
+Patch154: libvirt-virStorageSourceNewFromBacking-Also-transfer-the-format.patch
+Patch155: libvirt-virStorageBackendGlusterRefreshVol-Refactor-handling-of-backing-store.patch
+Patch156: libvirt-virStorageFileGetMetadataFromBuf-Remove-backingFormat-argument.patch
+Patch157: libvirt-virStorageFileGetMetadataFromFD-Remove-unused-backingFormat-argument.patch
+Patch158: libvirt-qemu-domain-Convert-detected-iso-image-format-into-raw.patch
+Patch159: libvirt-virStorageFileGetMetadataRecurse-Allow-format-probing-under-special-circumstances.patch
+Patch160: libvirt-kbase-backing_chains-Clarify-some-aspects-of-image-probing.patch
+Patch161: libvirt-kbase-backing_chains-Add-steps-how-to-securely-probe-image-format.patch
+Patch162: libvirt-conf-use-virXMLFormatElement-in-virDomainFSDefFormat.patch
+Patch163: libvirt-qemu-use-def-instead-of-vm-def-in-qemuExtDevicesStart.patch
+Patch164: libvirt-qemu-eliminate-ret-in-qemuExtDevicesStart.patch
+Patch165: libvirt-docs-render-class-literal-with-monospace-font.patch
+Patch166: libvirt-docs-reduce-excessive-spacing-in-ToC-for-RST-files.patch
+Patch167: libvirt-virDomainFSDefFree-Unref-private-data.patch
+Patch168: libvirt-schema-wrap-fsDriver-in-a-choice-group.patch
+Patch169: libvirt-qemuExtDevicesStart-pass-logManager.patch
+Patch170: libvirt-qemu-pass-virDomainObjPtr-to-qemuExtDevicesSetupCgroup.patch
+Patch171: libvirt-qemuxml2xmltest-set-driver-as-privileged.patch
+Patch172: libvirt-qemu-add-QEMU_CAPS_DEVICE_VHOST_USER_FS.patch
+Patch173: libvirt-docs-add-virtiofs-kbase.patch
+Patch174: libvirt-conf-qemu-add-virtiofs-fsdriver-type.patch
+Patch175: libvirt-conf-add-virtiofs-related-elements-and-attributes.patch
+Patch176: libvirt-qemu-add-virtiofsd_debug-to-qemu.conf.patch
+Patch177: libvirt-qemu-validate-virtiofs-filesystems.patch
+Patch178: libvirt-qemu-forbid-migration-with-vhost-user-fs-device.patch
+Patch179: libvirt-qemu-add-code-for-handling-virtiofsd.patch
+Patch180: libvirt-qemu-put-virtiofsd-in-the-emulator-cgroup.patch
+Patch181: libvirt-qemu-use-the-vhost-user-schemas-to-find-binary.patch
+Patch182: libvirt-qemu-build-vhost-user-fs-device-command-line.patch
+Patch183: libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
+Patch184: libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
+Patch185: libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
+Patch186: libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
+Patch187: libvirt-RHEL-qemuSetUnprivSGIO-Actually-use-calculated-sysfs_path-to-set-unpriv_sgio.patch
+Patch188: libvirt-RHEL-qemuCheckUnprivSGIO-use-sysfs_path-to-get-unpriv_sgio.patch
+Patch189: libvirt-security-Introduce-VIR_SECURITY_DOMAIN_IMAGE_PARENT_CHAIN_TOP-flag.patch
+Patch190: libvirt-qemu-Tell-secdrivers-which-images-are-top-parent.patch
+Patch191: libvirt-virDomainDiskTranslateSourcePool-Check-for-disk-type-correctly.patch
+Patch192: libvirt-virbuftest-remove-extra-G_GNUC_UNUSED-markers.patch
+Patch193: libvirt-virbuftest-use-g_autofree.patch
+Patch194: libvirt-virbuftest-remove-unnecessary-labels.patch
+Patch195: libvirt-virbuftest-declare-testBufAddStrData-earlier.patch
+Patch196: libvirt-virbuftest-use-field-names-when-initalizing-test-info.patch
+Patch197: libvirt-util-add-virBufferTrimChars.patch
+Patch198: libvirt-conf-do-not-generate-machine-names-ending-with-a-dash.patch
+Patch199: libvirt-conf-Don-t-generate-machine-names-with-a-dot.patch
+Patch200: libvirt-qemuAgentFSInfoFormatParams-Remove-pointless-returned-value.patch
+Patch201: libvirt-qemuDomainGetGuestInfo-Don-t-try-to-free-a-negative-number-of-entries.patch
+Patch202: libvirt-qemuDomainBlockPivot-Move-check-prior-to-executing-the-pivot-steps.patch
+Patch203: libvirt-qemuDomainBlockCopyCommon-Record-updated-flags-to-block-job.patch
+Patch204: libvirt-qemu-capabilities-Introduce-QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY.patch
+Patch205: libvirt-qemu-blockcopy-Allow-late-opening-of-the-backing-chain-of-a-shallow-copy.patch
+Patch206: libvirt-qemuBlockStorageSourceDetachPrepare-Get-rid-of-cleanup-section.patch
+Patch207: libvirt-qemu-Don-t-take-double-pointer-in-qemuDomainSecretInfoFree.patch
+Patch208: libvirt-qemuMigrationParamsResetTLS-Adapt-to-modern-memory-management.patch
+Patch209: libvirt-qemuMigrationParamsResetTLS-Fix-comment.patch
+Patch210: libvirt-qemuDomainSecretInfo-Register-autoptr-cleanup-function.patch
+Patch211: libvirt-qemuDomainSecretAESSetup-Automatically-free-non-secret-locals.patch
+Patch212: libvirt-qemuDomainSecretAESSetup-Allocate-and-return-secinfo-here.patch
+Patch213: libvirt-qemuDomainSecretAESSetup-Split-out-lookup-of-secret-data.patch
+Patch214: libvirt-Remove-qemuDomainSecretInfoNew.patch
+Patch215: libvirt-qemu-Introduce-another-helper-for-creating-alias-for-a-secret-object.patch
+Patch216: libvirt-qemuDomainSecretStorageSourcePrepare-Fix-naming-of-alias-variables.patch
+Patch217: libvirt-qemuDomainDeviceDiskDefPostParseRestoreSecAlias-Hardcode-restored-aliases.patch
+Patch218: libvirt-qemu-Split-out-initialization-of-secrets-for-iscsi-hostdevs.patch
+Patch219: libvirt-qemuDomainSecretAESSetupFromSecret-Use-qemuAliasForSecret.patch
+Patch220: libvirt-qemuDomainSecretStorageSourcePrepare-Change-aliases-for-disk-secrets.patch
+Patch221: libvirt-qemuDomainGetSecretAESAlias-Replace-outstanding-uses-with-qemuAliasForSecret.patch
+Patch222: libvirt-conf-Add-support-for-modifying-ssl-validation-for-https-ftps-disks.patch
+Patch223: libvirt-conf-Add-support-for-cookies-for-HTTP-based-disks.patch
+Patch224: libvirt-conf-Add-support-for-setting-timeout-and-readahead-size-for-network-disks.patch
+Patch225: libvirt-qemuDomainValidateStorageSource-Validate-new-network-storage-parameters.patch
+Patch226: libvirt-qemuxml2argvtest-Add-test-case-for-disks-with-http-s-source.patch
+Patch227: libvirt-qemu-block-Implement-ssl-verification-configuration.patch
+Patch228: libvirt-qemu-domain-Store-data-for-secret-object-representing-http-cookies.patch
+Patch229: libvirt-qemuDomainSecretStorageSourcePrepare-Setup-secret-for-http-cookies.patch
+Patch230: libvirt-qemu-Handle-hotplug-and-commandline-for-secret-objects-for-http-cookies.patch
+Patch231: libvirt-qemu-block-Add-support-for-HTTP-cookies.patch
+Patch232: libvirt-qemu-block-Implement-readahead-and-timeout-properties-for-curl-driver.patch
+Patch233: libvirt-virstoragefile-Add-JSON-parser-for-sslverify-readahead-cookies-and-timeout.patch
+Patch234: libvirt-virStorageSourceParseBackingJSONUri-Handle-undocumented-value-off-for-sslverify.patch
+Patch235: libvirt-qemublocktest-Load-QMP-schema-earlier.patch
+Patch236: libvirt-qemublocktest-Extract-schema-root-for-blockdev-add-validation.patch
+Patch237: libvirt-qemublocktest-XMLjsonXML-Test-formatting-parsing-of-modern-JSON.patch
+Patch238: libvirt-qemublocktest-Add-JSON-JSON-test-cases-for-block-device-backends.patch
+Patch239: libvirt-qemu-Pass-through-arguments-of-ssh-block-driver-used-by-libguestfs.patch
+Patch240: libvirt-qemu-capabilities-Add-QEMU_CAPS_BLOCKDEV_REOPEN.patch
+Patch241: libvirt-qemu-monitor-Add-handler-for-blockdev-reopen.patch
+Patch242: libvirt-qemu-block-implement-helpers-for-blockdev-reopen.patch
+Patch243: libvirt-qemuCheckpointDiscardBitmaps-Reopen-images-for-bitmap-modifications.patch
+Patch244: libvirt-qemuCheckpointDiscardBitmaps-Use-correct-field-for-checkpoint-bitmap-name.patch
+Patch245: libvirt-qemuDomainBlockCommit-Move-checks-depending-on-capabilities-after-liveness-check.patch
+Patch246: libvirt-qemu-domain-Extract-formatting-of-commit-blockjob-data-into-a-function.patch
+Patch247: libvirt-qemu-domain-Extract-parsing-of-commit-blockjob-data-into-a-function.patch
+Patch248: libvirt-qemu-blockjob-Store-list-of-bitmaps-disabled-prior-to-commit.patch
+Patch249: libvirt-qemublocktest-Fix-and-optimize-fake-image-chain.patch
+Patch250: libvirt-qemu-block-Implement-helpers-for-dealing-with-bitmaps-during-block-commit.patch
+Patch251: libvirt-qemublocktest-Add-tests-for-handling-of-bitmaps-during-block-commit.patch
+Patch252: libvirt-qemublocktest-Add-more-tests-for-block-commit-bitmap-handling-with-snapshots.patch
+Patch253: libvirt-qemublocktest-Add-tests-of-broken-bitmap-chain-handling-during-block-commit.patch
+Patch254: libvirt-qemuBlockJobDiskNewCommit-Propagate-disabledBitmapsBase.patch
+Patch255: libvirt-qemuDomainBlockCommit-Handle-bitmaps-on-start-of-commit.patch
+Patch256: libvirt-qemuDomainBlockPivot-Handle-merging-of-bitmaps-when-pivoting-an-active-block-commit.patch
+Patch257: libvirt-qemu-blockjob-Handle-bitmaps-after-finish-of-normal-block-commit.patch
+Patch258: libvirt-qemu-blockjob-Re-enable-bitmaps-after-failed-block-commit.patch
+Patch259: libvirt-qemuDomainGetGuestInfo-don-t-assign-NULL-hostname.patch
+Patch260: libvirt-rhel-Enable-usage-of-x-blockdev-reopen.patch
+Patch261: libvirt-qemuBlockBitmapsHandleCommitStart-Fix-allocation-of-string-list.patch
+Patch262: libvirt-qemuBlockBitmapsHandleCommitFinish-Use-proper-variable-to-iterate.patch
+Patch263: libvirt-qemublocktest-Add-tests-for-re-enabling-of-bitmaps-after-commit.patch
+Patch264: libvirt-qemu-Create-multipath-targets-for-PRs.patch
+Patch265: libvirt-qemu-Don-t-crash-when-getting-targets-for-a-multipath.patch
+Patch266: libvirt-virSecretLookupDefCopy-Remove-return-value.patch
+Patch267: libvirt-virStorageEncryptionSecretCopy-Properly-copy-internals.patch
+Patch268: libvirt-vmx-shortcut-earlier-few-ignore-cases-in-virVMXParseDisk.patch
+Patch269: libvirt-vmx-make-fileName-optional-for-CD-ROMs.patch
+Patch270: libvirt-qemublocktest-Backport-cleanups-for-testQemuDiskXMLToProps-from-dd94f36ffbe.patch
+Patch271: libvirt-conf-rename-namespace-property-of-struct-_virStorageSourceNVMeDef.patch
+Patch272: libvirt-qemublocktest-xml-json-Add-test-for-NVMe.patch
+Patch273: libvirt-virDomainDiskSourceNVMeFormat-Format-only-valid-managed-values.patch
+Patch274: libvirt-qemublocktest-xml-json-Refactor-cleanup-in-test-case-functions.patch
+Patch275: libvirt-testQemuDiskXMLToPropsValidateFileSrcOnly-Move-together-with-rest-of-xml-json-code.patch
+Patch276: libvirt-qemuBlockGetBackingStoreString-Add-pretty-argument.patch
+Patch277: libvirt-testQemuDiskXMLToProps-Store-all-per-image-data-in-one-structure.patch
+Patch278: libvirt-qemublocktest-Test-backing-store-strings.patch
+Patch279: libvirt-qemuBlockGetBackingStoreString-Remove-ret-variable.patch
+Patch280: libvirt-storage-Implement-backing-store-support-for-fat-prefix.patch
+Patch281: libvirt-qemuBlockGetBackingStoreString-Add-extra-wrapping-object-to-JSON-strings.patch
+Patch282: libvirt-qemu-block-Extract-formatting-of-cookie-string.patch
+Patch283: libvirt-qemuBlockGetBackingStoreString-Properly-handle-http-s-with-cookies-and-others.patch
+Patch284: libvirt-storage-Parse-nvme-disk-source-properties-from-json-pseudo-uri.patch
+Patch285: libvirt-qemu-virtiofs-shorten-pid-filename.patch
+Patch286: libvirt-qemu-virtiofs-shorten-socket-filename.patch
+Patch287: libvirt-api-disallow-virDomainAgentSetResponseTimeout-on-read-only-connections.patch
+Patch288: libvirt-qemuBackupBegin-Fix-monitor-access-when-rolling-back-due-to-failure.patch
+Patch289: libvirt-qemuxml2xmltest-Wire-up-disk-network-http-case.patch
+Patch290: libvirt-virStorageSourceNetCookieValidate-Accept-quoted-cookie-value.patch
+Patch291: libvirt-qemu-block-Support-VIR_DOMAIN_BLOCK_COMMIT-PULL-REBASE_RELATIVE-with-blockdev.patch
+Patch292: libvirt-qemuDomainSnapshotDiskPrepareOne-Don-t-load-the-relative-path-with-blockdev.patch
+Patch293: libvirt-docs-formatdomain-Mention-missing-protocols.patch
+Patch294: libvirt-schemas-rng-Use-interleave-in-the-disk-source-element.patch
+Patch295: libvirt-conf-Add-support-for-http-s-query-strings.patch
+Patch296: libvirt-qemuBlockStorageSourceGetURI-Pass-through-query-component.patch
+Patch297: libvirt-virStorageSourceParseBackingURI-Preserve-query-string-of-URI-for-http-s.patch
+Patch298: libvirt-qemuDomainSnapshotDiskPrepareOne-Fix-logic-of-relative-backing-store-update.patch
+Patch299: libvirt-qemuCheckpointCreateXML-Check-VM-liveness-first.patch
+Patch300: libvirt-qemu-checkpoint-Allow-checkpoint-redefine-for-offline-VMs.patch
+Patch301: libvirt-virDomainCheckpointRedefinePrep-Set-current-checkpoint-if-there-isn-t-any.patch
+Patch302: libvirt-qemu-avoid-launching-non-x86-guests-with-APIC-EOI-setting.patch
+Patch303: libvirt-tests-qemu-add-disk-error-policy-tests-for-s390x.patch
+Patch304: libvirt-qemu-add-QEMU_CAPS_STORAGE_WERROR.patch
+Patch305: libvirt-qemu-use-QEMU_CAPS_STORAGE_WERROR-for-disk-error-attributes.patch
+Patch306: libvirt-qemuMonitorTestProcessCommandDefaultValidate-Output-validator-output-to-stderr.patch
+Patch307: libvirt-qemumonitorjsontest-AddNetdev-Use-real-variant.patch
+Patch308: libvirt-qemu-new-capabilities-flag-pcie-root-port.hotplug.patch
+Patch309: libvirt-conf-new-attribute-hotplug-for-pci-controllers.patch
+Patch310: libvirt-qemu-hook-up-pcie-root-port-hotplug-off-option.patch
+Patch311: libvirt-docs-mention-hotplug-off-in-news.xml.patch
+Patch312: libvirt-conf-add-new-PCI_CONNECT-flag-AUTOASSIGN.patch
+Patch313: libvirt-conf-qemu-s-VIR_PCI_CONNECT_HOTPLUGGABLE-VIR_PCI_CONNECT_AUTOASSIGN-g.patch
+Patch314: libvirt-conf-simplify-logic-when-checking-for-AUTOASSIGN-PCI-addresses.patch
+Patch315: libvirt-qemu-conf-set-HOTPLUGGABLE-connect-flag-during-PCI-address-set-init.patch
+Patch316: libvirt-conf-check-HOTPLUGGABLE-connect-flag-when-validating-a-PCI-address.patch
+Patch317: libvirt-conf-during-PCI-hotplug-require-that-the-controller-support-hotplug.patch
+Patch318: libvirt-qemu-fix-detection-of-vCPU-pids-when-multiple-dies-are-present.patch
+Patch319: libvirt-storage_file-create-Create-new-images-with-write-permission-bit.patch
+Patch320: libvirt-qemuBlockStorageSourceCreateFormat-Force-write-access-when-formatting-images.patch
+Patch321: libvirt-qemu-snapshot-Allow-snapshots-of-read-only-disks-when-we-can-create-them.patch
+Patch322: libvirt-qemu-blockcopy-Allow-copy-of-read-only-disks-with-blockdev.patch
+Patch323: libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-not-a-devmapper-target.patch
+Patch324: libvirt-qemu-only-stop-external-devices-after-the-domain.patch
+Patch325: libvirt-qemu-fixing-auto-detecting-binary-in-domain-capabilities.patch
+Patch326: libvirt-qemu-prevent-attempts-to-detach-a-device-on-a-controller-with-hotplug-off.patch
+Patch327: libvirt-cpu-Change-control-flow-in-virCPUUpdateLive.patch
+Patch328: libvirt-cpu_x86-Prepare-virCPUx86UpdateLive-for-easier-extension.patch
+Patch329: libvirt-cpu-Honor-check-full-for-host-passthrough-CPUs.patch
+Patch330: libvirt-cputest-Add-data-for-Intel-R-Core-TM-i7-8550U-CPU-without-TSX.patch
+Patch331: libvirt-cpu_map-Add-more-noTSX-x86-CPU-models.patch
+Patch332: libvirt-cpu_map-Add-decode-element-to-x86-CPU-model-definitions.patch
+Patch333: libvirt-cpu_x86-Honor-CPU-models-decode-element.patch
+Patch334: libvirt-cpu_map-Don-t-use-new-noTSX-models-for-host-model-CPUs.patch
+Patch335: libvirt-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
+Patch336: libvirt-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
+Patch337: libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
+Patch338: libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
+Patch339: libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
+Patch340: libvirt-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
+Patch341: libvirt-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
+Patch342: libvirt-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
+Patch343: libvirt-cpu_x86-Use-g_auto-in-x86VendorParse.patch
+Patch344: libvirt-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
+Patch345: libvirt-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
+Patch346: libvirt-cpu_x86-Use-g_auto-in-x86ModelParse.patch
+Patch347: libvirt-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
+Patch348: libvirt-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
+Patch349: libvirt-cpu_x86-Use-g_auto-in-x86Compute.patch
+Patch350: libvirt-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
+Patch351: libvirt-cpu_x86-Use-g_auto-in-x86Decode.patch
+Patch352: libvirt-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
+Patch353: libvirt-cpu_x86-Use-g_auto-in-x86Encode.patch
+Patch354: libvirt-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
+Patch355: libvirt-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
+Patch356: libvirt-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
+Patch357: libvirt-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
+Patch358: libvirt-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
+Patch359: libvirt-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
+Patch360: libvirt-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
+Patch361: libvirt-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
+Patch362: libvirt-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
+Patch363: libvirt-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
+Patch364: libvirt-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
+Patch365: libvirt-cpu_x86-Move-and-rename-x86FormatSignatures.patch
+Patch366: libvirt-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
+Patch367: libvirt-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
+Patch368: libvirt-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-with-a-struct.patch
+Patch369: libvirt-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
+Patch370: libvirt-cpu_x86-Add-support-for-stepping-part-of-CPU-signature.patch
+Patch371: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-9242-CPU.patch
+Patch372: libvirt-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
+Patch373: libvirt-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-Server.patch
+Patch374: libvirt-cputest-Add-data-for-Cooperlake-CPU.patch
+Patch375: libvirt-cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILITIES-MSR.patch
+Patch376: libvirt-cpu_map-Add-Cooperlake-x86-CPU-model.patch
+Patch377: libvirt-cpu_map-Distribute-x86_Cooperlake.xml.patch
+Patch378: libvirt-qemu-Refuse-to-use-ps2-on-machines-that-do-not-have-this-bus.patch
+Patch379: libvirt-nodedev-fix-race-in-API-usage-vs-initial-device-enumeration.patch
+Patch380: libvirt-qemu-backup-Fix-handling-of-backing-store-for-backup-target-images.patch
+Patch381: libvirt-qemu-backup-Split-up-code-traversing-checkpoint-list-looking-for-bitmaps.patch
+Patch382: libvirt-qemu-backup-Fix-backup-of-disk-skipped-in-an-intermediate-checkpoint.patch
+Patch383: libvirt-conf-backup-Store-incremental-backup-checkpoint-name-per-disk.patch
+Patch384: libvirt-qemu-backup-Move-fetching-of-checkpoint-list-for-incremental-backup.patch
+Patch385: libvirt-qemublocktest-Add-empty-test-case-for-bitmaps.patch
+Patch386: libvirt-qemublocktest-Add-empty-case-for-incremental-backup-test.patch
+Patch387: libvirt-qemublocktest-Add-empty-case-for-checkpoint-deletion.patch
+Patch388: libvirt-qemublocktest-Add-empty-case-for-blockcopy-bitmap-handling-test.patch
+Patch389: libvirt-qemublocktest-Add-empty-case-for-checkpoint-bitmap-handling.patch
+Patch390: libvirt-qemublocktest-Disable-testcases-for-all-bitmap-handling.patch
+Patch391: libvirt-qemublocktest-Delete-synthetic-bitmap-test-cases.patch
+Patch392: libvirt-qemublocktest-Extract-printing-of-nodename-list.patch
+Patch393: libvirt-qemu-checkpoint-Don-t-chain-bitmaps-for-checkpoints.patch
+Patch394: libvirt-qemublocktest-Replace-basic-bitmap-detection-test-case-data.patch
+Patch395: libvirt-qemublocktest-Replace-snapshots-bitmap-detection-test-case-data.patch
+Patch396: libvirt-qemuBlockBitmapChainIsValid-Adjust-to-new-semantics-of-bitmaps.patch
+Patch397: libvirt-qemublocktest-Re-add-bitmap-validation-for-basic-and-snapshots-cases.patch
+Patch398: libvirt-qemublocktest-Add-new-synthetic-bitmap-detection-and-validation-test-case.patch
+Patch399: libvirt-qemu-checkpoint-Don-t-merge-checkpoints-during-deletion.patch
+Patch400: libvirt-qemublocktest-Rename-TEST_CHECKPOINT_DELETE_MERGE-to-TEST_CHECKPOINT_DELETE.patch
+Patch401: libvirt-qemublocktest-Re-introduce-testing-of-checkpoint-deletion.patch
+Patch402: libvirt-qemu-block-Add-universal-helper-for-merging-dirty-bitmaps-for-all-scenarios.patch
+Patch403: libvirt-qemu-backup-Rewrite-backup-bitmap-handling-to-the-new-bitmap-semantics.patch
+Patch404: libvirt-qemublocktest-Add-basic-tests-for-backup-bitmap-handling.patch
+Patch405: libvirt-qemublocktest-Add-snapshots-tests-for-backup-bitmap-handling.patch
+Patch406: libvirt-qemu-Rewrite-bitmap-handling-for-block-commit.patch
+Patch407: libvirt-qemublocktest-Add-basic-tests-for-commit-bitmap-handling.patch
+Patch408: libvirt-qemublocktest-Add-snapshots-tests-for-block-commit-bitmap-handling.patch
+Patch409: libvirt-qemu-blockjob-Remove-disabledBitmapsBase-field-from-commit-job-private-data.patch
+Patch410: libvirt-qemu-Rewrite-bitmap-handling-for-block-copy.patch
+Patch411: libvirt-qemublocktest-Add-test-cases-for-handling-bitmaps-during-block-copy.patch
+Patch412: libvirt-kbase-Add-document-outlining-internals-of-incremental-backup-in-qemu.patch
+Patch413: libvirt-qemuBackupBegin-Don-t-leak-def-on-early-failures.patch
+Patch414: libvirt-qemu-backup-Initialize-store-source-properly-and-just-once.patch
+Patch415: libvirt-qemuBackupDiskStarted-Fix-improper-dereference-of-array.patch
+Patch416: libvirt-qemuBackupDiskDataCleanupOne-Don-t-exit-early-when-the-job-has-started.patch
+Patch417: libvirt-qemuBackupDiskDataCleanupOne-Free-incrementalBitmap.patch
+Patch418: libvirt-util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
+Patch419: libvirt-virDevMapperGetTargetsImpl-Check-for-dm-major-properly.patch
+Patch420: libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF_FORMAT_SECURE-is-used.patch
+Patch421: libvirt-util-Introduce-a-parser-for-kernel-cmdline-arguments.patch
+Patch422: libvirt-qemu-Check-if-s390-secure-guest-support-is-enabled.patch
+Patch423: libvirt-qemu-Check-if-AMD-secure-guest-support-is-enabled.patch
+Patch424: libvirt-tools-Secure-guest-check-on-s390-in-virt-host-validate.patch
+Patch425: libvirt-tools-Secure-guest-check-for-AMD-in-virt-host-validate.patch
+Patch426: libvirt-docs-Update-AMD-launch-secure-description.patch
+Patch427: libvirt-docs-Describe-protected-virtualization-guest-setup.patch
+Patch428: libvirt-qemu-blockjob-Don-t-base-bitmap-handling-of-active-layer-block-commit-on-QEMU_CAPS_BLOCKDEV_REOPEN.patch
+Patch429: libvirt-qemu-blockjob-Actually-delete-temporary-bitmap-on-failed-active-commit.patch
+Patch430: libvirt-qemu-block-Remove-active-write-bitmap-even-if-there-are-no-bitmaps-to-merge.patch
+Patch431: libvirt-qemuDomainBlockPivot-Rename-actions-to-bitmapactions.patch
+Patch432: libvirt-qemuDomainBlockPivot-Ignore-failures-of-creating-active-layer-bitmap.patch
+Patch433: libvirt-src-assume-sys-sysmacros.h-always-exists-on-Linux.patch
+Patch434: libvirt-virdevmapper.c-Join-two-WITH_DEVMAPPER-sections-together.patch
+Patch435: libvirt-virDevMapperGetTargetsImpl-Use-VIR_AUTOSTRINGLIST.patch
+Patch436: libvirt-virdevmapper-Don-t-use-libdevmapper-to-obtain-dependencies.patch
+Patch437: libvirt-virDevMapperGetTargets-Don-t-ignore-EBADF.patch
+Patch438: libvirt-virdevmapper-Don-t-cache-device-mapper-major.patch
+Patch439: libvirt-virdevmapper-Handle-kernel-without-device-mapper-support.patch
+Patch440: libvirt-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-control.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -842,9 +682,9 @@ Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
 %if %{with_qemu}
 Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
 %endif
-%if %{with_uml}
-Requires: libvirt-daemon-driver-uml = %{version}-%{release}
-%endif
+# We had UML driver, but we've removed it.
+Obsoletes: libvirt-daemon-driver-uml <= 5.0.0
+Obsoletes: libvirt-daemon-uml <= 5.0.0
 %if %{with_vbox}
 Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
 %endif
@@ -865,22 +705,29 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: libtool
-BuildRequires: /usr/bin/pod2man
+%endif
+%if 0%{?rhel} == 7
+BuildRequires: python36-docutils
+%else
+BuildRequires: python3-docutils
 %endif
 BuildRequires: gcc
 BuildRequires: git
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: perl-interpreter
 %else
 BuildRequires: perl
 %endif
-BuildRequires: %{python}
-%if %{with_systemd}
-BuildRequires: systemd-units
+%if 0%{?rhel} > 7
+BuildRequires: python3-devel
+%else
+BuildRequires: python3
 %endif
+BuildRequires: systemd-units
 %if %{with_libxl}
 BuildRequires: xen-devel
 %endif
+BuildRequires: glib2-devel >= 2.48
 BuildRequires: libxml2-devel
 BuildRequires: libxslt
 BuildRequires: readline-devel
@@ -890,47 +737,28 @@ BuildRequires: bash-completion >= 2.0
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: libtasn1-devel
-%if (0%{?rhel} && 0%{?rhel} < 7)
-BuildRequires: libgcrypt-devel
-%endif
 BuildRequires: gnutls-devel
 BuildRequires: libattr-devel
 # For pool-build probing for existing pools
 BuildRequires: libblkid-devel >= 2.17
 # for augparse, optionally used in testing
 BuildRequires: augeas
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: systemd-devel >= 185
-%else
-BuildRequires: libudev-devel >= 145
-%endif
 BuildRequires: libpciaccess-devel >= 0.10.9
 BuildRequires: yajl-devel
 %if %{with_sanlock}
 BuildRequires: sanlock-devel >= 2.4
 %endif
 BuildRequires: libpcap-devel
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: libnl-devel
-%else
 BuildRequires: libnl3-devel
-%endif
-BuildRequires: avahi-devel
 BuildRequires: libselinux-devel
 BuildRequires: dnsmasq >= 2.41
 BuildRequires: iptables
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: iptables-ipv6
-%endif
 BuildRequires: radvd
 BuildRequires: ebtables
 BuildRequires: module-init-tools
 BuildRequires: cyrus-sasl-devel
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: polkit >= 0.112
-%else
-BuildRequires: polkit >= 0.93
-%endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
 %if %{with_qemu}
@@ -941,18 +769,25 @@ BuildRequires: /usr/bin/qemu-img
 %endif
 # For LVM drivers
 BuildRequires: lvm2
-# For ISCSI driver
+# For pool type=iscsi
 BuildRequires: iscsi-initiator-utils
+%if %{with_storage_iscsi_direct}
+# For pool type=iscsi-direct
+BuildRequires: libiscsi-devel
+%endif
 # For disk driver
 BuildRequires: parted-devel
 # For Multipath support
 BuildRequires: device-mapper-devel
+# For XFS reflink clone support
+BuildRequires: xfsprogs-devel
 %if %{with_storage_rbd}
-    %if 0%{?fedora} || 0%{?rhel} >= 7
+    %if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: librados-devel
+BuildRequires: librbd-devel
+    %else
 BuildRequires: librados2-devel
 BuildRequires: librbd1-devel
-    %else
-BuildRequires: ceph-devel
     %endif
 %endif
 %if %{with_storage_gluster}
@@ -976,15 +811,11 @@ BuildRequires: libcap-ng-devel >= 0.5.0
 %if %{with_fuse}
 BuildRequires: fuse-devel >= 2.8.6
 %endif
-%if %{with_phyp} || %{with_libssh2}
+%if %{with_libssh2}
 BuildRequires: libssh2-devel >= 1.3.0
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: netcf-devel >= 0.2.2
-%else
-BuildRequires: netcf-devel >= 0.1.8
-%endif
 %if %{with_esx}
 BuildRequires: libcurl-devel
 %endif
@@ -1014,14 +845,14 @@ BuildRequires: numad
 %endif
 
 %if %{with_wireshark}
-BuildRequires: wireshark-devel >= 2.1.0
+BuildRequires: wireshark-devel >= 2.4.0
 %endif
 
 %if %{with_libssh}
 BuildRequires: libssh-devel >= 0.7.0
 %endif
 
-%if 0%{?fedora} > 27 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: rpcgen
 BuildRequires: libtirpc-devel
 %endif
@@ -1053,6 +884,9 @@ Summary: Server side daemon and supporting files for libvirt library
 # The client side, i.e. shared libs are in a subpackage
 Requires: %{name}-libs = %{version}-%{release}
 
+# (client invokes 'nc' against the UNIX socket on the server)
+Requires: /usr/bin/nc
+
 # for modprobe of pci devices
 Requires: module-init-tools
 
@@ -1063,23 +897,16 @@ Requires: iproute
 Requires: iproute-tc
 %endif
 
-Requires: avahi-libs
-%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires: polkit >= 0.112
-%else
-Requires: polkit >= 0.93
-%endif
 %ifarch %{ix86} x86_64 ia64
 # For virConnectGetSysinfo
 Requires: dmidecode
 %endif
 # For service management
-%if %{with_systemd}
 Requires(post): systemd-units
 Requires(post): systemd-sysv
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-%endif
 %if %{with_numad}
 Requires: numad
 %endif
@@ -1118,9 +945,6 @@ Requires: libvirt-libs = %{version}-%{release}
 Requires: dnsmasq >= 2.41
 Requires: radvd
 Requires: iptables
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: iptables-ipv6
-%endif
 
 %description daemon-driver-network
 The network driver plugin for the libvirtd daemon, providing
@@ -1133,9 +957,6 @@ Summary: Nwfilter driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: iptables
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: iptables-ipv6
-%endif
 Requires: ebtables
 
 %description daemon-driver-nwfilter
@@ -1149,11 +970,7 @@ Summary: Nodedev driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 # needed for device enumeration
-%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires: systemd >= 185
-%else
-Requires: udev >= 145
-%endif
 
 %description daemon-driver-nodedev
 The nodedev driver plugin for the libvirtd daemon, providing
@@ -1165,9 +982,7 @@ capabilities.
 Summary: Interface driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
-%if (0%{?fedora} || 0%{?rhel} >= 7)
 Requires: netcf-libs >= 0.2.2
-%endif
 
 %description daemon-driver-interface
 The interface driver plugin for the libvirtd daemon, providing
@@ -1195,6 +1010,9 @@ Requires: util-linux
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
 %endif
+%if !%{with_storage_rbd}
+Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release}
+%endif
 
 %description daemon-driver-storage-core
 The storage driver plugin for the libvirtd daemon, providing
@@ -1245,6 +1063,19 @@ The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using the host iscsi stack.
 
 
+%if %{with_storage_iscsi_direct}
+%package daemon-driver-storage-iscsi-direct
+Summary: Storage driver plugin for iscsi-direct
+Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
+Requires: libiscsi
+
+%description daemon-driver-storage-iscsi-direct
+The storage driver backend adding implementation of the storage APIs for iscsi
+volumes using libiscsi direct connection.
+%endif
+
+
 %package daemon-driver-storage-mpath
 Summary: Storage driver plugin for multipath volumes
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -1322,6 +1153,9 @@ Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release}
+%if %{with_storage_iscsi_direct}
+Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release}
+%endif
 %if %{with_storage_gluster}
 Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
 %endif
@@ -1346,9 +1180,6 @@ parted and more.
 Summary: QEMU driver plugin for the libvirtd daemon
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
-# There really is a hard cross-driver dependency here
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
 Requires: /usr/bin/qemu-img
 # For image compression
 Requires: gzip
@@ -1384,19 +1215,6 @@ the Linux kernel
 %endif
 
 
-%if %{with_uml}
-%package daemon-driver-uml
-Summary: Uml driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-libs = %{version}-%{release}
-
-%description daemon-driver-uml
-The UML driver plugin for the libvirtd daemon, providing
-an implementation of the hypervisor driver APIs using
-User Mode Linux
-%endif
-
-
 %if %{with_vbox}
 %package daemon-driver-vbox
 Summary: VirtualBox driver plugin for the libvirtd daemon
@@ -1484,26 +1302,6 @@ capabilities of LXC
 %endif
 
 
-%if %{with_uml}
-%package daemon-uml
-Summary: Server side daemon & driver required to run UML guests
-
-Requires: libvirt-daemon = %{version}-%{release}
-Requires: libvirt-daemon-driver-uml = %{version}-%{release}
-Requires: libvirt-daemon-driver-interface = %{version}-%{release}
-Requires: libvirt-daemon-driver-network = %{version}-%{release}
-Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-Requires: libvirt-daemon-driver-secret = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-# There are no UML kernel RPMs in Fedora/RHEL to depend on.
-
-%description daemon-uml
-Server side daemon and driver required to manage the virtualization
-capabilities of UML
-%endif
-
-
 %if %{with_libxl}
 %package daemon-xen
 Summary: Server side daemon & driver required to run XEN guests
@@ -1552,10 +1350,6 @@ Requires: ncurses
 Requires: gettext
 # Needed by virt-pki-validate script.
 Requires: gnutls-utils
-%if %{with_pm_utils}
-# Needed for probing the power management features of the host.
-Requires: pm-utils
-%endif
 %if %{with_bash_completion}
 Requires: %{name}-bash-completion = %{version}-%{release}
 %endif
@@ -1567,8 +1361,6 @@ capabilities of recent versions of Linux (and other OSes).
 %package libs
 Summary: Client side libraries
 # So remote clients can access libvirt over SSH tunnel
-# (client invokes 'nc' against the UNIX socket on the server)
-Requires: nc
 Requires: cyrus-sasl
 # Needed by default sasl.conf - no onerous extra deps, since
 # 100's of other things on a system already pull in krb5-libs
@@ -1599,7 +1391,7 @@ Bash completion script stub.
 %if %{with_wireshark}
 %package wireshark
 Summary: Wireshark dissector plugin for libvirt RPC transactions
-Requires: wireshark >= 1.12.6-4
+Requires: wireshark >= 2.4.0
 Requires: %{name}-libs = %{version}-%{release}
 
 %description wireshark
@@ -1649,7 +1441,7 @@ Libvirt plugin for NSS for translating domain names into IP addresses.
 
 %prep
 
-%setup -q
+%autosetup -S git_am -N
 
 # "make dist" replaces all symlinks with a copy of the linked files;
 # we need to replace all of them with the original symlinks
@@ -1660,42 +1452,13 @@ while read lnk target; do
         ln -s $target $lnk
     fi
 done <%{_sourcedir}/symlinks || exit 1
-
-# Patches have to be stored in a temporary file because RPM has
-# a limit on the length of the result of any macro expansion;
-# if the string is longer, it's silently cropped
-%{lua:
-    tmp = os.tmpname();
-    f = io.open(tmp, "w+");
-    count = 0;
-    for i, p in ipairs(patches) do
-        f:write(p.."\n");
-        count = count + 1;
-    end;
-    f:close();
-    print("PATCHCOUNT="..count.."\n")
-    print("PATCHLIST="..tmp.."\n")
-}
-
-git init -q
-git config user.name rpm-build
-git config user.email rpm-build
-git config gc.auto 0
 git add .
-git commit -q -a --author 'rpm-build <rpm-build>' \
-           -m '%{name}-%{version} base'
+git commit -q -a --author 'rpm-build <rpm-build>' -m symlinks
 
-COUNT=$(grep '\.patch$' $PATCHLIST | wc -l)
-if [ $COUNT -ne $PATCHCOUNT ]; then
-    echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT"
-    exit 1
-fi
-if [ $COUNT -gt 0 ]; then
-    xargs git am <$PATCHLIST || exit 1
-fi
-echo "Applied $COUNT patches"
-rm -f $PATCHLIST
-rm -rf .git
+
+git config gc.auto 0
+
+%autopatch
 
 %build
 %if ! %{supported_platform}
@@ -1735,12 +1498,6 @@ exit 1
     %define arg_libxl --without-libxl
 %endif
 
-%if %{with_phyp}
-    %define arg_phyp --with-phyp
-%else
-    %define arg_phyp --without-phyp
-%endif
-
 %if %{with_esx}
     %define arg_esx --with-esx
 %else
@@ -1759,12 +1516,6 @@ exit 1
     %define arg_vmware --without-vmware
 %endif
 
-%if %{with_uml}
-    %define arg_uml --with-uml
-%else
-    %define arg_uml --without-uml
-%endif
-
 %if %{with_storage_rbd}
     %define arg_storage_rbd --with-storage-rbd
 %else
@@ -1831,10 +1582,10 @@ exit 1
     %define arg_wireshark --without-wireshark-dissector
 %endif
 
-%if %{with_pm_utils}
-    %define arg_pm_utils --with-pm-utils
+%if %{with_storage_iscsi_direct}
+    %define arg_storage_iscsi_direct --with-storage-iscsi-direct
 %else
-    %define arg_pm_utils --without-pm-utils
+    %define arg_storage_iscsi_direct --without-storage-iscsi-direct
 %endif
 
 %define when  %(date +"%%F-%%T")
@@ -1843,29 +1594,7 @@ exit 1
 %define arg_packager --with-packager="%{who}, %{when}, %{where}"
 %define arg_packager_version --with-packager-version="%{release}"
 
-%if %{with_systemd}
-    %define arg_init_script --with-init-script=systemd
-%else
-    %define arg_init_script --with-init-script=redhat
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-    %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux"
-%else
-    %define arg_selinux_mount --with-selinux-mount="/selinux"
-%endif
-
-%if 0%{?fedora}
-    # Nightly firmware repo x86/OVMF
-    LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
-    # Nightly firmware repo aarch64/AAVMF
-    LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
-    # Fedora official x86/OVMF
-    LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
-    # Fedora official aarch64/AAVMF
-    LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
-    %define arg_loader_nvram --with-loader-nvram="$LOADERS"
-%endif
+%define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux"
 
 # place macros above and build commands below this comment
 
@@ -1876,28 +1605,33 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
 %endif
 
 rm -f po/stamp-po
-%configure %{?arg_qemu} \
+
+%define _configure ../configure
+mkdir %{_vpath_builddir}
+cd %{_vpath_builddir}
+
+%configure --enable-dependency-tracking \
+           --with-runstatedir=%{_rundir} \
+           %{?arg_qemu} \
            %{?arg_openvz} \
            %{?arg_lxc} \
            %{?arg_vbox} \
            %{?arg_libxl} \
            --with-sasl \
-           --with-avahi \
            --with-polkit \
            --with-libvirtd \
-           %{?arg_uml} \
-           %{?arg_phyp} \
            %{?arg_esx} \
            %{?arg_hyperv} \
            %{?arg_vmware} \
-           --without-xenapi \
            --without-vz \
            --without-bhyve \
+           --with-remote-default-mode=legacy \
            --with-interface \
            --with-network \
            --with-storage-fs \
            --with-storage-lvm \
            --with-storage-iscsi \
+           %{?arg_storage_iscsi_direct} \
            --with-storage-scsi \
            --with-storage-disk \
            --with-storage-mpath \
@@ -1926,32 +1660,26 @@ rm -f po/stamp-po
            %{?arg_firewalld} \
            %{?arg_firewalld_zone} \
            %{?arg_wireshark} \
-           %{?arg_pm_utils} \
+           --without-pm-utils \
            --with-nss-plugin \
            %{arg_packager} \
            %{arg_packager_version} \
            --with-qemu-user=%{qemu_user} \
            --with-qemu-group=%{qemu_group} \
            --with-tls-priority=%{tls_priority} \
-           %{?arg_loader_nvram} \
            %{?enable_werror} \
            --enable-expensive-tests \
-           %{arg_init_script} \
+           --with-init-script=systemd \
            %{?arg_login_shell}
 make %{?_smp_mflags} V=1
-gzip -9 ChangeLog
 
 %install
 rm -fr %{buildroot}
 
 export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
 
-# Avoid using makeinstall macro as it changes prefixes rather than setting
-# DESTDIR. Newer make_install macro would be better but it's not available
-# on RHEL 5, thus we need to expand it here.
-make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
-
-make %{?_smp_mflags} -C examples distclean V=1
+cd %{_vpath_builddir}
+%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -1974,8 +1702,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
 cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
    $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+# libvirt saves this file with mode 0600
+chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 
 # nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post
 # to avoid verification errors on changed files in /etc
@@ -2017,12 +1745,9 @@ 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_uml}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
-%endif
 
 # Copied into libvirt-docs subpackage eventually
-mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
 
 %ifarch %{power64} s390x x86_64 ia64 alpha sparc64
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
@@ -2035,21 +1760,31 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 %endif
 
 %check
-cd tests
-# These tests don't current work in a mock build root
-for i in nodeinfotest seclabeltest
-do
-  rm -f $i
-  printf 'int main(void) { return 0; }' > $i.c
-  printf '#!/bin/sh\nexit 0\n' > $i
-  chmod +x $i
+# The gnulib's test test-nonblocking-pipe.sh depends on timing and fails
+# on AArch64. Let's just disable it until we get rid of gnulib completely.
+for t in gnulib/tests/test-nonblocking-pipe.sh; do
+    rm -f $t
+    printf '#!/bin/sh\nexit 77\n' > $t
+    chmod a+x $t
 done
+
+cd %{_vpath_builddir}
 if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=1
 then
-  cat test-suite.log || true
+  cat tests/test-suite.log || true
   exit 1
 fi
 
+%post libs
+%if 0%{?rhel} == 7
+/sbin/ldconfig
+%endif
+
+%postun libs
+%if 0%{?rhel} == 7
+/sbin/ldconfig
+%endif
+
 %pre daemon
 # 'libvirt' group is just to allow password-less polkit access to
 # libvirtd. The uid number is irrelevant, so we use dynamic allocation
@@ -2060,83 +1795,29 @@ exit 0
 
 %post daemon
 
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_post virtlockd.socket virtlockd-admin.socket
-        %systemd_post virtlogd.socket virtlogd-admin.socket
-        %systemd_post libvirtd.service
-    %else
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl enable \
-        virtlockd.socket \
-        virtlockd-admin.socket \
-        virtlogd.socket \
-        virtlogd-admin.socket \
-        libvirtd.service >/dev/null 2>&1 || :
-fi
-    %endif
-%else
-/sbin/chkconfig --add libvirtd
-/sbin/chkconfig --add virtlogd
-/sbin/chkconfig --add virtlockd
-%endif
+%systemd_post virtlockd.socket virtlockd-admin.socket
+%systemd_post virtlogd.socket virtlogd-admin.socket
+%systemd_post libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
+%systemd_post libvirtd-tcp.socket libvirtd-tls.socket
+%systemd_post libvirtd.service
 
 # request daemon restart in posttrans
 mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
 touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
 
 %preun daemon
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_preun libvirtd.service
-        %systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service
-        %systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service
-    %else
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable \
-        libvirtd.service \
-        virtlogd.socket \
-        virtlogd-admin.socket \
-        virtlogd.service \
-        virtlockd.socket \
-        virtlockd-admin.socket \
-        virtlockd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop \
-        libvirtd.service \
-        virtlogd.socket \
-        virtlogd-admin.socket \
-        virtlogd.service \
-        virtlockd.socket \
-        virtlockd-admin.socket \
-        virtlockd.service > /dev/null 2>&1 || :
-fi
-    %endif
-%else
-if [ $1 = 0 ]; then
-    /sbin/service libvirtd stop 1>/dev/null 2>&1
-    /sbin/chkconfig --del libvirtd
-    /sbin/service virtlogd stop 1>/dev/null 2>&1
-    /sbin/chkconfig --del virtlogd
-    /sbin/service virtlockd stop 1>/dev/null 2>&1
-    /sbin/chkconfig --del virtlockd
-fi
-%endif
+%systemd_preun libvirtd.service
+%systemd_preun libvirtd-tcp.socket libvirtd-tls.socket
+%systemd_preun libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
+%systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service
+%systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service
 
 %postun daemon
-%if %{with_systemd}
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || :
     /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || :
 fi
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service virtlockd reload > /dev/null 2>&1 || :
-    /sbin/service virtlogd reload > /dev/null 2>&1 || :
-fi
-%endif
 
 # In upgrade scenario we must explicitly enable virtlockd/virtlogd
 # sockets, if libvirtd is already enabled and start them if
@@ -2144,38 +1825,56 @@ fi
 # guests
 %triggerpostun daemon -- libvirt-daemon < 1.3.0
 if [ $1 -ge 1 ] ; then
-%if %{with_systemd}
     /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
         /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
     /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
         /bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
-%else
-    /sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
-        /sbin/chkconfig virtlogd on || :
-    /sbin/service libvirtd status 1>/dev/null 2>&1 &&
-        /sbin/service virtlogd start || :
-    /sbin/service virtlockd reload > /dev/null 2>&1 || :
-    /sbin/service virtlogd reload > /dev/null 2>&1 || :
-%endif
 fi
 
 %posttrans daemon
 if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-%if %{with_systemd}
-    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%else
-    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
-%endif
+    # See if user has previously modified their install to
+    # tell libvirtd to use --listen
+    grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1
+    if test $? = 0
+    then
+        # Then lets keep honouring --listen and *not* use
+        # systemd socket activation, because switching things
+        # might confuse mgmt tool like puppet/ansible that
+        # expect the old style libvirtd
+        /bin/systemctl mask libvirtd.socket >/dev/null 2>&1 || :
+        /bin/systemctl mask libvirtd-ro.socket >/dev/null 2>&1 || :
+        /bin/systemctl mask libvirtd-admin.socket >/dev/null 2>&1 || :
+        /bin/systemctl mask libvirtd-tls.socket >/dev/null 2>&1 || :
+        /bin/systemctl mask libvirtd-tcp.socket >/dev/null 2>&1 || :
+    else
+        # Old libvirtd owns the sockets and will delete them on
+        # shutdown. Can't use a try-restart as libvirtd will simply
+        # own the sockets again when it comes back up. Thus we must
+        # do this particular ordering, so that we get libvirtd
+        # running with socket activation in use
+        /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1
+        if test $? = 0
+        then
+            /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
+
+            /bin/systemctl try-restart libvirtd.socket >/dev/null 2>&1 || :
+            /bin/systemctl try-restart libvirtd-ro.socket >/dev/null 2>&1 || :
+            /bin/systemctl try-restart libvirtd-admin.socket >/dev/null 2>&1 || :
+
+            /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
+        fi
+    fi
 fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 %post daemon-driver-network
-%if %{with_firewalld}
+%if %{with_firewalld_zone}
     %firewalld_reload
 %endif
 
 %postun daemon-driver-network
-%if %{with_firewalld}
+%if %{with_firewalld_zone}
     %firewalld_reload
 %endif
 
@@ -2215,6 +1914,8 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
          < %{_datadir}/libvirt/networks/default.xml \
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+    # libvirt saves this file with mode 0600
+    chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml
 
     # Make sure libvirt picks up the new network defininiton
     mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
@@ -2223,43 +1924,25 @@ fi
 
 %posttrans daemon-config-network
 if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-%if %{with_systemd}
     /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%else
-    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
-%endif
 fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 %post daemon-config-nwfilter
 cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/
+# libvirt saves these files with mode 600
+chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml
 # Make sure libvirt picks up the new nwfilter defininitons
 mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
 touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
 
 %posttrans daemon-config-nwfilter
 if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-%if %{with_systemd}
     /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%else
-    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
-%endif
 fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 
-%if %{with_systemd}
-%triggerun -- libvirt < 0.9.4
-%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-/bin/systemctl --no-reload enable libvirtd.service >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del libvirtd >/dev/null 2>&1 || :
-/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-%endif
-
 %if %{with_qemu}
 %pre daemon-driver-qemu
 # We want soft static allocation of well-known ids, as disk images
@@ -2279,52 +1962,13 @@ exit 0
 
 %preun client
 
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_preun libvirt-guests.service
-    %endif
-%else
-if [ $1 = 0 ]; then
-    /sbin/chkconfig --del libvirt-guests
-    rm -f /var/lib/libvirt/libvirt-guests
-fi
-%endif
+%systemd_preun libvirt-guests.service
 
 %post client
-
-/sbin/ldconfig
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_post libvirt-guests.service
-    %endif
-%else
-/sbin/chkconfig --add libvirt-guests
-%endif
+%systemd_post libvirt-guests.service
 
 %postun client
-
-/sbin/ldconfig
-%if %{with_systemd}
-    %if %{with_systemd_macros}
-        %systemd_postun libvirt-guests.service
-    %endif
-%triggerun client -- libvirt < 0.9.4
-%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-/bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||:
-
-# Run this because the SysV package being removed won't do them
-/sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || :
-%endif
-
-%if %{with_sanlock}
-%post lock-sanlock
-if getent group sanlock > /dev/null ; then
-    chmod 0770 %{_localstatedir}/lib/libvirt/sanlock
-    chown root:sanlock %{_localstatedir}/lib/libvirt/sanlock
-fi
-%endif
+%systemd_postun libvirt-guests.service
 
 %if %{with_lxc}
 %pre login-shell
@@ -2335,33 +1979,25 @@ exit 0
 %files
 
 %files docs
-%doc AUTHORS ChangeLog.gz NEWS README README.md
-%doc libvirt-docs/*
-
-# API docs
-%dir %{_datadir}/gtk-doc/html/libvirt/
-%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
-%doc %{_datadir}/gtk-doc/html/libvirt/*.html
-%doc %{_datadir}/gtk-doc/html/libvirt/*.png
-%doc %{_datadir}/gtk-doc/html/libvirt/*.css
-%doc examples/hellolibvirt
-%doc examples/object-events
-%doc examples/dominfo
-%doc examples/domsuspend
-%doc examples/dommigrate
-%doc examples/openauth
-%doc examples/xml
-%doc examples/rename
-%doc examples/systemtap
-%doc examples/admin
-
+%doc AUTHORS ChangeLog NEWS README README.md
+%doc %{_vpath_builddir}/libvirt-docs/*
 
 %files daemon
 
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
-%if %{with_systemd}
 %{_unitdir}/libvirtd.service
+%{_unitdir}/libvirtd.socket
+%{_unitdir}/libvirtd-ro.socket
+%{_unitdir}/libvirtd-admin.socket
+%{_unitdir}/libvirtd-tcp.socket
+%{_unitdir}/libvirtd-tls.socket
+%{_unitdir}/virtproxyd.service
+%{_unitdir}/virtproxyd.socket
+%{_unitdir}/virtproxyd-ro.socket
+%{_unitdir}/virtproxyd-admin.socket
+%{_unitdir}/virtproxyd-tcp.socket
+%{_unitdir}/virtproxyd-tls.socket
 %{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
 %{_unitdir}/virtlogd.socket
@@ -2369,15 +2005,11 @@ exit 0
 %{_unitdir}/virtlockd.service
 %{_unitdir}/virtlockd.socket
 %{_unitdir}/virtlockd-admin.socket
-%else
-%{_sysconfdir}/rc.d/init.d/libvirtd
-%{_sysconfdir}/rc.d/init.d/virtlogd
-%{_sysconfdir}/rc.d/init.d/virtlockd
-%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
@@ -2386,7 +2018,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
 %dir %{_datadir}/libvirt/
 
-%ghost %dir %{_localstatedir}/run/libvirt/
+%ghost %dir %{_rundir}/libvirt/
 
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
@@ -2405,6 +2037,8 @@ exit 0
 %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %if %{with_qemu}
 %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
@@ -2419,6 +2053,7 @@ exit 0
 %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
 
 %attr(0755, root, root) %{_sbindir}/libvirtd
+%attr(0755, root, root) %{_sbindir}/virtproxyd
 %attr(0755, root, root) %{_sbindir}/virtlogd
 %attr(0755, root, root) %{_sbindir}/virtlockd
 
@@ -2427,11 +2062,11 @@ exit 0
 %{_mandir}/man8/virtlockd.8*
 %{_mandir}/man7/virkey*.7*
 
-%doc examples/polkit/*.rules
-
 %files daemon-config-network
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
+%ghost %{_sysconfdir}/libvirt/qemu/networks/default.xml
+%ghost %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 
 %files daemon-config-nwfilter
 %dir %{_datadir}/libvirt/nwfilter/
@@ -2439,13 +2074,29 @@ exit 0
 %ghost %{_sysconfdir}/libvirt/nwfilter/*.xml
 
 %files daemon-driver-interface
+%config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf
+%{_datadir}/augeas/lenses/virtinterfaced.aug
+%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
+%{_unitdir}/virtinterfaced.service
+%{_unitdir}/virtinterfaced.socket
+%{_unitdir}/virtinterfaced-ro.socket
+%{_unitdir}/virtinterfaced-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtinterfaced
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
 
 %files daemon-driver-network
+%config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf
+%{_datadir}/augeas/lenses/virtnetworkd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
+%{_unitdir}/virtnetworkd.service
+%{_unitdir}/virtnetworkd.socket
+%{_unitdir}/virtnetworkd-ro.socket
+%{_unitdir}/virtnetworkd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtnetworkd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
-%ghost %dir %{_localstatedir}/run/libvirt/network/
+%ghost %dir %{_rundir}/libvirt/network/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
 %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
@@ -2456,19 +2107,51 @@ exit 0
 %endif
 
 %files daemon-driver-nodedev
+%config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf
+%{_datadir}/augeas/lenses/virtnodedevd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
+%{_unitdir}/virtnodedevd.service
+%{_unitdir}/virtnodedevd.socket
+%{_unitdir}/virtnodedevd-ro.socket
+%{_unitdir}/virtnodedevd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtnodedevd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
 
 %files daemon-driver-nwfilter
+%config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf
+%{_datadir}/augeas/lenses/virtnwfilterd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
+%{_unitdir}/virtnwfilterd.service
+%{_unitdir}/virtnwfilterd.socket
+%{_unitdir}/virtnwfilterd-ro.socket
+%{_unitdir}/virtnwfilterd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtnwfilterd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
-%ghost %dir %{_localstatedir}/run/libvirt/network/
+%ghost %dir %{_rundir}/libvirt/network/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
 
 %files daemon-driver-secret
+%config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf
+%{_datadir}/augeas/lenses/virtsecretd.aug
+%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
+%{_unitdir}/virtsecretd.service
+%{_unitdir}/virtsecretd.socket
+%{_unitdir}/virtsecretd-ro.socket
+%{_unitdir}/virtsecretd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtsecretd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
 
 %files daemon-driver-storage
 
 %files daemon-driver-storage-core
+%config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf
+%{_datadir}/augeas/lenses/virtstoraged.aug
+%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
+%{_unitdir}/virtstoraged.service
+%{_unitdir}/virtstoraged.socket
+%{_unitdir}/virtstoraged-ro.socket
+%{_unitdir}/virtstoraged-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtstoraged
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
@@ -2486,6 +2169,11 @@ exit 0
 %files daemon-driver-storage-iscsi
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
 
+%if %{with_storage_iscsi_direct}
+%files daemon-driver-storage-iscsi-direct
+%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
+%endif
+
 %files daemon-driver-storage-mpath
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so
 
@@ -2512,12 +2200,20 @@ exit 0
 
 %if %{with_qemu}
 %files daemon-driver-qemu
+%config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
+%{_datadir}/augeas/lenses/virtqemud.aug
+%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
+%{_unitdir}/virtqemud.service
+%{_unitdir}/virtqemud.socket
+%{_unitdir}/virtqemud-ro.socket
+%{_unitdir}/virtqemud-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtqemud
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
-%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
+%ghost %dir %{_rundir}/libvirt/qemu/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
 %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
@@ -2529,10 +2225,18 @@ exit 0
 
 %if %{with_lxc}
 %files daemon-driver-lxc
+%config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf
+%{_datadir}/augeas/lenses/virtlxcd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
+%{_unitdir}/virtlxcd.service
+%{_unitdir}/virtlxcd.socket
+%{_unitdir}/virtlxcd-ro.socket
+%{_unitdir}/virtlxcd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtlxcd
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
 %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
-%ghost %dir %{_localstatedir}/run/libvirt/lxc/
+%ghost %dir %{_rundir}/libvirt/lxc/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
@@ -2540,30 +2244,37 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
 %endif
 
-%if %{with_uml}
-%files daemon-driver-uml
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
-%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
-%ghost %dir %{_localstatedir}/run/libvirt/uml/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so
-%endif
-
 %if %{with_libxl}
 %files daemon-driver-libxl
+%config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf
+%{_datadir}/augeas/lenses/virtxend.aug
+%{_datadir}/augeas/lenses/tests/test_virtxend.aug
+%{_unitdir}/virtxend.service
+%{_unitdir}/virtxend.socket
+%{_unitdir}/virtxend-ro.socket
+%{_unitdir}/virtxend-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtxend
 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %{_datadir}/augeas/lenses/libvirtd_libxl.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
-%ghost %dir %{_localstatedir}/run/libvirt/libxl/
+%ghost %dir %{_rundir}/libvirt/libxl/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
 %endif
 
 %if %{with_vbox}
 %files daemon-driver-vbox
+%config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
+%{_datadir}/augeas/lenses/virtvboxd.aug
+%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
+%{_unitdir}/virtvboxd.service
+%{_unitdir}/virtvboxd.socket
+%{_unitdir}/virtvboxd-ro.socket
+%{_unitdir}/virtvboxd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtvboxd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
 %endif
 
@@ -2579,10 +2290,6 @@ exit 0
 %files daemon-lxc
 %endif
 
-%if %{with_uml}
-%files daemon-uml
-%endif
-
 %if %{with_libxl}
 %files daemon-xen
 %endif
@@ -2602,7 +2309,7 @@ exit 0
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/sanlock
+%dir %attr(0770, root, sanlock) %{_localstatedir}/lib/libvirt/sanlock
 %{_sbindir}/virt-sanlock-cleanup
 %{_mandir}/man8/virt-sanlock-cleanup.8*
 %attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper
@@ -2629,17 +2336,11 @@ exit 0
 %endif
 
 
-%if %{with_systemd}
 %{_unitdir}/libvirt-guests.service
-%else
-%{_sysconfdir}/rc.d/init.d/libvirt-guests
-%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
 
-%files libs -f %{name}.lang
-# RHEL6 doesn't have 'license' macro
-%{!?_licensedir:%global license %%doc}
+%files libs -f %{_vpath_builddir}/%{name}.lang
 %license COPYING COPYING.LESSER
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf
@@ -2655,12 +2356,15 @@ exit 0
 %{_datadir}/libvirt/schemas/capability.rng
 %{_datadir}/libvirt/schemas/cputypes.rng
 %{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/domainbackup.rng
 %{_datadir}/libvirt/schemas/domaincaps.rng
+%{_datadir}/libvirt/schemas/domaincheckpoint.rng
 %{_datadir}/libvirt/schemas/domaincommon.rng
 %{_datadir}/libvirt/schemas/domainsnapshot.rng
 %{_datadir}/libvirt/schemas/interface.rng
 %{_datadir}/libvirt/schemas/network.rng
 %{_datadir}/libvirt/schemas/networkcommon.rng
+%{_datadir}/libvirt/schemas/networkport.rng
 %{_datadir}/libvirt/schemas/nodedev.rng
 %{_datadir}/libvirt/schemas/nwfilter.rng
 %{_datadir}/libvirt/schemas/nwfilter_params.rng
@@ -2668,9 +2372,10 @@ exit 0
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storagecommon.rng
 %{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagepoolcaps.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 
-%{_datadir}/libvirt/cpu_map.xml
+%{_datadir}/libvirt/cpu_map/*.xml
 
 %{_datadir}/libvirt/test-screenshot.png
 
@@ -2698,6 +2403,7 @@ exit 0
 %if %{with_lxc}
 %files login-shell
 %attr(4750, root, virtlogin) %{_bindir}/virt-login-shell
+%{_libexecdir}/virt-login-shell-helper
 %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
 %{_mandir}/man1/virt-login-shell.1*
 %endif
@@ -2713,6 +2419,7 @@ exit 0
 %{_includedir}/libvirt/libvirt-admin.h
 %{_includedir}/libvirt/libvirt-common.h
 %{_includedir}/libvirt/libvirt-domain.h
+%{_includedir}/libvirt/libvirt-domain-checkpoint.h
 %{_includedir}/libvirt/libvirt-domain-snapshot.h
 %{_includedir}/libvirt/libvirt-event.h
 %{_includedir}/libvirt/libvirt-host.h
@@ -2735,11 +2442,55 @@ exit 0
 %{_datadir}/libvirt/api/libvirt-admin-api.xml
 %{_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{_datadir}/libvirt/api/libvirt-lxc-api.xml
-# Needed building python bindings
-%doc docs/libvirt-api.xml
 
 
 %changelog
+* Wed Aug 26 2020 Jiri Denemark <jdenemar@redhat.com> - 6.0.0-28
+- virdevmapper: Don't cache device-mapper major (rhbz#1860421)
+- virdevmapper: Handle kernel without device-mapper support (rhbz#1860421)
+- virdevmapper: Ignore all errors when opening /dev/mapper/control (rhbz#1860421)
+
+* Fri Aug  7 2020 Jiri Denemark <jdenemar@redhat.com> - 6.0.0-27
+- src: assume sys/sysmacros.h always exists on Linux (rhbz#1860421)
+- virdevmapper.c: Join two WITH_DEVMAPPER sections together (rhbz#1860421)
+- virDevMapperGetTargetsImpl: Use VIR_AUTOSTRINGLIST (rhbz#1860421)
+- virdevmapper: Don't use libdevmapper to obtain dependencies (CVE-2020-14339, rhbz#1860421)
+- virDevMapperGetTargets: Don't ignore EBADF (rhbz#1860421)
+
+* Fri Jul 24 2020 Jiri Denemark <jdenemar@redhat.com> - 6.0.0-26
+- qemu: blockjob: Don't base bitmap handling of active-layer block commit on QEMU_CAPS_BLOCKDEV_REOPEN (rhbz#1857779)
+- qemu: blockjob: Actually delete temporary bitmap on failed active commit (rhbz#1857779)
+- qemu: block: Remove 'active-write' bitmap even if there are no bitmaps to merge (rhbz#1857779)
+- qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions' (rhbz#1857779)
+- qemuDomainBlockPivot: Ignore failures of creating active layer bitmap (rhbz#1857779)
+
+* Wed Jun 24 2020 Jiri Denemark <jdenemar@redhat.com> - 6.0.0-25
+- Upgrade components in virt:rhel module:stream for RHEL-8.3 release (rhbz#1828317)
+- conf: Don't format http cookies unless VIR_DOMAIN_DEF_FORMAT_SECURE is used (CVE-2020-14301)
+- util: Introduce a parser for kernel cmdline arguments (rhbz#1848997)
+- qemu: Check if s390 secure guest support is enabled (rhbz#1848997)
+- qemu: Check if AMD secure guest support is enabled (rhbz#1848997)
+- tools: Secure guest check on s390 in virt-host-validate (rhbz#1848997)
+- tools: Secure guest check for AMD in virt-host-validate (rhbz#1848997)
+- docs: Update AMD launch secure description (rhbz#1848997)
+- docs: Describe protected virtualization guest setup (rhbz#1848997)
+
+* Fri Jun 19 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 6.0.0
+- Resolves: bz#1828317
+(Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
+
+* Tue Jun 09 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 6.0.0
+- Resolves: bz#1810193
+(Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
+
+* Fri Jun 05 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 6.0.0
+- Resolves: bz#1810193
+(Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
+
+* Mon Apr 27 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 6.0.0
+- Resolves: bz#1810193
+  (Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
+
 * Mon Mar 16 2020 Jiri Denemark <jdenemar@redhat.com> - 4.5.0-42
 - RHEL: virscsi: Check device type before getting it's /dev node name (rhbz#1808388)
 - RHEL: virscsi: Support TAPEs in virSCSIDeviceGetDevName() (rhbz#1808388)